[xmlsec] update docs



commit 3a6f9999bffc6285f1af4342cb8c753cf8fc7703
Author: Aleksey Sanin <aleksey aleksey com>
Date:   Tue Jul 14 00:15:18 2009 -0700

    update docs

 docs/api/index.html                                |   19 +-
 docs/api/index.sgml                                |  156 ++-
 docs/api/sgml/app.sgml                             |  653 +++++++-
 docs/api/sgml/base64.sgml                          |   27 +
 docs/api/sgml/errors.sgml                          |    2 +-
 docs/api/sgml/gnutls/app.sgml                      |  149 ++
 docs/api/sgml/gnutls/crypto.sgml                   |   70 +-
 docs/api/sgml/gnutls/xmlsec-gnutls-doc.bottom      |    2 +-
 docs/api/sgml/gnutls/xmlsec-gnutls-doc.top         |    2 +-
 docs/api/sgml/keyinfo.sgml                         |   98 +-
 docs/api/sgml/keys.sgml                            |   16 +-
 docs/api/sgml/keysdata.sgml                        |   48 +-
 docs/api/sgml/keysmngr.sgml                        |   56 +-
 docs/api/sgml/list.sgml                            |   12 +-
 docs/api/sgml/mscrypto/app.sgml                    |  132 ++
 docs/api/sgml/mscrypto/certkeys.sgml               |   17 +
 docs/api/sgml/mscrypto/crypto.sgml                 |   69 +
 docs/api/sgml/mscrypto/x509.sgml                   |  104 +-
 docs/api/sgml/mscrypto/xmlsec-mscrypto-doc.bottom  |    4 +-
 docs/api/sgml/mscrypto/xmlsec-mscrypto-doc.top     |    4 +-
 docs/api/sgml/nodeset.sgml                         |   16 +-
 docs/api/sgml/nss/crypto.sgml                      |  101 +-
 docs/api/sgml/nss/x509.sgml                        |    4 +-
 docs/api/sgml/nss/xmlsec-nss-doc.bottom            |    6 +-
 docs/api/sgml/nss/xmlsec-nss-doc.top               |    6 +-
 docs/api/sgml/openssl/app.sgml                     |   23 +
 docs/api/sgml/openssl/crypto.sgml                  |  455 +++++-
 docs/api/sgml/openssl/x509.sgml                    |   47 +-
 docs/api/sgml/openssl/xmlsec-openssl-doc.bottom    |    4 +-
 docs/api/sgml/openssl/xmlsec-openssl-doc.top       |    4 +-
 docs/api/sgml/private.sgml                         |   18 +
 docs/api/sgml/soap.sgml                            |   76 +-
 docs/api/sgml/templates.sgml                       |  427 ++++--
 docs/api/sgml/transforms.sgml                      |   14 +-
 docs/api/sgml/version.sgml                         |    6 +-
 docs/api/sgml/x509.sgml                            |   18 +-
 docs/api/sgml/xkms.sgml                            | 1870 --------------------
 docs/api/sgml/xmldsig.sgml                         |  118 +-
 docs/api/sgml/xmlenc.sgml                          |  109 +-
 docs/api/sgml/xmltree.sgml                         |  135 ++-
 docs/api/tmpl/app.sgml                             |  330 ++++-
 docs/api/tmpl/base64.sgml                          |   16 +
 docs/api/tmpl/bn.sgml                              |    7 -
 docs/api/tmpl/gnutls/app.sgml                      |   52 +
 docs/api/tmpl/gnutls/crypto.sgml                   |   24 +-
 docs/api/tmpl/keysmngr.sgml                        |    9 +
 docs/api/tmpl/mscrypto/app.sgml                    |   64 +-
 docs/api/tmpl/mscrypto/certkeys.sgml               |    9 +
 docs/api/tmpl/mscrypto/crypto.sgml                 |   45 +
 docs/api/tmpl/mscrypto/x509.sgml                   |   45 +-
 docs/api/tmpl/mscrypto/xmlsec-mscrypto-unused.sgml |    9 -
 docs/api/tmpl/nss/crypto.sgml                      |   47 +-
 docs/api/tmpl/openssl/app.sgml                     |   12 +-
 docs/api/tmpl/openssl/crypto.sgml                  |  284 +++-
 docs/api/tmpl/openssl/x509.sgml                    |   20 +
 docs/api/tmpl/openssl/xmlsec-openssl-unused.sgml   |   20 -
 docs/api/tmpl/private.sgml                         |    3 +
 docs/api/tmpl/templates.sgml                       |   78 +
 docs/api/tmpl/xkms.sgml                            |  851 ---------
 docs/api/tmpl/xmlenc.sgml                          |    9 +-
 docs/api/tmpl/xmlsec-unused.sgml                   |  655 +++++++-
 docs/api/tmpl/xmltree.sgml                         |   44 +
 docs/api/xmlsec-app.html                           |  983 +++++++++--
 docs/api/xmlsec-base64.html                        |  125 +-
 docs/api/xmlsec-bn.html                            |  220 ++--
 docs/api/xmlsec-buffer.html                        |  184 +-
 docs/api/xmlsec-custom-keys-manager.html           |   16 +-
 docs/api/xmlsec-decrypt-with-keys-mngr.html        |   16 +-
 docs/api/xmlsec-decrypt-with-signle-key.html       |   16 +-
 docs/api/xmlsec-dl.html                            |   66 +-
 docs/api/xmlsec-encrypt-dynamic-template.html      |   16 +-
 docs/api/xmlsec-encrypt-template-file.html         |   16 +-
 docs/api/xmlsec-encrypt-with-session-key.html      |   16 +-
 docs/api/xmlsec-encryption-klasses.html            |   16 +-
 docs/api/xmlsec-errors.html                        |  212 ++-
 .../xmlsec-examples-sign-dynamimc-template.html    |   16 +-
 docs/api/xmlsec-examples-sign-template-file.html   |   16 +-
 docs/api/xmlsec-examples-sign-x509.html            |   16 +-
 docs/api/xmlsec-examples.html                      |   16 +-
 docs/api/xmlsec-gnutls-app.html                    |  301 +++-
 docs/api/xmlsec-gnutls-crypto.html                 |  216 ++-
 docs/api/xmlsec-gnutls-ref.html                    |   16 +-
 docs/api/xmlsec-index.html                         |  327 ++--
 docs/api/xmlsec-index.sgml                         | 1236 +++++++++++++
 docs/api/xmlsec-io.html                            |   62 +-
 docs/api/xmlsec-keyinfo.html                       |  192 ++-
 docs/api/xmlsec-keys.html                          |  364 ++--
 docs/api/xmlsec-keysdata.html                      |  652 ++++----
 docs/api/xmlsec-keysmngr.html                      |  247 ++--
 docs/api/xmlsec-list.html                          |  188 ++-
 docs/api/xmlsec-membuf.html                        |   36 +-
 docs/api/xmlsec-mscrypto-app.html                  |  344 +++-
 docs/api/xmlsec-mscrypto-certkeys.html             |   74 +-
 docs/api/xmlsec-mscrypto-crypto.html               |  235 ++-
 docs/api/xmlsec-mscrypto-keysstore.html            |   58 +-
 docs/api/xmlsec-mscrypto-ref.html                  |   16 +-
 docs/api/xmlsec-mscrypto-x509.html                 |  264 ++-
 docs/api/xmlsec-nodeset.html                       |  162 +-
 docs/api/xmlsec-notes-compiling-others.html        |   16 +-
 docs/api/xmlsec-notes-compiling-unix.html          |   16 +-
 docs/api/xmlsec-notes-compiling-windows.html       |   16 +-
 docs/api/xmlsec-notes-compiling.html               |   16 +-
 docs/api/xmlsec-notes-contexts.html                |   16 +-
 docs/api/xmlsec-notes-custom-keys-store.html       |   16 +-
 docs/api/xmlsec-notes-decrypt.html                 |   16 +-
 .../xmlsec-notes-dynamic-encryption-templates.html |   16 +-
 .../xmlsec-notes-dynamic-signature-templates.html  |   16 +-
 docs/api/xmlsec-notes-encrypt.html                 |   16 +-
 docs/api/xmlsec-notes-include-files.html           |   16 +-
 docs/api/xmlsec-notes-init-shutdown.html           |   16 +-
 docs/api/xmlsec-notes-keys-manager-sign-enc.html   |   16 +-
 .../api/xmlsec-notes-keys-mngr-verify-decrypt.html |   16 +-
 docs/api/xmlsec-notes-keys.html                    |   16 +-
 docs/api/xmlsec-notes-keysmngr.html                |   16 +-
 docs/api/xmlsec-notes-new-crypto-functions.html    |   16 +-
 docs/api/xmlsec-notes-new-crypto-key-stores.html   |   16 +-
 docs/api/xmlsec-notes-new-crypto-keys.html         |   16 +-
 docs/api/xmlsec-notes-new-crypto-klasses.html      |   16 +-
 .../xmlsec-notes-new-crypto-sharing-results.html   |   16 +-
 .../xmlsec-notes-new-crypto-simple-keys-mngr.html  |   16 +-
 docs/api/xmlsec-notes-new-crypto-skeleton.html     |   16 +-
 docs/api/xmlsec-notes-new-crypto-transforms.html   |   16 +-
 docs/api/xmlsec-notes-new-crypto.html              |   16 +-
 docs/api/xmlsec-notes-overview.html                |   16 +-
 docs/api/xmlsec-notes-sign-encrypt.html            |   16 +-
 docs/api/xmlsec-notes-sign-x509.html               |   16 +-
 docs/api/xmlsec-notes-sign.html                    |   16 +-
 docs/api/xmlsec-notes-simple-keys-store.html       |   16 +-
 docs/api/xmlsec-notes-structure.html               |   16 +-
 docs/api/xmlsec-notes-templates.html               |   16 +-
 docs/api/xmlsec-notes-transforms.html              |   16 +-
 docs/api/xmlsec-notes-verify-decrypt.html          |   16 +-
 docs/api/xmlsec-notes-verify-x509.html             |   16 +-
 docs/api/xmlsec-notes-verify.html                  |   16 +-
 docs/api/xmlsec-notes-x509.html                    |   16 +-
 docs/api/xmlsec-notes.html                         |   16 +-
 docs/api/xmlsec-nss-app.html                       |  228 ++--
 docs/api/xmlsec-nss-bignum.html                    |   44 +-
 docs/api/xmlsec-nss-crypto.html                    |  321 +++--
 docs/api/xmlsec-nss-keysstore.html                 |   58 +-
 docs/api/xmlsec-nss-pkikeys.html                   |   58 +-
 docs/api/xmlsec-nss-ref.html                       |   16 +-
 docs/api/xmlsec-nss-x509.html                      |  142 +-
 docs/api/xmlsec-openssl-app.html                   |  265 ++--
 docs/api/xmlsec-openssl-bn.html                    |   42 +-
 docs/api/xmlsec-openssl-crypto.html                |  783 +++++++--
 docs/api/xmlsec-openssl-evp.html                   |   50 +-
 docs/api/xmlsec-openssl-ref.html                   |   16 +-
 docs/api/xmlsec-openssl-x509.html                  |  213 ++-
 docs/api/xmlsec-parser.html                        |   62 +-
 docs/api/xmlsec-ref.html                           |   19 +-
 docs/api/xmlsec-reference.html                     |   16 +-
 docs/api/xmlsec-signature-klasses.html             |   16 +-
 docs/api/xmlsec-templates.html                     |  549 ++++--
 docs/api/xmlsec-transforms.html                    |  918 +++++-----
 docs/api/xmlsec-verify-with-key.html               |   16 +-
 docs/api/xmlsec-verify-with-keys-mngr.html         |   16 +-
 docs/api/xmlsec-verify-with-restrictions.html      |   16 +-
 docs/api/xmlsec-verify-with-x509.html              |   16 +-
 docs/api/xmlsec-version.html                       |   40 +-
 docs/api/xmlsec-x509.html                          |   46 +-
 docs/api/xmlsec-xmldsig.html                       |  258 ++--
 docs/api/xmlsec-xmlenc.html                        |  198 ++-
 docs/api/xmlsec-xmlsec.html                        |   62 +-
 docs/api/xmlsec-xmltree.html                       |  553 ++++---
 165 files changed, 13088 insertions(+), 7243 deletions(-)
---
diff --git a/docs/api/index.html b/docs/api/index.html
index dc4f67a..533629a 100644
--- a/docs/api/index.html
+++ b/docs/api/index.html
@@ -71,7 +71,21 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/";><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Links - start--><!--Links - end-->
+<!--Links - start--><tr>
+<td width="15"></td>
+<td><br><br><br><br><br><hr></td>
+</tr>
+<tr>
+<td width="15"></td>
+<td>
+<font size="-1">
+<h4>Links</h4>
+<p>
+</p>
+</font>
+</td>
+</tr>
+<!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -80,7 +94,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>
diff --git a/docs/api/index.sgml b/docs/api/index.sgml
index 21539b3..4c20213 100644
--- a/docs/api/index.sgml
+++ b/docs/api/index.sgml
@@ -8,6 +8,8 @@
 <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">
@@ -36,22 +38,56 @@
 <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 ="XMLSECTRANSFORMHMACSHA1ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMHMACSHA1ID">
-<ANCHOR id ="XMLSECTRANSFORMHMACSHA1GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMHMACSHA1GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMHMACRIPEMD160ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMHMACRIPEMD160ID">
-<ANCHOR id ="XMLSECTRANSFORMHMACRIPEMD160GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMHMACRIPEMD160GETKLASS">
+<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">
@@ -59,12 +95,18 @@
 <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">
@@ -423,6 +465,7 @@
 <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">
@@ -478,6 +521,7 @@
 <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">
@@ -503,6 +547,13 @@
 <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">
@@ -683,6 +734,7 @@
 <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">
@@ -721,8 +773,12 @@
 <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">
@@ -774,6 +830,7 @@
 <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">
@@ -789,6 +846,11 @@
 <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">
@@ -826,15 +888,27 @@
 <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 ="XMLSECOPENSSLTRANSFORMHMACSHA1ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA1ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMHMACSHA1GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA1GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMHMACRIPEMD160ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACRIPEMD160ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMHMACRIPEMD160GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACRIPEMD160GETKLASS">
 <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">
@@ -843,14 +917,34 @@
 <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">
@@ -880,7 +974,9 @@
 <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">
@@ -889,9 +985,13 @@
 <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">
@@ -913,15 +1013,17 @@
 <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 ="XMLSECGNUTLSTRANSFORMHMACSHA1ID" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA1ID">
-<ANCHOR id ="XMLSECGNUTLSTRANSFORMHMACSHA1GETKLASS" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA1GETKLASS">
-<ANCHOR id ="XMLSECGNUTLSTRANSFORMHMACRIPEMD160ID" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACRIPEMD160ID">
-<ANCHOR id ="XMLSECGNUTLSTRANSFORMHMACRIPEMD160GETKLASS" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACRIPEMD160GETKLASS">
 <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">
@@ -955,6 +1057,7 @@
 <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">
@@ -981,21 +1084,25 @@
 <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 ="XMLSECNSSTRANSFORMHMACSHA1ID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACSHA1ID">
-<ANCHOR id ="XMLSECNSSTRANSFORMHMACSHA1GETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACSHA1GETKLASS">
-<ANCHOR id ="XMLSECNSSTRANSFORMHMACRIPEMD160ID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACRIPEMD160ID">
-<ANCHOR id ="XMLSECNSSTRANSFORMHMACRIPEMD160GETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACRIPEMD160GETKLASS">
 <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">
@@ -1037,6 +1144,12 @@
 <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">
@@ -1049,6 +1162,7 @@
 <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">
@@ -1063,6 +1177,10 @@
 <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">
@@ -1071,6 +1189,8 @@
 <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">
@@ -1108,3 +1228,7 @@
 <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">
diff --git a/docs/api/sgml/app.sgml b/docs/api/sgml/app.sgml
index 00d2ab4..734ded2 100644
--- a/docs/api/sgml/app.sgml
+++ b/docs/api/sgml/app.sgml
@@ -24,6 +24,9 @@
 <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>
@@ -63,30 +66,81 @@
 #define     <link linkend="xmlSecTransformDsaSha1Id">xmlSecTransformDsaSha1Id</link>
 <link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformDsaSha1GetKlass">xmlSecTransformDsaSha1GetKlass</link>
                                             (void);
-#define     <link linkend="xmlSecTransformHmacSha1Id">xmlSecTransformHmacSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformHmacSha1GetKlass">xmlSecTransformHmacSha1GetKlass</link>
+#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="xmlSecTransformHmacMd5Id">xmlSecTransformHmacMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformHmacMd5GetKlass">xmlSecTransformHmacMd5GetKlass</link>
+#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>
@@ -105,18 +159,41 @@
                                              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>
@@ -242,6 +319,29 @@ 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()
+</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>
+<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
+(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()
 </programlisting>
@@ -561,24 +661,47 @@ implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
-<title><anchor id="xmlSecTransformHmacSha1Id">xmlSecTransformHmacSha1Id</title>
-<indexterm><primary>xmlSecTransformHmacSha1Id</primary></indexterm><programlisting>#define xmlSecTransformHmacSha1Id		xmlSecTransformHmacSha1GetKlass()
+<title><anchor id="xmlSecTransformGost2001GostR3411-94Id">xmlSecTransformGost2001GostR3411_94Id</title>
+<indexterm><primary>xmlSecTransformGost2001GostR3411_94Id</primary></indexterm><programlisting>#define xmlSecTransformGost2001GostR3411_94Id		xmlSecTransformGost2001GostR3411_94GetKlass()
 </programlisting>
 <para>
-The HMAC with SHA1 signature transform klass.</para>
+The GOST2001-GOSTR3411_94 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
+<title><anchor id="xmlSecTransformGost2001GostR3411-94GetKlass">xmlSecTransformGost2001GostR3411_94GetKlass ()</title>
+<indexterm><primary>xmlSecTransformGost2001GostR3411_94GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformGost2001GostR3411_94GetKlass
                                             (void);</programlisting>
 <para>
-The HMAC-SHA1 transform klass.</para>
+The GOST2001-GOSTR3411_94 signature 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> :</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()
+</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>
+<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
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
@@ -607,24 +730,139 @@ implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
-<title><anchor id="xmlSecTransformHmacMd5Id">xmlSecTransformHmacMd5Id</title>
-<indexterm><primary>xmlSecTransformHmacMd5Id</primary></indexterm><programlisting>#define xmlSecTransformHmacMd5Id		xmlSecTransformHmacMd5GetKlass()
+<title><anchor id="xmlSecTransformHmacSha1Id">xmlSecTransformHmacSha1Id</title>
+<indexterm><primary>xmlSecTransformHmacSha1Id</primary></indexterm><programlisting>#define xmlSecTransformHmacSha1Id		xmlSecTransformHmacSha1GetKlass()
 </programlisting>
 <para>
-The HMAC with MD5 signature transform klass.</para>
+The HMAC with SHA1 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
+<title><anchor id="xmlSecTransformHmacSha1GetKlass">xmlSecTransformHmacSha1GetKlass ()</title>
+<indexterm><primary>xmlSecTransformHmacSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformHmacSha1GetKlass
                                             (void);</programlisting>
 <para>
-The HMAC-MD5 transform klass.</para>
+The HMAC-SHA1 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> :</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()
+</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>
+<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
+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()
+</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>
+<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
+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()
+</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>
+<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
+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()
+</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>
+<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
+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()
+</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>
+<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
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
@@ -653,6 +891,52 @@ implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
+<title><anchor id="xmlSecTransformRsaMd5Id">xmlSecTransformRsaMd5Id</title>
+<indexterm><primary>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>
+<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
+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()
+</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>
+<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
+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()
 </programlisting>
@@ -676,6 +960,98 @@ implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
+<title><anchor id="xmlSecTransformRsaSha224Id">xmlSecTransformRsaSha224Id</title>
+<indexterm><primary>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>
+<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
+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()
+</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>
+<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
+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()
+</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>
+<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
+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()
+</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>
+<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
+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()
 </programlisting>
@@ -722,6 +1098,29 @@ 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()
+</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>
+<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
+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()
 </programlisting>
@@ -745,6 +1144,98 @@ implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
+<title><anchor id="xmlSecTransformSha224Id">xmlSecTransformSha224Id</title>
+<indexterm><primary>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>
+<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
+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()
+</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>
+<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
+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()
+</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>
+<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
+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()
+</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>
+<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
+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>
 <para>
@@ -881,6 +1372,38 @@ untrusted certs in <parameter>store</parameter>.</para>
 </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>
+<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>
+<listitem><simpara> 		the keys manager.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<listitem><simpara>		the certificate binary data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<listitem><simpara>		the certificate binary data size.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<listitem><simpara>		the certificate file format.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>type</parameter>&nbsp;:</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.
+</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,
@@ -911,6 +1434,40 @@ Reads key from the a file.</para>
 </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>
+<para>
+Reads key from the memory buffer.</para>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<listitem><simpara>		the binary key data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<listitem><simpara>		the size of binary key.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<listitem><simpara>		the key file format.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<listitem><simpara>		the key file password.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<listitem><simpara>	the key password callback.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</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.
+</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,
@@ -939,6 +1496,39 @@ in format=xmlSecKeyDataFormatPkcs12.</para>
 </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>
+<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>
+<listitem><simpara>		the PKCS12 binary data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<listitem><simpara>		the PKCS12 binary data size.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<listitem><simpara>		the PKCS12 file password.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<listitem><simpara>	the password callback.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</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.
+</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,
@@ -961,6 +1551,33 @@ Reads the certificate from $<parameter>filename</parameter> and adds it to key.<
 </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>
+<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>
+<listitem><simpara>		the pointer to key.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<listitem><simpara>		the certificate binary data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<listitem><simpara>		the certificate binary data size.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>format</parameter>&nbsp;:</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.
+</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>
diff --git a/docs/api/sgml/base64.sgml b/docs/api/sgml/base64.sgml
index 2b12b29..3091373 100644
--- a/docs/api/sgml/base64.sgml
+++ b/docs/api/sgml/base64.sgml
@@ -16,6 +16,8 @@
 
 
 #define     <link linkend="XMLSEC-BASE64-LINESIZE-CAPS">XMLSEC_BASE64_LINESIZE</link>
+<link linkend="int">int</link>         <link linkend="xmlSecBase64GetDefaultLineSize">xmlSecBase64GetDefaultLineSize</link>  ();
+<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);
@@ -67,6 +69,31 @@ The default maximum base64 encoded line size.</para>
 
 </para></refsect2>
 <refsect2>
+<title><anchor id="xmlSecBase64GetDefaultLineSize">xmlSecBase64GetDefaultLineSize ()</title>
+<indexterm><primary>xmlSecBase64GetDefaultLineSize</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBase64GetDefaultLineSize  ();</programlisting>
+<para>
+</para>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis> :</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>
+<para>
+Sets the current default line size.</para>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><parameter>columns</parameter>&nbsp;:</term>
+<listitem><simpara>
+
+
+</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>
diff --git a/docs/api/sgml/errors.sgml b/docs/api/sgml/errors.sgml
index daf8ac8..ce61daa 100644
--- a/docs/api/sgml/errors.sgml
+++ b/docs/api/sgml/errors.sgml
@@ -449,7 +449,7 @@ Max allowed retrievals level reached.</para>
 </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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink></ulink></ulink></ulink> node.</para>
+in the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink> node.</para>
 <para>
 
 </para></refsect2>
diff --git a/docs/api/sgml/gnutls/app.sgml b/docs/api/sgml/gnutls/app.sgml
index 8bfd4a7..f56bad4 100644
--- a/docs/api/sgml/gnutls/app.sgml
+++ b/docs/api/sgml/gnutls/app.sgml
@@ -33,18 +33,41 @@
                                              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>
@@ -204,6 +227,38 @@ untrusted certs in <parameter>store</parameter> (not implemented yet).</para>
 </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>
+<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>
+<listitem><simpara> 		the keys manager.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<listitem><simpara>		the certificate binary data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<listitem><simpara>		the certificate binary data size.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<listitem><simpara>		the certificate file format.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>type</parameter>&nbsp;:</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.
+</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,
@@ -234,6 +289,40 @@ Reads key from the a file (not implemented yet).</para>
 </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>
+<para>
+Reads key from the memory buffer (not implemented yet).</para>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<listitem><simpara>		the binary key data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<listitem><simpara>		the size of binary key.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<listitem><simpara>		the key file format.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<listitem><simpara>		the key file password.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<listitem><simpara>	the key password callback.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</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.
+</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,
@@ -263,6 +352,39 @@ in format=xmlSecKeyDataFormatPkcs12.</para>
 </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>
+<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>
+<listitem><simpara>		the PKCS12 binary data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<listitem><simpara>		the PKCS12 binary data size.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<listitem><simpara>		the PKCS12 file password.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<listitem><simpara>	the password callback.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</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.
+</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,
@@ -286,6 +408,33 @@ Reads the certificate from $<parameter>filename</parameter> and adds it to key
 </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>
+<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>
+<listitem><simpara>		the pointer to key.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<listitem><simpara>		the certificate binary data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<listitem><simpara>		the certificate binary data size.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>format</parameter>&nbsp;:</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.
+</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>
diff --git a/docs/api/sgml/gnutls/crypto.sgml b/docs/api/sgml/gnutls/crypto.sgml
index 00126b4..02f13b0 100644
--- a/docs/api/sgml/gnutls/crypto.sgml
+++ b/docs/api/sgml/gnutls/crypto.sgml
@@ -46,20 +46,24 @@
 #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>
+                                            ();
+<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="xmlSecGnuTLSTransformHmacSha1Id">xmlSecGnuTLSTransformHmacSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecGnuTLSTransformHmacSha1GetKlass">xmlSecGnuTLSTransformHmacSha1GetKlass</link>
+#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="xmlSecGnuTLSTransformHmacMd5Id">xmlSecGnuTLSTransformHmacMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecGnuTLSTransformHmacMd5GetKlass">xmlSecGnuTLSTransformHmacMd5GetKlass</link>
+#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>
@@ -315,6 +319,36 @@ Triple DES CBC encryption transform klass.</para>
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
+<title><anchor id="xmlSecGnuTLSHmacGetMinOutputLength">xmlSecGnuTLSHmacGetMinOutputLength ()</title>
+<indexterm><primary>xmlSecGnuTLSHmacGetMinOutputLength</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecGnuTLSHmacGetMinOutputLength
+                                            ();</programlisting>
+<para>
+</para>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis> :</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>
+<para>
+<parameter>min_length</parameter>: the new min length 
+</para>
+<para>
+Sets the min HMAC output length</para>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><parameter>min_length</parameter>&nbsp;:</term>
+<listitem><simpara>
+
+
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2>
 <title><anchor id="xmlSecGnuTLSKeyDataHmacId">xmlSecGnuTLSKeyDataHmacId</title>
 <indexterm><primary>xmlSecGnuTLSKeyDataHmacId</primary></indexterm><programlisting>#define     xmlSecGnuTLSKeyDataHmacId</programlisting>
 <para>
@@ -357,23 +391,23 @@ Sets the value of HMAC key data.</para>
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
-<title><anchor id="xmlSecGnuTLSTransformHmacSha1Id">xmlSecGnuTLSTransformHmacSha1Id</title>
-<indexterm><primary>xmlSecGnuTLSTransformHmacSha1Id</primary></indexterm><programlisting>#define     xmlSecGnuTLSTransformHmacSha1Id</programlisting>
+<title><anchor id="xmlSecGnuTLSTransformHmacMd5Id">xmlSecGnuTLSTransformHmacMd5Id</title>
+<indexterm><primary>xmlSecGnuTLSTransformHmacMd5Id</primary></indexterm><programlisting>#define     xmlSecGnuTLSTransformHmacMd5Id</programlisting>
 <para>
-The HMAC with SHA1 signature transform klass.</para>
+The HMAC with MD5 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
+<title><anchor id="xmlSecGnuTLSTransformHmacMd5GetKlass">xmlSecGnuTLSTransformHmacMd5GetKlass ()</title>
+<indexterm><primary>xmlSecGnuTLSTransformHmacMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecGnuTLSTransformHmacMd5GetKlass
                                             (void);</programlisting>
 <para>
-The HMAC-SHA1 transform klass.</para>
+The HMAC-MD5 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> :</term><listitem><simpara>the HMAC-MD5 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
@@ -397,23 +431,23 @@ The HMAC-RIPEMD160 transform klass.</para>
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
-<title><anchor id="xmlSecGnuTLSTransformHmacMd5Id">xmlSecGnuTLSTransformHmacMd5Id</title>
-<indexterm><primary>xmlSecGnuTLSTransformHmacMd5Id</primary></indexterm><programlisting>#define     xmlSecGnuTLSTransformHmacMd5Id</programlisting>
+<title><anchor id="xmlSecGnuTLSTransformHmacSha1Id">xmlSecGnuTLSTransformHmacSha1Id</title>
+<indexterm><primary>xmlSecGnuTLSTransformHmacSha1Id</primary></indexterm><programlisting>#define     xmlSecGnuTLSTransformHmacSha1Id</programlisting>
 <para>
-The HMAC with MD5 signature transform klass.</para>
+The HMAC with SHA1 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
+<title><anchor id="xmlSecGnuTLSTransformHmacSha1GetKlass">xmlSecGnuTLSTransformHmacSha1GetKlass ()</title>
+<indexterm><primary>xmlSecGnuTLSTransformHmacSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecGnuTLSTransformHmacSha1GetKlass
                                             (void);</programlisting>
 <para>
-The HMAC-MD5 transform klass.</para>
+The HMAC-SHA1 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> :</term><listitem><simpara>the HMAC-SHA1 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
diff --git a/docs/api/sgml/gnutls/xmlsec-gnutls-doc.bottom b/docs/api/sgml/gnutls/xmlsec-gnutls-doc.bottom
index 2f589ee..954db55 100644
--- a/docs/api/sgml/gnutls/xmlsec-gnutls-doc.bottom
+++ b/docs/api/sgml/gnutls/xmlsec-gnutls-doc.bottom
@@ -1,2 +1,2 @@
-    &xmlsec-gnutls-app;
     &xmlsec-gnutls-crypto;
+    &xmlsec-gnutls-app;
diff --git a/docs/api/sgml/gnutls/xmlsec-gnutls-doc.top b/docs/api/sgml/gnutls/xmlsec-gnutls-doc.top
index 7e275a7..68fed6b 100644
--- a/docs/api/sgml/gnutls/xmlsec-gnutls-doc.top
+++ b/docs/api/sgml/gnutls/xmlsec-gnutls-doc.top
@@ -1,2 +1,2 @@
-<!ENTITY xmlsec-gnutls-app SYSTEM "sgml/app.sgml">
 <!ENTITY xmlsec-gnutls-crypto SYSTEM "sgml/crypto.sgml">
+<!ENTITY xmlsec-gnutls-app SYSTEM "sgml/app.sgml">
diff --git a/docs/api/sgml/keyinfo.sgml b/docs/api/sgml/keyinfo.sgml
index b8facef..54de9a1 100644
--- a/docs/api/sgml/keyinfo.sgml
+++ b/docs/api/sgml/keyinfo.sgml
@@ -36,7 +36,7 @@ enum        <link linkend="xmlSecKeyInfoMode">xmlSecKeyInfoMode</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="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> <link linkend="xmlSecKeyInfoCtxCreate">xmlSecKeyInfoCtxCreate</link>  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
+<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);
@@ -85,19 +85,19 @@ struct      <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link>;
                                              <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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element <parameter>keyInfoNode</parameter>, extracts the key data
+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>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <listitem><simpara>		the pointer to result key object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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.
 </simpara></listitem></varlistentry>
@@ -108,18 +108,18 @@ and stores into <parameter>key</parameter>.</para>
                                              <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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element template <parameter>keyInfoNode</parameter>.</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>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <listitem><simpara>		the pointer to key object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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.
 </simpara></listitem></varlistentry>
@@ -138,12 +138,12 @@ The <parameter>xmlSecKeyInfoCtx</parameter> operation mode (read or write).</par
 </para><variablelist role="enum">
 <varlistentry>
 <term><literal>xmlSecKeyInfoModeRead</literal></term>
-<listitem><simpara> read <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink></ulink></ulink></ulink> element.
+<listitem><simpara> read <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink> element.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
 <term><literal>xmlSecKeyInfoModeWrite</literal></term>
-<listitem><simpara> write <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink></ulink></ulink></ulink> element.
+<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>
@@ -152,7 +152,7 @@ The <parameter>xmlSecKeyInfoCtx</parameter> operation mode (read or write).</par
 <indexterm><primary>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 "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink></ulink></ulink></ulink> 
+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>
 
@@ -162,7 +162,7 @@ element even when key is already found.</para>
 <indexterm><primary>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 "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink></ulink></ulink></ulink> 
+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>
 
@@ -173,7 +173,7 @@ child is found.</para>
 </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 "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName ">&lt;dsig:KeyName /&gt;</ulink></ulink></ulink></ulink> element) is found.</para>
+(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>
@@ -182,7 +182,7 @@ If flags is set then we abort if an unknown key name
 <indexterm><primary>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 "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue ">&lt;dsig:KeyValue /&gt;</ulink></ulink></ulink></ulink> 
+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>
 
@@ -193,7 +193,7 @@ child is found.</para>
 </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 "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink></ulink></ulink></ulink> element is found.</para>
+of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink> element is found.</para>
 <para>
 
 </para></refsect2>
@@ -202,7 +202,7 @@ of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod "><ulink U
 <indexterm><primary>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 "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink></ulink></ulink></ulink> 
+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>
 
@@ -212,7 +212,7 @@ element does not match the real key data type.</para>
 <indexterm><primary>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 "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data ">&lt;dsig:X509Data /&gt;</ulink></ulink></ulink></ulink> 
+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>
 
@@ -222,7 +222,7 @@ child is found.</para>
 <indexterm><primary>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 "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data ">&lt;dsig:X509Data /&gt;</ulink></ulink></ulink></ulink>
+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>
 
@@ -233,8 +233,8 @@ element without verification.</para>
 </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 "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial ">&lt;dsig:X509IssuerSerial /&gt;</ulink></ulink></ulink></ulink>, <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SKI "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SKI "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SKI "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SKI ">&lt;dsig:X509SKI /&gt;</ulink></ulink></ulink></ulink> or 
-<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName ">&lt;dsig:X509SubjectName /&gt;</ulink></ulink></ulink></ulink> elements.</para>
+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>
@@ -243,7 +243,7 @@ to certificate from <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Issue
 <indexterm><primary>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 "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data ">&lt;dsig:X509Data /&gt;</ulink></ulink></ulink></ulink> element
+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>
 
@@ -253,7 +253,7 @@ processing does not return a verified certificate.</para>
 <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
 </programlisting>
 <para>
-If the flag is set then we'll stop when <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey "><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey "><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey "><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey ">&lt;enc:EncryptedKey /&gt;</ulink></ulink></ulink></ulink> element
+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>
 
@@ -319,7 +319,7 @@ If the flag is set then we'll skip strict checking of certs and CRLs</para>
 };
 </programlisting>
 <para>
-The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink></ulink></ulink></ulink> reading or writing context.</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">
@@ -346,7 +346,7 @@ The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="htt
 </varlistentry>
 <varlistentry>
 <term><link linkend="xmlSecKeyInfoMode">xmlSecKeyInfoMode</link> <structfield>mode</structfield></term>
-<listitem><simpara> 		do we read or write <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink></ulink></ulink></ulink> element.
+<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>
@@ -362,27 +362,27 @@ The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="htt
 </varlistentry>
 <varlistentry>
 <term><link linkend="xmlSecTransformCtx">xmlSecTransformCtx</link> <structfield>retrievalMethodCtx</structfield></term>
-<listitem><simpara> the transforms context for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink></ulink></ulink></ulink>
+<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>
 <listitem><simpara> the max recursion level when processing
-		<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink></ulink></ulink></ulink> element; default level is 1 
+		<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>
-<listitem><simpara>		the encryption context for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-EncryptedKey "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-EncryptedKey "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-EncryptedKey "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-EncryptedKey ">&lt;dsig:EncryptedKey /&gt;</ulink></ulink></ulink></ulink> element
+<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>
 <listitem><simpara> the max recursion level when processing 
-		<ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey "><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey "><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey "><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey ">&lt;enc:EncryptedKey /&gt;</ulink></ulink></ulink></ulink> element; default level is 1 
+		<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>
@@ -407,13 +407,13 @@ The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="htt
 </varlistentry>
 <varlistentry>
 <term><link linkend="int">int</link> <structfield>curRetrievalMethodLevel</structfield></term>
-<listitem><simpara> the current <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink></ulink></ulink></ulink> element 
+<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>
-<listitem><simpara> the current <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey "><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey "><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey "><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey ">&lt;enc:EncryptedKey /&gt;</ulink></ulink></ulink></ulink> element
+<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>
@@ -435,9 +435,9 @@ The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="htt
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecKeyInfoCtxCreate">xmlSecKeyInfoCtxCreate ()</title>
-<indexterm><primary>xmlSecKeyInfoCtxCreate</primary></indexterm><programlisting><link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> xmlSecKeyInfoCtxCreate  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
+<indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+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>
@@ -458,7 +458,7 @@ Destroys <parameter>keyInfoCtx</parameter> object created with <link linkend="xm
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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>
@@ -466,13 +466,13 @@ Destroys <parameter>keyInfoCtx</parameter> object created with <link linkend="xm
 <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>
 <para>
-Initializes <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context. Caller is 
+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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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>
 <listitem><simpara> 		the pointer to keys manager (may be NULL).
@@ -490,7 +490,7 @@ function.</para>
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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>
@@ -502,7 +502,7 @@ Resets the <parameter>keyInfoCtx</parameter> state. User settings are not change
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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>
@@ -527,13 +527,13 @@ Copies user preferences from <parameter>src</parameter> context to <parameter>ds
 <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>
 <para>
-Creates encryption context form processing <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink></ulink></ulink></ulink> child
-of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element.</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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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.
 </simpara></listitem></varlistentry>
@@ -548,7 +548,7 @@ Prints user settings and current context state to <parameter>output</parameter>.
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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>
 <listitem><simpara>		the output file pointer.
@@ -564,7 +564,7 @@ Prints user settings and current context state in XML format to <parameter>outpu
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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>
 <listitem><simpara>		the output file pointer.
@@ -583,7 +583,7 @@ The &lt;dsig:KeyName&gt; processing class.</para>
 <title><anchor id="xmlSecKeyDataNameGetKlass">xmlSecKeyDataNameGetKlass ()</title>
 <indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";>&lt;dsig:KeyName/&gt;</ulink></ulink></ulink></ulink> element key data klass 
+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>):
 </para>
 <para>
@@ -597,7 +597,7 @@ 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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";>&lt;dsig:KeyName/&gt;</ulink></ulink></ulink></ulink> element processing key data klass.
+<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.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
@@ -613,7 +613,7 @@ The &lt;dsig:KeyValue&gt; processing class.</para>
 <title><anchor id="xmlSecKeyDataValueGetKlass">xmlSecKeyDataValueGetKlass ()</title>
 <indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";>&lt;dsig:KeyValue/&gt;</ulink></ulink></ulink></ulink> element key data klass 
+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>):
 </para>
 <para>
@@ -622,7 +622,7 @@ 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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";>&lt;dsig:KeyValue/&gt;</ulink></ulink></ulink></ulink> element processing key data klass.
+<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.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
@@ -639,7 +639,7 @@ The &lt;dsig:RetrievalMethod&gt; processing class.</para>
 <indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink></ulink></ulink></ulink> element key data klass 
+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>):
 A RetrievalMethod element within KeyInfo is used to convey a reference to 
 KeyInfo information that is stored at another location. For example, 
@@ -655,7 +655,7 @@ 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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink></ulink></ulink></ulink> element processing key data klass.
+<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.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
@@ -672,7 +672,7 @@ The &lt;enc:EncryptedKey&gt; processing class.</para>
 <indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink></ulink></ulink></ulink> element key data klass 
+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>):
 </para>
 <para>
@@ -686,7 +686,7 @@ 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";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink></ulink></ulink></ulink> element processing key data klass.
+<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.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/keys.sgml b/docs/api/sgml/keys.sgml
index c6c0614..1d7c7b9 100644
--- a/docs/api/sgml/keys.sgml
+++ b/docs/api/sgml/keys.sgml
@@ -61,19 +61,19 @@ 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="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecKeyDuplicate">xmlSecKeyDuplicate</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="xmlSecKeyData">xmlSecKeyDataPtr</link> <link linkend="xmlSecKeyGetValue">xmlSecKeyGetValue</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="xmlSecKeyData">xmlSecKeyDataPtr</link> <link linkend="xmlSecKeyGetData">xmlSecKeyGetData</link>           (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+<link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link> <link linkend="xmlSecKeyGetData">xmlSecKeyGetData</link>           (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
                                              <link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId);
-<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> <link linkend="xmlSecKeyEnsureData">xmlSecKeyEnsureData</link>        (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+<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);
@@ -672,7 +672,7 @@ Clears the <parameter>key</parameter> data.</para>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecKeyDuplicate">xmlSecKeyDuplicate ()</title>
-<indexterm><primary>xmlSecKeyDuplicate</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecKeyDuplicate             (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<indexterm><primary>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>
@@ -751,7 +751,7 @@ Gets <parameter>key</parameter> type.</para>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecKeyGetValue">xmlSecKeyGetValue ()</title>
-<indexterm><primary>xmlSecKeyGetValue</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> xmlSecKeyGetValue          (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<indexterm><primary>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>
@@ -783,7 +783,7 @@ Sets key value (see also <link linkend="xmlSecKeyGetValue"><type>xmlSecKeyGetVal
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecKeyGetData">xmlSecKeyGetData ()</title>
-<indexterm><primary>xmlSecKeyGetData</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> xmlSecKeyGetData           (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+<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>
 <para>
 Gets key's data.</para>
@@ -802,7 +802,7 @@ Gets key's data.</para>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecKeyEnsureData">xmlSecKeyEnsureData ()</title>
-<indexterm><primary>xmlSecKeyEnsureData</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> xmlSecKeyEnsureData        (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+<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>
 <para>
 If necessary, creates key data of <parameter>dataId</parameter> klass and adds to <parameter>key</parameter>.</para>
diff --git a/docs/api/sgml/keysdata.sgml b/docs/api/sgml/keysdata.sgml
index 653a893..72549d5 100644
--- a/docs/api/sgml/keysdata.sgml
+++ b/docs/api/sgml/keysdata.sgml
@@ -45,7 +45,7 @@ enum        <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link>;
 <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="xmlSecKeyData">xmlSecKeyDataPtr</link> <link linkend="xmlSecKeyDataDuplicate">xmlSecKeyDataDuplicate</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<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,
@@ -240,7 +240,7 @@ The key data usage is unknown.</para>
 <indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> child.</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>
@@ -249,7 +249,7 @@ The key data could be read from a <ulink URL="http://www.w3.org/TR/xmldsig-core/
 <indexterm><primary>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 "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink></ulink></ulink></ulink> child.</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>
@@ -258,7 +258,7 @@ The key data could be written to a <ulink URL="http://www.w3.org/TR/xmldsig-core
 <indexterm><primary>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 "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue ">&lt;dsig:KeyValue /&gt;</ulink></ulink></ulink></ulink> child.</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>
@@ -267,7 +267,7 @@ The key data could be read from a <ulink URL="http://www.w3.org/TR/xmldsig-core/
 <indexterm><primary>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 "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue ">&lt;dsig:KeyValue /&gt;</ulink></ulink></ulink></ulink> child.</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>
@@ -276,7 +276,7 @@ The key data could be written to a <ulink URL="http://www.w3.org/TR/xmldsig-core
 <indexterm><primary>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 "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink></ulink></ulink></ulink> node
+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>
 
@@ -286,7 +286,7 @@ in XML format.</para>
 <indexterm><primary>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 "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink></ulink></ulink></ulink> node
+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>
 
@@ -304,7 +304,7 @@ Any key data usage.</para>
 <title><anchor id="xmlSecKeyDataUsageKeyInfoNode">xmlSecKeyDataUsageKeyInfoNode</title>
 <indexterm><primary>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 "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink></ulink></ulink></ulink> child.</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>
@@ -312,7 +312,7 @@ The key data could be read and written from/to a <ulink URL="http://www.w3.org/T
 <title><anchor id="xmlSecKeyDataUsageKeyValueNode">xmlSecKeyDataUsageKeyValueNode</title>
 <indexterm><primary>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 "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue ">&lt;dsig:KeyValue /&gt;</ulink></ulink></ulink></ulink> child.</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>
@@ -320,7 +320,7 @@ The key data could be read and written from/to a <ulink URL="http://www.w3.org/T
 <title><anchor id="xmlSecKeyDataUsageRetrievalMethodNode">xmlSecKeyDataUsageRetrievalMethodNode</title>
 <indexterm><primary>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 "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink></ulink></ulink></ulink> node
+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>
 
@@ -517,8 +517,8 @@ Shuts down the keys data klasses. This function is called from the
 <indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";>&lt;dsig:KeyName/&gt;</ulink></ulink></ulink></ulink> element processing klass, 
-<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";>&lt;dsig:KeyValue/&gt;</ulink></ulink></ulink></ulink> element processing klass, ...</para>
+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">
@@ -588,7 +588,7 @@ or NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecKeyDataDuplicate">xmlSecKeyDataDuplicate ()</title>
-<indexterm><primary>xmlSecKeyDataDuplicate</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> xmlSecKeyDataDuplicate     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<indexterm><primary>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>
@@ -731,7 +731,7 @@ Reads the key data of klass <parameter>id</parameter> from XML <parameter>node</
 <listitem><simpara> 		the pointer to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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.
 </simpara></listitem></varlistentry>
@@ -757,7 +757,7 @@ Writes the key data of klass <parameter>id</parameter> from <parameter>key</para
 <listitem><simpara> 		the pointer to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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.
 </simpara></listitem></varlistentry>
@@ -787,7 +787,7 @@ Reads the key data of klass <parameter>id</parameter> from binary buffer <parame
 <listitem><simpara> 		the input buffer size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara> 	the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node processing context.
+<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.
 </simpara></listitem></varlistentry>
@@ -817,7 +817,7 @@ Writes the key data of klass <parameter>id</parameter> from the <parameter>key</
 <listitem><simpara> 		the output buffer size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara> 	the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node processing context.
+<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.
 </simpara></listitem></varlistentry>
@@ -967,7 +967,7 @@ Key data specific method for reading XML node.</para>
 <listitem><simpara> 		the pointer to data's value XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara> 	the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node processing context.
+<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.
 </simpara></listitem></varlistentry>
@@ -1023,7 +1023,7 @@ Key data specific method for reading binary buffer.</para>
 <listitem><simpara>		the buffer size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara> 	the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node processing context.
+<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.
 </simpara></listitem></varlistentry>
@@ -1053,7 +1053,7 @@ Key data specific method for reading binary buffer.</para>
 <listitem><simpara> 		the buffer size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara> 	the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node processing context.
+<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.
 </simpara></listitem></varlistentry>
@@ -1550,7 +1550,7 @@ Reads binary key data from <parameter>node</parameter> to the key by base64 deco
 <listitem><simpara> 		the pointer to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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.
 </simpara></listitem></varlistentry>
@@ -1578,7 +1578,7 @@ sets to the <parameter>node</parameter> content.</para>
 <listitem><simpara> 		the pointer to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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.
 </simpara></listitem></varlistentry>
@@ -1608,7 +1608,7 @@ Reads binary key data of the klass <parameter>id</parameter> from <parameter>buf
 <listitem><simpara>		the source binary buffer size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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.
 </simpara></listitem></varlistentry>
@@ -1639,7 +1639,7 @@ Writes binary key data of klass <parameter>id</parameter> from the <parameter>ke
 <listitem><simpara>		the destination binary buffer size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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.
 </simpara></listitem></varlistentry>
diff --git a/docs/api/sgml/keysmngr.sgml b/docs/api/sgml/keysmngr.sgml
index f54a63d..1d75353 100644
--- a/docs/api/sgml/keysmngr.sgml
+++ b/docs/api/sgml/keysmngr.sgml
@@ -17,7 +17,7 @@
 
 <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="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecKeysMngrFindKey">xmlSecKeysMngrFindKey</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,
@@ -29,15 +29,15 @@
 <link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> <link linkend="xmlSecKeysMngrGetDataStore">xmlSecKeysMngrGetDataStore</link>
                                             (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
                                              <link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> id);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> (<link linkend="xmlSecGetKeyCallback">*xmlSecGetKeyCallback</link>)        (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
+<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="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecKeysMngrGetKey">xmlSecKeysMngrGetKey</link>           (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
+<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="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecKeyStoreFindKey">xmlSecKeyStoreFindKey</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)
@@ -48,7 +48,7 @@ struct      <link linkend="xmlSecKeyStore">xmlSecKeyStore</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="xmlSecKey">xmlSecKeyPtr</link> (<link linkend="xmlSecKeyStoreFindKeyMethod">*xmlSecKeyStoreFindKeyMethod</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>;
@@ -64,6 +64,8 @@ struct      <link linkend="xmlSecKeyStoreKlass">xmlSecKeyStoreKlass</link>;
 <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);
 </synopsis>
 </refsynopsisdiv>
 
@@ -111,7 +113,7 @@ Destroys keys manager created with <link linkend="xmlSecKeysMngrCreate"><type>xm
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecKeysMngrFindKey">xmlSecKeysMngrFindKey ()</title>
-<indexterm><primary>xmlSecKeysMngrFindKey</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecKeysMngrFindKey          (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+<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>
 <para>
@@ -127,7 +129,7 @@ for destroying the returned key using <link linkend="xmlSecKeyDestroy"><type>xml
 <listitem><simpara>		the desired key name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node processing context.
+<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.
 </simpara></listitem></varlistentry>
@@ -206,18 +208,18 @@ occurs.
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecGetKeyCallback">xmlSecGetKeyCallback ()</title>
-<indexterm><primary>xmlSecGetKeyCallback</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> (*xmlSecGetKeyCallback)        (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
+<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>
 <para>
-Reads the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node <parameter>keyInfoNode</parameter> and extracts the key.</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>
-<listitem><simpara> 		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
-<listitem><simpara>			the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node processing context.
+<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 
 an error occurs.
@@ -249,24 +251,24 @@ The keys manager structure.</para>
 </varlistentry>
 <varlistentry>
 <term><link linkend="xmlSecGetKeyCallback">xmlSecGetKeyCallback</link> <structfield>getKey</structfield></term>
-<listitem><simpara> 			the callback used to read <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node.
+<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="xmlSecKey">xmlSecKeyPtr</link> xmlSecKeysMngrGetKey           (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
+<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>
 <para>
-Reads the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node <parameter>keyInfoNode</parameter> and extracts the key.</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>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node processing context.	
+<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 
 an error occurs.
@@ -333,7 +335,7 @@ Destroys the store created with <link linkend="xmlSecKeyStoreCreate"><type>xmlSe
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecKeyStoreFindKey">xmlSecKeyStoreFindKey ()</title>
-<indexterm><primary>xmlSecKeyStoreFindKey</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecKeyStoreFindKey          (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+<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>
 <para>
@@ -349,7 +351,7 @@ the returned key using <link linkend="xmlSecKeyDestroy"><type>xmlSecKeyDestroy</
 <listitem><simpara>		the desired key name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node processing context.
+<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.
 </simpara></listitem></varlistentry>
@@ -447,7 +449,7 @@ Keys store specific finalization (destroy) method.</para>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecKeyStoreFindKeyMethod">xmlSecKeyStoreFindKeyMethod ()</title>
-<indexterm><primary>xmlSecKeyStoreFindKeyMethod</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> (*xmlSecKeyStoreFindKeyMethod) (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+<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>
 <para>
@@ -629,6 +631,22 @@ Writes keys from <parameter>store</parameter> to an XML file.</para>
 <varlistentry><term><emphasis>Returns</emphasis> :</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>
+<para>
+</para>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><parameter>store</parameter>&nbsp;:</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
+if an error occurs.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
 
 </refsect1>
 
diff --git a/docs/api/sgml/list.sgml b/docs/api/sgml/list.sgml
index 1ab171d..f372887 100644
--- a/docs/api/sgml/list.sgml
+++ b/docs/api/sgml/list.sgml
@@ -27,9 +27,9 @@ struct      <link linkend="xmlSecPtrList">xmlSecPtrList</link>;
 <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="xmlSecPtrList">xmlSecPtrListPtr</link> <link linkend="xmlSecPtrListDuplicate">xmlSecPtrListDuplicate</link>     (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);
+<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="xmlSec">xmlSecPtr</link>   <link linkend="xmlSecPtrListGetItem">xmlSecPtrListGetItem</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);
@@ -46,7 +46,7 @@ struct      <link linkend="xmlSecPtrList">xmlSecPtrList</link>;
 #define     <link linkend="xmlSecPtrListIsValid">xmlSecPtrListIsValid</link>            (list)
 #define     <link linkend="xmlSecPtrListCheckId">xmlSecPtrListCheckId</link>            (list, dataId)
 #define     <link linkend="xmlSecPtrListIdUnknown">xmlSecPtrListIdUnknown</link>
-<link linkend="xmlSec">xmlSecPtr</link>   (<link linkend="xmlSecPtrDuplicateItemMethod">*xmlSecPtrDuplicateItemMethod</link>) (<link linkend="xmlSec">xmlSecPtr</link> ptr);
+<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);
@@ -227,7 +227,7 @@ we jsut copy pointers to items.</para>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecPtrListDuplicate">xmlSecPtrListDuplicate ()</title>
-<indexterm><primary>xmlSecPtrListDuplicate</primary></indexterm><programlisting><link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> xmlSecPtrListDuplicate     (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);</programlisting>
+<indexterm><primary>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>
@@ -255,7 +255,7 @@ Gets list size.</para>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecPtrListGetItem">xmlSecPtrListGetItem ()</title>
-<indexterm><primary>xmlSecPtrListGetItem</primary></indexterm><programlisting><link linkend="xmlSec">xmlSecPtr</link>   xmlSecPtrListGetItem            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+<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>
 <para>
 Gets item from the list.</para>
@@ -414,7 +414,7 @@ The "unknown" id.</para>
 </para></refsect2>
 <refsect2>
 <title><anchor id="xmlSecPtrDuplicateItemMethod">xmlSecPtrDuplicateItemMethod ()</title>
-<indexterm><primary>xmlSecPtrDuplicateItemMethod</primary></indexterm><programlisting><link linkend="xmlSec">xmlSecPtr</link>   (*xmlSecPtrDuplicateItemMethod) (<link linkend="xmlSec">xmlSecPtr</link> ptr);</programlisting>
+<indexterm><primary>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>
diff --git a/docs/api/sgml/mscrypto/app.sgml b/docs/api/sgml/mscrypto/app.sgml
index fd7873a..1feaeb5 100644
--- a/docs/api/sgml/mscrypto/app.sgml
+++ b/docs/api/sgml/mscrypto/app.sgml
@@ -31,6 +31,24 @@ const <link linkend="char">char</link>* <link linkend="xmlSecMSCryptoAppGetCertS
                                             (<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,
@@ -214,6 +232,120 @@ Saves keys from <parameter>mngr</parameter> to  XML keys file.</para>
 </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>
+<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>
+<listitem><simpara> 		the pointer to keys manager.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>hKey</parameter>&nbsp;:</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.
+</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>
+<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>
+<listitem><simpara> 		the pointer to keys manager.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>hKey</parameter>&nbsp;:</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.
+</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>
+<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>
+<listitem><simpara> 		the pointer to keys manager.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>hKey</parameter>&nbsp;:</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.
+</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>
+<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>
+<listitem><simpara> 		        the keys manager.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>keyStore</parameter>&nbsp;:</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.
+</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>
+<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>
+<listitem><simpara> 		        the keys manager.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>trustedStore</parameter>&nbsp;:</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.
+</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>
+<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>
+<listitem><simpara> 		        the keys manager.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>untrustedStore</parameter>&nbsp;:</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.
+</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,
diff --git a/docs/api/sgml/mscrypto/certkeys.sgml b/docs/api/sgml/mscrypto/certkeys.sgml
index 02a3772..6edaf3f 100644
--- a/docs/api/sgml/mscrypto/certkeys.sgml
+++ b/docs/api/sgml/mscrypto/certkeys.sgml
@@ -18,6 +18,8 @@
 <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);
@@ -76,6 +78,21 @@ returned HKEY must not be destroyed by the caller.</para>
 </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>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>
+
+
+</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>
 <para>
diff --git a/docs/api/sgml/mscrypto/crypto.sgml b/docs/api/sgml/mscrypto/crypto.sgml
index b1650ea..bcb8571 100644
--- a/docs/api/sgml/mscrypto/crypto.sgml
+++ b/docs/api/sgml/mscrypto/crypto.sgml
@@ -40,6 +40,12 @@
 #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);
@@ -52,6 +58,9 @@
 #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);
@@ -264,6 +273,46 @@ The DSA-SHA1 signature transform klass.</para>
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
+<title><anchor id="xmlSecMSCryptoKeyDataGost2001Id">xmlSecMSCryptoKeyDataGost2001Id</title>
+<indexterm><primary>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>
+<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.
+</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>
+<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>
+<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.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2>
 <title><anchor id="xmlSecMSCryptoKeyDataRsaId">xmlSecMSCryptoKeyDataRsaId</title>
 <indexterm><primary>xmlSecMSCryptoKeyDataRsaId</primary></indexterm><programlisting>#define     xmlSecMSCryptoKeyDataRsaId</programlisting>
 <para>
@@ -344,6 +393,26 @@ SHA-1 digest transform klass.</para>
 </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>
+<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>
+<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.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2>
 <title><anchor id="xmlSecMSCryptoKeyDataAesId">xmlSecMSCryptoKeyDataAesId</title>
 <indexterm><primary>xmlSecMSCryptoKeyDataAesId</primary></indexterm><programlisting>#define     xmlSecMSCryptoKeyDataAesId</programlisting>
 <para>
diff --git a/docs/api/sgml/mscrypto/x509.sgml b/docs/api/sgml/mscrypto/x509.sgml
index 3a32306..85f643b 100644
--- a/docs/api/sgml/mscrypto/x509.sgml
+++ b/docs/api/sgml/mscrypto/x509.sgml
@@ -60,6 +60,18 @@
                                             (<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>
 
@@ -298,22 +310,22 @@ Searches <parameter>store</parameter> for a certificate that matches given crite
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to X509 key data store klass.
+<listitem><simpara>          the pointer to X509 key data store klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>subjectName</parameter>&nbsp;:</term>
-<listitem><simpara>	the desired certificate name.
+<listitem><simpara>    the desired certificate name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>issuerName</parameter>&nbsp;:</term>
-<listitem><simpara>		the desired certificate issuer name.
+<listitem><simpara>     the desired certificate issuer name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>issuerSerial</parameter>&nbsp;:</term>
-<listitem><simpara>	the desired certificate issuer serial number.
+<listitem><simpara>   the desired certificate issuer serial number.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>ski</parameter>&nbsp;:</term>
-<listitem><simpara>		the desired certificate SKI.
+<listitem><simpara>            the desired certificate SKI.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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
 or an error occurs.
@@ -331,13 +343,13 @@ Verifies <parameter>certs</parameter> list.</para>
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to X509 certificate context store klass.
+<listitem><simpara>        the pointer to X509 certificate context store klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>certs</parameter>&nbsp;:</term>
-<listitem><simpara>		the untrusted certificates stack.
+<listitem><simpara>        the untrusted certificates stack.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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>.
 </simpara></listitem></varlistentry>
@@ -365,6 +377,80 @@ Adds trusted (root) or untrusted certificate to the store.</para>
 <varlistentry><term><emphasis>Returns</emphasis> :</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>
+<para>
+Adds <parameter>keyStore</parameter> to the list of key stores.</para>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<listitem><simpara>              the pointer to X509 key data store klass.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>keyStore</parameter>&nbsp;:</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.
+</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>
+<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>
+<listitem><simpara>              the pointer to X509 key data store klass.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>trustedStore</parameter>&nbsp;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis> :</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>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>untrustedStore</parameter>&nbsp;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>
+
+
+</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>
+<para>
+Enables/disables the system trusted certs.</para>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<listitem><simpara>              the pointer to X509 key data store klass.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>val</parameter>&nbsp;:</term>
+<listitem><simpara>                the enable/disable flag
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
 
 </refsect1>
 
diff --git a/docs/api/sgml/mscrypto/xmlsec-mscrypto-doc.bottom b/docs/api/sgml/mscrypto/xmlsec-mscrypto-doc.bottom
index 16c6a06..8128c1b 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-certkeys;
-    &xmlsec-mscrypto-app;
     &xmlsec-mscrypto-crypto;
     &xmlsec-mscrypto-keysstore;
+    &xmlsec-mscrypto-certkeys;
     &xmlsec-mscrypto-x509;
+    &xmlsec-mscrypto-app;
diff --git a/docs/api/sgml/mscrypto/xmlsec-mscrypto-doc.top b/docs/api/sgml/mscrypto/xmlsec-mscrypto-doc.top
index fc414c2..bf4488e 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-certkeys SYSTEM "sgml/certkeys.sgml">
-<!ENTITY xmlsec-mscrypto-app SYSTEM "sgml/app.sgml">
 <!ENTITY xmlsec-mscrypto-crypto SYSTEM "sgml/crypto.sgml">
 <!ENTITY xmlsec-mscrypto-keysstore SYSTEM "sgml/keysstore.sgml">
+<!ENTITY xmlsec-mscrypto-certkeys SYSTEM "sgml/certkeys.sgml">
 <!ENTITY xmlsec-mscrypto-x509 SYSTEM "sgml/x509.sgml">
+<!ENTITY xmlsec-mscrypto-app SYSTEM "sgml/app.sgml">
diff --git a/docs/api/sgml/nodeset.sgml b/docs/api/sgml/nodeset.sgml
index 63ac7f3..af8019c 100644
--- a/docs/api/sgml/nodeset.sgml
+++ b/docs/api/sgml/nodeset.sgml
@@ -22,7 +22,7 @@ struct      <link linkend="xmlSecNodeSet">xmlSecNodeSet</link>;
                                              <link linkend="xmlNode">xmlNodePtr</link> cur,
                                              <link linkend="xmlNode">xmlNodePtr</link> parent,
                                              <link linkend="void">void</link> *data);
-<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> <link linkend="xmlSecNodeSetCreate">xmlSecNodeSetCreate</link>        (<link linkend="xmlDoc">xmlDocPtr</link> doc,
+<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);
@@ -30,13 +30,13 @@ struct      <link linkend="xmlSecNodeSet">xmlSecNodeSet</link>;
 <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="xmlSecNodeSet">xmlSecNodeSetPtr</link> <link linkend="xmlSecNodeSetAdd">xmlSecNodeSetAdd</link>           (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
+<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="xmlSecNodeSet">xmlSecNodeSetPtr</link> <link linkend="xmlSecNodeSetAddList">xmlSecNodeSetAddList</link>       (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
+<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="xmlSecNodeSet">xmlSecNodeSetPtr</link> <link linkend="xmlSecNodeSetGetChildren">xmlSecNodeSetGetChildren</link>   (<link linkend="xmlDoc">xmlDocPtr</link> doc,
+<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);
@@ -244,7 +244,7 @@ an walk procedure should be interrupted.
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecNodeSetCreate">xmlSecNodeSetCreate ()</title>
-<indexterm><primary>xmlSecNodeSetCreate</primary></indexterm><programlisting><link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> xmlSecNodeSetCreate        (<link linkend="xmlDoc">xmlDocPtr</link> doc,
+<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>
 <para>
@@ -314,7 +314,7 @@ and a negative value if an error occurs.
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecNodeSetAdd">xmlSecNodeSetAdd ()</title>
-<indexterm><primary>xmlSecNodeSetAdd</primary></indexterm><programlisting><link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> xmlSecNodeSetAdd           (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
+<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>
 <para>
@@ -337,7 +337,7 @@ occurs.
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecNodeSetAddList">xmlSecNodeSetAddList ()</title>
-<indexterm><primary>xmlSecNodeSetAddList</primary></indexterm><programlisting><link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> xmlSecNodeSetAddList       (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
+<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>
 <para>
@@ -360,7 +360,7 @@ occurs.
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecNodeSetGetChildren">xmlSecNodeSetGetChildren ()</title>
-<indexterm><primary>xmlSecNodeSetGetChildren</primary></indexterm><programlisting><link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> xmlSecNodeSetGetChildren   (<link linkend="xmlDoc">xmlDocPtr</link> doc,
+<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>
diff --git a/docs/api/sgml/nss/crypto.sgml b/docs/api/sgml/nss/crypto.sgml
index e4d2a9c..428c36f 100644
--- a/docs/api/sgml/nss/crypto.sgml
+++ b/docs/api/sgml/nss/crypto.sgml
@@ -29,6 +29,7 @@
                                              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,
@@ -68,20 +69,22 @@
 #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> ();
+<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="xmlSecNssTransformHmacSha1Id">xmlSecNssTransformHmacSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecNssTransformHmacSha1GetKlass">xmlSecNssTransformHmacSha1GetKlass</link>
+#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="xmlSecNssTransformHmacMd5Id">xmlSecNssTransformHmacMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecNssTransformHmacMd5GetKlass">xmlSecNssTransformHmacMd5GetKlass</link>
+#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);
@@ -91,6 +94,9 @@
 #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);
@@ -217,6 +223,17 @@ The default errors reporting callback function.</para>
 </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>
+<para>
+</para>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis> :</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>
 <para>
@@ -498,6 +515,34 @@ The DSA-SHA1 signature transform klass.</para>
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
+<title><anchor id="xmlSecNssHmacGetMinOutputLength">xmlSecNssHmacGetMinOutputLength ()</title>
+<indexterm><primary>xmlSecNssHmacGetMinOutputLength</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssHmacGetMinOutputLength ();</programlisting>
+<para>
+</para>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis> :</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>
+<para>
+<parameter>min_length</parameter>: the new min length 
+</para>
+<para>
+Sets the min HMAC output length</para>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><parameter>min_length</parameter>&nbsp;:</term>
+<listitem><simpara>
+
+
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2>
 <title><anchor id="xmlSecNssKeyDataHmacId">xmlSecNssKeyDataHmacId</title>
 <indexterm><primary>xmlSecNssKeyDataHmacId</primary></indexterm><programlisting>#define     xmlSecNssKeyDataHmacId</programlisting>
 <para>
@@ -540,23 +585,23 @@ Sets the value of HMAC key data.</para>
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
-<title><anchor id="xmlSecNssTransformHmacSha1Id">xmlSecNssTransformHmacSha1Id</title>
-<indexterm><primary>xmlSecNssTransformHmacSha1Id</primary></indexterm><programlisting>#define     xmlSecNssTransformHmacSha1Id</programlisting>
+<title><anchor id="xmlSecNssTransformHmacMd5Id">xmlSecNssTransformHmacMd5Id</title>
+<indexterm><primary>xmlSecNssTransformHmacMd5Id</primary></indexterm><programlisting>#define     xmlSecNssTransformHmacMd5Id</programlisting>
 <para>
-The HMAC with SHA1 signature transform klass.</para>
+The HMAC with MD5 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
+<title><anchor id="xmlSecNssTransformHmacMd5GetKlass">xmlSecNssTransformHmacMd5GetKlass ()</title>
+<indexterm><primary>xmlSecNssTransformHmacMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecNssTransformHmacMd5GetKlass
                                             (void);</programlisting>
 <para>
-The HMAC-SHA1 transform klass.</para>
+The HMAC-MD5 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> :</term><listitem><simpara>the HMAC-MD5 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
@@ -580,23 +625,23 @@ The HMAC-RIPEMD160 transform klass.</para>
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
-<title><anchor id="xmlSecNssTransformHmacMd5Id">xmlSecNssTransformHmacMd5Id</title>
-<indexterm><primary>xmlSecNssTransformHmacMd5Id</primary></indexterm><programlisting>#define     xmlSecNssTransformHmacMd5Id</programlisting>
+<title><anchor id="xmlSecNssTransformHmacSha1Id">xmlSecNssTransformHmacSha1Id</title>
+<indexterm><primary>xmlSecNssTransformHmacSha1Id</primary></indexterm><programlisting>#define     xmlSecNssTransformHmacSha1Id</programlisting>
 <para>
-The HMAC with MD5 signature transform klass.</para>
+The HMAC with SHA1 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
+<title><anchor id="xmlSecNssTransformHmacSha1GetKlass">xmlSecNssTransformHmacSha1GetKlass ()</title>
+<indexterm><primary>xmlSecNssTransformHmacSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecNssTransformHmacSha1GetKlass
                                             (void);</programlisting>
 <para>
-The HMAC-MD5 transform klass.</para>
+The HMAC-SHA1 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> :</term><listitem><simpara>the HMAC-SHA1 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
@@ -659,6 +704,26 @@ The RSA-PKCS1 key transport transform klass.</para>
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
+<title><anchor id="xmlSecNssTransformRsaOaepId">xmlSecNssTransformRsaOaepId</title>
+<indexterm><primary>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>
+<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.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2>
 <title><anchor id="xmlSecNssTransformSha1Id">xmlSecNssTransformSha1Id</title>
 <indexterm><primary>xmlSecNssTransformSha1Id</primary></indexterm><programlisting>#define     xmlSecNssTransformSha1Id</programlisting>
 <para>
diff --git a/docs/api/sgml/nss/x509.sgml b/docs/api/sgml/nss/x509.sgml
index 159f48f..dd8ab1d 100644
--- a/docs/api/sgml/nss/x509.sgml
+++ b/docs/api/sgml/nss/x509.sgml
@@ -316,7 +316,7 @@ Searches <parameter>store</parameter> for a certificate that matches given crite
 <listitem><simpara>		the desired certificate SKI.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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
 or an error occurs.
@@ -339,7 +339,7 @@ Verifies <parameter>certs</parameter> list.</para>
 <listitem><simpara>		the untrusted certificates stack.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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>.
 </simpara></listitem></varlistentry>
diff --git a/docs/api/sgml/nss/xmlsec-nss-doc.bottom b/docs/api/sgml/nss/xmlsec-nss-doc.bottom
index 02cdd23..4932ae3 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-pkikeys;
     &xmlsec-nss-crypto;
     &xmlsec-nss-keysstore;
-    &xmlsec-nss-pkikeys;
+    &xmlsec-nss-bignum;
     &xmlsec-nss-x509;
+    &xmlsec-nss-app;
diff --git a/docs/api/sgml/nss/xmlsec-nss-doc.top b/docs/api/sgml/nss/xmlsec-nss-doc.top
index 07ef384..e067c16 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-pkikeys SYSTEM "sgml/pkikeys.sgml">
 <!ENTITY xmlsec-nss-crypto SYSTEM "sgml/crypto.sgml">
 <!ENTITY xmlsec-nss-keysstore SYSTEM "sgml/keysstore.sgml">
-<!ENTITY xmlsec-nss-pkikeys SYSTEM "sgml/pkikeys.sgml">
+<!ENTITY xmlsec-nss-bignum SYSTEM "sgml/bignum.sgml">
 <!ENTITY xmlsec-nss-x509 SYSTEM "sgml/x509.sgml">
+<!ENTITY xmlsec-nss-app SYSTEM "sgml/app.sgml">
diff --git a/docs/api/sgml/openssl/app.sgml b/docs/api/sgml/openssl/app.sgml
index 98fbe77..6b76594 100644
--- a/docs/api/sgml/openssl/app.sgml
+++ b/docs/api/sgml/openssl/app.sgml
@@ -48,6 +48,9 @@
 <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,
@@ -331,6 +334,26 @@ Reads cert from <parameter>path</parameter> and adds to the list of trusted cert
 </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>
+<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>
+<listitem><simpara>               the keys manager.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>file</parameter>&nbsp;:</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.
+</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,
diff --git a/docs/api/sgml/openssl/crypto.sgml b/docs/api/sgml/openssl/crypto.sgml
index 4cf9fe0..485eee9 100644
--- a/docs/api/sgml/openssl/crypto.sgml
+++ b/docs/api/sgml/openssl/crypto.sgml
@@ -15,6 +15,11 @@
 
 
 
+#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);
@@ -74,20 +79,39 @@ const <link linkend="xmlChar">xmlChar</link>* <link linkend="xmlSecOpenSSLGetDef
 #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="xmlSecOpenSSLTransformHmacSha1Id">xmlSecOpenSSLTransformHmacSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformHmacSha1GetKlass">xmlSecOpenSSLTransformHmacSha1GetKlass</link>
+#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="xmlSecOpenSSLTransformHmacMd5Id">xmlSecOpenSSLTransformHmacMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformHmacMd5GetKlass">xmlSecOpenSSLTransformHmacMd5GetKlass</link>
+#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>
@@ -101,9 +125,27 @@ const <link linkend="xmlChar">xmlChar</link>* <link linkend="xmlSecOpenSSLGetDef
 <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);
@@ -113,6 +155,18 @@ const <link linkend="xmlChar">xmlChar</link>* <link linkend="xmlSecOpenSSLGetDef
 #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>
@@ -144,6 +198,41 @@ const <link linkend="xmlChar">xmlChar</link>* <link linkend="xmlSecOpenSSLGetDef
 <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
+</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
+</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
+</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
+</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
+</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>
@@ -585,6 +674,36 @@ The DSA-SHA1 signature transform klass.</para>
 </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>
+<para>
+</para>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis> :</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>
+<para>
+<parameter>min_length</parameter>: the new min length 
+</para>
+<para>
+Sets the min HMAC output length</para>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><parameter>min_length</parameter>&nbsp;:</term>
+<listitem><simpara>
+
+
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2>
 <title><anchor id="xmlSecOpenSSLKeyDataHmacId">xmlSecOpenSSLKeyDataHmacId</title>
 <indexterm><primary>xmlSecOpenSSLKeyDataHmacId</primary></indexterm><programlisting>#define     xmlSecOpenSSLKeyDataHmacId</programlisting>
 <para>
@@ -627,23 +746,23 @@ Sets the value of HMAC key data.</para>
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
-<title><anchor id="xmlSecOpenSSLTransformHmacSha1Id">xmlSecOpenSSLTransformHmacSha1Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformHmacSha1Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformHmacSha1Id</programlisting>
+<title><anchor id="xmlSecOpenSSLTransformHmacMd5Id">xmlSecOpenSSLTransformHmacMd5Id</title>
+<indexterm><primary>xmlSecOpenSSLTransformHmacMd5Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformHmacMd5Id</programlisting>
 <para>
-The HMAC with SHA1 signature transform klass.</para>
+The HMAC with MD5 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
+<title><anchor id="xmlSecOpenSSLTransformHmacMd5GetKlass">xmlSecOpenSSLTransformHmacMd5GetKlass ()</title>
+<indexterm><primary>xmlSecOpenSSLTransformHmacMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformHmacMd5GetKlass
                                             (void);</programlisting>
 <para>
-The HMAC-SHA1 transform klass.</para>
+The HMAC-MD5 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> :</term><listitem><simpara>the HMAC-MD5 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
@@ -667,23 +786,123 @@ The HMAC-RIPEMD160 transform klass.</para>
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
-<title><anchor id="xmlSecOpenSSLTransformHmacMd5Id">xmlSecOpenSSLTransformHmacMd5Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformHmacMd5Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformHmacMd5Id</programlisting>
+<title><anchor id="xmlSecOpenSSLTransformHmacSha1Id">xmlSecOpenSSLTransformHmacSha1Id</title>
+<indexterm><primary>xmlSecOpenSSLTransformHmacSha1Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformHmacSha1Id</programlisting>
 <para>
-The HMAC with MD5 signature transform klass.</para>
+The HMAC with SHA1 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
+<title><anchor id="xmlSecOpenSSLTransformHmacSha1GetKlass">xmlSecOpenSSLTransformHmacSha1GetKlass ()</title>
+<indexterm><primary>xmlSecOpenSSLTransformHmacSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformHmacSha1GetKlass
                                             (void);</programlisting>
 <para>
-The HMAC-MD5 transform klass.</para>
+The HMAC-SHA1 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> :</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>
+<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>
+<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.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2>
+<title><anchor id="xmlSecOpenSSLTransformHmacSha256Id">xmlSecOpenSSLTransformHmacSha256Id</title>
+<indexterm><primary>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>
+<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.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2>
+<title><anchor id="xmlSecOpenSSLTransformHmacSha384Id">xmlSecOpenSSLTransformHmacSha384Id</title>
+<indexterm><primary>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>
+<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.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2>
+<title><anchor id="xmlSecOpenSSLTransformHmacSha512Id">xmlSecOpenSSLTransformHmacSha512Id</title>
+<indexterm><primary>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>
+<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.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2>
+<title><anchor id="xmlSecOpenSSLTransformMd5Id">xmlSecOpenSSLTransformMd5Id</title>
+<indexterm><primary>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>
+<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.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
@@ -791,6 +1010,46 @@ Gets the OpenSSL EVP key from RSA key data.</para>
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
+<title><anchor id="xmlSecOpenSSLTransformRsaMd5Id">xmlSecOpenSSLTransformRsaMd5Id</title>
+<indexterm><primary>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>
+<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.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2>
+<title><anchor id="xmlSecOpenSSLTransformRsaRipemd160Id">xmlSecOpenSSLTransformRsaRipemd160Id</title>
+<indexterm><primary>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>
+<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.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2>
 <title><anchor id="xmlSecOpenSSLTransformRsaSha1Id">xmlSecOpenSSLTransformRsaSha1Id</title>
 <indexterm><primary>xmlSecOpenSSLTransformRsaSha1Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformRsaSha1Id</programlisting>
 <para>
@@ -811,6 +1070,86 @@ The RSA-SHA1 signature transform klass.</para>
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
+<title><anchor id="xmlSecOpenSSLTransformRsaSha224Id">xmlSecOpenSSLTransformRsaSha224Id</title>
+<indexterm><primary>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>
+<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.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2>
+<title><anchor id="xmlSecOpenSSLTransformRsaSha256Id">xmlSecOpenSSLTransformRsaSha256Id</title>
+<indexterm><primary>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>
+<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.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2>
+<title><anchor id="xmlSecOpenSSLTransformRsaSha384Id">xmlSecOpenSSLTransformRsaSha384Id</title>
+<indexterm><primary>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>
+<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.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2>
+<title><anchor id="xmlSecOpenSSLTransformRsaSha512Id">xmlSecOpenSSLTransformRsaSha512Id</title>
+<indexterm><primary>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>
+<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.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2>
 <title><anchor id="xmlSecOpenSSLTransformRsaPkcs1Id">xmlSecOpenSSLTransformRsaPkcs1Id</title>
 <indexterm><primary>xmlSecOpenSSLTransformRsaPkcs1Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformRsaPkcs1Id</programlisting>
 <para>
@@ -871,6 +1210,86 @@ SHA-1 digest transform klass.</para>
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
+<title><anchor id="xmlSecOpenSSLTransformSha224Id">xmlSecOpenSSLTransformSha224Id</title>
+<indexterm><primary>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>
+<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.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2>
+<title><anchor id="xmlSecOpenSSLTransformSha256Id">xmlSecOpenSSLTransformSha256Id</title>
+<indexterm><primary>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>
+<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.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2>
+<title><anchor id="xmlSecOpenSSLTransformSha384Id">xmlSecOpenSSLTransformSha384Id</title>
+<indexterm><primary>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>
+<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.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2>
+<title><anchor id="xmlSecOpenSSLTransformSha512Id">xmlSecOpenSSLTransformSha512Id</title>
+<indexterm><primary>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>
+<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.
+</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)
 </programlisting>
diff --git a/docs/api/sgml/openssl/x509.sgml b/docs/api/sgml/openssl/x509.sgml
index 8589251..e0da6a3 100644
--- a/docs/api/sgml/openssl/x509.sgml
+++ b/docs/api/sgml/openssl/x509.sgml
@@ -60,9 +60,14 @@
 <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>
 
@@ -346,7 +351,7 @@ Searches <parameter>store</parameter> for a certificate that matches given crite
 <listitem><simpara>		the desired certificate SKI.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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
 or an error occurs.
@@ -373,7 +378,7 @@ Verifies <parameter>certs</parameter> list.</para>
 <listitem><simpara>		the crls stack.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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>.
 </simpara></listitem></varlistentry>
@@ -401,6 +406,24 @@ Adds trusted (root) or untrusted certificate to the store.</para>
 </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>
+<para>
+Adds X509 CRL to the store.</para>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<listitem><simpara>		the pointer to X509 key data store klass.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>crl</parameter>&nbsp;:</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.
+</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,
@@ -420,6 +443,26 @@ in <parameter>store</parameter>.</para>
 <varlistentry><term><emphasis>Returns</emphasis> :</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>
+<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>
+<listitem><simpara> the pointer to OpenSSL x509 store.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>file</parameter>&nbsp;:</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.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
 
 </refsect1>
 
diff --git a/docs/api/sgml/openssl/xmlsec-openssl-doc.bottom b/docs/api/sgml/openssl/xmlsec-openssl-doc.bottom
index ecb31c6..c6f43cd 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-app;
-    &xmlsec-openssl-bn;
     &xmlsec-openssl-crypto;
     &xmlsec-openssl-evp;
+    &xmlsec-openssl-bn;
     &xmlsec-openssl-x509;
+    &xmlsec-openssl-app;
diff --git a/docs/api/sgml/openssl/xmlsec-openssl-doc.top b/docs/api/sgml/openssl/xmlsec-openssl-doc.top
index 3718fe3..1939e24 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-app SYSTEM "sgml/app.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-bn SYSTEM "sgml/bn.sgml">
 <!ENTITY xmlsec-openssl-x509 SYSTEM "sgml/x509.sgml">
+<!ENTITY xmlsec-openssl-app SYSTEM "sgml/app.sgml">
diff --git a/docs/api/sgml/private.sgml b/docs/api/sgml/private.sgml
index 2531ba7..836360f 100644
--- a/docs/api/sgml/private.sgml
+++ b/docs/api/sgml/private.sgml
@@ -461,6 +461,7 @@ Reads the certificate from binary <parameter>data</parameter> buffer and adds it
     xmlSecCryptoKeyDataGetKlassMethod		 keyDataAesGetKlass;
     xmlSecCryptoKeyDataGetKlassMethod		 keyDataDesGetKlass;
     xmlSecCryptoKeyDataGetKlassMethod		 keyDataDsaGetKlass;
+    xmlSecCryptoKeyDataGetKlassMethod		 keyDataGost2001GetKlass;
     xmlSecCryptoKeyDataGetKlassMethod		 keyDataHmacGetKlass;
     xmlSecCryptoKeyDataGetKlassMethod		 keyDataRsaGetKlass;
     xmlSecCryptoKeyDataGetKlassMethod		 keyDataX509GetKlass;
@@ -483,6 +484,7 @@ Reads the certificate from binary <parameter>data</parameter> buffer and adds it
     xmlSecCryptoTransformGetKlassMethod		 transformDes3CbcGetKlass;
     xmlSecCryptoTransformGetKlassMethod		 transformKWDes3GetKlass;
     xmlSecCryptoTransformGetKlassMethod		 transformDsaSha1GetKlass;
+    xmlSecCryptoTransformGetKlassMethod		 transformGost2001GostR3411_94GetKlass;
     xmlSecCryptoTransformGetKlassMethod		 transformHmacMd5GetKlass;
     xmlSecCryptoTransformGetKlassMethod		 transformHmacRipemd160GetKlass;
     xmlSecCryptoTransformGetKlassMethod		 transformHmacSha1GetKlass;
@@ -501,6 +503,7 @@ Reads the certificate from binary <parameter>data</parameter> buffer and adds it
     xmlSecCryptoTransformGetKlassMethod		 transformRsaSha512GetKlass;
     xmlSecCryptoTransformGetKlassMethod		 transformRsaPkcs1GetKlass;
     xmlSecCryptoTransformGetKlassMethod		 transformRsaOaepGetKlass;
+    xmlSecCryptoTransformGetKlassMethod		 transformGostR3411_94GetKlass;
     xmlSecCryptoTransformGetKlassMethod		 transformSha1GetKlass;
     xmlSecCryptoTransformGetKlassMethod		 transformSha224GetKlass;
     xmlSecCryptoTransformGetKlassMethod		 transformSha256GetKlass;
@@ -563,6 +566,11 @@ The list of crypto engine functions, key data and transform classes.</para>
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
+<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link> <structfield>keyDataGost2001GetKlass</structfield></term>
+<listitem><simpara>
+</simpara></listitem>
+</varlistentry>
+<varlistentry>
 <term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link> <structfield>keyDataHmacGetKlass</structfield></term>
 <listitem><simpara>	the method to get pointer to HMAC key data klass.
 </simpara></listitem>
@@ -633,6 +641,11 @@ The list of crypto engine functions, key data and transform classes.</para>
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformGost2001GostR3411_94GetKlass</structfield></term>
+<listitem><simpara>
+</simpara></listitem>
+</varlistentry>
+<varlistentry>
 <term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformHmacMd5GetKlass</structfield></term>
 <listitem><simpara>	the method to get pointer to HMAC-MD5 transform.
 </simpara></listitem>
@@ -723,6 +736,11 @@ The list of crypto engine functions, key data and transform classes.</para>
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformGostR3411_94GetKlass</structfield></term>
+<listitem><simpara>
+</simpara></listitem>
+</varlistentry>
+<varlistentry>
 <term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformSha1GetKlass</structfield></term>
 <listitem><simpara>	the method to get pointer to SHA1 digest transform.
 </simpara></listitem>
diff --git a/docs/api/sgml/soap.sgml b/docs/api/sgml/soap.sgml
index 714dd61..db37eae 100644
--- a/docs/api/sgml/soap.sgml
+++ b/docs/api/sgml/soap.sgml
@@ -15,50 +15,50 @@
 
 
 
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecSoap11CreateEnvelope">xmlSecSoap11CreateEnvelope</link>      (<link linkend="xmlDoc">xmlDocPtr</link> doc);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecSoap11EnsureHeader">xmlSecSoap11EnsureHeader</link>        (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecSoap11AddBodyEntry">xmlSecSoap11AddBodyEntry</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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecSoap11AddFaultEntry">xmlSecSoap11AddFaultEntry</link>       (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+<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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecSoap11GetHeader">xmlSecSoap11GetHeader</link>           (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecSoap11GetBody">xmlSecSoap11GetBody</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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecSoap11GetBodyEntry">xmlSecSoap11GetBodyEntry</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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecSoap11GetFaultEntry">xmlSecSoap11GetFaultEntry</link>       (<link linkend="xmlNode">xmlNodePtr</link> envNode);
+<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap11GetFaultEntry">xmlSecSoap11GetFaultEntry</link>       (<link linkend="xmlNode">xmlNodePtr</link> envNode);
 enum        <link linkend="xmlSecSoap12FaultCode">xmlSecSoap12FaultCode</link>;
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecSoap12CreateEnvelope">xmlSecSoap12CreateEnvelope</link>      (<link linkend="xmlDoc">xmlDocPtr</link> doc);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecSoap12EnsureHeader">xmlSecSoap12EnsureHeader</link>        (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecSoap12AddBodyEntry">xmlSecSoap12AddBodyEntry</link>        (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+<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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecSoap12AddFaultEntry">xmlSecSoap12AddFaultEntry</link>       (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+<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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecSoap12AddFaultSubcode">xmlSecSoap12AddFaultSubcode</link>     (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
+<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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecSoap12AddFaultReasonText">xmlSecSoap12AddFaultReasonText</link>  (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
+<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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecSoap12AddFaultDetailEntry">xmlSecSoap12AddFaultDetailEntry</link> (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
+<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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecSoap12GetHeader">xmlSecSoap12GetHeader</link>           (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecSoap12GetBody">xmlSecSoap12GetBody</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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecSoap12GetBodyEntry">xmlSecSoap12GetBodyEntry</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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecSoap12GetFaultEntry">xmlSecSoap12GetFaultEntry</link>       (<link linkend="xmlNode">xmlNodePtr</link> envNode);
+<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap12GetFaultEntry">xmlSecSoap12GetFaultEntry</link>       (<link linkend="xmlNode">xmlNodePtr</link> envNode);
 </synopsis>
 </refsynopsisdiv>
 
@@ -81,7 +81,7 @@ enum        <link linkend="xmlSecSoap12FaultCode">xmlSecSoap12FaultCode</link>;
 <title>Details</title>
 <refsect2>
 <title><anchor id="xmlSecSoap11CreateEnvelope">xmlSecSoap11CreateEnvelope ()</title>
-<indexterm><primary>xmlSecSoap11CreateEnvelope</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecSoap11CreateEnvelope      (<link linkend="xmlDoc">xmlDocPtr</link> doc);</programlisting>
+<indexterm><primary>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.
@@ -112,7 +112,7 @@ if an error occurs.
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecSoap11EnsureHeader">xmlSecSoap11EnsureHeader ()</title>
-<indexterm><primary>xmlSecSoap11EnsureHeader</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecSoap11EnsureHeader        (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<indexterm><primary>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).
@@ -140,7 +140,7 @@ XML Schema (http://schemas.xmlsoap.org/soap/envelope/):
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecSoap11AddBodyEntry">xmlSecSoap11AddBodyEntry ()</title>
-<indexterm><primary>xmlSecSoap11AddBodyEntry</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecSoap11AddBodyEntry        (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+<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>
 <para>
 Adds a new entry to &lt;soap:Body&gt; node.</para>
@@ -158,7 +158,7 @@ Adds a new entry to &lt;soap:Body&gt; node.</para>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecSoap11AddFaultEntry">xmlSecSoap11AddFaultEntry ()</title>
-<indexterm><primary>xmlSecSoap11AddFaultEntry</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecSoap11AddFaultEntry       (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+<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,
@@ -226,7 +226,7 @@ not valid or a negative value if an error occurs.
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecSoap11GetHeader">xmlSecSoap11GetHeader ()</title>
-<indexterm><primary>xmlSecSoap11GetHeader</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecSoap11GetHeader           (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<indexterm><primary>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>
@@ -240,7 +240,7 @@ Gets pointer to the &lt;soap:Header&gt; node.</para>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecSoap11GetBody">xmlSecSoap11GetBody ()</title>
-<indexterm><primary>xmlSecSoap11GetBody</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecSoap11GetBody             (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<indexterm><primary>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>
@@ -269,7 +269,7 @@ Gets the number of body entries.</para>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecSoap11GetBodyEntry">xmlSecSoap11GetBodyEntry ()</title>
-<indexterm><primary>xmlSecSoap11GetBodyEntry</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecSoap11GetBodyEntry        (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+<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>
 <para>
 Gets the body entry number <parameter>pos</parameter>.</para>
@@ -287,7 +287,7 @@ Gets the body entry number <parameter>pos</parameter>.</para>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecSoap11GetFaultEntry">xmlSecSoap11GetFaultEntry ()</title>
-<indexterm><primary>xmlSecSoap11GetFaultEntry</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecSoap11GetFaultEntry       (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<indexterm><primary>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>
@@ -371,7 +371,7 @@ The values of the &lt;Value&gt; child element information item of the
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecSoap12CreateEnvelope">xmlSecSoap12CreateEnvelope ()</title>
-<indexterm><primary>xmlSecSoap12CreateEnvelope</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecSoap12CreateEnvelope      (<link linkend="xmlDoc">xmlDocPtr</link> doc);</programlisting>
+<indexterm><primary>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.
@@ -400,7 +400,7 @@ if an error occurs.
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecSoap12EnsureHeader">xmlSecSoap12EnsureHeader ()</title>
-<indexterm><primary>xmlSecSoap12EnsureHeader</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecSoap12EnsureHeader        (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<indexterm><primary>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).
@@ -428,7 +428,7 @@ XML Schema (http://www.w3.org/2003/05/soap-envelope):
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecSoap12AddBodyEntry">xmlSecSoap12AddBodyEntry ()</title>
-<indexterm><primary>xmlSecSoap12AddBodyEntry</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecSoap12AddBodyEntry        (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+<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>
 <para>
 Adds a new entry to &lt;soap:Body&gt; node.
@@ -459,7 +459,7 @@ XML Schema (http://www.w3.org/2003/05/soap-envelope):
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecSoap12AddFaultEntry">xmlSecSoap12AddFaultEntry ()</title>
-<indexterm><primary>xmlSecSoap12AddFaultEntry</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecSoap12AddFaultEntry       (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+<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,
@@ -558,7 +558,7 @@ XML Schema (http://www.w3.org/2003/05/soap-envelope):
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecSoap12AddFaultSubcode">xmlSecSoap12AddFaultSubcode ()</title>
-<indexterm><primary>xmlSecSoap12AddFaultSubcode</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecSoap12AddFaultSubcode     (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
+<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>
 <para>
@@ -581,7 +581,7 @@ occurs.
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecSoap12AddFaultReasonText">xmlSecSoap12AddFaultReasonText ()</title>
-<indexterm><primary>xmlSecSoap12AddFaultReasonText</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecSoap12AddFaultReasonText  (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
+<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>
 <para>
@@ -604,7 +604,7 @@ occurs.
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecSoap12AddFaultDetailEntry">xmlSecSoap12AddFaultDetailEntry ()</title>
-<indexterm><primary>xmlSecSoap12AddFaultDetailEntry</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecSoap12AddFaultDetailEntry (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
+<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>
 <para>
 Adds a new child to the Detail child element of <parameter>faultNode</parameter>.</para>
@@ -638,7 +638,7 @@ not valid or a negative value if an error occurs.
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecSoap12GetHeader">xmlSecSoap12GetHeader ()</title>
-<indexterm><primary>xmlSecSoap12GetHeader</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecSoap12GetHeader           (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<indexterm><primary>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>
@@ -652,7 +652,7 @@ Gets pointer to the &lt;soap:Header&gt; node.</para>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecSoap12GetBody">xmlSecSoap12GetBody ()</title>
-<indexterm><primary>xmlSecSoap12GetBody</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecSoap12GetBody             (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<indexterm><primary>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>
@@ -681,7 +681,7 @@ Gets the number of body entries.</para>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecSoap12GetBodyEntry">xmlSecSoap12GetBodyEntry ()</title>
-<indexterm><primary>xmlSecSoap12GetBodyEntry</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecSoap12GetBodyEntry        (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+<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>
 <para>
 Gets the body entry number <parameter>pos</parameter>.</para>
@@ -699,7 +699,7 @@ Gets the body entry number <parameter>pos</parameter>.</para>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecSoap12GetFaultEntry">xmlSecSoap12GetFaultEntry ()</title>
-<indexterm><primary>xmlSecSoap12GetFaultEntry</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecSoap12GetFaultEntry       (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<indexterm><primary>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>
diff --git a/docs/api/sgml/templates.sgml b/docs/api/sgml/templates.sgml
index 9599ba7..40c9cf1 100644
--- a/docs/api/sgml/templates.sgml
+++ b/docs/api/sgml/templates.sgml
@@ -15,19 +15,24 @@
 
 
 
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplSignatureCreate">xmlSecTmplSignatureCreate</link>       (<link linkend="xmlDoc">xmlDocPtr</link> doc,
+<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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplSignatureAddReference">xmlSecTmplSignatureAddReference</link> (<link linkend="xmlNode">xmlNodePtr</link> signNode,
+<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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplSignatureAddObject">xmlSecTmplSignatureAddObject</link>    (<link linkend="xmlNode">xmlNodePtr</link> signNode,
+<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);
@@ -35,31 +40,31 @@
                                             (<link linkend="xmlNode">xmlNodePtr</link> signNode);
 <link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplSignatureGetC14NMethodNode">xmlSecTmplSignatureGetC14NMethodNode</link>
                                             (<link linkend="xmlNode">xmlNodePtr</link> signNode);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplReferenceAddTransform">xmlSecTmplReferenceAddTransform</link> (<link linkend="xmlNode">xmlNodePtr</link> referenceNode,
+<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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplObjectAddManifest">xmlSecTmplObjectAddManifest</link>     (<link linkend="xmlNode">xmlNodePtr</link> objectNode,
+<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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplManifestAddReference">xmlSecTmplManifestAddReference</link>  (<link linkend="xmlNode">xmlNodePtr</link> manifestNode,
+<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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplEncDataCreate">xmlSecTmplEncDataCreate</link>         (<link linkend="xmlDoc">xmlDocPtr</link> doc,
+<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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplEncDataEnsureKeyInfo">xmlSecTmplEncDataEnsureKeyInfo</link>  (<link linkend="xmlNode">xmlNodePtr</link> encNode,
+<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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplEncDataAddEncProperty">xmlSecTmplEncDataAddEncProperty</link> (<link linkend="xmlNode">xmlNodePtr</link> encNode,
+<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>
@@ -78,10 +83,10 @@
 <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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplKeyInfoAddKeyName">xmlSecTmplKeyInfoAddKeyName</link>     (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
+<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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplKeyInfoAddKeyValue">xmlSecTmplKeyInfoAddKeyValue</link>    (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplKeyInfoAddX509Data">xmlSecTmplKeyInfoAddX509Data</link>    (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode);
+<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,
@@ -95,6 +100,20 @@
                                              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);
@@ -140,14 +159,14 @@
 <title>Details</title>
 <refsect2>
 <title><anchor id="xmlSecTmplSignatureCreate">xmlSecTmplSignatureCreate ()</title>
-<indexterm><primary>xmlSecTmplSignatureCreate</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplSignatureCreate       (<link linkend="xmlDoc">xmlDocPtr</link> doc,
+<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>
 <para>
-Creates new <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> node with the mandatory <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink></ulink></ulink></ulink>, 
-<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod";>&lt;dsig:CanonicalizationMethod/&gt;</ulink></ulink></ulink></ulink>, <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod";>&lt;dsig:SignatureMethod/&gt;</ulink></ulink></ulink></ulink> and 
-<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureValue";>&lt;dsig:SignatureValue/&gt;</ulink></ulink></ulink></ulink> children and sub-children. 
+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 
+<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureValue";>&lt;dsig:SignatureValue/&gt;</ulink> children and sub-children. 
 The application is responsible for inserting the returned node
 in the XML document.</para>
 <para>
@@ -168,7 +187,48 @@ in the XML document.</para>
 <varlistentry><term><parameter>id</parameter>&nbsp;:</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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> node or NULL if an 
+<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 
+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>
+<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 <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureValue";>&lt;dsig:SignatureValue/&gt;</ulink> children and
+sub-children. This method differs from xmlSecTmplSignatureCreate in
+that it will define the http://www.w3.org/2000/09/xmldsig#
+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>
+<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>
+<listitem><simpara> 	the signature canonicalization method.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>signMethodId</parameter>&nbsp;:</term>
+<listitem><simpara> 	the signature  method.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<listitem><simpara> 		the node id (may be NULL).
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>nsPrefix</parameter>&nbsp;:</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 
 error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
@@ -178,37 +238,37 @@ error occurs.
                                             (<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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> 
+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>
-<listitem><simpara> 		the  pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node or NULL if an 
+<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 
 error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecTmplSignatureAddReference">xmlSecTmplSignatureAddReference ()</title>
-<indexterm><primary>xmlSecTmplSignatureAddReference</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplSignatureAddReference (<link linkend="xmlNode">xmlNodePtr</link> signNode,
+<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>
 <para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestMethod";>&lt;dsig:DigestMethod/&gt;</ulink></ulink></ulink></ulink> and
-<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestValue";>&lt;dsig:DigestValue/&gt;</ulink></ulink></ulink></ulink> to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink></ulink></ulink></ulink> child of <parameter>signNode</parameter>.</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>
-<listitem><simpara> 		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <listitem><simpara>	the reference digest method.
@@ -222,23 +282,23 @@ Type (<parameter>type</parameter>) attributes and the required children <ulink U
 <varlistentry><term><parameter>type</parameter>&nbsp;:</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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> node or NULL 
+<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 
 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecTmplSignatureAddObject">xmlSecTmplSignatureAddObject ()</title>
-<indexterm><primary>xmlSecTmplSignatureAddObject</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplSignatureAddObject    (<link linkend="xmlNode">xmlNodePtr</link> signNode,
+<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>
 <para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink></ulink></ulink></ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> node <parameter>signNode</parameter>.</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>
-<listitem><simpara> 		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <listitem><simpara> 		the node id (may be NULL).
@@ -249,7 +309,7 @@ Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";><ulink URL="http
 <varlistentry><term><parameter>encoding</parameter>&nbsp;:</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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink></ulink></ulink></ulink> node or NULL 
+<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 
 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
@@ -258,14 +318,14 @@ if an error occurs.
 <indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod";>&lt;dsig:SignatureMethod/&gt;</ulink></ulink></ulink></ulink> child of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node.</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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature ">&lt;dsig:Signature /&gt;</ulink></ulink></ulink></ulink> node.
+<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 "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod ">&lt;dsig:SignatureMethod /&gt;</ulink></ulink></ulink></ulink> node or NULL if an error occurs.
+<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.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
@@ -273,32 +333,32 @@ Gets pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMeth
 <indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod";>&lt;dsig:CanonicalizationMethod/&gt;</ulink></ulink></ulink></ulink> child of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node.</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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature ">&lt;dsig:Signature /&gt;</ulink></ulink></ulink></ulink> node.
+<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 "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod ">&lt;dsig:CanonicalizationMethod /&gt;</ulink></ulink></ulink></ulink> node or NULL if an error occurs.
+<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.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecTmplReferenceAddTransform">xmlSecTmplReferenceAddTransform ()</title>
-<indexterm><primary>xmlSecTmplReferenceAddTransform</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplReferenceAddTransform (<link linkend="xmlNode">xmlNodePtr</link> referenceNode,
+<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>
 <para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink></ulink></ulink></ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> node <parameter>referenceNode</parameter>.</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>
-<listitem><simpara> 		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink></ulink></ulink></ulink> node or NULL if an 
+<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 
 error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
@@ -309,12 +369,12 @@ error occurs.
                                              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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureProperties";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureProperties";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureProperties";>&lt;dsig:SignatureProperties/&gt;</ulink></ulink></ulink></ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink></ulink></ulink></ulink> node <parameter>objectNode</parameter>.</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>
-<listitem><simpara> 	the  pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <listitem><simpara> 		the node id (may be NULL).
@@ -322,45 +382,45 @@ Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureProperties";><ul
 <varlistentry><term><parameter>target</parameter>&nbsp;:</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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureProperties";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureProperties";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureProperties";>&lt;dsig:SignatureProperties/&gt;</ulink></ulink></ulink></ulink> node or NULL 
+<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 
 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecTmplObjectAddManifest">xmlSecTmplObjectAddManifest ()</title>
-<indexterm><primary>xmlSecTmplObjectAddManifest</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplObjectAddManifest     (<link linkend="xmlNode">xmlNodePtr</link> objectNode,
+<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>
 <para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink></ulink></ulink></ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink></ulink></ulink></ulink> node <parameter>objectNode</parameter>.</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>
-<listitem><simpara> 	the  pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink></ulink></ulink></ulink> node or NULL 
+<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 
 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecTmplManifestAddReference">xmlSecTmplManifestAddReference ()</title>
-<indexterm><primary>xmlSecTmplManifestAddReference</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplManifestAddReference  (<link linkend="xmlNode">xmlNodePtr</link> manifestNode,
+<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>
 <para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestMethod";>&lt;dsig:DigestMethod/&gt;</ulink></ulink></ulink></ulink> and
-<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestValue";>&lt;dsig:DigestValue/&gt;</ulink></ulink></ulink></ulink> to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink></ulink></ulink></ulink> node <parameter>manifestNode</parameter>.</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>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <listitem><simpara>	the reference digest method.
@@ -374,20 +434,20 @@ Type (<parameter>type</parameter>) attributes and the required children <ulink U
 <varlistentry><term><parameter>type</parameter>&nbsp;:</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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> node or NULL 
+<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 
 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecTmplEncDataCreate">xmlSecTmplEncDataCreate ()</title>
-<indexterm><primary>xmlSecTmplEncDataCreate</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplEncDataCreate         (<link linkend="xmlDoc">xmlDocPtr</link> doc,
+<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>
 <para>
-Creates new <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData "><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData "><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData "><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData ">&lt;enc:EncryptedData /&gt;</ulink></ulink></ulink></ulink> node for encryption template.</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">
@@ -411,26 +471,26 @@ Creates new <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData "><u
 <varlistentry><term><parameter>encoding</parameter>&nbsp;:</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";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> node or NULL 
+<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 
 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecTmplEncDataEnsureKeyInfo">xmlSecTmplEncDataEnsureKeyInfo ()</title>
-<indexterm><primary>xmlSecTmplEncDataEnsureKeyInfo</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplEncDataEnsureKeyInfo  (<link linkend="xmlNode">xmlNodePtr</link> encNode,
+<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>
 <para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> to the  <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> node <parameter>encNode</parameter>.</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>
-<listitem><simpara> 		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node or 
+<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 error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
@@ -440,35 +500,35 @@ NULL if an error occurs.
                                             (<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";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties";>&lt;enc:EncryptionProperties/&gt;</ulink></ulink></ulink></ulink> node to the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> 
+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>
-<listitem><simpara> 		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <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";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties";>&lt;enc:EncryptionProperties/&gt;</ulink></ulink></ulink></ulink> node or 
+<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 
 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="xmlNode">xmlNodePtr</link>  xmlSecTmplEncDataAddEncProperty (<link linkend="xmlNode">xmlNodePtr</link> encNode,
+<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>
 <para>
-Adds <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperty";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperty";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperty";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperty";>&lt;enc:EncryptionProperty/&gt;</ulink></ulink></ulink></ulink> node (and the parent 
-<ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties";>&lt;enc:EncryptionProperties/&gt;</ulink></ulink></ulink></ulink> node if required) to the 
-<ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> node <parameter>encNode</parameter>.</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>
-<listitem><simpara> 		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <listitem><simpara> 		the Id attribute (optional).
@@ -476,7 +536,7 @@ Adds <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperty";><ulin
 <varlistentry><term><parameter>target</parameter>&nbsp;:</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";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperty";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperty";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperty";>&lt;enc:EncryptionProperty/&gt;</ulink></ulink></ulink></ulink> node or 
+<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 
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
@@ -485,14 +545,14 @@ NULL if an error occurs.
 <indexterm><primary>xmlSecTmplEncDataEnsureCipherValue</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplEncDataEnsureCipherValue
                                             (<link linkend="xmlNode">xmlNodePtr</link> encNode);</programlisting>
 <para>
-Adds <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue";>&lt;enc:CipherValue/&gt;</ulink></ulink></ulink></ulink> to the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> node <parameter>encNode</parameter>.</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>
-<listitem><simpara> 		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> node.
+<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";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue";>&lt;enc:CipherValue/&gt;</ulink></ulink></ulink></ulink> node or 
+<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 
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
@@ -502,18 +562,18 @@ NULL if an error occurs.
                                             (<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";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";>&lt;enc:CipherReference/&gt;</ulink></ulink></ulink></ulink> node with specified URI attribute <parameter>uri</parameter>
-to the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> node <parameter>encNode</parameter>.</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>
-<listitem><simpara> 		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <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";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";>&lt;enc:CipherReference/&gt;</ulink></ulink></ulink></ulink> node or 
+<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 
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
@@ -522,14 +582,14 @@ NULL if an error occurs.
 <indexterm><primary>xmlSecTmplEncDataGetEncMethodNode</primary></indexterm><programlisting><link linkend="xmlNode">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";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncrytpionMethod";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncrytpionMethod";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncrytpionMethod";>&lt;enc:EncrytpionMethod/&gt;</ulink></ulink></ulink></ulink> node.</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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EcnryptedData "><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EcnryptedData "><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EcnryptedData "><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EcnryptedData ">&lt;enc:EcnryptedData /&gt;</ulink></ulink></ulink></ulink> node.
+<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 "><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod "><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod "><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod ">&lt;enc:EncryptionMethod /&gt;</ulink></ulink></ulink></ulink> node or NULL if an error occurs.
+<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.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
@@ -538,19 +598,19 @@ Gets pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncrytpionMeth
                                             (<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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink></ulink></ulink></ulink> node (and the parent <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transforms";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transforms";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transforms";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transforms";>&lt;dsig:Transforms/&gt;</ulink></ulink></ulink></ulink> node)
-with specified transform methods <parameter>transform</parameter> to the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";>&lt;enc:CipherReference/&gt;</ulink></ulink></ulink></ulink>
-child node of the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> node <parameter>encNode</parameter>.</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>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";>&lt;enc:CipherReference/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink></ulink></ulink></ulink> node or 
+<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 error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
@@ -560,17 +620,17 @@ NULL if an error occurs.
                                             (<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";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-DataReference";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-DataReference";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-DataReference";>&lt;enc:DataReference/&gt;</ulink></ulink></ulink></ulink> and the parent <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-ReferenceList";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-ReferenceList";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-ReferenceList";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-ReferenceList";>&lt;enc:ReferenceList/&gt;</ulink></ulink></ulink></ulink> node (if needed).</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>
-<listitem><simpara> 	                the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <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";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-DataReference";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-DataReference";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-DataReference";>&lt;enc:DataReference/&gt;</ulink></ulink></ulink></ulink> node or 
+<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 
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
@@ -580,66 +640,66 @@ NULL if an error occurs.
                                             (<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";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-KeyReference";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-KeyReference";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-KeyReference";>&lt;enc:KeyReference/&gt;</ulink></ulink></ulink></ulink> and the parent <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-ReferenceList";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-ReferenceList";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-ReferenceList";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-ReferenceList";>&lt;enc:ReferenceList/&gt;</ulink></ulink></ulink></ulink> node (if needed).</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>
-<listitem><simpara> 	                the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <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";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-KeyReference";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-KeyReference";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-KeyReference";>&lt;enc:KeyReference/&gt;</ulink></ulink></ulink></ulink> node or 
+<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 
 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="xmlNode">xmlNodePtr</link>  xmlSecTmplKeyInfoAddKeyName     (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
+<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>
 <para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";>&lt;dsig:KeyName/&gt;</ulink></ulink></ulink></ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node <parameter>keyInfoNode</parameter>.</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>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";>&lt;dsig:KeyName/&gt;</ulink></ulink></ulink></ulink> node or
+<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
 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="xmlNode">xmlNodePtr</link>  xmlSecTmplKeyInfoAddKeyValue    (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode);</programlisting>
+<indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";>&lt;dsig:KeyValue/&gt;</ulink></ulink></ulink></ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node <parameter>keyInfoNode</parameter>.</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>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node.
+<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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";>&lt;dsig:KeyValue/&gt;</ulink></ulink></ulink></ulink> node or
+<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
 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="xmlNode">xmlNodePtr</link>  xmlSecTmplKeyInfoAddX509Data    (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode);</programlisting>
+<indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink></ulink></ulink></ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node <parameter>keyInfoNode</parameter>.</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>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node.
+<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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink></ulink></ulink></ulink> node or
+<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
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
@@ -650,12 +710,12 @@ NULL if an error occurs.
                                              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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink></ulink></ulink></ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node <parameter>keyInfoNode</parameter>.</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>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <listitem><simpara> 		the URI attribute (optional).
@@ -663,7 +723,7 @@ Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";><ulink
 <varlistentry><term><parameter>type</parameter>&nbsp;:</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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink></ulink></ulink></ulink> node or
+<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
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
@@ -673,18 +733,18 @@ NULL if an error occurs.
                                             (<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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink></ulink></ulink></ulink> node (and the parent <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transforms";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transforms";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transforms";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transforms";>&lt;dsig:Transforms/&gt;</ulink></ulink></ulink></ulink> node
-if required) to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink></ulink></ulink></ulink> node <parameter>retrMethod</parameter>.</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>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transforms";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transforms";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transforms";>&lt;dsig:Transforms/&gt;</ulink></ulink></ulink></ulink> node or
+<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
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
@@ -697,13 +757,13 @@ NULL if an error occurs.
                                              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";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink></ulink></ulink></ulink> node with given attributes to 
-the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node <parameter>keyInfoNode</parameter>.</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>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <listitem><simpara>	the encryption method (optional).
@@ -717,7 +777,124 @@ the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http
 <varlistentry><term><parameter>recipient</parameter>&nbsp;:</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";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink></ulink></ulink></ulink> node or
+<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
+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>
+<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>
+<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
+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>
+<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>
+<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>
+<listitem><simpara>
+</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
+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>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><parameter>x509IssuerSerialNode</parameter>&nbsp;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>serial</parameter>&nbsp;:</term>
+<listitem><simpara>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>
+
+
+</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>
+<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>
+<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
+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>
+<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>
+<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
+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>
+<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>
+<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
+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>
+<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>
+<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
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
@@ -727,13 +904,13 @@ NULL if an error occurs.
                                             (<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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-HMACOutputLength";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-HMACOutputLength";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-HMACOutputLength";>&lt;dsig:HMACOutputLength/&gt;</ulink></ulink></ulink></ulink> child for the HMAC transform 
+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>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink></ulink></ulink></ulink> node
+<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>
 <listitem><simpara> 		the required length in bits
@@ -748,12 +925,12 @@ node <parameter>node</parameter>.</para>
                                              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";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-OAEPParam";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-OAEPParam";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-OAEPParam";>&lt;enc:OAEPParam/&gt;</ulink></ulink></ulink></ulink> child node in the <parameter>node</parameter>.</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>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <listitem><simpara> 		the OAEP param buffer.
@@ -775,7 +952,7 @@ Writes the XSLT transform expression to the <parameter>node</parameter>.</para>
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>transformNode</parameter>&nbsp;:</term>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <listitem><simpara> 		the XSLT transform exspression.
@@ -794,7 +971,7 @@ Adds "inclusive" namespaces to the ExcC14N transform node <parameter>node</param
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>transformNode</parameter>&nbsp;:</term>
-<listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <listitem><simpara> 	the white space delimited  list of namespace prefixes, 
@@ -810,13 +987,13 @@ Adds "inclusive" namespaces to the ExcC14N transform node <parameter>node</param
                                              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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink></ulink></ulink></ulink> node 
+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>
-<listitem><simpara> 	the pointer to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <listitem><simpara> 	the XPath expression.
@@ -835,13 +1012,13 @@ Writes XPath transform infromation to the <ulink URL="http://www.w3.org/TR/xmlds
                                              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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink></ulink></ulink></ulink> node 
+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>
-<listitem><simpara> 	the pointer to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <listitem><simpara> 		the XPath2 transform type ("union", "intersect" or "subtract").
@@ -862,13 +1039,13 @@ Writes XPath2 transform infromation to the <ulink URL="http://www.w3.org/TR/xmld
                                              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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink></ulink></ulink></ulink> node 
+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>
-<listitem><simpara> 	the pointer to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <listitem><simpara> 	the XPath expression.
diff --git a/docs/api/sgml/transforms.sgml b/docs/api/sgml/transforms.sgml
index 7168b27..0f00f19 100644
--- a/docs/api/sgml/transforms.sgml
+++ b/docs/api/sgml/transforms.sgml
@@ -96,7 +96,7 @@ struct      <link linkend="xmlSecTransformCtx">xmlSecTransformCtx</link>;
 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="xmlSecTransform">xmlSecTransformPtr</link> <link linkend="xmlSecTransformNodeRead">xmlSecTransformNodeRead</link>  (<link linkend="xmlNode">xmlNodePtr</link> node,
+<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,
@@ -1076,7 +1076,7 @@ of transforms in <parameter>ctx</parameter>.</para>
                                              <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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink></ulink></ulink></ulink> children of the <parameter>node</parameter> and 
+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>
 
@@ -1085,7 +1085,7 @@ appends them to the current transforms chain in <parameter>ctx</parameter> objec
 <listitem><simpara>		the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink></ulink></ulink></ulink> nodes parent node.
+<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>
 <listitem><simpara>		the transform's usage (signature, encryption, etc.).
@@ -1267,7 +1267,7 @@ The transform structure.</para>
 </varlistentry>
 <varlistentry>
 <term><link linkend="xmlNode">xmlNodePtr</link> <structfield>hereNode</structfield></term>
-<listitem><simpara>		the pointer to transform's <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform "><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform ">&lt;dsig:Transform /&gt;</ulink></ulink></ulink></ulink> node.
+<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>
@@ -1340,7 +1340,7 @@ Destroys transform created with <link linkend="xmlSecTransformCreate"><type>xmlS
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecTransformNodeRead">xmlSecTransformNodeRead ()</title>
-<indexterm><primary>xmlSecTransformNodeRead</primary></indexterm><programlisting><link linkend="xmlSecTransform">xmlSecTransformPtr</link> xmlSecTransformNodeRead  (<link linkend="xmlNode">xmlNodePtr</link> node,
+<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>
 <para>
@@ -2034,7 +2034,7 @@ the <parameter>node</parameter>.</para>
 <listitem><simpara>			the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&nbsp;:</term>
-<listitem><simpara>			the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <listitem><simpara>		the pointer to transform context object.
@@ -2057,7 +2057,7 @@ The transform specific method to write transform information to an XML node <par
 <listitem><simpara>			the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&nbsp;:</term>
-<listitem><simpara>			the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <listitem><simpara>		the pointer to transform context object.
diff --git a/docs/api/sgml/version.sgml b/docs/api/sgml/version.sgml
index 4dedbbc..40dad22 100644
--- a/docs/api/sgml/version.sgml
+++ b/docs/api/sgml/version.sgml
@@ -42,7 +42,7 @@
 <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.9"
+<indexterm><primary>XMLSEC_VERSION</primary></indexterm><programlisting>#define XMLSEC_VERSION			"1.2.12"
 </programlisting>
 <para>
 The library version string in the format
@@ -70,7 +70,7 @@ The library minor version number.</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		9
+<indexterm><primary>XMLSEC_VERSION_SUBMINOR</primary></indexterm><programlisting>#define XMLSEC_VERSION_SUBMINOR		12
 </programlisting>
 <para>
 The library sub-minor version number.</para>
@@ -79,7 +79,7 @@ The library sub-minor version number.</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:9:2"
+<indexterm><primary>XMLSEC_VERSION_INFO</primary></indexterm><programlisting>#define XMLSEC_VERSION_INFO		"3:12:2"
 </programlisting>
 <para>
 The library version info string in the format
diff --git a/docs/api/sgml/x509.sgml b/docs/api/sgml/x509.sgml
index 5f18b2b..a4247d4 100644
--- a/docs/api/sgml/x509.sgml
+++ b/docs/api/sgml/x509.sgml
@@ -49,7 +49,7 @@
 <indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate";>&lt;dsig:X509Certificate/&gt;</ulink></ulink></ulink></ulink> node found or would be written back.</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>
@@ -58,7 +58,7 @@
 <indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName";>&lt;dsig:X509SubjectName/&gt;</ulink></ulink></ulink></ulink> node found or would be written back.</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>
@@ -67,7 +67,7 @@
 <indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial";>&lt;dsig:X509IssuerSerial/&gt;</ulink></ulink></ulink></ulink> node found or would be written back.</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>
@@ -85,7 +85,7 @@
 <indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509CRL";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509CRL";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509CRL";>&lt;dsig:X509CRL/&gt;</ulink></ulink></ulink></ulink> node found or would be written back.</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>
@@ -94,7 +94,7 @@
 <indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink></ulink></ulink></ulink> node template.</para>
+<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node template.</para>
 <para>
 
 </para></refsect2>
@@ -104,21 +104,21 @@ Default set of nodes to write in case of empty
                                              <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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink></ulink></ulink></ulink> node and returns it as
+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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
 <listitem><simpara>	the flag that indicates whether to remove node children after reading.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node processing context.
+<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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink></ulink></ulink></ulink> node content
+<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
 or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
diff --git a/docs/api/sgml/xkms.sgml b/docs/api/sgml/xkms.sgml
index 577682d..034e17f 100644
--- a/docs/api/sgml/xkms.sgml
+++ b/docs/api/sgml/xkms.sgml
@@ -15,187 +15,6 @@
 
 
 
-enum        <link linkend="xmlSecXkmsResultMajor">xmlSecXkmsResultMajor</link>;
-enum        <link linkend="xmlSecXkmsResultMinor">xmlSecXkmsResultMinor</link>;
-enum        <link linkend="xmlSecXkmsKeyBindingStatus">xmlSecXkmsKeyBindingStatus</link>;
-enum        <link linkend="xmlSecXkmsServerFormat">xmlSecXkmsServerFormat</link>;
-<link linkend="xmlSecXkmsServerFormat">xmlSecXkmsServerFormat</link> <link linkend="xmlSecXkmsServerFormatFromString">xmlSecXkmsServerFormatFromString</link>
-                                            (const <link linkend="xmlChar">xmlChar</link> *str);
-const <link linkend="xmlChar">xmlChar</link>* <link linkend="xmlSecXkmsServerFormatToString">xmlSecXkmsServerFormatToString</link>
-                                            (<link linkend="xmlSecXkmsServerFormat">xmlSecXkmsServerFormat</link> format);
-struct      <link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtx</link>;
-<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> <link linkend="xmlSecXkmsServerCtxCreate">xmlSecXkmsServerCtxCreate</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
-<link linkend="void">void</link>        <link linkend="xmlSecXkmsServerCtxDestroy">xmlSecXkmsServerCtxDestroy</link>      (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx);
-<link linkend="int">int</link>         <link linkend="xmlSecXkmsServerCtxInitialize">xmlSecXkmsServerCtxInitialize</link>   (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
-<link linkend="void">void</link>        <link linkend="xmlSecXkmsServerCtxFinalize">xmlSecXkmsServerCtxFinalize</link>     (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx);
-<link linkend="void">void</link>        <link linkend="xmlSecXkmsServerCtxReset">xmlSecXkmsServerCtxReset</link>        (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx);
-<link linkend="int">int</link>         <link linkend="xmlSecXkmsServerCtxCopyUserPref">xmlSecXkmsServerCtxCopyUserPref</link> (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> dst,
-                                             <link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> src);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecXkmsServerCtxProcess">xmlSecXkmsServerCtxProcess</link>      (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecXkmsServerFormat">xmlSecXkmsServerFormat</link> format,
-                                             <link linkend="xmlDoc">xmlDocPtr</link> doc);
-<link linkend="int">int</link>         <link linkend="xmlSecXkmsServerCtxRequestRead">xmlSecXkmsServerCtxRequestRead</link>  (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecXkmsServerCtxResponseWrite">xmlSecXkmsServerCtxResponseWrite</link>
-                                            (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlDoc">xmlDocPtr</link> doc);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecXkmsServerCtxRequestUnwrap">xmlSecXkmsServerCtxRequestUnwrap</link>
-                                            (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecXkmsServerFormat">xmlSecXkmsServerFormat</link> format);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecXkmsServerCtxResponseWrap">xmlSecXkmsServerCtxResponseWrap</link> (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecXkmsServerFormat">xmlSecXkmsServerFormat</link> format,
-                                             <link linkend="xmlDoc">xmlDocPtr</link> doc);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecXkmsServerCtxFatalErrorResponseCreate">xmlSecXkmsServerCtxFatalErrorResponseCreate</link>
-                                            (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlSecXkmsServerFormat">xmlSecXkmsServerFormat</link> format,
-                                             <link linkend="xmlDoc">xmlDocPtr</link> doc);
-<link linkend="void">void</link>        <link linkend="xmlSecXkmsServerCtxSetResult">xmlSecXkmsServerCtxSetResult</link>    (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlSecXkmsResultMajor">xmlSecXkmsResultMajor</link> resultMajor,
-                                             <link linkend="xmlSecXkmsResultMinor">xmlSecXkmsResultMinor</link> resultMinor);
-<link linkend="void">void</link>        <link linkend="xmlSecXkmsServerCtxDebugDump">xmlSecXkmsServerCtxDebugDump</link>    (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="void">void</link>        <link linkend="xmlSecXkmsServerCtxDebugXmlDump">xmlSecXkmsServerCtxDebugXmlDump</link> (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-#define     <link linkend="xmlSecXkmsServerCtxPtrListId">xmlSecXkmsServerCtxPtrListId</link>
-<link linkend="xmlSecPtrListId">xmlSecPtrListId</link> <link linkend="xmlSecXkmsServerCtxPtrListGetKlass">xmlSecXkmsServerCtxPtrListGetKlass</link>
-                                            (void);
-#define     <link linkend="XMLSEC-XKMS-SERVER-FLAGS-STOP-ON-UNKNOWN-RESPONSE-MECHANISM-CAPS">XMLSEC_XKMS_SERVER_FLAGS_STOP_ON_UNKNOWN_RESPONSE_MECHANISM</link>
-#define     <link linkend="XMLSEC-XKMS-SERVER-FLAGS-STOP-ON-UNKNOWN-RESPOND-WITH-CAPS">XMLSEC_XKMS_SERVER_FLAGS_STOP_ON_UNKNOWN_RESPOND_WITH</link>
-#define     <link linkend="XMLSEC-XKMS-SERVER-FLAGS-STOP-ON-UNKNOWN-KEY-USAGE-CAPS">XMLSEC_XKMS_SERVER_FLAGS_STOP_ON_UNKNOWN_KEY_USAGE</link>
-#define     <link linkend="XMLSEC-XKMS-RESPONSE-MECHANISM-MASK-PENDING-CAPS">XMLSEC_XKMS_RESPONSE_MECHANISM_MASK_PENDING</link>
-#define     <link linkend="XMLSEC-XKMS-RESPONSE-MECHANISM-MASK-REPRESENT-CAPS">XMLSEC_XKMS_RESPONSE_MECHANISM_MASK_REPRESENT</link>
-#define     <link linkend="XMLSEC-XKMS-RESPONSE-MECHANISM-MASK-REQUEST-SIGNATURE-VALUE-CAPS">XMLSEC_XKMS_RESPONSE_MECHANISM_MASK_REQUEST_SIGNATURE_VALUE</link>
-#define     <link linkend="XMLSEC-XKMS-NO-RESPONSE-LIMIT-CAPS">XMLSEC_XKMS_NO_RESPONSE_LIMIT</link>
-#define     <link linkend="XMLSEC-XKMS-KEY-BINDING-REASON-MASK-ISSUER-TRAST-CAPS">XMLSEC_XKMS_KEY_BINDING_REASON_MASK_ISSUER_TRAST</link>
-#define     <link linkend="XMLSEC-XKMS-KEY-BINDING-REASON-MASK-REVOCATION-STATUS-CAPS">XMLSEC_XKMS_KEY_BINDING_REASON_MASK_REVOCATION_STATUS</link>
-#define     <link linkend="XMLSEC-XKMS-KEY-BINDING-REASON-MASK-VALIDITY-INTERVAL-CAPS">XMLSEC_XKMS_KEY_BINDING_REASON_MASK_VALIDITY_INTERVAL</link>
-#define     <link linkend="XMLSEC-XKMS-KEY-BINDING-REASON-MASK-SIGNATURE-CAPS">XMLSEC_XKMS_KEY_BINDING_REASON_MASK_SIGNATURE</link>
-<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> <link linkend="xmlSecXkmsRespondWithIdsGet">xmlSecXkmsRespondWithIdsGet</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecXkmsRespondWithIdsInit">xmlSecXkmsRespondWithIdsInit</link>    (void);
-<link linkend="void">void</link>        <link linkend="xmlSecXkmsRespondWithIdsShutdown">xmlSecXkmsRespondWithIdsShutdown</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecXkmsRespondWithIdsRegisterDefault">xmlSecXkmsRespondWithIdsRegisterDefault</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecXkmsRespondWithIdsRegister">xmlSecXkmsRespondWithIdsRegister</link>
-                                            (<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> id);
-<link linkend="int">int</link>         <link linkend="xmlSecXkmsRespondWithNodeRead">xmlSecXkmsRespondWithNodeRead</link>   (<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> id,
-                                             <link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="int">int</link>         <link linkend="xmlSecXkmsRespondWithNodeWrite">xmlSecXkmsRespondWithNodeWrite</link>  (<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> id,
-                                             <link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="void">void</link>        <link linkend="xmlSecXkmsRespondWithDebugDump">xmlSecXkmsRespondWithDebugDump</link>  (<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> id,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="void">void</link>        <link linkend="xmlSecXkmsRespondWithDebugXmlDump">xmlSecXkmsRespondWithDebugXmlDump</link>
-                                            (<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> id,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="int">int</link>         <link linkend="xmlSecXkmsRespondWithDefaultNodeRead">xmlSecXkmsRespondWithDefaultNodeRead</link>
-                                            (<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> id,
-                                             <link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="int">int</link>         <link linkend="xmlSecXkmsRespondWithDefaultNodeWrite">xmlSecXkmsRespondWithDefaultNodeWrite</link>
-                                            (<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> id,
-                                             <link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);
-#define     <link linkend="xmlSecXkmsRespondWithIdListId">xmlSecXkmsRespondWithIdListId</link>
-<link linkend="xmlSecPtrListId">xmlSecPtrListId</link> <link linkend="xmlSecXkmsRespondWithIdListGetKlass">xmlSecXkmsRespondWithIdListGetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecXkmsRespondWithIdListFind">xmlSecXkmsRespondWithIdListFind</link> (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> id);
-<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> <link linkend="xmlSecXkmsRespondWithIdListFindByNodeValue">xmlSecXkmsRespondWithIdListFindByNodeValue</link>
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="int">int</link>         <link linkend="xmlSecXkmsRespondWithIdListWrite">xmlSecXkmsRespondWithIdListWrite</link>
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);
-#define     <link linkend="xmlSecXkmsRespondWithIdUnknown">xmlSecXkmsRespondWithIdUnknown</link>
-#define     <link linkend="xmlSecXkmsRespondWithKeyNameId">xmlSecXkmsRespondWithKeyNameId</link>
-<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> <link linkend="xmlSecXkmsRespondWithKeyNameGetKlass">xmlSecXkmsRespondWithKeyNameGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecXkmsRespondWithKeyValueId">xmlSecXkmsRespondWithKeyValueId</link>
-<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> <link linkend="xmlSecXkmsRespondWithKeyValueGetKlass">xmlSecXkmsRespondWithKeyValueGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecXkmsRespondWithPrivateKeyId">xmlSecXkmsRespondWithPrivateKeyId</link>
-<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> <link linkend="xmlSecXkmsRespondWithPrivateKeyGetKlass">xmlSecXkmsRespondWithPrivateKeyGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecXkmsRespondWithRetrievalMethodId">xmlSecXkmsRespondWithRetrievalMethodId</link>
-<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> <link linkend="xmlSecXkmsRespondWithRetrievalMethodGetKlass">xmlSecXkmsRespondWithRetrievalMethodGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecXkmsRespondWithX509CertId">xmlSecXkmsRespondWithX509CertId</link>
-<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> <link linkend="xmlSecXkmsRespondWithX509CertGetKlass">xmlSecXkmsRespondWithX509CertGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecXkmsRespondWithX509ChainId">xmlSecXkmsRespondWithX509ChainId</link>
-<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> <link linkend="xmlSecXkmsRespondWithX509ChainGetKlass">xmlSecXkmsRespondWithX509ChainGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecXkmsRespondWithX509CRLId">xmlSecXkmsRespondWithX509CRLId</link>
-<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> <link linkend="xmlSecXkmsRespondWithX509CRLGetKlass">xmlSecXkmsRespondWithX509CRLGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecXkmsRespondWithPGPId">xmlSecXkmsRespondWithPGPId</link>
-<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> <link linkend="xmlSecXkmsRespondWithPGPGetKlass">xmlSecXkmsRespondWithPGPGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecXkmsRespondWithSPKIId">xmlSecXkmsRespondWithSPKIId</link>
-<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> <link linkend="xmlSecXkmsRespondWithSPKIGetKlass">xmlSecXkmsRespondWithSPKIGetKlass</link>
-                                            (void);
-<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> <link linkend="xmlSecXkmsServerRequestIdsGet">xmlSecXkmsServerRequestIdsGet</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecXkmsServerRequestIdsInit">xmlSecXkmsServerRequestIdsInit</link>  (void);
-<link linkend="void">void</link>        <link linkend="xmlSecXkmsServerRequestIdsShutdown">xmlSecXkmsServerRequestIdsShutdown</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecXkmsServerRequestIdsRegisterDefault">xmlSecXkmsServerRequestIdsRegisterDefault</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecXkmsServerRequestIdsRegister">xmlSecXkmsServerRequestIdsRegister</link>
-                                            (<link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> id);
-<link linkend="int">int</link>         <link linkend="xmlSecXkmsServerRequestNodeRead">xmlSecXkmsServerRequestNodeRead</link> (<link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> id,
-                                             <link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="int">int</link>         <link linkend="xmlSecXkmsServerRequestExecute">xmlSecXkmsServerRequestExecute</link>  (<link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> id,
-                                             <link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecXkmsServerRequestNodeWrite">xmlSecXkmsServerRequestNodeWrite</link>
-                                            (<link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> id,
-                                             <link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="void">void</link>        <link linkend="xmlSecXkmsServerRequestDebugDump">xmlSecXkmsServerRequestDebugDump</link>
-                                            (<link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> id,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="void">void</link>        <link linkend="xmlSecXkmsServerRequestDebugXmlDump">xmlSecXkmsServerRequestDebugXmlDump</link>
-                                            (<link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> id,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-#define     <link linkend="xmlSecXkmsServerRequestIdListId">xmlSecXkmsServerRequestIdListId</link>
-<link linkend="xmlSecPtrListId">xmlSecPtrListId</link> <link linkend="xmlSecXkmsServerRequestIdListGetKlass">xmlSecXkmsServerRequestIdListGetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecXkmsServerRequestIdListFind">xmlSecXkmsServerRequestIdListFind</link>
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> id);
-<link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> <link linkend="xmlSecXkmsServerRequestIdListFindByName">xmlSecXkmsServerRequestIdListFindByName</link>
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             const <link linkend="xmlChar">xmlChar</link> *name);
-<link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> <link linkend="xmlSecXkmsServerRequestIdListFindByNode">xmlSecXkmsServerRequestIdListFindByNode</link>
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);
-#define     <link linkend="xmlSecXkmsServerRequestIdUnknown">xmlSecXkmsServerRequestIdUnknown</link>
-#define     <link linkend="xmlSecXkmsServerRequestResultId">xmlSecXkmsServerRequestResultId</link>
-<link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> <link linkend="xmlSecXkmsServerRequestResultGetKlass">xmlSecXkmsServerRequestResultGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecXkmsServerRequestStatusId">xmlSecXkmsServerRequestStatusId</link>
-<link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> <link linkend="xmlSecXkmsServerRequestStatusGetKlass">xmlSecXkmsServerRequestStatusGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecXkmsServerRequestCompoundId">xmlSecXkmsServerRequestCompoundId</link>
-<link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> <link linkend="xmlSecXkmsServerRequestCompoundGetKlass">xmlSecXkmsServerRequestCompoundGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecXkmsServerRequestLocateId">xmlSecXkmsServerRequestLocateId</link>
-<link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> <link linkend="xmlSecXkmsServerRequestLocateGetKlass">xmlSecXkmsServerRequestLocateGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecXkmsServerRequestValidateId">xmlSecXkmsServerRequestValidateId</link>
-<link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> <link linkend="xmlSecXkmsServerRequestValidateGetKlass">xmlSecXkmsServerRequestValidateGetKlass</link>
-                                            (void);
 </synopsis>
 </refsynopsisdiv>
 
@@ -216,1695 +35,6 @@ struct      <link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtx</link>;
 
 <refsect1>
 <title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecXkmsResultMajor">enum xmlSecXkmsResultMajor</title>
-<indexterm><primary>xmlSecXkmsResultMajor</primary></indexterm><programlisting>typedef enum {
-    xmlSecXkmsResultMajorSuccess = 0,
-    xmlSecXkmsResultMajorVersionMismatch,
-    xmlSecXkmsResultMajorSender,
-    xmlSecXkmsResultMajorReceiver,
-    xmlSecXkmsResultMajorRepresent,
-    xmlSecXkmsResultMajorPending
-} xmlSecXkmsResultMajor;
-</programlisting>
-<para>
-The values for ResultMajor attribute.</para>
-<para>
-
-</para><variablelist role="enum">
-<varlistentry>
-<term><literal>xmlSecXkmsResultMajorSuccess</literal></term>
-<listitem><simpara>               The operation succeeded.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><literal>xmlSecXkmsResultMajorVersionMismatch</literal></term>
-<listitem><simpara>       The service does not support 
-                                             the protocol version specified 
-                                             in the request.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><literal>xmlSecXkmsResultMajorSender</literal></term>
-<listitem><simpara>                An error occurred that was due
-                                             to the message sent by the sender.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><literal>xmlSecXkmsResultMajorReceiver</literal></term>
-<listitem><simpara>              An error occurred at the receiver.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><literal>xmlSecXkmsResultMajorRepresent</literal></term>
-<listitem><simpara>             The service has not acted on the 
-                                             request. In order for the request
-                                             to be acted upon the request MUST 
-                                             be represented with the specified
-                                             nonce in accordance with the two
-                                             phase protocol.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><literal>xmlSecXkmsResultMajorPending</literal></term>
-<listitem><simpara>               The request has been accepted 
-                                             for processing and the service 
-                                             will return the result asynchronously.
-</simpara></listitem>
-</varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsResultMinor">enum xmlSecXkmsResultMinor</title>
-<indexterm><primary>xmlSecXkmsResultMinor</primary></indexterm><programlisting>typedef enum {
-    xmlSecXkmsResultMinorNone = 0,
-    xmlSecXkmsResultMinorNoMatch,
-    xmlSecXkmsResultMinorTooManyResponses,
-    xmlSecXkmsResultMinorIncomplete,
-    xmlSecXkmsResultMinorFailure,
-    xmlSecXkmsResultMinorRefused,
-    xmlSecXkmsResultMinorNoAuthentication,
-    xmlSecXkmsResultMinorMessageNotSupported,
-    xmlSecXkmsResultMinorUnknownResponseId,
-    xmlSecXkmsResultMinorSynchronous
-} xmlSecXkmsResultMinor;
-</programlisting>
-<para>
-The values for ResultMinor attribute.</para>
-<para>
-
-</para><variablelist role="enum">
-<varlistentry>
-<term><literal>xmlSecXkmsResultMinorNone</literal></term>
-<listitem><simpara>                  No minor result code available.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><literal>xmlSecXkmsResultMinorNoMatch</literal></term>
-<listitem><simpara>               No match was found for the search 
-                                             prototype provided.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><literal>xmlSecXkmsResultMinorTooManyResponses</literal></term>
-<listitem><simpara>      The request resulted in the 
-                                             number of responses that 
-                                             exceeded either the ResponseLimit 
-                                             value specified in the request or 
-                                             some other limit determined by 
-                                             the service. The service MAY 
-                                             either return a subset of the 
-                                             possible responses or none at all.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><literal>xmlSecXkmsResultMinorIncomplete</literal></term>
-<listitem><simpara>            Only part of the information 
-                                             requested could be provided.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><literal>xmlSecXkmsResultMinorFailure</literal></term>
-<listitem><simpara>               The service attempted to perform 
-                                             the request but the operation 
-                                             failed for unspecified reasons.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><literal>xmlSecXkmsResultMinorRefused</literal></term>
-<listitem><simpara>               The operation was refused. The 
-                                             service did not attempt to 
-                                             perform the request.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><literal>xmlSecXkmsResultMinorNoAuthentication</literal></term>
-<listitem><simpara>      The operation was refused 
-                                             because the necessary authentication 
-                                             information was incorrect or missing.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><literal>xmlSecXkmsResultMinorMessageNotSupported</literal></term>
-<listitem><simpara>   The receiver does not implement 
-                                             the specified operation.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><literal>xmlSecXkmsResultMinorUnknownResponseId</literal></term>
-<listitem><simpara>     The ResponseId for which pending 
-                                             status was requested is unknown to 
-                                             the service.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><literal>xmlSecXkmsResultMinorSynchronous</literal></term>
-<listitem><simpara>           The receiver does not support 
-                                             synchronous processing of this 
-                                             type of request.
-</simpara></listitem>
-</varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsKeyBindingStatus">enum xmlSecXkmsKeyBindingStatus</title>
-<indexterm><primary>xmlSecXkmsKeyBindingStatus</primary></indexterm><programlisting>typedef enum {
-    xmlSecXkmsKeyBindingStatusNone,
-    xmlSecXkmsKeyBindingStatusValid,
-    xmlSecXkmsKeyBindingStatusInvalid,
-    xmlSecXkmsKeyBindingStatusIndeterminate
-} xmlSecXkmsKeyBindingStatus;
-</programlisting>
-<para>
-The values for key binding StatusValue attribute.</para>
-<para>
-
-</para><variablelist role="enum">
-<varlistentry>
-<term><literal>xmlSecXkmsKeyBindingStatusNone</literal></term>
-<listitem><simpara>             The key status is not available.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><literal>xmlSecXkmsKeyBindingStatusValid</literal></term>
-<listitem><simpara>            The key is valid.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><literal>xmlSecXkmsKeyBindingStatusInvalid</literal></term>
-<listitem><simpara>          The key is not valid.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><literal>xmlSecXkmsKeyBindingStatusIndeterminate</literal></term>
-<listitem><simpara>    Could not determine key status.
-</simpara></listitem>
-</varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerFormat">enum xmlSecXkmsServerFormat</title>
-<indexterm><primary>xmlSecXkmsServerFormat</primary></indexterm><programlisting>typedef enum {
-    xmlSecXkmsServerFormatUnknown = 0,
-    xmlSecXkmsServerFormatPlain,
-    xmlSecXkmsServerFormatSoap11,
-    xmlSecXkmsServerFormatSoap12
-} xmlSecXkmsServerFormat;
-</programlisting>
-<para>
-The xkms server request/response format.</para>
-<para>
-
-</para><variablelist role="enum">
-<varlistentry>
-<term><literal>xmlSecXkmsServerFormatUnknown</literal></term>
-<listitem><simpara>              The format is unknown.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><literal>xmlSecXkmsServerFormatPlain</literal></term>
-<listitem><simpara>                The request/response are not enveloped.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><literal>xmlSecXkmsServerFormatSoap11</literal></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><literal>xmlSecXkmsServerFormatSoap12</literal></term>
-<listitem><simpara>
-
-</simpara></listitem>
-</varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerFormatFromString">xmlSecXkmsServerFormatFromString ()</title>
-<indexterm><primary>xmlSecXkmsServerFormatFromString</primary></indexterm><programlisting><link linkend="xmlSecXkmsServerFormat">xmlSecXkmsServerFormat</link> xmlSecXkmsServerFormatFromString
-                                            (const <link linkend="xmlChar">xmlChar</link> *str);</programlisting>
-<para>
-Gets xmlSecXkmsServerFormat from string <parameter>str</parameter>.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>str</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>corresponding format or xmlSecXkmsServerFormatUnknown
-if format could not be recognized.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerFormatToString">xmlSecXkmsServerFormatToString ()</title>
-<indexterm><primary>xmlSecXkmsServerFormatToString</primary></indexterm><programlisting>const <link linkend="xmlChar">xmlChar</link>* xmlSecXkmsServerFormatToString
-                                            (<link linkend="xmlSecXkmsServerFormat">xmlSecXkmsServerFormat</link> format);</programlisting>
-<para>
-Gets string from <parameter>format</parameter>.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
-<listitem><simpara>     the format.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>string corresponding to <parameter>format</parameter> or NULL if an error occurs.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerCtx">struct xmlSecXkmsServerCtx</title>
-<indexterm><primary>xmlSecXkmsServerCtx</primary></indexterm><programlisting>struct xmlSecXkmsServerCtx {
-
-    /* these data user can set before performing the operation */
-    void*			userData;
-    xmlSecBitMask		flags;
-    xmlSecBitMask		flags2;    
-    xmlSecKeyInfoCtx		keyInfoReadCtx;
-    xmlSecKeyInfoCtx		keyInfoWriteCtx;
-    xmlSecPtrList		enabledRespondWithIds;
-    xmlSecPtrList		enabledServerRequestIds;
-    xmlChar* 			expectedService;
-    xmlChar*			idPrefix;
-    xmlSecSize			idLen;
-        
-    /* these data are returned */
-    xmlSecPtrList		keys;
-    xmlSecXkmsResultMajor	resultMajor;
-    xmlSecXkmsResultMinor	resultMinor;
-    xmlSecXkmsServerRequestId	requestId;
-    xmlChar*			id;    
-    xmlChar*			service;
-    xmlChar*			nonce;
-    xmlChar*			originalRequestId;
-    xmlChar*                    pendingNotificationMechanism;
-    xmlChar*                    pendingNotificationIdentifier;
-    int 			responseLimit;
-    xmlSecBitMask		responseMechanismMask;
-    xmlSecPtrListPtr		compoundRequestContexts;
-
-    /* these are internal data, nobody should change that except us */
-    xmlNodePtr			requestNode;
-    xmlNodePtr			opaqueClientDataNode;
-    xmlNodePtr 			firtsMsgExtNode;
-    xmlNodePtr 			keyInfoNode;
-    xmlSecPtrList		respWithList;
-    
-    /* reserved for future */
-    void*			reserved0;
-    void*			reserved1;
-};
-</programlisting>
-<para>
-XKMS context.</para>
-<para>
-
-</para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="void">void</link> *<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="xmlSecBitMask">xmlSecBitMask</link> <structfield>flags</structfield></term>
-<listitem><simpara>			the XML Encryption processing flags.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecBitMask">xmlSecBitMask</link> <structfield>flags2</structfield></term>
-<listitem><simpara>			the XML Encryption processing flags.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> <structfield>keyInfoReadCtx</structfield></term>
-<listitem><simpara>		the reading key context.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> <structfield>keyInfoWriteCtx</structfield></term>
-<listitem><simpara>		the writing key context (not used for signature verification).
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrList</link> <structfield>enabledRespondWithIds</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrList</link> <structfield>enabledServerRequestIds</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>expectedService</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>idPrefix</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link> <structfield>idLen</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrList</link> <structfield>keys</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecXkmsResultMajor">xmlSecXkmsResultMajor</link> <structfield>resultMajor</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecXkmsResultMinor">xmlSecXkmsResultMinor</link> <structfield>resultMinor</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> <structfield>requestId</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>id</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>service</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>nonce</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>originalRequestId</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>pendingNotificationMechanism</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>pendingNotificationIdentifier</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="int">int</link> <structfield>responseLimit</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecBitMask">xmlSecBitMask</link> <structfield>responseMechanismMask</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> <structfield>compoundRequestContexts</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlNode">xmlNodePtr</link> <structfield>requestNode</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlNode">xmlNodePtr</link> <structfield>opaqueClientDataNode</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlNode">xmlNodePtr</link> <structfield>firtsMsgExtNode</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlNode">xmlNodePtr</link> <structfield>keyInfoNode</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrList</link> <structfield>respWithList</structfield></term>
-<listitem><simpara>
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved0</structfield></term>
-<listitem><simpara>			reserved for the future.
-</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved1</structfield></term>
-<listitem><simpara>			reserved for the future.
-</simpara></listitem>
-</varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerCtxCreate">xmlSecXkmsServerCtxCreate ()</title>
-<indexterm><primary>xmlSecXkmsServerCtxCreate</primary></indexterm><programlisting><link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> xmlSecXkmsServerCtxCreate
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
-<para>
-Creates XKMS request server side processing context.
-The caller is responsible for destroying returend object by calling 
-<link linkend="xmlSecXkmsServerCtxDestroy"><type>xmlSecXkmsServerCtxDestroy</type></link> function.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>keysMngr</parameter>&nbsp;:</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
-occurs.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerCtxDestroy">xmlSecXkmsServerCtxDestroy ()</title>
-<indexterm><primary>xmlSecXkmsServerCtxDestroy</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecXkmsServerCtxDestroy      (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx);</programlisting>
-<para>
-Destroy context object created with <link linkend="xmlSecXkmsServerCtxCreate"><type>xmlSecXkmsServerCtxCreate</type></link> function.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to XKMS processing context.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerCtxInitialize">xmlSecXkmsServerCtxInitialize ()</title>
-<indexterm><primary>xmlSecXkmsServerCtxInitialize</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecXkmsServerCtxInitialize   (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
-<para>
-Initializes XKMS element processing context.
-The caller is responsible for cleaing up returend object by calling 
-<link linkend="xmlSecXkmsServerCtxFinalize"><type>xmlSecXkmsServerCtxFinalize</type></link> function.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to XKMS processing context.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keysMngr</parameter>&nbsp;:</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.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerCtxFinalize">xmlSecXkmsServerCtxFinalize ()</title>
-<indexterm><primary>xmlSecXkmsServerCtxFinalize</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecXkmsServerCtxFinalize     (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx);</programlisting>
-<para>
-Cleans up <parameter>ctx</parameter> object.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to XKMS processing context.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerCtxReset">xmlSecXkmsServerCtxReset ()</title>
-<indexterm><primary>xmlSecXkmsServerCtxReset</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecXkmsServerCtxReset        (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx);</programlisting>
-<para>
-Resets <parameter>ctx</parameter> object, user settings are not touched.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to XKMS processing context.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerCtxCopyUserPref">xmlSecXkmsServerCtxCopyUserPref ()</title>
-<indexterm><primary>xmlSecXkmsServerCtxCopyUserPref</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecXkmsServerCtxCopyUserPref (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> dst,
-                                             <link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</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>
-<listitem><simpara>	the pointer to destination context.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src</parameter>&nbsp;:</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.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerCtxProcess">xmlSecXkmsServerCtxProcess ()</title>
-<indexterm><primary>xmlSecXkmsServerCtxProcess</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecXkmsServerCtxProcess      (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecXkmsServerFormat">xmlSecXkmsServerFormat</link> format,
-                                             <link linkend="xmlDoc">xmlDocPtr</link> doc);</programlisting>
-<para>
-Reads XKMS request from <parameter>node</parameter> and creates response to a newly created node. 
-Caller is responsible for adding the returned node to the XML document.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to XKMS processing context.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to request node.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
-<listitem><simpara>     the request/response format.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>doc</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to response parent XML document (might be NULL).
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created XKMS response node or NULL
-if an error occurs.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerCtxRequestRead">xmlSecXkmsServerCtxRequestRead ()</title>
-<indexterm><primary>xmlSecXkmsServerCtxRequestRead</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecXkmsServerCtxRequestRead  (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
-<para>
-Reads XKMS request from <parameter>node</parameter> and stores data in <parameter>ctx</parameter>.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to XKMS processing context.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to request node.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerCtxResponseWrite">xmlSecXkmsServerCtxResponseWrite ()</title>
-<indexterm><primary>xmlSecXkmsServerCtxResponseWrite</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecXkmsServerCtxResponseWrite
-                                            (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlDoc">xmlDocPtr</link> doc);</programlisting>
-<para>
-Writes XKMS response from context to a newly created node. Caller is 
-responsible for adding the returned node to the XML document.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to XKMS processing context.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>doc</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to response parent XML document (might be NULL).
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created XKMS response node or NULL
-if an error occurs.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerCtxRequestUnwrap">xmlSecXkmsServerCtxRequestUnwrap ()</title>
-<indexterm><primary>xmlSecXkmsServerCtxRequestUnwrap</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecXkmsServerCtxRequestUnwrap
-                                            (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecXkmsServerFormat">xmlSecXkmsServerFormat</link> format);</programlisting>
-<para>
-Removes SOAP or other envelope from XKMS request.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to XKMS processing context.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to request node.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
-<listitem><simpara>     the request/response format.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to "real" XKMS request node or NULL if an error occurs. 
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerCtxResponseWrap">xmlSecXkmsServerCtxResponseWrap ()</title>
-<indexterm><primary>xmlSecXkmsServerCtxResponseWrap</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecXkmsServerCtxResponseWrap (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecXkmsServerFormat">xmlSecXkmsServerFormat</link> format,
-                                             <link linkend="xmlDoc">xmlDocPtr</link> doc);</programlisting>
-<para>
-Creates SOAP or other envelope around XKMS response.
-Caller is responsible for adding the returned node to the XML document.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to XKMS processing context.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to response node.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
-<listitem><simpara>     the request/response format.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>doc</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to response parent XML document (might be NULL).
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created response envelope node or NULL
-if an error occurs.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerCtxFatalErrorResponseCreate">xmlSecXkmsServerCtxFatalErrorResponseCreate ()</title>
-<indexterm><primary>xmlSecXkmsServerCtxFatalErrorResponseCreate</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecXkmsServerCtxFatalErrorResponseCreate
-                                            (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlSecXkmsServerFormat">xmlSecXkmsServerFormat</link> format,
-                                             <link linkend="xmlDoc">xmlDocPtr</link> doc);</programlisting>
-<para>
-Creates a "fatal error" SOAP or other envelope respons. Caller is 
-responsible for adding the returned node to the XML document.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to XKMS processing context.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
-<listitem><simpara>     the request/response format.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>doc</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to response parent XML document (might be NULL).
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created fatal error response (it might be NULL).
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerCtxSetResult">xmlSecXkmsServerCtxSetResult ()</title>
-<indexterm><primary>xmlSecXkmsServerCtxSetResult</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecXkmsServerCtxSetResult    (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlSecXkmsResultMajor">xmlSecXkmsResultMajor</link> resultMajor,
-                                             <link linkend="xmlSecXkmsResultMinor">xmlSecXkmsResultMinor</link> resultMinor);</programlisting>
-<para>
-Sets the major/minor result code in the context if no other result is already
-reported.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>	 the pointer to XKMS processing context.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>resultMajor</parameter>&nbsp;:</term>
-<listitem><simpara> the major result code.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>resultMinor</parameter>&nbsp;:</term>
-<listitem><simpara> the minor result code.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerCtxDebugDump">xmlSecXkmsServerCtxDebugDump ()</title>
-<indexterm><primary>xmlSecXkmsServerCtxDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecXkmsServerCtxDebugDump    (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints the debug information about <parameter>ctx</parameter> to <parameter>output</parameter>.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to XKMS processing context.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to output FILE.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerCtxDebugXmlDump">xmlSecXkmsServerCtxDebugXmlDump ()</title>
-<indexterm><primary>xmlSecXkmsServerCtxDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecXkmsServerCtxDebugXmlDump (<link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints the debug information about <parameter>ctx</parameter> to <parameter>output</parameter> in XML format.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to XKMS processing context.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to output FILE.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerCtxPtrListId">xmlSecXkmsServerCtxPtrListId</title>
-<indexterm><primary>xmlSecXkmsServerCtxPtrListId</primary></indexterm><programlisting>#define xmlSecXkmsServerCtxPtrListId	xmlSecXkmsServerCtxPtrListGetKlass()
-</programlisting>
-<para>
-zmlSecXkmsServerCtx klasses list klass.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerCtxPtrListGetKlass">xmlSecXkmsServerCtxPtrListGetKlass ()</title>
-<indexterm><primary>xmlSecXkmsServerCtxPtrListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link> xmlSecXkmsServerCtxPtrListGetKlass
-                                            (void);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-XKMS-SERVER-FLAGS-STOP-ON-UNKNOWN-RESPONSE-MECHANISM-CAPS">XMLSEC_XKMS_SERVER_FLAGS_STOP_ON_UNKNOWN_RESPONSE_MECHANISM</title>
-<indexterm><primary>XMLSEC_XKMS_SERVER_FLAGS_STOP_ON_UNKNOWN_RESPONSE_MECHANISM</primary></indexterm><programlisting>#define XMLSEC_XKMS_SERVER_FLAGS_STOP_ON_UNKNOWN_RESPONSE_MECHANISM	0x00000001
-</programlisting>
-<para>
-If flag is set then we abort if an unknown &lt;xkms:ResponseMechanism/&gt; 
-value is found.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-XKMS-SERVER-FLAGS-STOP-ON-UNKNOWN-RESPOND-WITH-CAPS">XMLSEC_XKMS_SERVER_FLAGS_STOP_ON_UNKNOWN_RESPOND_WITH</title>
-<indexterm><primary>XMLSEC_XKMS_SERVER_FLAGS_STOP_ON_UNKNOWN_RESPOND_WITH</primary></indexterm><programlisting>#define XMLSEC_XKMS_SERVER_FLAGS_STOP_ON_UNKNOWN_RESPOND_WITH		0x00000002
-</programlisting>
-<para>
-If flag is set then we abort if an unknown &lt;xkms:RespondWith/&gt; 
-value is found.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-XKMS-SERVER-FLAGS-STOP-ON-UNKNOWN-KEY-USAGE-CAPS">XMLSEC_XKMS_SERVER_FLAGS_STOP_ON_UNKNOWN_KEY_USAGE</title>
-<indexterm><primary>XMLSEC_XKMS_SERVER_FLAGS_STOP_ON_UNKNOWN_KEY_USAGE</primary></indexterm><programlisting>#define XMLSEC_XKMS_SERVER_FLAGS_STOP_ON_UNKNOWN_KEY_USAGE		0x00000004
-</programlisting>
-<para>
-If flag is set then we abort if an unknown &lt;xkms:KeyUsage/&gt; 
-value is found.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-XKMS-RESPONSE-MECHANISM-MASK-PENDING-CAPS">XMLSEC_XKMS_RESPONSE_MECHANISM_MASK_PENDING</title>
-<indexterm><primary>XMLSEC_XKMS_RESPONSE_MECHANISM_MASK_PENDING</primary></indexterm><programlisting>#define XMLSEC_XKMS_RESPONSE_MECHANISM_MASK_PENDING			0x00000001	
-</programlisting>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-XKMS-RESPONSE-MECHANISM-MASK-REPRESENT-CAPS">XMLSEC_XKMS_RESPONSE_MECHANISM_MASK_REPRESENT</title>
-<indexterm><primary>XMLSEC_XKMS_RESPONSE_MECHANISM_MASK_REPRESENT</primary></indexterm><programlisting>#define XMLSEC_XKMS_RESPONSE_MECHANISM_MASK_REPRESENT			0x00000002
-</programlisting>
-<para>
-XKMS ResponseMechanism element value. The requestor is prepared to 
-accept a response that uses the two phase protocol, i.e. the service 
-MAY return the MajorResult code Represent.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-XKMS-RESPONSE-MECHANISM-MASK-REQUEST-SIGNATURE-VALUE-CAPS">XMLSEC_XKMS_RESPONSE_MECHANISM_MASK_REQUEST_SIGNATURE_VALUE</title>
-<indexterm><primary>XMLSEC_XKMS_RESPONSE_MECHANISM_MASK_REQUEST_SIGNATURE_VALUE</primary></indexterm><programlisting>#define XMLSEC_XKMS_RESPONSE_MECHANISM_MASK_REQUEST_SIGNATURE_VALUE	0x00000004
-</programlisting>
-<para>
-XKMS ResponseMechanism element value. The requestor is prepared to 
-accept a response that carries a &lt;RequestSignatureValue&gt; element.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-XKMS-NO-RESPONSE-LIMIT-CAPS">XMLSEC_XKMS_NO_RESPONSE_LIMIT</title>
-<indexterm><primary>XMLSEC_XKMS_NO_RESPONSE_LIMIT</primary></indexterm><programlisting>#define XMLSEC_XKMS_NO_RESPONSE_LIMIT			        -1
-</programlisting>
-<para>
-The ResponseLimit is not specified.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-XKMS-KEY-BINDING-REASON-MASK-ISSUER-TRAST-CAPS">XMLSEC_XKMS_KEY_BINDING_REASON_MASK_ISSUER_TRAST</title>
-<indexterm><primary>XMLSEC_XKMS_KEY_BINDING_REASON_MASK_ISSUER_TRAST</primary></indexterm><programlisting>#define XMLSEC_XKMS_KEY_BINDING_REASON_MASK_ISSUER_TRAST	0x00000001
-</programlisting>
-<para>
-The issuer of the information on which the key binding is based is 
-considered to be trustworthy by the XKMS service.
-</para>
-<para>
-X.509 Equivalents
-  - Valid:	Certificate path anchored by trusted root successfully constructed.
-  - Invalid:	Certificate path could not be constructed to a trusted root.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-XKMS-KEY-BINDING-REASON-MASK-REVOCATION-STATUS-CAPS">XMLSEC_XKMS_KEY_BINDING_REASON_MASK_REVOCATION_STATUS</title>
-<indexterm><primary>XMLSEC_XKMS_KEY_BINDING_REASON_MASK_REVOCATION_STATUS</primary></indexterm><programlisting>#define XMLSEC_XKMS_KEY_BINDING_REASON_MASK_REVOCATION_STATUS	0x00000002
-</programlisting>
-<para>
-The XKMS service has affirmatively verified the status of the 
-key binding with an authoritative source
-</para>
-<para>
-X.509 Equivalents
-  - Valid:	Certificate status validated using CRL or OCSP.
-  - Invalid:	Certificate status returned revoked or suspended.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-XKMS-KEY-BINDING-REASON-MASK-VALIDITY-INTERVAL-CAPS">XMLSEC_XKMS_KEY_BINDING_REASON_MASK_VALIDITY_INTERVAL</title>
-<indexterm><primary>XMLSEC_XKMS_KEY_BINDING_REASON_MASK_VALIDITY_INTERVAL</primary></indexterm><programlisting>#define XMLSEC_XKMS_KEY_BINDING_REASON_MASK_VALIDITY_INTERVAL	 0x00000004
-</programlisting>
-<para>
-The requested time instant was within the validity interval of 
-the key binding
-</para>
-<para>
-X.509 Equivalents
-  - Valid:	The certificate chain was valid at the requested time instant.
-  - Invalid:	The requested time instant was before or after the certificate 
-             chain validity interval.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-XKMS-KEY-BINDING-REASON-MASK-SIGNATURE-CAPS">XMLSEC_XKMS_KEY_BINDING_REASON_MASK_SIGNATURE</title>
-<indexterm><primary>XMLSEC_XKMS_KEY_BINDING_REASON_MASK_SIGNATURE</primary></indexterm><programlisting>#define XMLSEC_XKMS_KEY_BINDING_REASON_MASK_SIGNATURE		 0x00000008
-</programlisting>
-<para>
-Signature on signed data provided by the client in the &lt;Keyinfo&gt; element was 
-successfully verified.
-</para>
-<para>
-X.509 Equivalents
-  - Valid: 	Certificate Signature verified.
-  - Invalid: Certificate Signature verification failed.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithIdsGet">xmlSecXkmsRespondWithIdsGet ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithIdsGet</primary></indexterm><programlisting><link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> xmlSecXkmsRespondWithIdsGet
-                                            (void);</programlisting>
-<para>
-Gets global registered RespondWith klasses list.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to list of all registered RespondWith klasses.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithIdsInit">xmlSecXkmsRespondWithIdsInit ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithIdsInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecXkmsRespondWithIdsInit    (void);</programlisting>
-<para>
-Initializes the RespondWith 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.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithIdsShutdown">xmlSecXkmsRespondWithIdsShutdown ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithIdsShutdown</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecXkmsRespondWithIdsShutdown
-                                            (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="xmlSecXkmsRespondWithIdsRegisterDefault">xmlSecXkmsRespondWithIdsRegisterDefault ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithIdsRegisterDefault</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecXkmsRespondWithIdsRegisterDefault
-                                            (void);</programlisting>
-<para>
-Registers default (implemented by XML Security Library)
-RespondWith klasses: KeyName, KeyValue,...</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.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithIdsRegister">xmlSecXkmsRespondWithIdsRegister ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithIdsRegister</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecXkmsRespondWithIdsRegister
-                                            (<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> id);</programlisting>
-<para>
-Registers <parameter>id</parameter> in the global list of RespondWith klasses.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
-<listitem><simpara>		the RespondWith klass.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithNodeRead">xmlSecXkmsRespondWithNodeRead ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithNodeRead</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecXkmsRespondWithNodeRead   (<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> id,
-                                             <link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
-<para>
-Reads the content of the &lt;xkms:RespondWith/&gt; <parameter>node</parameter>.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
-<listitem><simpara>		the RespondWith class.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>	the XKMS request processing context.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to &lt;xkms:RespondWith/&gt; node.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithNodeWrite">xmlSecXkmsRespondWithNodeWrite ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithNodeWrite</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecXkmsRespondWithNodeWrite  (<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> id,
-                                             <link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
-<para>
-Writes the content of the &lt;xkms:RespondWith/&gt; <parameter>node</parameter>.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
-<listitem><simpara>		the RespondWith class.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>	the XKMS request processing context.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to &lt;xkms:RespondWith/&gt; node.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithDebugDump">xmlSecXkmsRespondWithDebugDump ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecXkmsRespondWithDebugDump  (<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> id,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
-<para>
-Writes debug information about <parameter>id</parameter> into the <parameter>output</parameter>.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
-<listitem><simpara>		the RespondWith class.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
-<listitem><simpara>	the output file.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithDebugXmlDump">xmlSecXkmsRespondWithDebugXmlDump ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecXkmsRespondWithDebugXmlDump
-                                            (<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> id,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
-<para>
-Writes debug information about <parameter>id</parameter> into the <parameter>output</parameter> in XML format.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
-<listitem><simpara>		the RespondWith class.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
-<listitem><simpara>	the output file.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithDefaultNodeRead">xmlSecXkmsRespondWithDefaultNodeRead ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithDefaultNodeRead</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecXkmsRespondWithDefaultNodeRead
-                                            (<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> id,
-                                             <link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithDefaultNodeWrite">xmlSecXkmsRespondWithDefaultNodeWrite ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithDefaultNodeWrite</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecXkmsRespondWithDefaultNodeWrite
-                                            (<link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> id,
-                                             <link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithIdListId">xmlSecXkmsRespondWithIdListId</title>
-<indexterm><primary>xmlSecXkmsRespondWithIdListId</primary></indexterm><programlisting>#define xmlSecXkmsRespondWithIdListId	xmlSecXkmsRespondWithIdListGetKlass()
-</programlisting>
-<para>
-XKMS RespondWith  klasses list klass.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithIdListGetKlass">xmlSecXkmsRespondWithIdListGetKlass ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithIdListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link> xmlSecXkmsRespondWithIdListGetKlass
-                                            (void);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithIdListFind">xmlSecXkmsRespondWithIdListFind ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithIdListFind</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecXkmsRespondWithIdListFind (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> id);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithIdListFindByNodeValue">xmlSecXkmsRespondWithIdListFindByNodeValue ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithIdListFindByNodeValue</primary></indexterm><programlisting><link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> xmlSecXkmsRespondWithIdListFindByNodeValue
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithIdListWrite">xmlSecXkmsRespondWithIdListWrite ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithIdListWrite</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecXkmsRespondWithIdListWrite
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithIdUnknown">xmlSecXkmsRespondWithIdUnknown</title>
-<indexterm><primary>xmlSecXkmsRespondWithIdUnknown</primary></indexterm><programlisting>#define xmlSecXkmsRespondWithIdUnknown			NULL
-</programlisting>
-<para>
-The "unknown" RespondWith id (NULL).</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithKeyNameId">xmlSecXkmsRespondWithKeyNameId</title>
-<indexterm><primary>xmlSecXkmsRespondWithKeyNameId</primary></indexterm><programlisting>#define     xmlSecXkmsRespondWithKeyNameId</programlisting>
-<para>
-The respond with KeyName klass.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithKeyNameGetKlass">xmlSecXkmsRespondWithKeyNameGetKlass ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithKeyNameGetKlass</primary></indexterm><programlisting><link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> xmlSecXkmsRespondWithKeyNameGetKlass
-                                            (void);</programlisting>
-<para>
-The respond with KeyName klass.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>respond with KeyName klass.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithKeyValueId">xmlSecXkmsRespondWithKeyValueId</title>
-<indexterm><primary>xmlSecXkmsRespondWithKeyValueId</primary></indexterm><programlisting>#define     xmlSecXkmsRespondWithKeyValueId</programlisting>
-<para>
-The respond with KeyValue klass.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithKeyValueGetKlass">xmlSecXkmsRespondWithKeyValueGetKlass ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithKeyValueGetKlass</primary></indexterm><programlisting><link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> xmlSecXkmsRespondWithKeyValueGetKlass
-                                            (void);</programlisting>
-<para>
-The respond with KeyValue klass.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>respond with KeyValue klass.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithPrivateKeyId">xmlSecXkmsRespondWithPrivateKeyId</title>
-<indexterm><primary>xmlSecXkmsRespondWithPrivateKeyId</primary></indexterm><programlisting>#define     xmlSecXkmsRespondWithPrivateKeyId</programlisting>
-<para>
-The respond with PrivateKey klass.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithPrivateKeyGetKlass">xmlSecXkmsRespondWithPrivateKeyGetKlass ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithPrivateKeyGetKlass</primary></indexterm><programlisting><link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> xmlSecXkmsRespondWithPrivateKeyGetKlass
-                                            (void);</programlisting>
-<para>
-The respond with PrivateKey klass.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>respond with PrivateKey klass.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithRetrievalMethodId">xmlSecXkmsRespondWithRetrievalMethodId</title>
-<indexterm><primary>xmlSecXkmsRespondWithRetrievalMethodId</primary></indexterm><programlisting>#define     xmlSecXkmsRespondWithRetrievalMethodId</programlisting>
-<para>
-The respond with RetrievalMethod klass.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithRetrievalMethodGetKlass">xmlSecXkmsRespondWithRetrievalMethodGetKlass ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithRetrievalMethodGetKlass</primary></indexterm><programlisting><link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> xmlSecXkmsRespondWithRetrievalMethodGetKlass
-                                            (void);</programlisting>
-<para>
-The respond with RetrievalMethod klass.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>respond with RetrievalMethod klass.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithX509CertId">xmlSecXkmsRespondWithX509CertId</title>
-<indexterm><primary>xmlSecXkmsRespondWithX509CertId</primary></indexterm><programlisting>#define     xmlSecXkmsRespondWithX509CertId</programlisting>
-<para>
-The respond with X509Cert klass.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithX509CertGetKlass">xmlSecXkmsRespondWithX509CertGetKlass ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithX509CertGetKlass</primary></indexterm><programlisting><link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> xmlSecXkmsRespondWithX509CertGetKlass
-                                            (void);</programlisting>
-<para>
-The respond with X509Cert klass.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>respond with X509Cert klass.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithX509ChainId">xmlSecXkmsRespondWithX509ChainId</title>
-<indexterm><primary>xmlSecXkmsRespondWithX509ChainId</primary></indexterm><programlisting>#define     xmlSecXkmsRespondWithX509ChainId</programlisting>
-<para>
-The respond with X509Chain klass.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithX509ChainGetKlass">xmlSecXkmsRespondWithX509ChainGetKlass ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithX509ChainGetKlass</primary></indexterm><programlisting><link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> xmlSecXkmsRespondWithX509ChainGetKlass
-                                            (void);</programlisting>
-<para>
-The respond with X509Chain klass.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>respond with X509Chain klass.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithX509CRLId">xmlSecXkmsRespondWithX509CRLId</title>
-<indexterm><primary>xmlSecXkmsRespondWithX509CRLId</primary></indexterm><programlisting>#define     xmlSecXkmsRespondWithX509CRLId</programlisting>
-<para>
-The respond with X509CRL klass.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithX509CRLGetKlass">xmlSecXkmsRespondWithX509CRLGetKlass ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithX509CRLGetKlass</primary></indexterm><programlisting><link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> xmlSecXkmsRespondWithX509CRLGetKlass
-                                            (void);</programlisting>
-<para>
-The respond with X509CRL klass.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>respond with X509CRL klass.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithPGPId">xmlSecXkmsRespondWithPGPId</title>
-<indexterm><primary>xmlSecXkmsRespondWithPGPId</primary></indexterm><programlisting>#define     xmlSecXkmsRespondWithPGPId</programlisting>
-<para>
-The respond with PGP klass.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithPGPGetKlass">xmlSecXkmsRespondWithPGPGetKlass ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithPGPGetKlass</primary></indexterm><programlisting><link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> xmlSecXkmsRespondWithPGPGetKlass
-                                            (void);</programlisting>
-<para>
-The respond with PGP klass.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>respond with PGP klass.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithSPKIId">xmlSecXkmsRespondWithSPKIId</title>
-<indexterm><primary>xmlSecXkmsRespondWithSPKIId</primary></indexterm><programlisting>#define     xmlSecXkmsRespondWithSPKIId</programlisting>
-<para>
-The respond with SPKI klass.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsRespondWithSPKIGetKlass">xmlSecXkmsRespondWithSPKIGetKlass ()</title>
-<indexterm><primary>xmlSecXkmsRespondWithSPKIGetKlass</primary></indexterm><programlisting><link linkend="xmlSecXkmsRespondWithId">xmlSecXkmsRespondWithId</link> xmlSecXkmsRespondWithSPKIGetKlass
-                                            (void);</programlisting>
-<para>
-The respond with SPKI klass.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>respond with SPKI klass.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestIdsGet">xmlSecXkmsServerRequestIdsGet ()</title>
-<indexterm><primary>xmlSecXkmsServerRequestIdsGet</primary></indexterm><programlisting><link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> xmlSecXkmsServerRequestIdsGet
-                                            (void);</programlisting>
-<para>
-Gets global registered ServerRequest klasses list.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to list of all registered ServerRequest klasses.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestIdsInit">xmlSecXkmsServerRequestIdsInit ()</title>
-<indexterm><primary>xmlSecXkmsServerRequestIdsInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecXkmsServerRequestIdsInit  (void);</programlisting>
-<para>
-Initializes the ServerRequest 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.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestIdsShutdown">xmlSecXkmsServerRequestIdsShutdown ()</title>
-<indexterm><primary>xmlSecXkmsServerRequestIdsShutdown</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecXkmsServerRequestIdsShutdown
-                                            (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="xmlSecXkmsServerRequestIdsRegisterDefault">xmlSecXkmsServerRequestIdsRegisterDefault ()</title>
-<indexterm><primary>xmlSecXkmsServerRequestIdsRegisterDefault</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecXkmsServerRequestIdsRegisterDefault
-                                            (void);</programlisting>
-<para>
-Registers default (implemented by XML Security Library)
-ServerRequest klasses: KeyName, KeyValue,...</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.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestIdsRegister">xmlSecXkmsServerRequestIdsRegister ()</title>
-<indexterm><primary>xmlSecXkmsServerRequestIdsRegister</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecXkmsServerRequestIdsRegister
-                                            (<link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> id);</programlisting>
-<para>
-Registers <parameter>id</parameter> in the global list of ServerRequest klasses.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
-<listitem><simpara>		the ServerRequest klass.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestNodeRead">xmlSecXkmsServerRequestNodeRead ()</title>
-<indexterm><primary>xmlSecXkmsServerRequestNodeRead</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecXkmsServerRequestNodeRead (<link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> id,
-                                             <link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
-<para>
-Reads the content of the &lt;xkms:ServerRequest/&gt; <parameter>node</parameter>.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
-<listitem><simpara>		the ServerRequest class.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>	the XKMS request processing context.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
-<listitem><simpara>	the pointer to &lt;xkms:ServerRequest/&gt; node.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestExecute">xmlSecXkmsServerRequestExecute ()</title>
-<indexterm><primary>xmlSecXkmsServerRequestExecute</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecXkmsServerRequestExecute  (<link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> id,
-                                             <link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestNodeWrite">xmlSecXkmsServerRequestNodeWrite ()</title>
-<indexterm><primary>xmlSecXkmsServerRequestNodeWrite</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecXkmsServerRequestNodeWrite
-                                            (<link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> id,
-                                             <link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtxPtr</link> ctx,
-                                             <link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>doc</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestDebugDump">xmlSecXkmsServerRequestDebugDump ()</title>
-<indexterm><primary>xmlSecXkmsServerRequestDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecXkmsServerRequestDebugDump
-                                            (<link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> id,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
-<para>
-Writes debug information about <parameter>id</parameter> into the <parameter>output</parameter>.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
-<listitem><simpara>			the ServerRequest class.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
-<listitem><simpara>		the output file.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestDebugXmlDump">xmlSecXkmsServerRequestDebugXmlDump ()</title>
-<indexterm><primary>xmlSecXkmsServerRequestDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecXkmsServerRequestDebugXmlDump
-                                            (<link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> id,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
-<para>
-Writes debug information about <parameter>id</parameter> into the <parameter>output</parameter> in XML format.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
-<listitem><simpara>			the ServerRequest class.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
-<listitem><simpara>		the output file.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestIdListId">xmlSecXkmsServerRequestIdListId</title>
-<indexterm><primary>xmlSecXkmsServerRequestIdListId</primary></indexterm><programlisting>#define xmlSecXkmsServerRequestIdListId	xmlSecXkmsServerRequestIdListGetKlass()
-</programlisting>
-<para>
-XKMS ServerRequest  klasses list klass.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestIdListGetKlass">xmlSecXkmsServerRequestIdListGetKlass ()</title>
-<indexterm><primary>xmlSecXkmsServerRequestIdListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link> xmlSecXkmsServerRequestIdListGetKlass
-                                            (void);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestIdListFind">xmlSecXkmsServerRequestIdListFind ()</title>
-<indexterm><primary>xmlSecXkmsServerRequestIdListFind</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecXkmsServerRequestIdListFind
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> id);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestIdListFindByName">xmlSecXkmsServerRequestIdListFindByName ()</title>
-<indexterm><primary>xmlSecXkmsServerRequestIdListFindByName</primary></indexterm><programlisting><link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> xmlSecXkmsServerRequestIdListFindByName
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             const <link linkend="xmlChar">xmlChar</link> *name);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestIdListFindByNode">xmlSecXkmsServerRequestIdListFindByNode ()</title>
-<indexterm><primary>xmlSecXkmsServerRequestIdListFindByNode</primary></indexterm><programlisting><link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> xmlSecXkmsServerRequestIdListFindByNode
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestIdUnknown">xmlSecXkmsServerRequestIdUnknown</title>
-<indexterm><primary>xmlSecXkmsServerRequestIdUnknown</primary></indexterm><programlisting>#define xmlSecXkmsServerRequestIdUnknown			NULL
-</programlisting>
-<para>
-The "unknown" ServerRequest id (NULL).</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestResultId">xmlSecXkmsServerRequestResultId</title>
-<indexterm><primary>xmlSecXkmsServerRequestResultId</primary></indexterm><programlisting>#define     xmlSecXkmsServerRequestResultId</programlisting>
-<para>
-The Result response klass.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestResultGetKlass">xmlSecXkmsServerRequestResultGetKlass ()</title>
-<indexterm><primary>xmlSecXkmsServerRequestResultGetKlass</primary></indexterm><programlisting><link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> xmlSecXkmsServerRequestResultGetKlass
-                                            (void);</programlisting>
-<para>
-The Result response klass.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>Result response klass.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestStatusId">xmlSecXkmsServerRequestStatusId</title>
-<indexterm><primary>xmlSecXkmsServerRequestStatusId</primary></indexterm><programlisting>#define     xmlSecXkmsServerRequestStatusId</programlisting>
-<para>
-The StatusRequest klass.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestStatusGetKlass">xmlSecXkmsServerRequestStatusGetKlass ()</title>
-<indexterm><primary>xmlSecXkmsServerRequestStatusGetKlass</primary></indexterm><programlisting><link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> xmlSecXkmsServerRequestStatusGetKlass
-                                            (void);</programlisting>
-<para>
-The StatusRequest klass.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>StatusRequest klass.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestCompoundId">xmlSecXkmsServerRequestCompoundId</title>
-<indexterm><primary>xmlSecXkmsServerRequestCompoundId</primary></indexterm><programlisting>#define     xmlSecXkmsServerRequestCompoundId</programlisting>
-<para>
-The CompoundRequest klass.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestCompoundGetKlass">xmlSecXkmsServerRequestCompoundGetKlass ()</title>
-<indexterm><primary>xmlSecXkmsServerRequestCompoundGetKlass</primary></indexterm><programlisting><link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> xmlSecXkmsServerRequestCompoundGetKlass
-                                            (void);</programlisting>
-<para>
-The CompoundRequest klass.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>CompoundRequest klass.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestLocateId">xmlSecXkmsServerRequestLocateId</title>
-<indexterm><primary>xmlSecXkmsServerRequestLocateId</primary></indexterm><programlisting>#define     xmlSecXkmsServerRequestLocateId</programlisting>
-<para>
-The LocateRequest klass.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestLocateGetKlass">xmlSecXkmsServerRequestLocateGetKlass ()</title>
-<indexterm><primary>xmlSecXkmsServerRequestLocateGetKlass</primary></indexterm><programlisting><link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> xmlSecXkmsServerRequestLocateGetKlass
-                                            (void);</programlisting>
-<para>
-The LocateRequest klass.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>LocateRequest klass.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestValidateId">xmlSecXkmsServerRequestValidateId</title>
-<indexterm><primary>xmlSecXkmsServerRequestValidateId</primary></indexterm><programlisting>#define     xmlSecXkmsServerRequestValidateId</programlisting>
-<para>
-The ValidateRequest klass.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecXkmsServerRequestValidateGetKlass">xmlSecXkmsServerRequestValidateGetKlass ()</title>
-<indexterm><primary>xmlSecXkmsServerRequestValidateGetKlass</primary></indexterm><programlisting><link linkend="xmlSecXkmsServerRequestId">xmlSecXkmsServerRequestId</link> xmlSecXkmsServerRequestValidateGetKlass
-                                            (void);</programlisting>
-<para>
-The ValidateRequest klass.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>ValidateRequest klass.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
 
 </refsect1>
 
diff --git a/docs/api/sgml/xmldsig.sgml b/docs/api/sgml/xmldsig.sgml
index 1f34895..90db2a8 100644
--- a/docs/api/sgml/xmldsig.sgml
+++ b/docs/api/sgml/xmldsig.sgml
@@ -22,7 +22,7 @@ enum        <link linkend="xmlSecDSigStatus">xmlSecDSigStatus</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="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> <link linkend="xmlSecDSigCtxCreate">xmlSecDSigCtxCreate</link>        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
+<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);
@@ -121,7 +121,7 @@ XML Digital signature processing status.</para>
 <indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifests";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifests";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifests";>&lt;dsig:Manifests/&gt;</ulink></ulink></ulink></ulink> nodes will not be processed.</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>
@@ -130,8 +130,8 @@ If this flag is set then <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Mani
 <indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> child
-of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink></ulink></ulink></ulink> element will be stored in <link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtx</type></link>.</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>
@@ -140,8 +140,8 @@ of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";><ulink URL="http:
 <indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> child
-of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink></ulink></ulink></ulink> element will be stored in <link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtx</type></link>.</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>
@@ -150,7 +150,7 @@ of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http
 <indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink></ulink></ulink></ulink>
+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>
 
@@ -235,22 +235,22 @@ XML DSig processing context.</para>
 </varlistentry>
 <varlistentry>
 <term><link linkend="xmlSecTransformCtx">xmlSecTransformCtx</link> <structfield>transformCtx</structfield></term>
-<listitem><simpara>		the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink></ulink></ulink></ulink> node processing context.
+<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>
-<listitem><simpara>	the URI types allowed for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
-<listitem><simpara>	the list of transforms allowed in <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
-<listitem><simpara>the callback for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> node processing.
+<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>
@@ -287,7 +287,7 @@ XML DSig processing context.</para>
 </varlistentry>
 <varlistentry>
 <term><link linkend="xmlSecDSigStatus">xmlSecDSigStatus</link> <structfield>status</structfield></term>
-<listitem><simpara>			the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signatuire";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signatuire";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signatuire";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signatuire";>&lt;dsig:Signatuire/&gt;</ulink></ulink></ulink></ulink> procesisng status.
+<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>
@@ -308,22 +308,22 @@ XML DSig processing context.</para>
 </varlistentry>
 <varlistentry>
 <term><link linkend="xmlNode">xmlNodePtr</link> <structfield>signValueNode</structfield></term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureValue";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureValue";>&lt;dsig:SignatureValue/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
-<listitem><simpara>				the pointer to Id attribute of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
-<listitem><simpara>	the list of references in <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink></ulink></ulink></ulink> node.		
+<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>
-<listitem><simpara>		the list of references in <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink></ulink></ulink></ulink> nodes.
+<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>
@@ -339,9 +339,9 @@ XML DSig processing context.</para>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecDSigCtxCreate">xmlSecDSigCtxCreate ()</title>
-<indexterm><primary>xmlSecDSigCtxCreate</primary></indexterm><programlisting><link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> xmlSecDSigCtxCreate        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
+<indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> element processing context.
+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>
@@ -363,7 +363,7 @@ Destroy context object created with <link linkend="xmlSecDSigCtxCreate"><type>xm
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
@@ -371,14 +371,14 @@ Destroy context object created with <link linkend="xmlSecDSigCtxCreate"><type>xm
 <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>
 <para>
-Initializes <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> element processing context.
+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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
 <listitem><simpara> 		the pointer to keys manager.
@@ -395,7 +395,7 @@ Cleans up <parameter>dsigCtx</parameter> object initialized with <link linkend="
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
@@ -408,10 +408,10 @@ Signs the data as described in <parameter>tmpl</parameter> node.</para>
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> node with signature template.
+<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.
 </simpara></listitem></varlistentry>
@@ -427,10 +427,10 @@ in <link linkend="status"><type>status</type></link> member of the <parameter>ds
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
-<listitem><simpara>		the pointer with <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> node.
+<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 
 signature verification result) or a negative value if an error occurs.
@@ -442,12 +442,12 @@ signature verification result) or a negative value if an error occurs.
                                             (<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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> elements processing.</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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
 <listitem><simpara>	the transform klass.
@@ -461,12 +461,12 @@ Enables <parameter>transformId</parameter> for <ulink URL="http://www.w3.org/TR/
                                             (<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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink></ulink></ulink></ulink> element processing.</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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
 <listitem><simpara>	the transform klass.
@@ -479,14 +479,14 @@ Enables <parameter>transformId</parameter> for <ulink URL="http://www.w3.org/TR/
 <indexterm><primary>xmlSecDSigCtxGetPreSignBuffer</primary></indexterm><programlisting><link linkend="xmlSecBuffer">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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink></ulink></ulink></ulink> element
+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>
 <para>
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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.
 </simpara></listitem></varlistentry>
@@ -501,7 +501,7 @@ Prints the debug information about <parameter>dsigCtx</parameter> to <parameter>
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
 <listitem><simpara>		the pointer to output FILE.
@@ -517,7 +517,7 @@ Prints the debug information about <parameter>dsigCtx</parameter> to <parameter>
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
 <listitem><simpara>		the pointer to output FILE.
@@ -531,8 +531,8 @@ Prints the debug information about <parameter>dsigCtx</parameter> to <parameter>
 } xmlSecDSigReferenceOrigin;
 </programlisting>
 <para>
-The possible <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> node locations: in the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink></ulink></ulink></ulink> 
-node or in the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink></ulink></ulink></ulink> node.</para>
+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">
@@ -570,7 +570,7 @@ node or in the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><uli
 };
 </programlisting>
 <para>
-The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> processing context.</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">
@@ -582,12 +582,12 @@ The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="ht
 </varlistentry>
 <varlistentry>
 <term><link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> <structfield>dsigCtx</structfield></term>
-<listitem><simpara>			the pointer to "parent" <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
-<listitem><simpara>			the signature origin (<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink></ulink></ulink></ulink> or <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink></ulink></ulink></ulink>).
+<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>
@@ -620,17 +620,17 @@ The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="ht
 </varlistentry>
 <varlistentry>
 <term><link linkend="xmlChar">xmlChar</link> *<structfield>id</structfield></term>
-<listitem><simpara>				the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> node ID attribute. 
+<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>
-<listitem><simpara>			the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> node URI attribute. 
+<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>
-<listitem><simpara>			the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> node Type attribute. 
+<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>
@@ -650,17 +650,17 @@ The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="ht
                                             (<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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> element processing context. Caller is responsible
+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>
-<listitem><simpara>		the pointer to parent <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> node processing context.
+<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>
-<listitem><simpara>		the reference origin (<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink></ulink></ulink></ulink> or <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink></ulink></ulink></ulink> node).
+<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.
 </simpara></listitem></varlistentry>
@@ -674,7 +674,7 @@ Destroy context object created with <link linkend="xmlSecDSigReferenceCtxCreate"
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigRefCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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>
@@ -684,20 +684,20 @@ Destroy context object created with <link linkend="xmlSecDSigReferenceCtxCreate"
                                              <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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> element processing context. Caller is responsible
+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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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>
-<listitem><simpara>		the pointer to parent <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink></ulink></ulink></ulink> node processing context.
+<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>
-<listitem><simpara>		the reference origin (<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink></ulink></ulink></ulink> or <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink></ulink></ulink></ulink> node).
+<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.
 </simpara></listitem></varlistentry>
@@ -711,7 +711,7 @@ Cleans up context object created with <link linkend="xmlSecDSigReferenceCtxIniti
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigRefCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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>
@@ -737,10 +737,10 @@ from elsewhere.</para>
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigRefCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> node.
+<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.
 </simpara></listitem></varlistentry>
@@ -750,7 +750,7 @@ from elsewhere.</para>
 <indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> node processing just before digesting
+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
 is set).</para>
@@ -758,7 +758,7 @@ is set).</para>
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigRefCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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.
 </simpara></listitem></varlistentry>
@@ -773,7 +773,7 @@ Prints debug information about <parameter>dsigRefCtx</parameter> to <parameter>o
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigRefCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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>
 <listitem><simpara>		the pointer to output FILE.
@@ -790,7 +790,7 @@ Prints debug information about <parameter>dsigRefCtx</parameter> to <parameter>o
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigRefCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> element processing context.
+<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>
 <listitem><simpara>		the pointer to output FILE.
@@ -809,11 +809,11 @@ The references list klass.</para>
 <indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> element processing contexts list klass.</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";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink></ulink></ulink></ulink> element processing context list klass.
+<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.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/xmlenc.sgml b/docs/api/sgml/xmlenc.sgml
index faeacd4..a838d00 100644
--- a/docs/api/sgml/xmlenc.sgml
+++ b/docs/api/sgml/xmlenc.sgml
@@ -16,8 +16,9 @@
 
 
 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="xmlSecEncCtx">xmlSecEncCtxPtr</link> <link linkend="xmlSecEncCtxCreate">xmlSecEncCtxCreate</link>          (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
+<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);
@@ -37,7 +38,7 @@ struct      <link linkend="xmlSecEncCtx">xmlSecEncCtx</link>;
                                              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="xmlSecBuffer">xmlSecBufferPtr</link> <link linkend="xmlSecEncCtxDecryptToBuffer">xmlSecEncCtxDecryptToBuffer</link> (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
+<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);
@@ -77,16 +78,25 @@ The <link linkend="xmlSecEncCtx"><type>xmlSecEncCtx</type></link> mode.</para>
 </para><variablelist role="enum">
 <varlistentry>
 <term><literal>xmlEncCtxModeEncryptedData</literal></term>
-<listitem><simpara>	the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> element procesing.
+<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>
 <term><literal>xmlEncCtxModeEncryptedKey</literal></term>
-<listitem><simpara>	the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink></ulink></ulink></ulink> element processing.
+<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
+</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 {
 
@@ -107,7 +117,7 @@ The <link linkend="xmlSecEncCtx"><type>xmlSecEncCtx</type></link> mode.</para>
     int				resultBase64Encoded;
     int				resultReplaced;
     xmlSecTransformPtr		encMethod;
-
+		
     /* attributes from EncryptedData or EncryptedKey */    
     xmlChar*			id;
     xmlChar*			type;
@@ -121,10 +131,9 @@ The <link linkend="xmlSecEncCtx"><type>xmlSecEncCtx</type></link> mode.</para>
     xmlNodePtr			encMethodNode;
     xmlNodePtr			keyInfoNode;
     xmlNodePtr			cipherValueNode;
-    
-    /* reserved for future */
-    void*			reserved0;
-    void*			reserved1;
+        
+    xmlNodePtr			replacedNodeList; /* the pointer to the replaced node */
+    void*			reserved1;	  /* reserved for future */
 };
 </programlisting>
 <para>
@@ -171,7 +180,7 @@ XML Encrypiton context.</para>
 <varlistentry>
 <term><link linkend="xmlSecTransformId">xmlSecTransformId</link> <structfield>defEncMethodId</structfield></term>
 <listitem><simpara>		the default encryption method (used if
-			<ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod";>&lt;enc:EncryptionMethod/&gt;</ulink></ulink></ulink></ulink> node is not present).
+			<ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod";>&lt;enc:EncryptionMethod/&gt;</ulink> node is not present).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
@@ -197,8 +206,8 @@ XML Encrypiton context.</para>
 </varlistentry>
 <varlistentry>
 <term><link linkend="int">int</link> <structfield>resultReplaced</structfield></term>
-<listitem><simpara>		the flag: if set then resulted <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink>
-			or <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink></ulink></ulink></ulink> node is added to the document.
+<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>
@@ -208,62 +217,62 @@ XML Encrypiton context.</para>
 </varlistentry>
 <varlistentry>
 <term><link linkend="xmlChar">xmlChar</link> *<structfield>id</structfield></term>
-<listitem><simpara>				the ID attribute of <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink>
-			or <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
-<listitem><simpara>			the Type attribute of <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink>
-			or <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
-<listitem><simpara>			the MimeType attribute of <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink>
-			or <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
-<listitem><simpara>			the Encoding attributeof <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink>
-			or <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink></ulink></ulink></ulink> node. 
+<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>
-<listitem><simpara>			the Recipient attribute of <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink></ulink></ulink></ulink> node..
+<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>
-<listitem><simpara>		the CarriedKeyName attribute of <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink>
-			or <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod";>&lt;enc:EncryptionMethod/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-KeyInfo";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-KeyInfo";>&lt;enc:KeyInfo/&gt;</ulink></ulink></ulink></ulink> node.
+<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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue";>&lt;enc:CipherValue/&gt;</ulink></ulink></ulink></ulink> node.
+<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="void">void</link> *<structfield>reserved0</structfield></term>
-<listitem><simpara>			reserved for the future.
+<term><link linkend="xmlNode">xmlNodePtr</link> <structfield>replacedNodeList</structfield></term>
+<listitem><simpara> the first node of the list of replaced nodes depending on the nodeReplacementMode
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
@@ -274,9 +283,9 @@ XML Encrypiton context.</para>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecEncCtxCreate">xmlSecEncCtxCreate ()</title>
-<indexterm><primary>xmlSecEncCtxCreate</primary></indexterm><programlisting><link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> xmlSecEncCtxCreate          (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
+<indexterm><primary>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";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> element processing context.
+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>
@@ -298,7 +307,7 @@ Destroy context object created with <link linkend="xmlSecEncCtxCreate"><type>xml
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>encCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
@@ -306,14 +315,14 @@ Destroy context object created with <link linkend="xmlSecEncCtxCreate"><type>xml
 <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>
 <para>
-Initializes <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> element processing context.
+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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
 <listitem><simpara> 		the pointer to keys manager.
@@ -330,7 +339,7 @@ Cleans up <parameter>encCtx</parameter> object.</para>
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>encCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
@@ -360,7 +369,7 @@ Resets <parameter>encCtx</parameter> object, user settings are not touched.</par
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>encCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
@@ -375,10 +384,10 @@ Encrypts <parameter>data</parameter> according to template <parameter>tmpl</para
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>encCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> template node.
+<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>
 <listitem><simpara>		the pointer for binary buffer.
@@ -396,15 +405,15 @@ Encrypts <parameter>data</parameter> according to template <parameter>tmpl</para
                                              <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";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> node.</para>
+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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> template node.
+<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>
 <listitem><simpara>		the pointer to node for encryption.
@@ -423,10 +432,10 @@ Encrypts data from <parameter>uri</parameter> according to template <parameter>t
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>encCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> template node.
+<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>
 <listitem><simpara>		the URI.
@@ -444,17 +453,17 @@ Decrypts <parameter>node</parameter> and if necessary replaces <parameter>node</
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>encCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> node.
+<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.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecEncCtxDecryptToBuffer">xmlSecEncCtxDecryptToBuffer ()</title>
-<indexterm><primary>xmlSecEncCtxDecryptToBuffer</primary></indexterm><programlisting><link linkend="xmlSecBuffer">xmlSecBufferPtr</link> xmlSecEncCtxDecryptToBuffer (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
+<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>
 <para>
 Decrypts <parameter>node</parameter> data to the <parameter>encCtx</parameter> buffer.</para>
@@ -462,10 +471,10 @@ Decrypts <parameter>node</parameter> data to the <parameter>encCtx</parameter> b
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>encCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> node.
+<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.
 </simpara></listitem></varlistentry>
@@ -480,7 +489,7 @@ Prints the debug information about <parameter>encCtx</parameter> to <parameter>o
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>encCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
 <listitem><simpara>		the pointer to output FILE.
@@ -496,7 +505,7 @@ Prints the debug information about <parameter>encCtx</parameter> to <parameter>o
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>encCtx</parameter>&nbsp;:</term>
-<listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";><ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink></ulink></ulink></ulink> processing context.
+<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>
 <listitem><simpara>		the pointer to output FILE.
diff --git a/docs/api/sgml/xmltree.sgml b/docs/api/sgml/xmltree.sgml
index d8a5564..45776a8 100644
--- a/docs/api/sgml/xmltree.sgml
+++ b/docs/api/sgml/xmltree.sgml
@@ -20,34 +20,47 @@ const <link linkend="xmlChar">xmlChar</link>* <link linkend="xmlSecGetNodeNsHref
 <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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecGetNextElementNode">xmlSecGetNextElementNode</link>        (<link linkend="xmlNode">xmlNodePtr</link> cur);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecFindChild">xmlSecFindChild</link>                 (const <link linkend="xmlNode">xmlNodePtr</link> parent,
+<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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecFindParent">xmlSecFindParent</link>                (const <link linkend="xmlNode">xmlNodePtr</link> cur,
+<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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecFindNode">xmlSecFindNode</link>                  (const <link linkend="xmlNode">xmlNodePtr</link> parent,
+<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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecAddChild">xmlSecAddChild</link>                  (<link linkend="xmlNode">xmlNodePtr</link> parent,
+<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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecAddChildNode">xmlSecAddChildNode</link>              (<link linkend="xmlNode">xmlNodePtr</link> parent,
+<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecAddChildNode">xmlSecAddChildNode</link>              (<link linkend="xmlNode">xmlNodePtr</link> parent,
                                              <link linkend="xmlNode">xmlNodePtr</link> child);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecAddNextSibling">xmlSecAddNextSibling</link>            (<link linkend="xmlNode">xmlNodePtr</link> node,
+<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="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecAddPrevSibling">xmlSecAddPrevSibling</link>            (<link linkend="xmlNode">xmlNodePtr</link> node,
+<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);
@@ -218,7 +231,7 @@ Checks that the node has a given name and a given namespace href.</para>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecGetNextElementNode">xmlSecGetNextElementNode ()</title>
-<indexterm><primary>xmlSecGetNextElementNode</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecGetNextElementNode        (<link linkend="xmlNode">xmlNodePtr</link> cur);</programlisting>
+<indexterm><primary>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>
@@ -232,7 +245,7 @@ Seraches for the next element node.</para>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecFindChild">xmlSecFindChild ()</title>
-<indexterm><primary>xmlSecFindChild</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecFindChild                 (const <link linkend="xmlNode">xmlNodePtr</link> parent,
+<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>
 <para>
@@ -256,7 +269,7 @@ node is not found.
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecFindParent">xmlSecFindParent ()</title>
-<indexterm><primary>xmlSecFindParent</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecFindParent                (const <link linkend="xmlNode">xmlNodePtr</link> cur,
+<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>
 <para>
@@ -280,7 +293,7 @@ node is not found.
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecFindNode">xmlSecFindNode ()</title>
-<indexterm><primary>xmlSecFindNode</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecFindNode                  (const <link linkend="xmlNode">xmlNodePtr</link> parent,
+<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>
 <para>
@@ -304,7 +317,7 @@ node is not found.
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecAddChild">xmlSecAddChild ()</title>
-<indexterm><primary>xmlSecAddChild</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecAddChild                  (<link linkend="xmlNode">xmlNodePtr</link> parent,
+<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>
 <para>
@@ -326,7 +339,7 @@ Adds a child to the node <parameter>parent</parameter> with given <parameter>nam
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecAddChildNode">xmlSecAddChildNode ()</title>
-<indexterm><primary>xmlSecAddChildNode</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecAddChildNode              (<link linkend="xmlNode">xmlNodePtr</link> parent,
+<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>
 <para>
 Adds <parameter>child</parameter> node to the <parameter>parent</parameter> node.</para>
@@ -344,7 +357,7 @@ Adds <parameter>child</parameter> node to the <parameter>parent</parameter> node
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecAddNextSibling">xmlSecAddNextSibling ()</title>
-<indexterm><primary>xmlSecAddNextSibling</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecAddNextSibling            (<link linkend="xmlNode">xmlNodePtr</link> node,
+<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>
 <para>
@@ -366,7 +379,7 @@ Adds next sibling to the node <parameter>node</parameter> with given <parameter>
 </variablelist></refsect2>
 <refsect2>
 <title><anchor id="xmlSecAddPrevSibling">xmlSecAddPrevSibling ()</title>
-<indexterm><primary>xmlSecAddPrevSibling</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecAddPrevSibling            (<link linkend="xmlNode">xmlNodePtr</link> node,
+<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>
 <para>
@@ -405,6 +418,28 @@ Swaps the <parameter>node</parameter> and <parameter>newNode</parameter> in the
 </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>
+<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>
+<listitem><simpara> 		the current node.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>newNode</parameter>&nbsp;:</term>
+<listitem><simpara> 		the new node.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>replaced</parameter>&nbsp;:</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.
+</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>
@@ -423,6 +458,28 @@ Swaps the content of <parameter>node</parameter> and <parameter>newNode</paramet
 </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>
+<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>
+<listitem><simpara> 		the current node.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>newNode</parameter>&nbsp;:</term>
+<listitem><simpara> 		the new node.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>replaced</parameter>&nbsp;:</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.
+</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,
@@ -445,6 +502,52 @@ Swaps the <parameter>node</parameter> and the parsed XML data from the <paramete
 </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>
+<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>
+<listitem><simpara> 		the current node.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>buffer</parameter>&nbsp;:</term>
+<listitem><simpara> 		the XML data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<listitem><simpara> 		the XML data size.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>replaced</parameter>&nbsp;:</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.
+</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>
+<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>
+<listitem><simpara> 		    the pointer to an XML node.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>buffer</parameter>&nbsp;:</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.
+</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,
diff --git a/docs/api/tmpl/app.sgml b/docs/api/tmpl/app.sgml
index 3637296..5fd6855 100644
--- a/docs/api/tmpl/app.sgml
+++ b/docs/api/tmpl/app.sgml
@@ -84,6 +84,21 @@ app
 @Returns: 
 
 
+<!-- ##### MACRO xmlSecKeyDataGost2001Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecKeyDataGost2001GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
 <!-- ##### MACRO xmlSecKeyDataHmacId ##### -->
 <para>
 
@@ -294,14 +309,29 @@ app
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecTransformHmacSha1Id ##### -->
+<!-- ##### MACRO xmlSecTransformGost2001GostR3411_94Id ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecTransformHmacSha1GetKlass ##### -->
+<!-- ##### FUNCTION xmlSecTransformGost2001GostR3411_94GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecTransformHmacMd5Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecTransformHmacMd5GetKlass ##### -->
 <para>
 
 </para>
@@ -324,14 +354,89 @@ app
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecTransformHmacMd5Id ##### -->
+<!-- ##### MACRO xmlSecTransformHmacSha1Id ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecTransformHmacMd5GetKlass ##### -->
+<!-- ##### FUNCTION xmlSecTransformHmacSha1GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecTransformHmacSha224Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecTransformHmacSha224GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecTransformHmacSha256Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecTransformHmacSha256GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecTransformHmacSha384Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecTransformHmacSha384GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecTransformHmacSha512Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecTransformHmacSha512GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecTransformMd5Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecTransformMd5GetKlass ##### -->
 <para>
 
 </para>
@@ -354,6 +459,36 @@ app
 @Returns: 
 
 
+<!-- ##### MACRO xmlSecTransformRsaMd5Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecTransformRsaMd5GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecTransformRsaRipemd160Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecTransformRsaRipemd160GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
 <!-- ##### MACRO xmlSecTransformRsaSha1Id ##### -->
 <para>
 
@@ -369,6 +504,66 @@ app
 @Returns: 
 
 
+<!-- ##### MACRO xmlSecTransformRsaSha224Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecTransformRsaSha224GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecTransformRsaSha256Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecTransformRsaSha256GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecTransformRsaSha384Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecTransformRsaSha384GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecTransformRsaSha512Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecTransformRsaSha512GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
 <!-- ##### MACRO xmlSecTransformRsaPkcs1Id ##### -->
 <para>
 
@@ -399,6 +594,21 @@ app
 @Returns: 
 
 
+<!-- ##### MACRO xmlSecTransformGostR3411_94Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecTransformGostR3411_94GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
 <!-- ##### MACRO xmlSecTransformSha1Id ##### -->
 <para>
 
@@ -414,6 +624,66 @@ app
 @Returns: 
 
 
+<!-- ##### MACRO xmlSecTransformSha224Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecTransformSha224GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecTransformSha256Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecTransformSha256GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecTransformSha384Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecTransformSha384GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecTransformSha512Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecTransformSha512GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
 <!-- ##### FUNCTION xmlSecCryptoAppInit ##### -->
 <para>
 
@@ -483,6 +753,19 @@ app
 @Returns: 
 
 
+<!-- ##### FUNCTION xmlSecCryptoAppKeysMngrCertLoadMemory ##### -->
+<para>
+
+</para>
+
+ mngr: 
+ data: 
+ dataSize: 
+ format: 
+ type: 
+ Returns: 
+
+
 <!-- ##### FUNCTION xmlSecCryptoAppKeyLoad ##### -->
 <para>
 
@@ -496,6 +779,20 @@ app
 @Returns: 
 
 
+<!-- ##### FUNCTION xmlSecCryptoAppKeyLoadMemory ##### -->
+<para>
+
+</para>
+
+ data: 
+ dataSize: 
+ format: 
+ pwd: 
+ pwdCallback: 
+ pwdCallbackCtx: 
+ Returns: 
+
+
 <!-- ##### FUNCTION xmlSecCryptoAppPkcs12Load ##### -->
 <para>
 
@@ -508,6 +805,19 @@ app
 @Returns: 
 
 
+<!-- ##### FUNCTION xmlSecCryptoAppPkcs12LoadMemory ##### -->
+<para>
+
+</para>
+
+ data: 
+ dataSize: 
+ pwd: 
+ pwdCallback: 
+ pwdCallbackCtx: 
+ Returns: 
+
+
 <!-- ##### FUNCTION xmlSecCryptoAppKeyCertLoad ##### -->
 <para>
 
@@ -519,6 +829,18 @@ app
 @Returns: 
 
 
+<!-- ##### FUNCTION xmlSecCryptoAppKeyCertLoadMemory ##### -->
+<para>
+
+</para>
+
+ key: 
+ data: 
+ dataSize: 
+ format: 
+ Returns: 
+
+
 <!-- ##### FUNCTION xmlSecCryptoAppGetDefaultPwdCallback ##### -->
 <para>
 
diff --git a/docs/api/tmpl/base64.sgml b/docs/api/tmpl/base64.sgml
index 90e56bb..94582e6 100644
--- a/docs/api/tmpl/base64.sgml
+++ b/docs/api/tmpl/base64.sgml
@@ -21,6 +21,22 @@ base64
 
 
 
+<!-- ##### FUNCTION xmlSecBase64GetDefaultLineSize ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecBase64SetDefaultLineSize ##### -->
+<para>
+
+</para>
+
+ columns: 
+
+
 <!-- ##### FUNCTION xmlSecBase64CtxCreate ##### -->
 <para>
 
diff --git a/docs/api/tmpl/bn.sgml b/docs/api/tmpl/bn.sgml
index 8563a47..ab7fffa 100644
--- a/docs/api/tmpl/bn.sgml
+++ b/docs/api/tmpl/bn.sgml
@@ -162,8 +162,6 @@ bn
 @bn: 
 @multiplier: 
 @Returns: 
-<!-- # Unused Parameters # -->
- Param2: 
 
 
 <!-- ##### FUNCTION xmlSecBnDiv ##### -->
@@ -175,8 +173,6 @@ bn
 @divider: 
 @mod: 
 @Returns: 
-<!-- # Unused Parameters # -->
- Param2: 
 
 
 <!-- ##### FUNCTION xmlSecBnAdd ##### -->
@@ -187,9 +183,6 @@ bn
 @bn: 
 @delta: 
 @Returns: 
-<!-- # Unused Parameters # -->
- nn: 
- Param2: 
 
 
 <!-- ##### FUNCTION xmlSecBnReverse ##### -->
diff --git a/docs/api/tmpl/gnutls/app.sgml b/docs/api/tmpl/gnutls/app.sgml
index 062d3f3..d2196c1 100644
--- a/docs/api/tmpl/gnutls/app.sgml
+++ b/docs/api/tmpl/gnutls/app.sgml
@@ -83,6 +83,19 @@ app
 @Returns: 
 
 
+<!-- ##### FUNCTION xmlSecGnuTLSAppKeysMngrCertLoadMemory ##### -->
+<para>
+
+</para>
+
+ mngr: 
+ data: 
+ dataSize: 
+ format: 
+ type: 
+ Returns: 
+
+
 <!-- ##### FUNCTION xmlSecGnuTLSAppKeyLoad ##### -->
 <para>
 
@@ -96,6 +109,20 @@ app
 @Returns: 
 
 
+<!-- ##### FUNCTION xmlSecGnuTLSAppKeyLoadMemory ##### -->
+<para>
+
+</para>
+
+ data: 
+ dataSize: 
+ format: 
+ pwd: 
+ pwdCallback: 
+ pwdCallbackCtx: 
+ Returns: 
+
+
 <!-- ##### FUNCTION xmlSecGnuTLSAppPkcs12Load ##### -->
 <para>
 
@@ -108,6 +135,19 @@ app
 @Returns: 
 
 
+<!-- ##### FUNCTION xmlSecGnuTLSAppPkcs12LoadMemory ##### -->
+<para>
+
+</para>
+
+ data: 
+ dataSize: 
+ pwd: 
+ pwdCallback: 
+ pwdCallbackCtx: 
+ Returns: 
+
+
 <!-- ##### FUNCTION xmlSecGnuTLSAppKeyCertLoad ##### -->
 <para>
 
@@ -119,6 +159,18 @@ app
 @Returns: 
 
 
+<!-- ##### FUNCTION xmlSecGnuTLSAppKeyCertLoadMemory ##### -->
+<para>
+
+</para>
+
+ key: 
+ data: 
+ dataSize: 
+ format: 
+ Returns: 
+
+
 <!-- ##### FUNCTION xmlSecGnuTLSAppGetDefaultPwdCallback ##### -->
 <para>
 
diff --git a/docs/api/tmpl/gnutls/crypto.sgml b/docs/api/tmpl/gnutls/crypto.sgml
index 6361973..5bab8bd 100644
--- a/docs/api/tmpl/gnutls/crypto.sgml
+++ b/docs/api/tmpl/gnutls/crypto.sgml
@@ -169,6 +169,22 @@ crypto
 @Returns: 
 
 
+<!-- ##### FUNCTION xmlSecGnuTLSHmacGetMinOutputLength ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSHmacSetMinOutputLength ##### -->
+<para>
+
+</para>
+
+ min_length: 
+
+
 <!-- ##### MACRO xmlSecGnuTLSKeyDataHmacId ##### -->
 <para>
 
@@ -195,14 +211,14 @@ crypto
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSTransformHmacSha1Id ##### -->
+<!-- ##### MACRO xmlSecGnuTLSTransformHmacMd5Id ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSTransformHmacSha1GetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGnuTLSTransformHmacMd5GetKlass ##### -->
 <para>
 
 </para>
@@ -225,14 +241,14 @@ crypto
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSTransformHmacMd5Id ##### -->
+<!-- ##### MACRO xmlSecGnuTLSTransformHmacSha1Id ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSTransformHmacMd5GetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGnuTLSTransformHmacSha1GetKlass ##### -->
 <para>
 
 </para>
diff --git a/docs/api/tmpl/keysmngr.sgml b/docs/api/tmpl/keysmngr.sgml
index 6aac9f9..2381155 100644
--- a/docs/api/tmpl/keysmngr.sgml
+++ b/docs/api/tmpl/keysmngr.sgml
@@ -284,3 +284,12 @@ keysmngr
 @Returns: 
 
 
+<!-- ##### FUNCTION xmlSecSimpleKeysStoreGetKeys ##### -->
+<para>
+
+</para>
+
+ store: 
+ Returns: 
+
+
diff --git a/docs/api/tmpl/mscrypto/app.sgml b/docs/api/tmpl/mscrypto/app.sgml
index 8f2e0dd..c47b5f3 100644
--- a/docs/api/tmpl/mscrypto/app.sgml
+++ b/docs/api/tmpl/mscrypto/app.sgml
@@ -79,6 +79,66 @@ app
 @Returns: 
 
 
+<!-- ##### FUNCTION xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad ##### -->
+<para>
+
+</para>
+
+ mngr: 
+ hKey: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad ##### -->
+<para>
+
+</para>
+
+ mngr: 
+ hKey: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad ##### -->
+<para>
+
+</para>
+
+ mngr: 
+ hKey: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore ##### -->
+<para>
+
+</para>
+
+ mngr: 
+ keyStore: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore ##### -->
+<para>
+
+</para>
+
+ mngr: 
+ trustedStore: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore ##### -->
+<para>
+
+</para>
+
+ mngr: 
+ untrustedStore: 
+ Returns: 
+
+
 <!-- ##### FUNCTION xmlSecMSCryptoAppKeysMngrCertLoad ##### -->
 <para>
 
@@ -129,8 +189,6 @@ app
 @pwdCallback: 
 @pwdCallbackCtx: 
 @Returns: 
-<!-- # Unused Parameters # -->
- bdata: 
 
 
 <!-- ##### FUNCTION xmlSecMSCryptoAppPkcs12Load ##### -->
@@ -156,8 +214,6 @@ app
 @pwdCallback: 
 @pwdCallbackCtx: 
 @Returns: 
-<!-- # Unused Parameters # -->
- bdata: 
 
 
 <!-- ##### FUNCTION xmlSecMSCryptoAppKeyCertLoad ##### -->
diff --git a/docs/api/tmpl/mscrypto/certkeys.sgml b/docs/api/tmpl/mscrypto/certkeys.sgml
index 36ed33a..cb7bb8f 100644
--- a/docs/api/tmpl/mscrypto/certkeys.sgml
+++ b/docs/api/tmpl/mscrypto/certkeys.sgml
@@ -33,6 +33,15 @@ certkeys
 @Returns: 
 
 
+<!-- ##### FUNCTION xmlSecMSCryptoKeyDataGetDecryptKey ##### -->
+<para>
+
+</para>
+
+ data: 
+ Returns: 
+
+
 <!-- ##### FUNCTION xmlSecMSCryptoCertDup ##### -->
 <para>
 
diff --git a/docs/api/tmpl/mscrypto/crypto.sgml b/docs/api/tmpl/mscrypto/crypto.sgml
index 75b038f..b7853a9 100644
--- a/docs/api/tmpl/mscrypto/crypto.sgml
+++ b/docs/api/tmpl/mscrypto/crypto.sgml
@@ -113,6 +113,36 @@ crypto
 @Returns: 
 
 
+<!-- ##### MACRO xmlSecMSCryptoKeyDataGost2001Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecMSCryptoKeyDataGost2001GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecMSCryptoTransformGost2001GostR3411_94Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
 <!-- ##### MACRO xmlSecMSCryptoKeyDataRsaId ##### -->
 <para>
 
@@ -173,6 +203,21 @@ crypto
 @Returns: 
 
 
+<!-- ##### MACRO xmlSecMSCryptoTransformGostR3411_94Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecMSCryptoTransformGostR3411_94GetKlass ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+
 <!-- ##### MACRO xmlSecMSCryptoKeyDataAesId ##### -->
 <para>
 
diff --git a/docs/api/tmpl/mscrypto/x509.sgml b/docs/api/tmpl/mscrypto/x509.sgml
index 3d8ee68..519547d 100644
--- a/docs/api/tmpl/mscrypto/x509.sgml
+++ b/docs/api/tmpl/mscrypto/x509.sgml
@@ -46,8 +46,6 @@ x509
 @data: 
 @cert: 
 @Returns: 
-<!-- # Unused Parameters # -->
- pCertContext: 
 
 
 <!-- ##### FUNCTION