[xmlsec] separate gnutls and gcrypt



commit 3f69e05b6c84043d3fef3714b6cfeed8a1bb47b8
Author: Aleksey Sanin <aleksey aleksey com>
Date:   Mon May 10 00:42:52 2010 -0700

    separate gnutls and gcrypt

 Copyright                                      |    2 +-
 Makefile.am                                    |   11 +-
 TODO                                           |   77 +
 apps/xmlsec.c                                  |    2 +-
 configure.in                                   |   93 ++
 docs/api/Makefile.am                           |   12 +
 docs/api/chapters/compiling-and-linking.sgml   |    2 +-
 docs/api/chapters/init-and-shutdown.sgml       |    2 +-
 docs/api/chapters/new-crypto.sgml              |    6 +-
 docs/api/index.html                            |    7 +
 docs/api/index.sgml                            |    2 +
 docs/api/sgml/app.sgml                         | 1008 ++++++------
 docs/api/sgml/base64.sgml                      |  206 ++--
 docs/api/sgml/bn.sgml                          |  434 +++---
 docs/api/sgml/buffer.sgml                      |  352 ++--
 docs/api/sgml/dl.sgml                          |  100 +-
 docs/api/sgml/errors.sgml                      |  755 +++++-----
 docs/api/sgml/exports.sgml                     |   23 +-
 docs/api/sgml/gcrypt/app.sgml                  |  446 +++---
 docs/api/sgml/gcrypt/crypto.sgml               | 1096 +++++++++----
 docs/api/sgml/gcrypt/xmlsec-gcrypt-doc.bottom  |    4 +-
 docs/api/sgml/gcrypt/xmlsec-gcrypt-doc.top     |    4 +-
 docs/api/sgml/gnutls/app.sgml                  |  368 ++---
 docs/api/sgml/gnutls/crypto.sgml               |  866 +++++++---
 docs/api/sgml/io.sgml                          |  108 +-
 docs/api/sgml/keyinfo.sgml                     |  477 +++---
 docs/api/sgml/keys.sgml                        |  776 +++++-----
 docs/api/sgml/keysdata.sgml                    | 1458 ++++++++---------
 docs/api/sgml/keysmngr.sgml                    |  460 +++---
 docs/api/sgml/list.sgml                        |  385 ++---
 docs/api/sgml/membuf.sgml                      |   44 +-
 docs/api/sgml/mscrypto/app.sgml                |  514 +++---
 docs/api/sgml/mscrypto/certkeys.sgml           |  108 +-
 docs/api/sgml/mscrypto/crypto.sgml             |  861 ++++++-----
 docs/api/sgml/mscrypto/keysstore.sgml          |   94 +-
 docs/api/sgml/mscrypto/x509.sgml               |  290 ++--
 docs/api/sgml/nodeset.sgml                     |  316 ++--
 docs/api/sgml/nss/app.sgml                     |  490 +++---
 docs/api/sgml/nss/bignum.sgml                  |   62 +-
 docs/api/sgml/nss/crypto.sgml                  |  674 ++++----
 docs/api/sgml/nss/keysstore.sgml               |   94 +-
 docs/api/sgml/nss/pkikeys.sgml                 |   80 +-
 docs/api/sgml/nss/x509.sgml                    |  268 ++--
 docs/api/sgml/openssl/app.sgml                 |  542 +++----
 docs/api/sgml/openssl/bn.sgml                  |   56 +-
 docs/api/sgml/openssl/crypto.sgml              |  992 ++++++------
 docs/api/sgml/openssl/evp.sgml                 |   64 +-
 docs/api/sgml/openssl/x509.sgml                |  352 ++--
 docs/api/sgml/parser.sgml                      |  104 +-
 docs/api/sgml/private.sgml                     |  693 ++++-----
 docs/api/sgml/soap.sgml                        |  374 ++---
 docs/api/sgml/templates.sgml                   |  828 +++++-----
 docs/api/sgml/transforms.sgml                  | 2107 ++++++++++++------------
 docs/api/sgml/version.sgml                     |   68 +-
 docs/api/sgml/x509.sgml                        |  100 +-
 docs/api/sgml/xmldsig.sgml                     |  594 +++----
 docs/api/sgml/xmlenc.sgml                      |  384 ++---
 docs/api/sgml/xmlsec.sgml                      |  179 ++-
 docs/api/sgml/xmltree.sgml                     | 1094 ++++++-------
 docs/api/tmpl/app.sgml                         |   50 +
 docs/api/tmpl/base64.sgml                      |    4 +
 docs/api/tmpl/bn.sgml                          |    3 +
 docs/api/tmpl/buffer.sgml                      |    3 +
 docs/api/tmpl/dl.sgml                          |    6 +
 docs/api/tmpl/errors.sgml                      |    5 +
 docs/api/tmpl/exports.sgml                     |    3 +
 docs/api/tmpl/gcrypt/app.sgml                  |   37 +-
 docs/api/tmpl/gcrypt/crypto.sgml               |  412 ++++-
 docs/api/tmpl/gcrypt/xmlsec-gcrypt-unused.sgml |    7 +
 docs/api/tmpl/gnutls/app.sgml                  |    5 +
 docs/api/tmpl/gnutls/crypto.sgml               |  312 ++++
 docs/api/tmpl/io.sgml                          |    8 +
 docs/api/tmpl/keyinfo.sgml                     |    7 +
 docs/api/tmpl/keys.sgml                        |    6 +
 docs/api/tmpl/keysdata.sgml                    |   10 +
 docs/api/tmpl/keysmngr.sgml                    |    5 +
 docs/api/tmpl/list.sgml                        |    4 +
 docs/api/tmpl/membuf.sgml                      |    4 +
 docs/api/tmpl/mscrypto/app.sgml                |    6 +
 docs/api/tmpl/mscrypto/certkeys.sgml           |    3 +
 docs/api/tmpl/mscrypto/crypto.sgml             |  116 ++
 docs/api/tmpl/mscrypto/keysstore.sgml          |    4 +
 docs/api/tmpl/mscrypto/x509.sgml               |    6 +
 docs/api/tmpl/nodeset.sgml                     |    3 +
 docs/api/tmpl/nss/app.sgml                     |    5 +
 docs/api/tmpl/nss/bignum.sgml                  |    3 +
 docs/api/tmpl/nss/crypto.sgml                  |   40 +
 docs/api/tmpl/nss/keysstore.sgml               |    4 +
 docs/api/tmpl/nss/pkikeys.sgml                 |    3 +
 docs/api/tmpl/nss/x509.sgml                    |    6 +
 docs/api/tmpl/openssl/app.sgml                 |    5 +
 docs/api/tmpl/openssl/bn.sgml                  |    3 +
 docs/api/tmpl/openssl/crypto.sgml              |   45 +
 docs/api/tmpl/openssl/evp.sgml                 |    3 +
 docs/api/tmpl/openssl/x509.sgml                |    6 +
 docs/api/tmpl/parser.sgml                      |    4 +
 docs/api/tmpl/private.sgml                     |    9 +
 docs/api/tmpl/soap.sgml                        |    3 +
 docs/api/tmpl/templates.sgml                   |    3 +
 docs/api/tmpl/transforms.sgml                  |   23 +
 docs/api/tmpl/version.sgml                     |    3 +
 docs/api/tmpl/x509.sgml                        |    3 +
 docs/api/tmpl/xmldsig.sgml                     |    4 +
 docs/api/tmpl/xmlenc.sgml                      |    3 +
 docs/api/tmpl/xmlsec-unused.sgml               |   48 +
 docs/api/tmpl/xmlsec.sgml                      |   31 +
 docs/api/tmpl/xmltree.sgml                     |    3 +
 docs/api/xmlsec-app.html                       |  802 ++++-----
 docs/api/xmlsec-base64.html                    |  211 ++--
 docs/api/xmlsec-bn.html                        |  480 +++---
 docs/api/xmlsec-buffer.html                    |  364 ++---
 docs/api/xmlsec-dl.html                        |   86 +-
 docs/api/xmlsec-errors.html                    |  509 +++----
 docs/api/xmlsec-gcrypt.sgml                    |    8 +-
 docs/api/xmlsec-gnutls-app.html                |  427 +++---
 docs/api/xmlsec-gnutls-crypto.html             |  801 +++++++---
 docs/api/xmlsec-index.html                     |  144 ++
 docs/api/xmlsec-index.sgml                     |  144 ++
 docs/api/xmlsec-io.html                        |   88 +-
 docs/api/xmlsec-keyinfo.html                   |  360 ++---
 docs/api/xmlsec-keys.html                      |  744 ++++-----
 docs/api/xmlsec-keysdata.html                  | 1362 +++++++--------
 docs/api/xmlsec-keysmngr.html                  |  436 +++---
 docs/api/xmlsec-list.html                      |  350 ++---
 docs/api/xmlsec-membuf.html                    |   21 +-
 docs/api/xmlsec-mscrypto-app.html              |  584 ++++----
 docs/api/xmlsec-mscrypto-certkeys.html         |  103 +-
 docs/api/xmlsec-mscrypto-crypto.html           |  698 ++++----
 docs/api/xmlsec-mscrypto-keysstore.html        |   83 +-
 docs/api/xmlsec-mscrypto-x509.html             |  287 ++--
 docs/api/xmlsec-nodeset.html                   |  316 ++--
 docs/api/xmlsec-notes-compiling-unix.html      |    2 +-
 docs/api/xmlsec-notes-init-shutdown.html       |    2 +-
 docs/api/xmlsec-notes-new-crypto-skeleton.html |    2 +-
 docs/api/xmlsec-notes-new-crypto.html          |    4 +-
 docs/api/xmlsec-notes-overview.html            |    2 +-
 docs/api/xmlsec-notes-structure.html           |    3 +-
 docs/api/xmlsec-nss-app.html                   |  574 ++++----
 docs/api/xmlsec-nss-bignum.html                |   56 +-
 docs/api/xmlsec-nss-crypto.html                |  492 +++----
 docs/api/xmlsec-nss-keysstore.html             |   83 +-
 docs/api/xmlsec-nss-pkikeys.html               |   73 +-
 docs/api/xmlsec-nss-ref.html                   |    6 +-
 docs/api/xmlsec-nss-x509.html                  |  270 ++--
 docs/api/xmlsec-openssl-app.html               |  632 ++++----
 docs/api/xmlsec-openssl-bn.html                |   48 +-
 docs/api/xmlsec-openssl-crypto.html            |  785 ++++-----
 docs/api/xmlsec-openssl-evp.html               |   54 +-
 docs/api/xmlsec-openssl-x509.html              |  357 ++---
 docs/api/xmlsec-parser.html                    |   99 +-
 docs/api/xmlsec-reference.html                 |    1 +
 docs/api/xmlsec-templates.html                 |  969 ++++++------
 docs/api/xmlsec-transforms.html                | 2046 +++++++++++------------
 docs/api/xmlsec-version.html                   |   27 +-
 docs/api/xmlsec-x509.html                      |   59 +-
 docs/api/xmlsec-xmldsig.html                   |  518 +++---
 docs/api/xmlsec-xmlenc.html                    |  354 ++---
 docs/api/xmlsec-xmlsec.html                    |  132 +-
 docs/api/xmlsec-xmltree.html                   | 1237 +++++++--------
 docs/api/xmlsec.sgml                           |   18 +-
 docs/download.html                             |    5 +-
 docs/faq.html                                  |   29 +-
 docs/related.html                              |    6 +-
 docs/xmldsig.html                              |  137 ++-
 docs/xmlenc.html                               |  165 ++-
 docs/xmlsec-man.html                           |    2 +-
 include/xmlsec/crypto.h                        |   18 +-
 include/xmlsec/gcrypt/Makefile.am              |    6 +-
 include/xmlsec/gcrypt/app.h                    |   36 +-
 include/xmlsec/gcrypt/crypto.h                 |  300 ++--
 include/xmlsec/gcrypt/symbols.h                |   98 +-
 man/xmlsec1-config.1                           |    6 +-
 man/xmlsec1.1                                  |    8 +-
 src/gcrypt/Makefile.am                         |   18 +-
 src/gcrypt/README                              |    2 +-
 src/gcrypt/app.c                               |  116 +-
 src/gcrypt/asymkeys.c                          |  565 ++++----
 src/gcrypt/ciphers.c                           |  219 ++--
 src/gcrypt/crypto.c                            |  141 +-
 src/gcrypt/digests.c                           |  215 ++--
 src/gcrypt/hmac.c                              |  309 ++--
 src/gcrypt/kw_aes.c                            |  181 +-
 src/gcrypt/kw_des.c                            |  153 +-
 src/gcrypt/symkeys.c                           |  206 ++--
 xmlsec-config.in                               |   13 +-
 xmlsec-gcrypt.pc.in                            |    8 +-
 186 files changed, 22931 insertions(+), 21601 deletions(-)
---
diff --git a/Copyright b/Copyright
index 0bb446b..23e4372 100644
--- a/Copyright
+++ b/Copyright
@@ -1,4 +1,4 @@
-xmlsec, xmlsec-openssl, xmlsec-gnutls libraries
+xmlsec, xmlsec-openssl, xmlsec-gnutls, xmlsec-gcrypt libraries
 ------------------------------------------------------------------------------
 
 Copyright (C) 2002-2010 Aleksey Sanin.  All Rights Reserved.
diff --git a/Makefile.am b/Makefile.am
index d683586..11b105b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,11 @@ ACLOCAL_AMFLAGS	= -I m4
 
 DISTCLEANFILES = \
 	xmlsec1Conf.sh \
-	xmlsec1.pc xmlsec1-openssl.pc xmlsec1-gnutls.pc xmlsec1-nss.pc \
+	xmlsec1.pc \
+	xmlsec1-openssl.pc \
+	xmlsec1-nss.pc \
+	xmlsec1-gnutls.pc \
+	xmlsec1-gcrypt.pc \
 	xmlsec1-config \
 	xmlsec1.spec \
 	stamp-h2 \
@@ -36,7 +40,10 @@ EXTRA_DIST = \
 	ChangeLog \
 	Copyright \
 	HACKING \
-	xmlsec-openssl.pc.in xmlsec-gnutls.pc.in xmlsec-nss.pc.in\
+	xmlsec-openssl.pc.in \
+	xmlsec-nss.pc.in\
+	xmlsec-gnutls.pc.in \
+	xmlsec-gcrypt.pc.in \
 	xmlsec-config.in \
 	xmlsecConf.sh.in \
 	xmlsec.spec.in \
diff --git a/TODO b/TODO
index 4cef702..97d851e 100644
--- a/TODO
+++ b/TODO
@@ -140,3 +140,80 @@ merlin-xmlenc-five/encrypt-data-tripledes-cbc-rsa-oaep-mgf1p
 01-phaos-xmlenc-3/enc-text-aes192-kt-rsa1_5
 01-phaos-xmlenc-3/enc-content-aes256-kt-rsa1_5
 01-phaos-xmlenc-3/enc-text-aes256-kt-rsa_oaep_sha1
+
+-------------------------------------------------
+* xmlsec-gnutls (May 09, 2010 using GnuTLS)
+-------------------------------------------------
+
+** Skipped tests due to missing transforms: RSA, DSA, RSA PKCS/OAEP, X509, GOST
+
+aleksey-xmldsig-01/enveloping-dsa-x509chain
+aleksey-xmldsig-01/enveloping-rsa-x509chain
+aleksey-xmldsig-01/enveloping-sha224-hmac-sha224
+aleksey-xmldsig-01/enveloping-sha224-hmac-sha224-64
+aleksey-xmldsig-01/enveloping-md5-rsa-md5
+aleksey-xmldsig-01/enveloping-ripemd160-rsa-ripemd160
+aleksey-xmldsig-01/enveloping-sha1-rsa-sha1
+aleksey-xmldsig-01/enveloping-sha224-rsa-sha224
+aleksey-xmldsig-01/enveloping-sha256-rsa-sha256
+aleksey-xmldsig-01/enveloping-sha384-rsa-sha384
+aleksey-xmldsig-01/enveloping-sha512-rsa-sha512
+aleksey-xmldsig-01/enveloping-expired-cert
+aleksey-xmldsig-01/x509data-test
+aleksey-xmldsig-01/x509data-sn-test
+merlin-xmldsig-twenty-three/signature-enveloped-dsa
+merlin-xmldsig-twenty-three/signature-enveloping-dsa
+merlin-xmldsig-twenty-three/signature-enveloping-b64-dsa
+merlin-xmldsig-twenty-three/signature-enveloping-rsa
+merlin-xmldsig-twenty-three/signature-external-b64-dsa
+merlin-xmldsig-twenty-three/signature-external-dsa
+merlin-xmldsig-twenty-three/signature-keyname
+merlin-xmldsig-twenty-three/signature-x509-crt
+merlin-xmldsig-twenty-three/signature-x509-sn
+merlin-xmldsig-twenty-three/signature-x509-is
+merlin-xmldsig-twenty-three/signature-x509-ski
+merlin-xmldsig-twenty-three/signature-retrievalmethod-rawx509crt
+merlin-xmldsig-twenty-three/signature
+merlin-xmlenc-five/encsig-ripemd160-hmac-ripemd160-kw-tripledes
+merlin-exc-c14n-one/exc-signature
+merlin-exc-c14n-one/exc-signature
+merlin-c14n-three/signature
+merlin-xpath-filter2-three/sign-xfdl
+merlin-xpath-filter2-three/sign-spec
+phaos-xmldsig-three/signature-big
+phaos-xmldsig-three/signature-dsa-detached
+phaos-xmldsig-three/signature-dsa-enveloped
+phaos-xmldsig-three/signature-dsa-enveloping
+phaos-xmldsig-three/signature-dsa-manifest
+phaos-xmldsig-three/signature-rsa-detached-b64-transform
+phaos-xmldsig-three/signature-rsa-detached
+phaos-xmldsig-three/signature-rsa-detached-xpath-transform
+phaos-xmldsig-three/signature-rsa-detached-xslt-transform-retrieval-method
+phaos-xmldsig-three/signature-rsa-detached-xslt-transform
+phaos-xmldsig-three/signature-rsa-enveloped
+phaos-xmldsig-three/signature-rsa-enveloping
+phaos-xmldsig-three/signature-rsa-manifest-x509-data-cert-chain
+phaos-xmldsig-three/signature-rsa-manifest-x509-data-cert
+phaos-xmldsig-three/signature-rsa-manifest-x509-data-issuer-serial
+phaos-xmldsig-three/signature-rsa-manifest-x509-data-ski
+phaos-xmldsig-three/signature-rsa-manifest-x509-data-subject-name
+phaos-xmldsig-three/signature-rsa-manifest
+phaos-xmldsig-three/signature-rsa-xpath-transform-enveloped
+aleksey-xmldsig-01/enveloped-gost
+merlin-xmldsig-twenty-three/signature-x509-crt-crl
+aleksey-xmldsig-01/enveloping-expired-cert
+phaos-xmldsig-three/signature-rsa-detached-xslt-transform-bad-retrieval-method
+phaos-xmldsig-three/signature-rsa-enveloped-bad-digest-val
+phaos-xmldsig-three/signature-rsa-enveloped-bad-sig
+phaos-xmldsig-three/signature-rsa-manifest-x509-data-crl
+
+merlin-xmlenc-five/encrypt-element-aes128-cbc-rsa-1_5
+merlin-xmlenc-five/encrypt-data-tripledes-cbc-rsa-oaep-mgf1p
+01-phaos-xmlenc-3/enc-element-3des-kt-rsa1_5
+01-phaos-xmlenc-3/enc-element-3des-kt-rsa_oaep_sha1
+01-phaos-xmlenc-3/enc-element-aes128-kt-rsa1_5
+01-phaos-xmlenc-3/enc-element-aes128-kt-rsa_oaep_sha1
+01-phaos-xmlenc-3/enc-element-aes192-kt-rsa_oaep_sha1
+01-phaos-xmlenc-3/enc-text-aes192-kt-rsa1_5
+01-phaos-xmlenc-3/enc-content-aes256-kt-rsa1_5
+01-phaos-xmlenc-3/enc-text-aes256-kt-rsa_oaep_sha1
diff --git a/apps/xmlsec.c b/apps/xmlsec.c
index a1315d7..ef7c891 100644
--- a/apps/xmlsec.c
+++ b/apps/xmlsec.c
@@ -169,7 +169,7 @@ static xmlSecAppCmdLineParam cryptoParam = {
     NULL,
     "--crypto <name>"
     "\n\tthe name of the crypto engine to use from the following"
-    "\n\tlist: openssl, gnutls, nss, mscrypto (if no crypto engine is"
+    "\n\tlist: openssl, mscrypto, nss, gnutls, gcrypt (if no crypto engine is"
     "\n\tspecified then the default one is used)",
     xmlSecAppCmdLineParamTypeString,
     xmlSecAppCmdLineParamFlagNone,
diff --git a/configure.in b/configure.in
index bd5837d..e3b700c 100644
--- a/configure.in
+++ b/configure.in
@@ -861,6 +861,88 @@ AC_SUBST(GNUTLS_CRYPTO_LIB)
 AC_SUBST(GNUTLS_MIN_VERSION)
 
 dnl ==========================================================================
+dnl See if we can find GCrypt
+dnl ==========================================================================
+GCRYPT_CONFIG="libgcrypt-config"
+XMLSEC_NO_GCRYPT="1"
+GCRYPT_MIN_VERSION="1.4.0"
+GCRYPT_VERSION=""
+GCRYPT_CFLAGS=""
+GCRYPT_LIBS=""
+GCRYPT_CRYPTO_LIB="$XMLSEC_PACKAGE-gcrypt"
+GCRYPT_FOUND="no"
+AC_ARG_WITH(gcrypt, [  --with-gcrypt=[PFX]       gcrypt location])
+if test "z$with_gcrypt" = "zno" ; then
+    AC_MSG_CHECKING(for gcrypt libraries >= $GCRYPT_MIN_VERSION) 
+    AC_MSG_RESULT(no)
+    GCRYPT_FOUND="without"
+elif test "z$with_gcrypt" = "z" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
+    PKG_CHECK_MODULES(GCRYPT, gcrypt >= $GCRYPT_MIN_VERSION,
+	[GCRYPT_FOUND=yes],
+	[GCRYPT_FOUND=no])
+
+    if test "z$GCRYPT_FOUND" = "zno" ; then
+        PKG_CHECK_MODULES(GCRYPT, libgcrypt >= $GCRYPT_MIN_VERSION,
+	    [GCRYPT_FOUND=yes],
+	    [GCRYPT_FOUND=no])
+    fi
+
+    if test "z$GCRYPT_FOUND" = "zno" ; then
+        PKG_CHECK_MODULES(GCRYPT, libgcrypt11 >= $GCRYPT_MIN_VERSION,
+	    [GCRYPT_FOUND=yes],
+	    [GCRYPT_FOUND=no])
+    fi
+fi
+
+if test "z$GCRYPT_FOUND" = "zno" ; then
+    AC_MSG_CHECKING(for gcrypt libraries >= $GCRYPT_MIN_VERSION) 
+    if test "z$with_gcrypt" != "z" ; then
+	GCRYPT_CONFIG=$with_gcrypt/bin/$GCRYPT_CONFIG
+    fi
+    if ! $GCRYPT_CONFIG --version > /dev/null 2>&1 ; then
+	if test "z$with_gcrypt" != "z" ; then
+	    AC_MSG_ERROR(Unable to find gcrypt at '$with_gcrypt')
+	else
+	    AC_MSG_RESULT(no)
+	fi
+    else
+        vers=`$GCRYPT_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+	minvers=`echo $GCRYPT_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+	if test "$vers" -ge "$minvers" ; then
+	    GCRYPT_CFLAGS="$GCRYPT_CFLAGS `$GCRYPT_CONFIG --cflags`"
+	    GCRYPT_LIBS="$GCRYPT_LIBS `$GCRYPT_CONFIG --libs`"
+	    GCRYPT_FOUND=yes
+	else
+	    AC_MSG_ERROR(You need at least gcrypt $GCRYPT_MIN_VERSION for this version of $XMLSEC_PACKAGE)
+	fi	
+    fi
+fi
+
+if test "z$GCRYPT_FOUND" = "zyes" ; then 
+    XMLSEC_NO_GCRYPT="0"
+    GCRYPT_CFLAGS="$GCRYPT_CFLAGS -DXMLSEC_CRYPTO_GCRYPT=1"
+
+    dnl first crypto library is default one
+    if test "z$XMLSEC_CRYPTO" = "z" ; then
+	XMLSEC_CRYPTO="gcrypt"
+    	XMLSEC_CRYPTO_LIB="$GCRYPT_CRYPTO_LIB"
+	XMLSEC_CRYPTO_CFLAGS="$GCRYPT_CFLAGS"
+	XMLSEC_CRYPTO_LIBS="$GCRYPT_LIBS"
+    fi	
+    XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST gcrypt"
+else
+    XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST gcrypt"
+fi
+
+AM_CONDITIONAL(XMLSEC_NO_GCRYPT, test "z$XMLSEC_NO_GCRYPT" = "z1")
+AC_SUBST(XMLSEC_NO_GCRYPT)
+AC_SUBST(GCRYPT_CFLAGS)
+AC_SUBST(GCRYPT_LIBS)
+AC_SUBST(GCRYPT_CRYPTO_LIB)
+AC_SUBST(GCRYPT_MIN_VERSION)
+
+
+dnl ==========================================================================
 dnl See if we can find MSCrypto
 dnl ==========================================================================
 XMLSEC_NO_MSCRYPTO="1"
@@ -1372,11 +1454,17 @@ XMLSEC_OPENSSL_LIBS="-L${libdir} -l$OPENSSL_CRYPTO_LIB $XMLSEC_CORE_LIBS $OPENSS
 AC_SUBST(XMLSEC_OPENSSL_CFLAGS)
 AC_SUBST(XMLSEC_OPENSSL_LIBS)
 
+
 XMLSEC_GNUTLS_CFLAGS="$XMLSEC_CORE_CFLAGS $GNUTLS_CFLAGS"
 XMLSEC_GNUTLS_LIBS="-L${libdir} -l$GNUTLS_CRYPTO_LIB $XMLSEC_CORE_LIBS $GNUTLS_LIBS"
 AC_SUBST(XMLSEC_GNUTLS_CFLAGS)
 AC_SUBST(XMLSEC_GNUTLS_LIBS)
 
+XMLSEC_GCRYPT_CFLAGS="$XMLSEC_CORE_CFLAGS $GCRYPT_CFLAGS"
+XMLSEC_GCRYPT_LIBS="-L${libdir} -l$GCRYPT_CRYPTO_LIB $XMLSEC_CORE_LIBS $GCRYPT_LIBS"
+AC_SUBST(XMLSEC_GCRYPT_CFLAGS)
+AC_SUBST(XMLSEC_GCRYPT_LIBS)
+
 XMLSEC_NSS_CFLAGS="$XMLSEC_CORE_CFLAGS $NSS_CFLAGS"
 XMLSEC_NSS_LIBS="-L${libdir} -l$NSS_CRYPTO_LIB $XMLSEC_CORE_LIBS $NSS_LIBS"
 AC_SUBST(XMLSEC_NSS_CFLAGS)
@@ -1427,6 +1515,10 @@ if test "z$XMLSEC_NO_GNUTLS" != "z1" ; then
 AC_CONFIG_FILES([include/xmlsec/gnutls/Makefile src/gnutls/Makefile])
 fi
 
+if test "z$XMLSEC_NO_GCRYPT" != "z1" ; then
+AC_CONFIG_FILES([include/xmlsec/gcrypt/Makefile src/gcrypt/Makefile])
+fi
+
 if test "z$XMLSEC_NO_NSS" != "z1" ; then
 AC_CONFIG_FILES([include/xmlsec/nss/Makefile src/nss/Makefile])
 fi
@@ -1457,6 +1549,7 @@ xmlsec1Conf.sh:xmlsecConf.sh.in
 xmlsec1-config:xmlsec-config.in
 xmlsec1-openssl.pc:xmlsec-openssl.pc.in
 xmlsec1-gnutls.pc:xmlsec-gnutls.pc.in
+xmlsec1-gcrypt.pc:xmlsec-gcrypt.pc.in
 xmlsec1-nss.pc:xmlsec-nss.pc.in
 xmlsec1.spec:xmlsec.spec.in
 ])
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index 99d2e9f..71aa901 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -65,6 +65,12 @@ sgml: templates
 		    --output-dir=sgml/gnutls \
 		    --source-dir=$(DOC_SOURCE_DIR)/src/gnutls \
 		    --source-dir=$(DOC_SOURCE_DIR)/include/xmlsec/gnutls
+	- gtkdoc-mkdb --module=xmlsec-gcrypt \
+		    --main-sgml-file=xmlsec-gcrypt.sgml \
+		    --tmpl-dir=tmpl/gcrypt \
+		    --output-dir=sgml/gcrypt \
+		    --source-dir=$(DOC_SOURCE_DIR)/src/gcrypt \
+		    --source-dir=$(DOC_SOURCE_DIR)/include/xmlsec/gcrypt
 	- gtkdoc-mkdb --module=xmlsec-nss \
 		    --main-sgml-file=xmlsec-nss.sgml \
 		    --tmpl-dir=tmpl/nss \
@@ -92,6 +98,8 @@ templates: scan
 		    --output-dir=tmpl/openssl
 	- gtkdoc-mktmpl --module=xmlsec-gnutls \
 		    --output-dir=tmpl/gnutls
+	- gtkdoc-mktmpl --module=xmlsec-gcrypt \
+		    --output-dir=tmpl/gcrypt
 	- gtkdoc-mktmpl --module=xmlsec-nss \
 		    --output-dir=tmpl/nss
 	- gtkdoc-mktmpl --module=xmlsec-mscrypto \
@@ -110,6 +118,10 @@ scan: doc_sources example_sources
 		    --rebuild-sections \
 		    --source-dir=$(DOC_SOURCE_DIR)/src/gnutls \
 		    --source-dir=$(DOC_SOURCE_DIR)/include/xmlsec/gnutls
+	- gtkdoc-scan --module=xmlsec-gcrypt \
+		    --rebuild-sections \
+		    --source-dir=$(DOC_SOURCE_DIR)/src/gcrypt \
+		    --source-dir=$(DOC_SOURCE_DIR)/include/xmlsec/gcrypt
 	- gtkdoc-scan --module=xmlsec-nss \
 		    --rebuild-sections \
 		    --source-dir=$(DOC_SOURCE_DIR)/src/nss \
diff --git a/docs/api/chapters/compiling-and-linking.sgml b/docs/api/chapters/compiling-and-linking.sgml
index 2cc6e44..f184c6a 100644
--- a/docs/api/chapters/compiling-and-linking.sgml
+++ b/docs/api/chapters/compiling-and-linking.sgml
@@ -161,7 +161,7 @@ clean:
 	    <listitem><para>xmlsec1-config script
 		<example>
 		    <title>Using xmlsec1-config script in a Makefile
-		    to select crypto engine (gnutls) at linking time.</title>
+		    to select crypto engine (e.g. gnutls) at linking time.</title>
 		    <programlisting><![CDATA[
 PROGRAM = test
 PROGRAM_FILES = test.c
diff --git a/docs/api/chapters/init-and-shutdown.sgml b/docs/api/chapters/init-and-shutdown.sgml
index 4cf869f..688a637 100644
--- a/docs/api/chapters/init-and-shutdown.sgml
+++ b/docs/api/chapters/init-and-shutdown.sgml
@@ -6,7 +6,7 @@
 	<itemizedlist>
 	    <listitem><para>libxml library;</para></listitem>
 	    <listitem><para>libxslt library;</para></listitem>
-	    <listitem><para>crypto library (OpenSSL, GnuTLS, NSS, ...);</para></listitem>
+	    <listitem><para>crypto library (OpenSSL, GnuTLS, GCrypt, NSS, ...);</para></listitem>
 	    <listitem><para>xmlsec library 
 		(<link linkend="xmlSecInit">xmlSecInit</link> 
 		and <link linkend="xmlSecShutdown">xmlSecShutdown</link> 
diff --git a/docs/api/chapters/new-crypto.sgml b/docs/api/chapters/new-crypto.sgml
index 08a936e..5219141 100644
--- a/docs/api/chapters/new-crypto.sgml
+++ b/docs/api/chapters/new-crypto.sgml
@@ -4,7 +4,7 @@
     <title>Overview.</title>
     <para>XML Security Library can support practicaly any cryptographic
     library. Currently, it has "out-of-the-box" support for OpenSSL,
-    NSS and GnuTLS. If your favorite library is not supported yet then
+    MSCrypto, NSS, GnuTLS and GCrypt. If your favorite library is not supported yet then
     you can write necessary code yourself. If you and your company
     (university, ...) are willing to share the results of your work I would 
     be happy to add support for new libraries to the main XML Security 
@@ -14,7 +14,7 @@
     <link linkend="xmlsec-notes-structure">separates</link> 
     the cryptographic library (engine) 
     specific code in an "xmlsec-&lt;crypto&gt;" library (where "&lt;crypto&gt;" is 
-    "openssl", "gnutls", "nss", etc.) which includes following items:
+    "openssl", "mscrypt", "gnutls", "gcrypt", "nss", etc.) which includes following items:
     <itemizedlist>
     <listitem><para>
     xmlSecCryptoApp* functions.
@@ -186,7 +186,7 @@ src/mycrypto/Makefile
 	<example>
 	    <title>Compiling the results.</title>
 	    <programlisting><![CDATA[
-./autogen.sh --without-openssl --without-nss --without-gnutls \
+./autogen.sh --without-openssl --without-nss --without-gnutls --without-gcrypt \
     	     --with-mycrypto=$HOME --disable-tmpl-tests
 make	
 	    ]]></programlisting>
diff --git a/docs/api/index.html b/docs/api/index.html
index d0e95a0..cc534d9 100644
--- a/docs/api/index.html
+++ b/docs/api/index.html
@@ -259,6 +259,13 @@
 <dt>
 <a href="xmlsec-gnutls-crypto.html">crypto</a> -- Crypto transforms implementation for GnuTLS.</dt>
 </dl></dd>
+<dt><a href="xmlsec-gcrypt-ref.html">XML Security Library for GCrypt API Reference.</a></dt>
+<dd><dl>
+<dt>
+<a href="xmlsec-gcrypt-app.html">app</a> -- Application functions implementation for GnuTLS.</dt>
+<dt>
+<a href="xmlsec-gcrypt-crypto.html">crypto</a> -- Crypto transforms implementation for GCrypt.</dt>
+</dl></dd>
 <dt><a href="xmlsec-nss-ref.html">XML Security Library for NSS API Reference.</a></dt>
 <dd><dl>
 <dt>
diff --git a/docs/api/index.sgml b/docs/api/index.sgml
index cccfd3f..eb112aa 100644
--- a/docs/api/index.sgml
+++ b/docs/api/index.sgml
@@ -28,6 +28,8 @@
 <ANCHOR id ="XMLSEC-OPENSSL-X509" href="xmlsec-openssl-x509.html">
 <ANCHOR id ="XMLSEC-GNUTLS-APP" href="xmlsec-gnutls-app.html">
 <ANCHOR id ="XMLSEC-GNUTLS-CRYPTO" href="xmlsec-gnutls-crypto.html">
+<ANCHOR id ="XMLSEC-GCRYPT-APP" href="xmlsec-gcrypt-app.html">
+<ANCHOR id ="XMLSEC-GCRYPT-CRYPTO" href="xmlsec-gcrypt-crypto.html">
 <ANCHOR id ="XMLSEC-NSS-APP" href="xmlsec-nss-app.html">
 <ANCHOR id ="XMLSEC-NSS-BIGNUM" href="xmlsec-nss-bignum.html">
 <ANCHOR id ="XMLSEC-NSS-CRYPTO" href="xmlsec-nss-crypto.html">
diff --git a/docs/api/sgml/app.sgml b/docs/api/sgml/app.sgml
index fbaaf3e..1676e4d 100644
--- a/docs/api/sgml/app.sgml
+++ b/docs/api/sgml/app.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-app.top_of_page">app</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>app</refname>
 <refpurpose>Crypto-engine independent application support function.</refpurpose>
@@ -13,215 +14,205 @@
 <refsynopsisdiv id="xmlsec-app.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="int">int</link>                 <link linkend="xmlSecCryptoInit">xmlSecCryptoInit</link>                    (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecCryptoShutdown">xmlSecCryptoShutdown</link>                (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecCryptoKeysMngrInit">xmlSecCryptoKeysMngrInit</link>            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
+<synopsis><link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCryptoInit">xmlSecCryptoInit</link>                    (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCryptoShutdown">xmlSecCryptoShutdown</link>                (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCryptoKeysMngrInit">xmlSecCryptoKeysMngrInit</link>            (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);
 #define             <link linkend="xmlSecKeyDataAesId">xmlSecKeyDataAesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataAesGetKlass">xmlSecKeyDataAesGetKlass</link>            (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecKeyDataAesGetKlass">xmlSecKeyDataAesGetKlass</link>            (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecKeyDataDesId">xmlSecKeyDataDesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataDesGetKlass">xmlSecKeyDataDesGetKlass</link>            (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecKeyDataDesGetKlass">xmlSecKeyDataDesGetKlass</link>            (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecKeyDataDsaId">xmlSecKeyDataDsaId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataDsaGetKlass">xmlSecKeyDataDsaGetKlass</link>            (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecKeyDataDsaGetKlass">xmlSecKeyDataDsaGetKlass</link>            (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecKeyDataGost2001Id">xmlSecKeyDataGost2001Id</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataGost2001GetKlass">xmlSecKeyDataGost2001GetKlass</link>       (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecKeyDataGost2001GetKlass">xmlSecKeyDataGost2001GetKlass</link>       (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecKeyDataHmacId">xmlSecKeyDataHmacId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataHmacGetKlass">xmlSecKeyDataHmacGetKlass</link>           (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecKeyDataHmacGetKlass">xmlSecKeyDataHmacGetKlass</link>           (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecKeyDataRsaId">xmlSecKeyDataRsaId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataRsaGetKlass">xmlSecKeyDataRsaGetKlass</link>            (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecKeyDataRsaGetKlass">xmlSecKeyDataRsaGetKlass</link>            (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecKeyDataX509Id">xmlSecKeyDataX509Id</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataX509GetKlass">xmlSecKeyDataX509GetKlass</link>           (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecKeyDataX509GetKlass">xmlSecKeyDataX509GetKlass</link>           (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecKeyDataRawX509CertId">xmlSecKeyDataRawX509CertId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataRawX509CertGetKlass">xmlSecKeyDataRawX509CertGetKlass</link>    (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecKeyDataRawX509CertGetKlass">xmlSecKeyDataRawX509CertGetKlass</link>    (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecX509StoreId">xmlSecX509StoreId</link>
-<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>  <link linkend="xmlSecX509StoreGetKlass">xmlSecX509StoreGetKlass</link>           (void);
+<link linkend="xmlSecKeyDataStoreId"><returnvalue>xmlSecKeyDataStoreId</returnvalue></link>  <link linkend="xmlSecX509StoreGetKlass">xmlSecX509StoreGetKlass</link>           (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformAes128CbcId">xmlSecTransformAes128CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformAes128CbcGetKlass">xmlSecTransformAes128CbcGetKlass</link>    (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformAes128CbcGetKlass">xmlSecTransformAes128CbcGetKlass</link>    (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformAes192CbcId">xmlSecTransformAes192CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformAes192CbcGetKlass">xmlSecTransformAes192CbcGetKlass</link>    (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformAes192CbcGetKlass">xmlSecTransformAes192CbcGetKlass</link>    (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformAes256CbcId">xmlSecTransformAes256CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformAes256CbcGetKlass">xmlSecTransformAes256CbcGetKlass</link>    (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformAes256CbcGetKlass">xmlSecTransformAes256CbcGetKlass</link>    (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformKWAes128Id">xmlSecTransformKWAes128Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformKWAes128GetKlass">xmlSecTransformKWAes128GetKlass</link>     (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformKWAes128GetKlass">xmlSecTransformKWAes128GetKlass</link>     (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformKWAes192Id">xmlSecTransformKWAes192Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformKWAes192GetKlass">xmlSecTransformKWAes192GetKlass</link>     (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformKWAes192GetKlass">xmlSecTransformKWAes192GetKlass</link>     (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformKWAes256Id">xmlSecTransformKWAes256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformKWAes256GetKlass">xmlSecTransformKWAes256GetKlass</link>     (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformKWAes256GetKlass">xmlSecTransformKWAes256GetKlass</link>     (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformDes3CbcId">xmlSecTransformDes3CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformDes3CbcGetKlass">xmlSecTransformDes3CbcGetKlass</link>      (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformDes3CbcGetKlass">xmlSecTransformDes3CbcGetKlass</link>      (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformKWDes3Id">xmlSecTransformKWDes3Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformKWDes3GetKlass">xmlSecTransformKWDes3GetKlass</link>       (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformKWDes3GetKlass">xmlSecTransformKWDes3GetKlass</link>       (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformDsaSha1Id">xmlSecTransformDsaSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformDsaSha1GetKlass">xmlSecTransformDsaSha1GetKlass</link>      (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformDsaSha1GetKlass">xmlSecTransformDsaSha1GetKlass</link>      (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformGost2001GostR3411-94Id">xmlSecTransformGost2001GostR3411_94Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformGost2001GostR3411-94GetKlass">xmlSecTransformGost2001GostR3411_94GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformGost2001GostR3411-94GetKlass">xmlSecTransformGost2001GostR3411_94GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformHmacMd5Id">xmlSecTransformHmacMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformHmacMd5GetKlass">xmlSecTransformHmacMd5GetKlass</link>      (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformHmacMd5GetKlass">xmlSecTransformHmacMd5GetKlass</link>      (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformHmacRipemd160Id">xmlSecTransformHmacRipemd160Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformHmacRipemd160GetKlass">xmlSecTransformHmacRipemd160GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformHmacRipemd160GetKlass">xmlSecTransformHmacRipemd160GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformHmacSha1Id">xmlSecTransformHmacSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformHmacSha1GetKlass">xmlSecTransformHmacSha1GetKlass</link>     (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformHmacSha1GetKlass">xmlSecTransformHmacSha1GetKlass</link>     (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformHmacSha224Id">xmlSecTransformHmacSha224Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformHmacSha224GetKlass">xmlSecTransformHmacSha224GetKlass</link>   (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformHmacSha224GetKlass">xmlSecTransformHmacSha224GetKlass</link>   (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformHmacSha256Id">xmlSecTransformHmacSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformHmacSha256GetKlass">xmlSecTransformHmacSha256GetKlass</link>   (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformHmacSha256GetKlass">xmlSecTransformHmacSha256GetKlass</link>   (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformHmacSha384Id">xmlSecTransformHmacSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformHmacSha384GetKlass">xmlSecTransformHmacSha384GetKlass</link>   (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformHmacSha384GetKlass">xmlSecTransformHmacSha384GetKlass</link>   (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformHmacSha512Id">xmlSecTransformHmacSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformHmacSha512GetKlass">xmlSecTransformHmacSha512GetKlass</link>   (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformHmacSha512GetKlass">xmlSecTransformHmacSha512GetKlass</link>   (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformMd5Id">xmlSecTransformMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformMd5GetKlass">xmlSecTransformMd5GetKlass</link>          (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformMd5GetKlass">xmlSecTransformMd5GetKlass</link>          (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformRipemd160Id">xmlSecTransformRipemd160Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRipemd160GetKlass">xmlSecTransformRipemd160GetKlass</link>    (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformRipemd160GetKlass">xmlSecTransformRipemd160GetKlass</link>    (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformRsaMd5Id">xmlSecTransformRsaMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRsaMd5GetKlass">xmlSecTransformRsaMd5GetKlass</link>       (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformRsaMd5GetKlass">xmlSecTransformRsaMd5GetKlass</link>       (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformRsaRipemd160Id">xmlSecTransformRsaRipemd160Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRsaRipemd160GetKlass">xmlSecTransformRsaRipemd160GetKlass</link> (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformRsaRipemd160GetKlass">xmlSecTransformRsaRipemd160GetKlass</link> (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformRsaSha1Id">xmlSecTransformRsaSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRsaSha1GetKlass">xmlSecTransformRsaSha1GetKlass</link>      (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformRsaSha1GetKlass">xmlSecTransformRsaSha1GetKlass</link>      (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformRsaSha224Id">xmlSecTransformRsaSha224Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRsaSha224GetKlass">xmlSecTransformRsaSha224GetKlass</link>    (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformRsaSha224GetKlass">xmlSecTransformRsaSha224GetKlass</link>    (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformRsaSha256Id">xmlSecTransformRsaSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRsaSha256GetKlass">xmlSecTransformRsaSha256GetKlass</link>    (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformRsaSha256GetKlass">xmlSecTransformRsaSha256GetKlass</link>    (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformRsaSha384Id">xmlSecTransformRsaSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRsaSha384GetKlass">xmlSecTransformRsaSha384GetKlass</link>    (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformRsaSha384GetKlass">xmlSecTransformRsaSha384GetKlass</link>    (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformRsaSha512Id">xmlSecTransformRsaSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRsaSha512GetKlass">xmlSecTransformRsaSha512GetKlass</link>    (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformRsaSha512GetKlass">xmlSecTransformRsaSha512GetKlass</link>    (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformRsaPkcs1Id">xmlSecTransformRsaPkcs1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRsaPkcs1GetKlass">xmlSecTransformRsaPkcs1GetKlass</link>     (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformRsaPkcs1GetKlass">xmlSecTransformRsaPkcs1GetKlass</link>     (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformRsaOaepId">xmlSecTransformRsaOaepId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRsaOaepGetKlass">xmlSecTransformRsaOaepGetKlass</link>      (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformRsaOaepGetKlass">xmlSecTransformRsaOaepGetKlass</link>      (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformGostR3411-94Id">xmlSecTransformGostR3411_94Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformGostR3411-94GetKlass">xmlSecTransformGostR3411_94GetKlass</link> (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformGostR3411-94GetKlass">xmlSecTransformGostR3411_94GetKlass</link> (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformSha1Id">xmlSecTransformSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformSha1GetKlass">xmlSecTransformSha1GetKlass</link>         (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformSha1GetKlass">xmlSecTransformSha1GetKlass</link>         (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformSha224Id">xmlSecTransformSha224Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformSha224GetKlass">xmlSecTransformSha224GetKlass</link>       (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformSha224GetKlass">xmlSecTransformSha224GetKlass</link>       (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformSha256Id">xmlSecTransformSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformSha256GetKlass">xmlSecTransformSha256GetKlass</link>       (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformSha256GetKlass">xmlSecTransformSha256GetKlass</link>       (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformSha384Id">xmlSecTransformSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformSha384GetKlass">xmlSecTransformSha384GetKlass</link>       (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformSha384GetKlass">xmlSecTransformSha384GetKlass</link>       (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformSha512Id">xmlSecTransformSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformSha512GetKlass">xmlSecTransformSha512GetKlass</link>       (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecCryptoAppInit">xmlSecCryptoAppInit</link>                 (const <link linkend="char">char</link> *config);
-<link linkend="int">int</link>                 <link linkend="xmlSecCryptoAppShutdown">xmlSecCryptoAppShutdown</link>             (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecCryptoAppDefaultKeysMngrInit">xmlSecCryptoAppDefaultKeysMngrInit</link>  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>                 <link linkend="xmlSecCryptoAppDefaultKeysMngrAdoptKey">xmlSecCryptoAppDefaultKeysMngrAdoptKey</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>                 <link linkend="xmlSecCryptoAppDefaultKeysMngrLoad">xmlSecCryptoAppDefaultKeysMngrLoad</link>  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *uri);
-<link linkend="int">int</link>                 <link linkend="xmlSecCryptoAppDefaultKeysMngrSave">xmlSecCryptoAppDefaultKeysMngrSave</link>  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>                 <link linkend="xmlSecCryptoAppKeysMngrCertLoad">xmlSecCryptoAppKeysMngrCertLoad</link>     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>                 <link linkend="xmlSecCryptoAppKeysMngrCertLoadMemory">xmlSecCryptoAppKeysMngrCertLoadMemory</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecCryptoAppKeyLoad">xmlSecCryptoAppKeyLoad</link>              (const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecCryptoAppKeyLoadMemory">xmlSecCryptoAppKeyLoadMemory</link>        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecCryptoAppPkcs12Load">xmlSecCryptoAppPkcs12Load</link>           (const <link linkend="char">char</link> *filename,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecCryptoAppPkcs12LoadMemory">xmlSecCryptoAppPkcs12LoadMemory</link>     (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecCryptoAppKeyCertLoad">xmlSecCryptoAppKeyCertLoad</link>          (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="int">int</link>                 <link linkend="xmlSecCryptoAppKeyCertLoadMemory">xmlSecCryptoAppKeyCertLoadMemory</link>    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="void">void</link>*               <link linkend="xmlSecCryptoAppGetDefaultPwdCallback">xmlSecCryptoAppGetDefaultPwdCallback</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformSha512GetKlass">xmlSecTransformSha512GetKlass</link>       (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCryptoAppInit">xmlSecCryptoAppInit</link>                 (<parameter>const <link linkend="char"><type>char</type></link> *config</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCryptoAppShutdown">xmlSecCryptoAppShutdown</link>             (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCryptoAppDefaultKeysMngrInit">xmlSecCryptoAppDefaultKeysMngrInit</link>  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCryptoAppDefaultKeysMngrAdoptKey">xmlSecCryptoAppDefaultKeysMngrAdoptKey</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCryptoAppDefaultKeysMngrLoad">xmlSecCryptoAppDefaultKeysMngrLoad</link>  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *uri</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCryptoAppDefaultKeysMngrSave">xmlSecCryptoAppDefaultKeysMngrSave</link>  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCryptoAppKeysMngrCertLoad">xmlSecCryptoAppKeysMngrCertLoad</link>     (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCryptoAppKeysMngrCertLoadMemory">xmlSecCryptoAppKeysMngrCertLoadMemory</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecCryptoAppKeyLoad">xmlSecCryptoAppKeyLoad</link>              (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecCryptoAppKeyLoadMemory">xmlSecCryptoAppKeyLoadMemory</link>        (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecCryptoAppPkcs12Load">xmlSecCryptoAppPkcs12Load</link>           (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecCryptoAppPkcs12LoadMemory">xmlSecCryptoAppPkcs12LoadMemory</link>     (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCryptoAppKeyCertLoad">xmlSecCryptoAppKeyCertLoad</link>          (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCryptoAppKeyCertLoadMemory">xmlSecCryptoAppKeyCertLoadMemory</link>    (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>*               <link linkend="xmlSecCryptoAppGetDefaultPwdCallback">xmlSecCryptoAppGetDefaultPwdCallback</link>
+                                                        (<parameter><type>void</type></parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-app.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Crypto-engine application support function used by xmlsec command line utility.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-app.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecCryptoInit" role="function">
 <title>xmlSecCryptoInit ()</title>
-<indexterm zone="xmlSecCryptoInit"><primary sortas="xmlSecCryptoInit">xmlSecCryptoInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoInit                    (void);</programlisting>
-<para>
-XMLSec library specific crypto engine initialization.</para>
+<indexterm zone="xmlSecCryptoInit"><primary>xmlSecCryptoInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCryptoInit                    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+XMLSec library specific crypto engine initialization.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoShutdown" role="function">
 <title>xmlSecCryptoShutdown ()</title>
-<indexterm zone="xmlSecCryptoShutdown"><primary sortas="xmlSecCryptoShutdown">xmlSecCryptoShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoShutdown                (void);</programlisting>
-<para>
-XMLSec library specific crypto engine shutdown.</para>
+<indexterm zone="xmlSecCryptoShutdown"><primary>xmlSecCryptoShutdown</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCryptoShutdown                (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+XMLSec library specific crypto engine shutdown.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoKeysMngrInit" role="function">
 <title>xmlSecCryptoKeysMngrInit ()</title>
-<indexterm zone="xmlSecCryptoKeysMngrInit"><primary sortas="xmlSecCryptoKeysMngrInit">xmlSecCryptoKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoKeysMngrInit            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
-<para>
-Adds crypto specific key data stores in keys manager.</para>
+<indexterm zone="xmlSecCryptoKeysMngrInit"><primary>xmlSecCryptoKeysMngrInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCryptoKeysMngrInit            (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);</programlisting>
 <para>
+Adds crypto specific key data stores in keys manager.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataAesId" role="macro">
 <title>xmlSecKeyDataAesId</title>
-<indexterm zone="xmlSecKeyDataAesId"><primary sortas="xmlSecKeyDataAesId">xmlSecKeyDataAesId</primary></indexterm><programlisting>#define xmlSecKeyDataAesId                      xmlSecKeyDataAesGetKlass()
+<indexterm zone="xmlSecKeyDataAesId"><primary>xmlSecKeyDataAesId</primary></indexterm>
+<programlisting>#define xmlSecKeyDataAesId                      xmlSecKeyDataAesGetKlass()
 </programlisting>
 <para>
-The AES key klass.</para>
-<para>
+The AES key klass.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataAesGetKlass" role="function">
 <title>xmlSecKeyDataAesGetKlass ()</title>
-<indexterm zone="xmlSecKeyDataAesGetKlass"><primary sortas="xmlSecKeyDataAesGetKlass">xmlSecKeyDataAesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataAesGetKlass            (void);</programlisting>
-<para>
-The AES key data klass.</para>
+<indexterm zone="xmlSecKeyDataAesGetKlass"><primary>xmlSecKeyDataAesGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecKeyDataAesGetKlass            (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The AES key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the AES key data
@@ -230,18 +221,18 @@ klass is not implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataDesId" role="macro">
 <title>xmlSecKeyDataDesId</title>
-<indexterm zone="xmlSecKeyDataDesId"><primary sortas="xmlSecKeyDataDesId">xmlSecKeyDataDesId</primary></indexterm><programlisting>#define xmlSecKeyDataDesId                      xmlSecKeyDataDesGetKlass()
+<indexterm zone="xmlSecKeyDataDesId"><primary>xmlSecKeyDataDesId</primary></indexterm>
+<programlisting>#define xmlSecKeyDataDesId                      xmlSecKeyDataDesGetKlass()
 </programlisting>
 <para>
-The DES key klass.</para>
-<para>
+The DES key klass.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataDesGetKlass" role="function">
 <title>xmlSecKeyDataDesGetKlass ()</title>
-<indexterm zone="xmlSecKeyDataDesGetKlass"><primary sortas="xmlSecKeyDataDesGetKlass">xmlSecKeyDataDesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataDesGetKlass            (void);</programlisting>
-<para>
-The DES key data klass.</para>
+<indexterm zone="xmlSecKeyDataDesGetKlass"><primary>xmlSecKeyDataDesGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecKeyDataDesGetKlass            (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The DES key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DES key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the DES key data
@@ -250,18 +241,18 @@ klass is not implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataDsaId" role="macro">
 <title>xmlSecKeyDataDsaId</title>
-<indexterm zone="xmlSecKeyDataDsaId"><primary sortas="xmlSecKeyDataDsaId">xmlSecKeyDataDsaId</primary></indexterm><programlisting>#define xmlSecKeyDataDsaId                      xmlSecKeyDataDsaGetKlass()
+<indexterm zone="xmlSecKeyDataDsaId"><primary>xmlSecKeyDataDsaId</primary></indexterm>
+<programlisting>#define xmlSecKeyDataDsaId                      xmlSecKeyDataDsaGetKlass()
 </programlisting>
 <para>
-The DSA key klass.</para>
-<para>
+The DSA key klass.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataDsaGetKlass" role="function">
 <title>xmlSecKeyDataDsaGetKlass ()</title>
-<indexterm zone="xmlSecKeyDataDsaGetKlass"><primary sortas="xmlSecKeyDataDsaGetKlass">xmlSecKeyDataDsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataDsaGetKlass            (void);</programlisting>
-<para>
-The DSA key data klass.</para>
+<indexterm zone="xmlSecKeyDataDsaGetKlass"><primary>xmlSecKeyDataDsaGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecKeyDataDsaGetKlass            (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The DSA key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DSA key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the DSA key data
@@ -270,18 +261,18 @@ klass is not implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataGost2001Id" role="macro">
 <title>xmlSecKeyDataGost2001Id</title>
-<indexterm zone="xmlSecKeyDataGost2001Id"><primary sortas="xmlSecKeyDataGost2001Id">xmlSecKeyDataGost2001Id</primary></indexterm><programlisting>#define xmlSecKeyDataGost2001Id                 xmlSecKeyDataGost2001GetKlass()
+<indexterm zone="xmlSecKeyDataGost2001Id"><primary>xmlSecKeyDataGost2001Id</primary></indexterm>
+<programlisting>#define xmlSecKeyDataGost2001Id                 xmlSecKeyDataGost2001GetKlass()
 </programlisting>
 <para>
-The GOST2001 key klass.</para>
-<para>
+The GOST2001 key klass.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataGost2001GetKlass" role="function">
 <title>xmlSecKeyDataGost2001GetKlass ()</title>
-<indexterm zone="xmlSecKeyDataGost2001GetKlass"><primary sortas="xmlSecKeyDataGost2001GetKlass">xmlSecKeyDataGost2001GetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataGost2001GetKlass       (void);</programlisting>
-<para>
-The GOST2001 key data klass.</para>
+<indexterm zone="xmlSecKeyDataGost2001GetKlass"><primary>xmlSecKeyDataGost2001GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecKeyDataGost2001GetKlass       (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The GOST2001 key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> GOST2001 key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the GOST2001 key data
@@ -290,18 +281,18 @@ klass is not implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataHmacId" role="macro">
 <title>xmlSecKeyDataHmacId</title>
-<indexterm zone="xmlSecKeyDataHmacId"><primary sortas="xmlSecKeyDataHmacId">xmlSecKeyDataHmacId</primary></indexterm><programlisting>#define xmlSecKeyDataHmacId                     xmlSecKeyDataHmacGetKlass()
+<indexterm zone="xmlSecKeyDataHmacId"><primary>xmlSecKeyDataHmacId</primary></indexterm>
+<programlisting>#define xmlSecKeyDataHmacId                     xmlSecKeyDataHmacGetKlass()
 </programlisting>
 <para>
-The DHMAC key klass.</para>
-<para>
+The DHMAC key klass.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataHmacGetKlass" role="function">
 <title>xmlSecKeyDataHmacGetKlass ()</title>
-<indexterm zone="xmlSecKeyDataHmacGetKlass"><primary sortas="xmlSecKeyDataHmacGetKlass">xmlSecKeyDataHmacGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataHmacGetKlass           (void);</programlisting>
-<para>
-The HMAC key data klass.</para>
+<indexterm zone="xmlSecKeyDataHmacGetKlass"><primary>xmlSecKeyDataHmacGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecKeyDataHmacGetKlass           (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> HMAC key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the HMAC key data
@@ -310,18 +301,18 @@ klass is not implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataRsaId" role="macro">
 <title>xmlSecKeyDataRsaId</title>
-<indexterm zone="xmlSecKeyDataRsaId"><primary sortas="xmlSecKeyDataRsaId">xmlSecKeyDataRsaId</primary></indexterm><programlisting>#define xmlSecKeyDataRsaId                      xmlSecKeyDataRsaGetKlass()
+<indexterm zone="xmlSecKeyDataRsaId"><primary>xmlSecKeyDataRsaId</primary></indexterm>
+<programlisting>#define xmlSecKeyDataRsaId                      xmlSecKeyDataRsaGetKlass()
 </programlisting>
 <para>
-The RSA key klass.</para>
-<para>
+The RSA key klass.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataRsaGetKlass" role="function">
 <title>xmlSecKeyDataRsaGetKlass ()</title>
-<indexterm zone="xmlSecKeyDataRsaGetKlass"><primary sortas="xmlSecKeyDataRsaGetKlass">xmlSecKeyDataRsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataRsaGetKlass            (void);</programlisting>
-<para>
-The RSA key data klass.</para>
+<indexterm zone="xmlSecKeyDataRsaGetKlass"><primary>xmlSecKeyDataRsaGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecKeyDataRsaGetKlass            (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the RSA key data
@@ -330,18 +321,18 @@ klass is not implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataX509Id" role="macro">
 <title>xmlSecKeyDataX509Id</title>
-<indexterm zone="xmlSecKeyDataX509Id"><primary sortas="xmlSecKeyDataX509Id">xmlSecKeyDataX509Id</primary></indexterm><programlisting>#define xmlSecKeyDataX509Id                     xmlSecKeyDataX509GetKlass()
+<indexterm zone="xmlSecKeyDataX509Id"><primary>xmlSecKeyDataX509Id</primary></indexterm>
+<programlisting>#define xmlSecKeyDataX509Id                     xmlSecKeyDataX509GetKlass()
 </programlisting>
 <para>
-The X509 data klass.</para>
-<para>
+The X509 data klass.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataX509GetKlass" role="function">
 <title>xmlSecKeyDataX509GetKlass ()</title>
-<indexterm zone="xmlSecKeyDataX509GetKlass"><primary sortas="xmlSecKeyDataX509GetKlass">xmlSecKeyDataX509GetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataX509GetKlass           (void);</programlisting>
-<para>
-The X509 key data klass.</para>
+<indexterm zone="xmlSecKeyDataX509GetKlass"><primary>xmlSecKeyDataX509GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecKeyDataX509GetKlass           (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The X509 key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> X509 key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the X509 key data
@@ -350,18 +341,18 @@ klass is not implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataRawX509CertId" role="macro">
 <title>xmlSecKeyDataRawX509CertId</title>
-<indexterm zone="xmlSecKeyDataRawX509CertId"><primary sortas="xmlSecKeyDataRawX509CertId">xmlSecKeyDataRawX509CertId</primary></indexterm><programlisting>#define xmlSecKeyDataRawX509CertId              xmlSecKeyDataRawX509CertGetKlass()
+<indexterm zone="xmlSecKeyDataRawX509CertId"><primary>xmlSecKeyDataRawX509CertId</primary></indexterm>
+<programlisting>#define xmlSecKeyDataRawX509CertId              xmlSecKeyDataRawX509CertGetKlass()
 </programlisting>
 <para>
-The  raw X509 certificate klass.</para>
-<para>
+The  raw X509 certificate klass.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataRawX509CertGetKlass" role="function">
 <title>xmlSecKeyDataRawX509CertGetKlass ()</title>
-<indexterm zone="xmlSecKeyDataRawX509CertGetKlass"><primary sortas="xmlSecKeyDataRawX509CertGetKlass">xmlSecKeyDataRawX509CertGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataRawX509CertGetKlass    (void);</programlisting>
-<para>
-The raw X509 cert key data klass.</para>
+<indexterm zone="xmlSecKeyDataRawX509CertGetKlass"><primary>xmlSecKeyDataRawX509CertGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecKeyDataRawX509CertGetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The raw X509 cert key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> raw x509 cert key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the raw X509 cert key data
@@ -370,18 +361,18 @@ klass is not implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecX509StoreId" role="macro">
 <title>xmlSecX509StoreId</title>
-<indexterm zone="xmlSecX509StoreId"><primary sortas="xmlSecX509StoreId">xmlSecX509StoreId</primary></indexterm><programlisting>#define xmlSecX509StoreId                       xmlSecX509StoreGetKlass()
+<indexterm zone="xmlSecX509StoreId"><primary>xmlSecX509StoreId</primary></indexterm>
+<programlisting>#define xmlSecX509StoreId                       xmlSecX509StoreGetKlass()
 </programlisting>
 <para>
-The  X509 store klass.</para>
-<para>
+The  X509 store klass.
 </para></refsect2>
 <refsect2 id="xmlSecX509StoreGetKlass" role="function">
 <title>xmlSecX509StoreGetKlass ()</title>
-<indexterm zone="xmlSecX509StoreGetKlass"><primary sortas="xmlSecX509StoreGetKlass">xmlSecX509StoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>  xmlSecX509StoreGetKlass           (void);</programlisting>
-<para>
-The X509 certificates key data store klass.</para>
+<indexterm zone="xmlSecX509StoreGetKlass"><primary>xmlSecX509StoreGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataStoreId"><returnvalue>xmlSecKeyDataStoreId</returnvalue></link>  xmlSecX509StoreGetKlass           (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The X509 certificates key data store klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to X509 certificates key data store klass or NULL if
 an error occurs (xmlsec-crypto library is not loaded or the raw X509
@@ -390,18 +381,18 @@ cert key data klass is not implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformAes128CbcId" role="macro">
 <title>xmlSecTransformAes128CbcId</title>
-<indexterm zone="xmlSecTransformAes128CbcId"><primary sortas="xmlSecTransformAes128CbcId">xmlSecTransformAes128CbcId</primary></indexterm><programlisting>#define xmlSecTransformAes128CbcId              xmlSecTransformAes128CbcGetKlass()
+<indexterm zone="xmlSecTransformAes128CbcId"><primary>xmlSecTransformAes128CbcId</primary></indexterm>
+<programlisting>#define xmlSecTransformAes128CbcId              xmlSecTransformAes128CbcGetKlass()
 </programlisting>
 <para>
-The AES128 CBC cipher transform klass.</para>
-<para>
+The AES128 CBC cipher transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformAes128CbcGetKlass" role="function">
 <title>xmlSecTransformAes128CbcGetKlass ()</title>
-<indexterm zone="xmlSecTransformAes128CbcGetKlass"><primary sortas="xmlSecTransformAes128CbcGetKlass">xmlSecTransformAes128CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformAes128CbcGetKlass    (void);</programlisting>
-<para>
-AES 128 CBC encryption transform klass.</para>
+<indexterm zone="xmlSecTransformAes128CbcGetKlass"><primary>xmlSecTransformAes128CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformAes128CbcGetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+AES 128 CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 128 CBC encryption transform or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -410,18 +401,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformAes192CbcId" role="macro">
 <title>xmlSecTransformAes192CbcId</title>
-<indexterm zone="xmlSecTransformAes192CbcId"><primary sortas="xmlSecTransformAes192CbcId">xmlSecTransformAes192CbcId</primary></indexterm><programlisting>#define xmlSecTransformAes192CbcId              xmlSecTransformAes192CbcGetKlass()
+<indexterm zone="xmlSecTransformAes192CbcId"><primary>xmlSecTransformAes192CbcId</primary></indexterm>
+<programlisting>#define xmlSecTransformAes192CbcId              xmlSecTransformAes192CbcGetKlass()
 </programlisting>
 <para>
-The AES192 CBC cipher transform klass.</para>
-<para>
+The AES192 CBC cipher transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformAes192CbcGetKlass" role="function">
 <title>xmlSecTransformAes192CbcGetKlass ()</title>
-<indexterm zone="xmlSecTransformAes192CbcGetKlass"><primary sortas="xmlSecTransformAes192CbcGetKlass">xmlSecTransformAes192CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformAes192CbcGetKlass    (void);</programlisting>
-<para>
-AES 192 CBC encryption transform klass.</para>
+<indexterm zone="xmlSecTransformAes192CbcGetKlass"><primary>xmlSecTransformAes192CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformAes192CbcGetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+AES 192 CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 192 CBC encryption transform or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -430,18 +421,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformAes256CbcId" role="macro">
 <title>xmlSecTransformAes256CbcId</title>
-<indexterm zone="xmlSecTransformAes256CbcId"><primary sortas="xmlSecTransformAes256CbcId">xmlSecTransformAes256CbcId</primary></indexterm><programlisting>#define xmlSecTransformAes256CbcId              xmlSecTransformAes256CbcGetKlass()
+<indexterm zone="xmlSecTransformAes256CbcId"><primary>xmlSecTransformAes256CbcId</primary></indexterm>
+<programlisting>#define xmlSecTransformAes256CbcId              xmlSecTransformAes256CbcGetKlass()
 </programlisting>
 <para>
-The AES256 CBC cipher transform klass.</para>
-<para>
+The AES256 CBC cipher transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformAes256CbcGetKlass" role="function">
 <title>xmlSecTransformAes256CbcGetKlass ()</title>
-<indexterm zone="xmlSecTransformAes256CbcGetKlass"><primary sortas="xmlSecTransformAes256CbcGetKlass">xmlSecTransformAes256CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformAes256CbcGetKlass    (void);</programlisting>
-<para>
-AES 256 CBC encryption transform klass.</para>
+<indexterm zone="xmlSecTransformAes256CbcGetKlass"><primary>xmlSecTransformAes256CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformAes256CbcGetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+AES 256 CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 256 CBC encryption transform or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -450,18 +441,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformKWAes128Id" role="macro">
 <title>xmlSecTransformKWAes128Id</title>
-<indexterm zone="xmlSecTransformKWAes128Id"><primary sortas="xmlSecTransformKWAes128Id">xmlSecTransformKWAes128Id</primary></indexterm><programlisting>#define xmlSecTransformKWAes128Id               xmlSecTransformKWAes128GetKlass()
+<indexterm zone="xmlSecTransformKWAes128Id"><primary>xmlSecTransformKWAes128Id</primary></indexterm>
+<programlisting>#define xmlSecTransformKWAes128Id               xmlSecTransformKWAes128GetKlass()
 </programlisting>
 <para>
-The AES 128 key wrap transform klass.</para>
-<para>
+The AES 128 key wrap transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformKWAes128GetKlass" role="function">
 <title>xmlSecTransformKWAes128GetKlass ()</title>
-<indexterm zone="xmlSecTransformKWAes128GetKlass"><primary sortas="xmlSecTransformKWAes128GetKlass">xmlSecTransformKWAes128GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformKWAes128GetKlass     (void);</programlisting>
-<para>
-The AES-128 kew wrapper transform klass.</para>
+<indexterm zone="xmlSecTransformKWAes128GetKlass"><primary>xmlSecTransformKWAes128GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformKWAes128GetKlass     (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The AES-128 kew wrapper transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-128 kew wrapper transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -470,18 +461,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformKWAes192Id" role="macro">
 <title>xmlSecTransformKWAes192Id</title>
-<indexterm zone="xmlSecTransformKWAes192Id"><primary sortas="xmlSecTransformKWAes192Id">xmlSecTransformKWAes192Id</primary></indexterm><programlisting>#define xmlSecTransformKWAes192Id               xmlSecTransformKWAes192GetKlass()
+<indexterm zone="xmlSecTransformKWAes192Id"><primary>xmlSecTransformKWAes192Id</primary></indexterm>
+<programlisting>#define xmlSecTransformKWAes192Id               xmlSecTransformKWAes192GetKlass()
 </programlisting>
 <para>
-The AES 192 key wrap transform klass.</para>
-<para>
+The AES 192 key wrap transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformKWAes192GetKlass" role="function">
 <title>xmlSecTransformKWAes192GetKlass ()</title>
-<indexterm zone="xmlSecTransformKWAes192GetKlass"><primary sortas="xmlSecTransformKWAes192GetKlass">xmlSecTransformKWAes192GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformKWAes192GetKlass     (void);</programlisting>
-<para>
-The AES-192 kew wrapper transform klass.</para>
+<indexterm zone="xmlSecTransformKWAes192GetKlass"><primary>xmlSecTransformKWAes192GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformKWAes192GetKlass     (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The AES-192 kew wrapper transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-192 kew wrapper transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -490,18 +481,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformKWAes256Id" role="macro">
 <title>xmlSecTransformKWAes256Id</title>
-<indexterm zone="xmlSecTransformKWAes256Id"><primary sortas="xmlSecTransformKWAes256Id">xmlSecTransformKWAes256Id</primary></indexterm><programlisting>#define xmlSecTransformKWAes256Id               xmlSecTransformKWAes256GetKlass()
+<indexterm zone="xmlSecTransformKWAes256Id"><primary>xmlSecTransformKWAes256Id</primary></indexterm>
+<programlisting>#define xmlSecTransformKWAes256Id               xmlSecTransformKWAes256GetKlass()
 </programlisting>
 <para>
-The AES 256 key wrap transform klass.</para>
-<para>
+The AES 256 key wrap transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformKWAes256GetKlass" role="function">
 <title>xmlSecTransformKWAes256GetKlass ()</title>
-<indexterm zone="xmlSecTransformKWAes256GetKlass"><primary sortas="xmlSecTransformKWAes256GetKlass">xmlSecTransformKWAes256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformKWAes256GetKlass     (void);</programlisting>
-<para>
-The AES-256 kew wrapper transform klass.</para>
+<indexterm zone="xmlSecTransformKWAes256GetKlass"><primary>xmlSecTransformKWAes256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformKWAes256GetKlass     (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The AES-256 kew wrapper transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-256 kew wrapper transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -510,18 +501,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformDes3CbcId" role="macro">
 <title>xmlSecTransformDes3CbcId</title>
-<indexterm zone="xmlSecTransformDes3CbcId"><primary sortas="xmlSecTransformDes3CbcId">xmlSecTransformDes3CbcId</primary></indexterm><programlisting>#define xmlSecTransformDes3CbcId                xmlSecTransformDes3CbcGetKlass()
+<indexterm zone="xmlSecTransformDes3CbcId"><primary>xmlSecTransformDes3CbcId</primary></indexterm>
+<programlisting>#define xmlSecTransformDes3CbcId                xmlSecTransformDes3CbcGetKlass()
 </programlisting>
 <para>
-The Triple DES encryption transform klass.</para>
-<para>
+The Triple DES encryption transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformDes3CbcGetKlass" role="function">
 <title>xmlSecTransformDes3CbcGetKlass ()</title>
-<indexterm zone="xmlSecTransformDes3CbcGetKlass"><primary sortas="xmlSecTransformDes3CbcGetKlass">xmlSecTransformDes3CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformDes3CbcGetKlass      (void);</programlisting>
-<para>
-Triple DES CBC encryption transform klass.</para>
+<indexterm zone="xmlSecTransformDes3CbcGetKlass"><primary>xmlSecTransformDes3CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformDes3CbcGetKlass      (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Triple DES CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to Triple DES encryption transform or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -530,18 +521,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformKWDes3Id" role="macro">
 <title>xmlSecTransformKWDes3Id</title>
-<indexterm zone="xmlSecTransformKWDes3Id"><primary sortas="xmlSecTransformKWDes3Id">xmlSecTransformKWDes3Id</primary></indexterm><programlisting>#define xmlSecTransformKWDes3Id                 xmlSecTransformKWDes3GetKlass()
+<indexterm zone="xmlSecTransformKWDes3Id"><primary>xmlSecTransformKWDes3Id</primary></indexterm>
+<programlisting>#define xmlSecTransformKWDes3Id                 xmlSecTransformKWDes3GetKlass()
 </programlisting>
 <para>
-The DES3 CBC cipher transform klass.</para>
-<para>
+The DES3 CBC cipher transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformKWDes3GetKlass" role="function">
 <title>xmlSecTransformKWDes3GetKlass ()</title>
-<indexterm zone="xmlSecTransformKWDes3GetKlass"><primary sortas="xmlSecTransformKWDes3GetKlass">xmlSecTransformKWDes3GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformKWDes3GetKlass       (void);</programlisting>
-<para>
-The Triple DES key wrapper transform klass.</para>
+<indexterm zone="xmlSecTransformKWDes3GetKlass"><primary>xmlSecTransformKWDes3GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformKWDes3GetKlass       (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The Triple DES key wrapper transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Triple DES key wrapper transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -550,18 +541,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformDsaSha1Id" role="macro">
 <title>xmlSecTransformDsaSha1Id</title>
-<indexterm zone="xmlSecTransformDsaSha1Id"><primary sortas="xmlSecTransformDsaSha1Id">xmlSecTransformDsaSha1Id</primary></indexterm><programlisting>#define xmlSecTransformDsaSha1Id                xmlSecTransformDsaSha1GetKlass()
+<indexterm zone="xmlSecTransformDsaSha1Id"><primary>xmlSecTransformDsaSha1Id</primary></indexterm>
+<programlisting>#define xmlSecTransformDsaSha1Id                xmlSecTransformDsaSha1GetKlass()
 </programlisting>
 <para>
-The DSA-SHA1 signature transform klass.</para>
-<para>
+The DSA-SHA1 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformDsaSha1GetKlass" role="function">
 <title>xmlSecTransformDsaSha1GetKlass ()</title>
-<indexterm zone="xmlSecTransformDsaSha1GetKlass"><primary sortas="xmlSecTransformDsaSha1GetKlass">xmlSecTransformDsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformDsaSha1GetKlass      (void);</programlisting>
-<para>
-The DSA-SHA1 signature transform klass.</para>
+<indexterm zone="xmlSecTransformDsaSha1GetKlass"><primary>xmlSecTransformDsaSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformDsaSha1GetKlass      (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The DSA-SHA1 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DSA-SHA1 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -570,19 +561,19 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformGost2001GostR3411-94Id" role="macro">
 <title>xmlSecTransformGost2001GostR3411_94Id</title>
-<indexterm zone="xmlSecTransformGost2001GostR3411-94Id"><primary sortas="xmlSecTransformGost2001GostR3411_94Id">xmlSecTransformGost2001GostR3411_94Id</primary></indexterm><programlisting>#define xmlSecTransformGost2001GostR3411_94Id           xmlSecTransformGost2001GostR3411_94GetKlass()
+<indexterm zone="xmlSecTransformGost2001GostR3411-94Id"><primary>xmlSecTransformGost2001GostR3411_94Id</primary></indexterm>
+<programlisting>#define xmlSecTransformGost2001GostR3411_94Id           xmlSecTransformGost2001GostR3411_94GetKlass()
 </programlisting>
 <para>
-The GOST2001-GOSTR3411_94 signature transform klass.</para>
-<para>
+The GOST2001-GOSTR3411_94 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformGost2001GostR3411-94GetKlass" role="function">
 <title>xmlSecTransformGost2001GostR3411_94GetKlass ()</title>
-<indexterm zone="xmlSecTransformGost2001GostR3411-94GetKlass"><primary sortas="xmlSecTransformGost2001GostR3411_94GetKlass">xmlSecTransformGost2001GostR3411_94GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformGost2001GostR3411_94GetKlass
-                                                        (void);</programlisting>
-<para>
-The GOST2001-GOSTR3411_94 signature transform klass.</para>
+<indexterm zone="xmlSecTransformGost2001GostR3411-94GetKlass"><primary>xmlSecTransformGost2001GostR3411_94GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformGost2001GostR3411_94GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The GOST2001-GOSTR3411_94 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> GOST2001-GOSTR3411_94 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -591,18 +582,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformHmacMd5Id" role="macro">
 <title>xmlSecTransformHmacMd5Id</title>
-<indexterm zone="xmlSecTransformHmacMd5Id"><primary sortas="xmlSecTransformHmacMd5Id">xmlSecTransformHmacMd5Id</primary></indexterm><programlisting>#define xmlSecTransformHmacMd5Id                xmlSecTransformHmacMd5GetKlass()
+<indexterm zone="xmlSecTransformHmacMd5Id"><primary>xmlSecTransformHmacMd5Id</primary></indexterm>
+<programlisting>#define xmlSecTransformHmacMd5Id                xmlSecTransformHmacMd5GetKlass()
 </programlisting>
 <para>
-The HMAC with MD5 signature transform klass.</para>
-<para>
+The HMAC with MD5 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformHmacMd5GetKlass" role="function">
 <title>xmlSecTransformHmacMd5GetKlass ()</title>
-<indexterm zone="xmlSecTransformHmacMd5GetKlass"><primary sortas="xmlSecTransformHmacMd5GetKlass">xmlSecTransformHmacMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformHmacMd5GetKlass      (void);</programlisting>
-<para>
-The HMAC-MD5 transform klass.</para>
+<indexterm zone="xmlSecTransformHmacMd5GetKlass"><primary>xmlSecTransformHmacMd5GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformHmacMd5GetKlass      (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-MD5 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-MD5 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -611,19 +602,19 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformHmacRipemd160Id" role="macro">
 <title>xmlSecTransformHmacRipemd160Id</title>
-<indexterm zone="xmlSecTransformHmacRipemd160Id"><primary sortas="xmlSecTransformHmacRipemd160Id">xmlSecTransformHmacRipemd160Id</primary></indexterm><programlisting>#define xmlSecTransformHmacRipemd160Id          xmlSecTransformHmacRipemd160GetKlass()
+<indexterm zone="xmlSecTransformHmacRipemd160Id"><primary>xmlSecTransformHmacRipemd160Id</primary></indexterm>
+<programlisting>#define xmlSecTransformHmacRipemd160Id          xmlSecTransformHmacRipemd160GetKlass()
 </programlisting>
 <para>
-The HMAC with RipeMD160 signature transform klass.</para>
-<para>
+The HMAC with RipeMD160 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformHmacRipemd160GetKlass" role="function">
 <title>xmlSecTransformHmacRipemd160GetKlass ()</title>
-<indexterm zone="xmlSecTransformHmacRipemd160GetKlass"><primary sortas="xmlSecTransformHmacRipemd160GetKlass">xmlSecTransformHmacRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformHmacRipemd160GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-RIPEMD160 transform klass.</para>
+<indexterm zone="xmlSecTransformHmacRipemd160GetKlass"><primary>xmlSecTransformHmacRipemd160GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformHmacRipemd160GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-RIPEMD160 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-RIPEMD160 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -632,18 +623,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformHmacSha1Id" role="macro">
 <title>xmlSecTransformHmacSha1Id</title>
-<indexterm zone="xmlSecTransformHmacSha1Id"><primary sortas="xmlSecTransformHmacSha1Id">xmlSecTransformHmacSha1Id</primary></indexterm><programlisting>#define xmlSecTransformHmacSha1Id               xmlSecTransformHmacSha1GetKlass()
+<indexterm zone="xmlSecTransformHmacSha1Id"><primary>xmlSecTransformHmacSha1Id</primary></indexterm>
+<programlisting>#define xmlSecTransformHmacSha1Id               xmlSecTransformHmacSha1GetKlass()
 </programlisting>
 <para>
-The HMAC with SHA1 signature transform klass.</para>
-<para>
+The HMAC with SHA1 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformHmacSha1GetKlass" role="function">
 <title>xmlSecTransformHmacSha1GetKlass ()</title>
-<indexterm zone="xmlSecTransformHmacSha1GetKlass"><primary sortas="xmlSecTransformHmacSha1GetKlass">xmlSecTransformHmacSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformHmacSha1GetKlass     (void);</programlisting>
-<para>
-The HMAC-SHA1 transform klass.</para>
+<indexterm zone="xmlSecTransformHmacSha1GetKlass"><primary>xmlSecTransformHmacSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformHmacSha1GetKlass     (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA1 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA1 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -652,18 +643,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformHmacSha224Id" role="macro">
 <title>xmlSecTransformHmacSha224Id</title>
-<indexterm zone="xmlSecTransformHmacSha224Id"><primary sortas="xmlSecTransformHmacSha224Id">xmlSecTransformHmacSha224Id</primary></indexterm><programlisting>#define xmlSecTransformHmacSha224Id             xmlSecTransformHmacSha224GetKlass()
+<indexterm zone="xmlSecTransformHmacSha224Id"><primary>xmlSecTransformHmacSha224Id</primary></indexterm>
+<programlisting>#define xmlSecTransformHmacSha224Id             xmlSecTransformHmacSha224GetKlass()
 </programlisting>
 <para>
-The HMAC with SHA224 signature transform klass.</para>
-<para>
+The HMAC with SHA224 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformHmacSha224GetKlass" role="function">
 <title>xmlSecTransformHmacSha224GetKlass ()</title>
-<indexterm zone="xmlSecTransformHmacSha224GetKlass"><primary sortas="xmlSecTransformHmacSha224GetKlass">xmlSecTransformHmacSha224GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformHmacSha224GetKlass   (void);</programlisting>
-<para>
-The HMAC-SHA224 transform klass.</para>
+<indexterm zone="xmlSecTransformHmacSha224GetKlass"><primary>xmlSecTransformHmacSha224GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformHmacSha224GetKlass   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA224 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA224 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -672,18 +663,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformHmacSha256Id" role="macro">
 <title>xmlSecTransformHmacSha256Id</title>
-<indexterm zone="xmlSecTransformHmacSha256Id"><primary sortas="xmlSecTransformHmacSha256Id">xmlSecTransformHmacSha256Id</primary></indexterm><programlisting>#define xmlSecTransformHmacSha256Id             xmlSecTransformHmacSha256GetKlass()
+<indexterm zone="xmlSecTransformHmacSha256Id"><primary>xmlSecTransformHmacSha256Id</primary></indexterm>
+<programlisting>#define xmlSecTransformHmacSha256Id             xmlSecTransformHmacSha256GetKlass()
 </programlisting>
 <para>
-The HMAC with SHA256 signature transform klass.</para>
-<para>
+The HMAC with SHA256 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformHmacSha256GetKlass" role="function">
 <title>xmlSecTransformHmacSha256GetKlass ()</title>
-<indexterm zone="xmlSecTransformHmacSha256GetKlass"><primary sortas="xmlSecTransformHmacSha256GetKlass">xmlSecTransformHmacSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformHmacSha256GetKlass   (void);</programlisting>
-<para>
-The HMAC-SHA256 transform klass.</para>
+<indexterm zone="xmlSecTransformHmacSha256GetKlass"><primary>xmlSecTransformHmacSha256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformHmacSha256GetKlass   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA256 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA256 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -692,18 +683,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformHmacSha384Id" role="macro">
 <title>xmlSecTransformHmacSha384Id</title>
-<indexterm zone="xmlSecTransformHmacSha384Id"><primary sortas="xmlSecTransformHmacSha384Id">xmlSecTransformHmacSha384Id</primary></indexterm><programlisting>#define xmlSecTransformHmacSha384Id             xmlSecTransformHmacSha384GetKlass()
+<indexterm zone="xmlSecTransformHmacSha384Id"><primary>xmlSecTransformHmacSha384Id</primary></indexterm>
+<programlisting>#define xmlSecTransformHmacSha384Id             xmlSecTransformHmacSha384GetKlass()
 </programlisting>
 <para>
-The HMAC with SHA384 signature transform klass.</para>
-<para>
+The HMAC with SHA384 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformHmacSha384GetKlass" role="function">
 <title>xmlSecTransformHmacSha384GetKlass ()</title>
-<indexterm zone="xmlSecTransformHmacSha384GetKlass"><primary sortas="xmlSecTransformHmacSha384GetKlass">xmlSecTransformHmacSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformHmacSha384GetKlass   (void);</programlisting>
-<para>
-The HMAC-SHA384 transform klass.</para>
+<indexterm zone="xmlSecTransformHmacSha384GetKlass"><primary>xmlSecTransformHmacSha384GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformHmacSha384GetKlass   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA384 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA384 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -712,18 +703,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformHmacSha512Id" role="macro">
 <title>xmlSecTransformHmacSha512Id</title>
-<indexterm zone="xmlSecTransformHmacSha512Id"><primary sortas="xmlSecTransformHmacSha512Id">xmlSecTransformHmacSha512Id</primary></indexterm><programlisting>#define xmlSecTransformHmacSha512Id             xmlSecTransformHmacSha512GetKlass()
+<indexterm zone="xmlSecTransformHmacSha512Id"><primary>xmlSecTransformHmacSha512Id</primary></indexterm>
+<programlisting>#define xmlSecTransformHmacSha512Id             xmlSecTransformHmacSha512GetKlass()
 </programlisting>
 <para>
-The HMAC with SHA512 signature transform klass.</para>
-<para>
+The HMAC with SHA512 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformHmacSha512GetKlass" role="function">
 <title>xmlSecTransformHmacSha512GetKlass ()</title>
-<indexterm zone="xmlSecTransformHmacSha512GetKlass"><primary sortas="xmlSecTransformHmacSha512GetKlass">xmlSecTransformHmacSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformHmacSha512GetKlass   (void);</programlisting>
-<para>
-The HMAC-SHA512 transform klass.</para>
+<indexterm zone="xmlSecTransformHmacSha512GetKlass"><primary>xmlSecTransformHmacSha512GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformHmacSha512GetKlass   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA512 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA512 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -732,18 +723,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformMd5Id" role="macro">
 <title>xmlSecTransformMd5Id</title>
-<indexterm zone="xmlSecTransformMd5Id"><primary sortas="xmlSecTransformMd5Id">xmlSecTransformMd5Id</primary></indexterm><programlisting>#define xmlSecTransformMd5Id                    xmlSecTransformMd5GetKlass()
+<indexterm zone="xmlSecTransformMd5Id"><primary>xmlSecTransformMd5Id</primary></indexterm>
+<programlisting>#define xmlSecTransformMd5Id                    xmlSecTransformMd5GetKlass()
 </programlisting>
 <para>
-The MD5 digest transform klass.</para>
-<para>
+The MD5 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformMd5GetKlass" role="function">
 <title>xmlSecTransformMd5GetKlass ()</title>
-<indexterm zone="xmlSecTransformMd5GetKlass"><primary sortas="xmlSecTransformMd5GetKlass">xmlSecTransformMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformMd5GetKlass          (void);</programlisting>
-<para>
-MD5 digest transform klass.</para>
+<indexterm zone="xmlSecTransformMd5GetKlass"><primary>xmlSecTransformMd5GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformMd5GetKlass          (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+MD5 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to MD5 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -752,18 +743,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformRipemd160Id" role="macro">
 <title>xmlSecTransformRipemd160Id</title>
-<indexterm zone="xmlSecTransformRipemd160Id"><primary sortas="xmlSecTransformRipemd160Id">xmlSecTransformRipemd160Id</primary></indexterm><programlisting>#define xmlSecTransformRipemd160Id              xmlSecTransformRipemd160GetKlass()
+<indexterm zone="xmlSecTransformRipemd160Id"><primary>xmlSecTransformRipemd160Id</primary></indexterm>
+<programlisting>#define xmlSecTransformRipemd160Id              xmlSecTransformRipemd160GetKlass()
 </programlisting>
 <para>
-The RIPEMD160 digest transform klass.</para>
-<para>
+The RIPEMD160 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformRipemd160GetKlass" role="function">
 <title>xmlSecTransformRipemd160GetKlass ()</title>
-<indexterm zone="xmlSecTransformRipemd160GetKlass"><primary sortas="xmlSecTransformRipemd160GetKlass">xmlSecTransformRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRipemd160GetKlass    (void);</programlisting>
-<para>
-RIPEMD-160 digest transform klass.</para>
+<indexterm zone="xmlSecTransformRipemd160GetKlass"><primary>xmlSecTransformRipemd160GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformRipemd160GetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+RIPEMD-160 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to RIPEMD-160 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -772,18 +763,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformRsaMd5Id" role="macro">
 <title>xmlSecTransformRsaMd5Id</title>
-<indexterm zone="xmlSecTransformRsaMd5Id"><primary sortas="xmlSecTransformRsaMd5Id">xmlSecTransformRsaMd5Id</primary></indexterm><programlisting>#define xmlSecTransformRsaMd5Id                 xmlSecTransformRsaMd5GetKlass()
+<indexterm zone="xmlSecTransformRsaMd5Id"><primary>xmlSecTransformRsaMd5Id</primary></indexterm>
+<programlisting>#define xmlSecTransformRsaMd5Id                 xmlSecTransformRsaMd5GetKlass()
 </programlisting>
 <para>
-The RSA-MD5 signature transform klass.</para>
-<para>
+The RSA-MD5 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformRsaMd5GetKlass" role="function">
 <title>xmlSecTransformRsaMd5GetKlass ()</title>
-<indexterm zone="xmlSecTransformRsaMd5GetKlass"><primary sortas="xmlSecTransformRsaMd5GetKlass">xmlSecTransformRsaMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRsaMd5GetKlass       (void);</programlisting>
-<para>
-The RSA-MD5 signature transform klass.</para>
+<indexterm zone="xmlSecTransformRsaMd5GetKlass"><primary>xmlSecTransformRsaMd5GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformRsaMd5GetKlass       (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-MD5 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-MD5 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -792,18 +783,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformRsaRipemd160Id" role="macro">
 <title>xmlSecTransformRsaRipemd160Id</title>
-<indexterm zone="xmlSecTransformRsaRipemd160Id"><primary sortas="xmlSecTransformRsaRipemd160Id">xmlSecTransformRsaRipemd160Id</primary></indexterm><programlisting>#define xmlSecTransformRsaRipemd160Id           xmlSecTransformRsaRipemd160GetKlass()
+<indexterm zone="xmlSecTransformRsaRipemd160Id"><primary>xmlSecTransformRsaRipemd160Id</primary></indexterm>
+<programlisting>#define xmlSecTransformRsaRipemd160Id           xmlSecTransformRsaRipemd160GetKlass()
 </programlisting>
 <para>
-The RSA-RIPEMD160 signature transform klass.</para>
-<para>
+The RSA-RIPEMD160 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformRsaRipemd160GetKlass" role="function">
 <title>xmlSecTransformRsaRipemd160GetKlass ()</title>
-<indexterm zone="xmlSecTransformRsaRipemd160GetKlass"><primary sortas="xmlSecTransformRsaRipemd160GetKlass">xmlSecTransformRsaRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRsaRipemd160GetKlass (void);</programlisting>
-<para>
-The RSA-RIPEMD160 signature transform klass.</para>
+<indexterm zone="xmlSecTransformRsaRipemd160GetKlass"><primary>xmlSecTransformRsaRipemd160GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformRsaRipemd160GetKlass (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-RIPEMD160 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-RIPEMD160 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -812,18 +803,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformRsaSha1Id" role="macro">
 <title>xmlSecTransformRsaSha1Id</title>
-<indexterm zone="xmlSecTransformRsaSha1Id"><primary sortas="xmlSecTransformRsaSha1Id">xmlSecTransformRsaSha1Id</primary></indexterm><programlisting>#define xmlSecTransformRsaSha1Id                xmlSecTransformRsaSha1GetKlass()
+<indexterm zone="xmlSecTransformRsaSha1Id"><primary>xmlSecTransformRsaSha1Id</primary></indexterm>
+<programlisting>#define xmlSecTransformRsaSha1Id                xmlSecTransformRsaSha1GetKlass()
 </programlisting>
 <para>
-The RSA-SHA1 signature transform klass.</para>
-<para>
+The RSA-SHA1 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformRsaSha1GetKlass" role="function">
 <title>xmlSecTransformRsaSha1GetKlass ()</title>
-<indexterm zone="xmlSecTransformRsaSha1GetKlass"><primary sortas="xmlSecTransformRsaSha1GetKlass">xmlSecTransformRsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRsaSha1GetKlass      (void);</programlisting>
-<para>
-The RSA-SHA1 signature transform klass.</para>
+<indexterm zone="xmlSecTransformRsaSha1GetKlass"><primary>xmlSecTransformRsaSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformRsaSha1GetKlass      (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-SHA1 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA1 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -832,18 +823,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformRsaSha224Id" role="macro">
 <title>xmlSecTransformRsaSha224Id</title>
-<indexterm zone="xmlSecTransformRsaSha224Id"><primary sortas="xmlSecTransformRsaSha224Id">xmlSecTransformRsaSha224Id</primary></indexterm><programlisting>#define xmlSecTransformRsaSha224Id              xmlSecTransformRsaSha224GetKlass()
+<indexterm zone="xmlSecTransformRsaSha224Id"><primary>xmlSecTransformRsaSha224Id</primary></indexterm>
+<programlisting>#define xmlSecTransformRsaSha224Id              xmlSecTransformRsaSha224GetKlass()
 </programlisting>
 <para>
-The RSA-SHA224 signature transform klass.</para>
-<para>
+The RSA-SHA224 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformRsaSha224GetKlass" role="function">
 <title>xmlSecTransformRsaSha224GetKlass ()</title>
-<indexterm zone="xmlSecTransformRsaSha224GetKlass"><primary sortas="xmlSecTransformRsaSha224GetKlass">xmlSecTransformRsaSha224GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRsaSha224GetKlass    (void);</programlisting>
-<para>
-The RSA-SHA224 signature transform klass.</para>
+<indexterm zone="xmlSecTransformRsaSha224GetKlass"><primary>xmlSecTransformRsaSha224GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformRsaSha224GetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-SHA224 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA224 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -852,18 +843,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformRsaSha256Id" role="macro">
 <title>xmlSecTransformRsaSha256Id</title>
-<indexterm zone="xmlSecTransformRsaSha256Id"><primary sortas="xmlSecTransformRsaSha256Id">xmlSecTransformRsaSha256Id</primary></indexterm><programlisting>#define xmlSecTransformRsaSha256Id              xmlSecTransformRsaSha256GetKlass()
+<indexterm zone="xmlSecTransformRsaSha256Id"><primary>xmlSecTransformRsaSha256Id</primary></indexterm>
+<programlisting>#define xmlSecTransformRsaSha256Id              xmlSecTransformRsaSha256GetKlass()
 </programlisting>
 <para>
-The RSA-SHA256 signature transform klass.</para>
-<para>
+The RSA-SHA256 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformRsaSha256GetKlass" role="function">
 <title>xmlSecTransformRsaSha256GetKlass ()</title>
-<indexterm zone="xmlSecTransformRsaSha256GetKlass"><primary sortas="xmlSecTransformRsaSha256GetKlass">xmlSecTransformRsaSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRsaSha256GetKlass    (void);</programlisting>
-<para>
-The RSA-SHA256 signature transform klass.</para>
+<indexterm zone="xmlSecTransformRsaSha256GetKlass"><primary>xmlSecTransformRsaSha256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformRsaSha256GetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-SHA256 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA256 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -872,18 +863,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformRsaSha384Id" role="macro">
 <title>xmlSecTransformRsaSha384Id</title>
-<indexterm zone="xmlSecTransformRsaSha384Id"><primary sortas="xmlSecTransformRsaSha384Id">xmlSecTransformRsaSha384Id</primary></indexterm><programlisting>#define xmlSecTransformRsaSha384Id              xmlSecTransformRsaSha384GetKlass()
+<indexterm zone="xmlSecTransformRsaSha384Id"><primary>xmlSecTransformRsaSha384Id</primary></indexterm>
+<programlisting>#define xmlSecTransformRsaSha384Id              xmlSecTransformRsaSha384GetKlass()
 </programlisting>
 <para>
-The RSA-SHA384 signature transform klass.</para>
-<para>
+The RSA-SHA384 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformRsaSha384GetKlass" role="function">
 <title>xmlSecTransformRsaSha384GetKlass ()</title>
-<indexterm zone="xmlSecTransformRsaSha384GetKlass"><primary sortas="xmlSecTransformRsaSha384GetKlass">xmlSecTransformRsaSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRsaSha384GetKlass    (void);</programlisting>
-<para>
-The RSA-SHA384 signature transform klass.</para>
+<indexterm zone="xmlSecTransformRsaSha384GetKlass"><primary>xmlSecTransformRsaSha384GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformRsaSha384GetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-SHA384 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA384 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -892,18 +883,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformRsaSha512Id" role="macro">
 <title>xmlSecTransformRsaSha512Id</title>
-<indexterm zone="xmlSecTransformRsaSha512Id"><primary sortas="xmlSecTransformRsaSha512Id">xmlSecTransformRsaSha512Id</primary></indexterm><programlisting>#define xmlSecTransformRsaSha512Id              xmlSecTransformRsaSha512GetKlass()
+<indexterm zone="xmlSecTransformRsaSha512Id"><primary>xmlSecTransformRsaSha512Id</primary></indexterm>
+<programlisting>#define xmlSecTransformRsaSha512Id              xmlSecTransformRsaSha512GetKlass()
 </programlisting>
 <para>
-The RSA-SHA512 signature transform klass.</para>
-<para>
+The RSA-SHA512 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformRsaSha512GetKlass" role="function">
 <title>xmlSecTransformRsaSha512GetKlass ()</title>
-<indexterm zone="xmlSecTransformRsaSha512GetKlass"><primary sortas="xmlSecTransformRsaSha512GetKlass">xmlSecTransformRsaSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRsaSha512GetKlass    (void);</programlisting>
-<para>
-The RSA-SHA512 signature transform klass.</para>
+<indexterm zone="xmlSecTransformRsaSha512GetKlass"><primary>xmlSecTransformRsaSha512GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformRsaSha512GetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-SHA512 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA512 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -912,18 +903,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformRsaPkcs1Id" role="macro">
 <title>xmlSecTransformRsaPkcs1Id</title>
-<indexterm zone="xmlSecTransformRsaPkcs1Id"><primary sortas="xmlSecTransformRsaPkcs1Id">xmlSecTransformRsaPkcs1Id</primary></indexterm><programlisting>#define xmlSecTransformRsaPkcs1Id               xmlSecTransformRsaPkcs1GetKlass()
+<indexterm zone="xmlSecTransformRsaPkcs1Id"><primary>xmlSecTransformRsaPkcs1Id</primary></indexterm>
+<programlisting>#define xmlSecTransformRsaPkcs1Id               xmlSecTransformRsaPkcs1GetKlass()
 </programlisting>
 <para>
-The RSA PKCS1 key transport transform klass.</para>
-<para>
+The RSA PKCS1 key transport transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformRsaPkcs1GetKlass" role="function">
 <title>xmlSecTransformRsaPkcs1GetKlass ()</title>
-<indexterm zone="xmlSecTransformRsaPkcs1GetKlass"><primary sortas="xmlSecTransformRsaPkcs1GetKlass">xmlSecTransformRsaPkcs1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRsaPkcs1GetKlass     (void);</programlisting>
-<para>
-The RSA-PKCS1 key transport transform klass.</para>
+<indexterm zone="xmlSecTransformRsaPkcs1GetKlass"><primary>xmlSecTransformRsaPkcs1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformRsaPkcs1GetKlass     (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-PKCS1 key transport transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-PKCS1 key transport transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -932,18 +923,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformRsaOaepId" role="macro">
 <title>xmlSecTransformRsaOaepId</title>
-<indexterm zone="xmlSecTransformRsaOaepId"><primary sortas="xmlSecTransformRsaOaepId">xmlSecTransformRsaOaepId</primary></indexterm><programlisting>#define xmlSecTransformRsaOaepId                xmlSecTransformRsaOaepGetKlass()
+<indexterm zone="xmlSecTransformRsaOaepId"><primary>xmlSecTransformRsaOaepId</primary></indexterm>
+<programlisting>#define xmlSecTransformRsaOaepId                xmlSecTransformRsaOaepGetKlass()
 </programlisting>
 <para>
-The RSA PKCS1 key transport transform klass.</para>
-<para>
+The RSA PKCS1 key transport transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformRsaOaepGetKlass" role="function">
 <title>xmlSecTransformRsaOaepGetKlass ()</title>
-<indexterm zone="xmlSecTransformRsaOaepGetKlass"><primary sortas="xmlSecTransformRsaOaepGetKlass">xmlSecTransformRsaOaepGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRsaOaepGetKlass      (void);</programlisting>
-<para>
-The RSA-OAEP key transport transform klass.</para>
+<indexterm zone="xmlSecTransformRsaOaepGetKlass"><primary>xmlSecTransformRsaOaepGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformRsaOaepGetKlass      (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-OAEP key transport transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-OAEP key transport transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -952,18 +943,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformGostR3411-94Id" role="macro">
 <title>xmlSecTransformGostR3411_94Id</title>
-<indexterm zone="xmlSecTransformGostR3411-94Id"><primary sortas="xmlSecTransformGostR3411_94Id">xmlSecTransformGostR3411_94Id</primary></indexterm><programlisting>#define xmlSecTransformGostR3411_94Id                   xmlSecTransformGostR3411_94GetKlass()
+<indexterm zone="xmlSecTransformGostR3411-94Id"><primary>xmlSecTransformGostR3411_94Id</primary></indexterm>
+<programlisting>#define xmlSecTransformGostR3411_94Id                   xmlSecTransformGostR3411_94GetKlass()
 </programlisting>
 <para>
-The GOSTR3411_94 digest transform klass.</para>
-<para>
+The GOSTR3411_94 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformGostR3411-94GetKlass" role="function">
 <title>xmlSecTransformGostR3411_94GetKlass ()</title>
-<indexterm zone="xmlSecTransformGostR3411-94GetKlass"><primary sortas="xmlSecTransformGostR3411_94GetKlass">xmlSecTransformGostR3411_94GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformGostR3411_94GetKlass (void);</programlisting>
-<para>
-GOSTR3411_94 digest transform klass.</para>
+<indexterm zone="xmlSecTransformGostR3411-94GetKlass"><primary>xmlSecTransformGostR3411_94GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformGostR3411_94GetKlass (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+GOSTR3411_94 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to GOSTR3411_94 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -972,18 +963,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformSha1Id" role="macro">
 <title>xmlSecTransformSha1Id</title>
-<indexterm zone="xmlSecTransformSha1Id"><primary sortas="xmlSecTransformSha1Id">xmlSecTransformSha1Id</primary></indexterm><programlisting>#define xmlSecTransformSha1Id                   xmlSecTransformSha1GetKlass()
+<indexterm zone="xmlSecTransformSha1Id"><primary>xmlSecTransformSha1Id</primary></indexterm>
+<programlisting>#define xmlSecTransformSha1Id                   xmlSecTransformSha1GetKlass()
 </programlisting>
 <para>
-The SHA1 digest transform klass.</para>
-<para>
+The SHA1 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformSha1GetKlass" role="function">
 <title>xmlSecTransformSha1GetKlass ()</title>
-<indexterm zone="xmlSecTransformSha1GetKlass"><primary sortas="xmlSecTransformSha1GetKlass">xmlSecTransformSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformSha1GetKlass         (void);</programlisting>
-<para>
-SHA-1 digest transform klass.</para>
+<indexterm zone="xmlSecTransformSha1GetKlass"><primary>xmlSecTransformSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformSha1GetKlass         (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA-1 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-1 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -992,18 +983,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformSha224Id" role="macro">
 <title>xmlSecTransformSha224Id</title>
-<indexterm zone="xmlSecTransformSha224Id"><primary sortas="xmlSecTransformSha224Id">xmlSecTransformSha224Id</primary></indexterm><programlisting>#define xmlSecTransformSha224Id                 xmlSecTransformSha224GetKlass()
+<indexterm zone="xmlSecTransformSha224Id"><primary>xmlSecTransformSha224Id</primary></indexterm>
+<programlisting>#define xmlSecTransformSha224Id                 xmlSecTransformSha224GetKlass()
 </programlisting>
 <para>
-The SHA224 digest transform klass.</para>
-<para>
+The SHA224 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformSha224GetKlass" role="function">
 <title>xmlSecTransformSha224GetKlass ()</title>
-<indexterm zone="xmlSecTransformSha224GetKlass"><primary sortas="xmlSecTransformSha224GetKlass">xmlSecTransformSha224GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformSha224GetKlass       (void);</programlisting>
-<para>
-SHA224 digest transform klass.</para>
+<indexterm zone="xmlSecTransformSha224GetKlass"><primary>xmlSecTransformSha224GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformSha224GetKlass       (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA224 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA224 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -1012,18 +1003,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformSha256Id" role="macro">
 <title>xmlSecTransformSha256Id</title>
-<indexterm zone="xmlSecTransformSha256Id"><primary sortas="xmlSecTransformSha256Id">xmlSecTransformSha256Id</primary></indexterm><programlisting>#define xmlSecTransformSha256Id                 xmlSecTransformSha256GetKlass()
+<indexterm zone="xmlSecTransformSha256Id"><primary>xmlSecTransformSha256Id</primary></indexterm>
+<programlisting>#define xmlSecTransformSha256Id                 xmlSecTransformSha256GetKlass()
 </programlisting>
 <para>
-The SHA256 digest transform klass.</para>
-<para>
+The SHA256 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformSha256GetKlass" role="function">
 <title>xmlSecTransformSha256GetKlass ()</title>
-<indexterm zone="xmlSecTransformSha256GetKlass"><primary sortas="xmlSecTransformSha256GetKlass">xmlSecTransformSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformSha256GetKlass       (void);</programlisting>
-<para>
-SHA256 digest transform klass.</para>
+<indexterm zone="xmlSecTransformSha256GetKlass"><primary>xmlSecTransformSha256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformSha256GetKlass       (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA256 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA256 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -1032,18 +1023,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformSha384Id" role="macro">
 <title>xmlSecTransformSha384Id</title>
-<indexterm zone="xmlSecTransformSha384Id"><primary sortas="xmlSecTransformSha384Id">xmlSecTransformSha384Id</primary></indexterm><programlisting>#define xmlSecTransformSha384Id                 xmlSecTransformSha384GetKlass()
+<indexterm zone="xmlSecTransformSha384Id"><primary>xmlSecTransformSha384Id</primary></indexterm>
+<programlisting>#define xmlSecTransformSha384Id                 xmlSecTransformSha384GetKlass()
 </programlisting>
 <para>
-The SHA384 digest transform klass.</para>
-<para>
+The SHA384 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformSha384GetKlass" role="function">
 <title>xmlSecTransformSha384GetKlass ()</title>
-<indexterm zone="xmlSecTransformSha384GetKlass"><primary sortas="xmlSecTransformSha384GetKlass">xmlSecTransformSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformSha384GetKlass       (void);</programlisting>
-<para>
-SHA384 digest transform klass.</para>
+<indexterm zone="xmlSecTransformSha384GetKlass"><primary>xmlSecTransformSha384GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformSha384GetKlass       (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA384 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA384 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -1052,18 +1043,18 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformSha512Id" role="macro">
 <title>xmlSecTransformSha512Id</title>
-<indexterm zone="xmlSecTransformSha512Id"><primary sortas="xmlSecTransformSha512Id">xmlSecTransformSha512Id</primary></indexterm><programlisting>#define xmlSecTransformSha512Id                 xmlSecTransformSha512GetKlass()
+<indexterm zone="xmlSecTransformSha512Id"><primary>xmlSecTransformSha512Id</primary></indexterm>
+<programlisting>#define xmlSecTransformSha512Id                 xmlSecTransformSha512GetKlass()
 </programlisting>
 <para>
-The SHA512 digest transform klass.</para>
-<para>
+The SHA512 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformSha512GetKlass" role="function">
 <title>xmlSecTransformSha512GetKlass ()</title>
-<indexterm zone="xmlSecTransformSha512GetKlass"><primary sortas="xmlSecTransformSha512GetKlass">xmlSecTransformSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformSha512GetKlass       (void);</programlisting>
-<para>
-SHA512 digest transform klass.</para>
+<indexterm zone="xmlSecTransformSha512GetKlass"><primary>xmlSecTransformSha512GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformSha512GetKlass       (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA512 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA512 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
@@ -1072,125 +1063,125 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppInit" role="function">
 <title>xmlSecCryptoAppInit ()</title>
-<indexterm zone="xmlSecCryptoAppInit"><primary sortas="xmlSecCryptoAppInit">xmlSecCryptoAppInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoAppInit                 (const <link linkend="char">char</link> *config);</programlisting>
+<indexterm zone="xmlSecCryptoAppInit"><primary>xmlSecCryptoAppInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCryptoAppInit                 (<parameter>const <link linkend="char"><type>char</type></link> *config</parameter>);</programlisting>
 <para>
 General crypto engine initialization. This function is used
 by XMLSec command line utility and called before
-<parameter>xmlSecInit</parameter> function.</para>
-<para>
+<parameter>xmlSecInit</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>config</parameter>&#160;:</term>
-<listitem><simpara>             the path to crypto library configuration.
+<listitem><simpara>the path to crypto library configuration.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppShutdown" role="function">
 <title>xmlSecCryptoAppShutdown ()</title>
-<indexterm zone="xmlSecCryptoAppShutdown"><primary sortas="xmlSecCryptoAppShutdown">xmlSecCryptoAppShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoAppShutdown             (void);</programlisting>
+<indexterm zone="xmlSecCryptoAppShutdown"><primary>xmlSecCryptoAppShutdown</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCryptoAppShutdown             (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after
-<parameter>xmlSecShutdown</parameter> function.</para>
-<para>
+<parameter>xmlSecShutdown</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppDefaultKeysMngrInit" role="function">
 <title>xmlSecCryptoAppDefaultKeysMngrInit ()</title>
-<indexterm zone="xmlSecCryptoAppDefaultKeysMngrInit"><primary sortas="xmlSecCryptoAppDefaultKeysMngrInit">xmlSecCryptoAppDefaultKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoAppDefaultKeysMngrInit  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
+<indexterm zone="xmlSecCryptoAppDefaultKeysMngrInit"><primary>xmlSecCryptoAppDefaultKeysMngrInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCryptoAppDefaultKeysMngrInit  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);</programlisting>
 <para>
 Initializes <parameter>mngr</parameter> with simple keys store <link linkend="xmlSecSimpleKeysStoreId"><type>xmlSecSimpleKeysStoreId</type></link>
-and a default crypto key data stores.</para>
-<para>
+and a default crypto key data stores.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppDefaultKeysMngrAdoptKey" role="function">
 <title>xmlSecCryptoAppDefaultKeysMngrAdoptKey ()</title>
-<indexterm zone="xmlSecCryptoAppDefaultKeysMngrAdoptKey"><primary sortas="xmlSecCryptoAppDefaultKeysMngrAdoptKey">xmlSecCryptoAppDefaultKeysMngrAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoAppDefaultKeysMngrAdoptKey
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<indexterm zone="xmlSecCryptoAppDefaultKeysMngrAdoptKey"><primary>xmlSecCryptoAppDefaultKeysMngrAdoptKey</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCryptoAppDefaultKeysMngrAdoptKey
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);</programlisting>
 <para>
 Adds <parameter>key</parameter> to the keys manager <parameter>mngr</parameter> created with <link linkend="xmlSecCryptoAppDefaultKeysMngrInit"><type>xmlSecCryptoAppDefaultKeysMngrInit</type></link>
-function.</para>
-<para>
+function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppDefaultKeysMngrLoad" role="function">
 <title>xmlSecCryptoAppDefaultKeysMngrLoad ()</title>
-<indexterm zone="xmlSecCryptoAppDefaultKeysMngrLoad"><primary sortas="xmlSecCryptoAppDefaultKeysMngrLoad">xmlSecCryptoAppDefaultKeysMngrLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoAppDefaultKeysMngrLoad  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *uri);</programlisting>
+<indexterm zone="xmlSecCryptoAppDefaultKeysMngrLoad"><primary>xmlSecCryptoAppDefaultKeysMngrLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCryptoAppDefaultKeysMngrLoad  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *uri</parameter>);</programlisting>
 <para>
 Loads XML keys file from <parameter>uri</parameter> to the keys manager <parameter>mngr</parameter> created
-with <link linkend="xmlSecCryptoAppDefaultKeysMngrInit"><type>xmlSecCryptoAppDefaultKeysMngrInit</type></link> function.</para>
-<para>
+with <link linkend="xmlSecCryptoAppDefaultKeysMngrInit"><type>xmlSecCryptoAppDefaultKeysMngrInit</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>uri</parameter>&#160;:</term>
-<listitem><simpara>                the uri.
+<listitem><simpara>the uri.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppDefaultKeysMngrSave" role="function">
 <title>xmlSecCryptoAppDefaultKeysMngrSave ()</title>
-<indexterm zone="xmlSecCryptoAppDefaultKeysMngrSave"><primary sortas="xmlSecCryptoAppDefaultKeysMngrSave">xmlSecCryptoAppDefaultKeysMngrSave</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoAppDefaultKeysMngrSave  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
-<para>
-Saves keys from <parameter>mngr</parameter> to  XML keys file.</para>
+<indexterm zone="xmlSecCryptoAppDefaultKeysMngrSave"><primary>xmlSecCryptoAppDefaultKeysMngrSave</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCryptoAppDefaultKeysMngrSave  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
+Saves keys from <parameter>mngr</parameter> to  XML keys file.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the destination filename.
+<listitem><simpara>the destination filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the type of keys to save (public/private/symmetric).
+<listitem><simpara>the type of keys to save (public/private/symmetric).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppKeysMngrCertLoad" role="function">
 <title>xmlSecCryptoAppKeysMngrCertLoad ()</title>
-<indexterm zone="xmlSecCryptoAppKeysMngrCertLoad"><primary sortas="xmlSecCryptoAppKeysMngrCertLoad">xmlSecCryptoAppKeysMngrCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoAppKeysMngrCertLoad     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<indexterm zone="xmlSecCryptoAppKeysMngrCertLoad"><primary>xmlSecCryptoAppKeysMngrCertLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCryptoAppKeysMngrCertLoad     (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
 Reads cert from <parameter>filename</parameter> and adds to the list of trusted or known
-untrusted certs in <parameter>store</parameter>.</para>
-<para>
+untrusted certs in <parameter>store</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the keys manager.
+<listitem><simpara>the keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the certificate file.
+<listitem><simpara>the certificate file.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the flag that indicates is the certificate in <parameter>filename</parameter>
+<listitem><simpara>the flag that indicates is the certificate in <parameter>filename</parameter>
                      trusted or not.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
@@ -1198,208 +1189,208 @@ untrusted certs in <parameter>store</parameter>.</para>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppKeysMngrCertLoadMemory" role="function">
 <title>xmlSecCryptoAppKeysMngrCertLoadMemory ()</title>
-<indexterm zone="xmlSecCryptoAppKeysMngrCertLoadMemory"><primary sortas="xmlSecCryptoAppKeysMngrCertLoadMemory">xmlSecCryptoAppKeysMngrCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoAppKeysMngrCertLoadMemory
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<indexterm zone="xmlSecCryptoAppKeysMngrCertLoadMemory"><primary>xmlSecCryptoAppKeysMngrCertLoadMemory</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCryptoAppKeysMngrCertLoadMemory
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</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>
+untrusted certs in <parameter>store</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the keys manager.
+<listitem><simpara>the keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the certificate binary data.
+<listitem><simpara>the certificate binary data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the certificate binary data size.
+<listitem><simpara>the certificate binary data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the flag that indicates is the certificate trusted or not.
+<listitem><simpara>the flag that indicates is the certificate trusted or not.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppKeyLoad" role="function">
 <title>xmlSecCryptoAppKeyLoad ()</title>
-<indexterm zone="xmlSecCryptoAppKeyLoad"><primary sortas="xmlSecCryptoAppKeyLoad">xmlSecCryptoAppKeyLoad</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecCryptoAppKeyLoad              (const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
-<para>
-Reads key from the a file.</para>
-<para>
+<indexterm zone="xmlSecCryptoAppKeyLoad"><primary>xmlSecCryptoAppKeyLoad</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecCryptoAppKeyLoad              (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
+<para>
+Reads key from the a file.
 </para><variablelist role="params">
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the key filename.
+<listitem><simpara>the key filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the key file format.
+<listitem><simpara>the key file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the key file password.
+<listitem><simpara>the key file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the key password callback.
+<listitem><simpara>the key password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppKeyLoadMemory" role="function">
 <title>xmlSecCryptoAppKeyLoadMemory ()</title>
-<indexterm zone="xmlSecCryptoAppKeyLoadMemory"><primary sortas="xmlSecCryptoAppKeyLoadMemory">xmlSecCryptoAppKeyLoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecCryptoAppKeyLoadMemory        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
-<para>
-Reads key from the memory buffer.</para>
-<para>
+<indexterm zone="xmlSecCryptoAppKeyLoadMemory"><primary>xmlSecCryptoAppKeyLoadMemory</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecCryptoAppKeyLoadMemory        (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
+<para>
+Reads key from the memory buffer.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the binary key data.
+<listitem><simpara>the binary key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the size of binary key.
+<listitem><simpara>the size of binary key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the key file format.
+<listitem><simpara>the key file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the key file password.
+<listitem><simpara>the key file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the key password callback.
+<listitem><simpara>the key password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppPkcs12Load" role="function">
 <title>xmlSecCryptoAppPkcs12Load ()</title>
-<indexterm zone="xmlSecCryptoAppPkcs12Load"><primary sortas="xmlSecCryptoAppPkcs12Load">xmlSecCryptoAppPkcs12Load</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecCryptoAppPkcs12Load           (const <link linkend="char">char</link> *filename,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<indexterm zone="xmlSecCryptoAppPkcs12Load"><primary>xmlSecCryptoAppPkcs12Load</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecCryptoAppPkcs12Load           (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 file.
 For uniformity, call xmlSecCryptoAppKeyLoad instead of this function. Pass
-in format=xmlSecKeyDataFormatPkcs12.</para>
-<para>
+in format=xmlSecKeyDataFormatPkcs12.
 </para><variablelist role="params">
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the PKCS12 key filename.
+<listitem><simpara>the PKCS12 key filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the PKCS12 file password.
+<listitem><simpara>the PKCS12 file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the password callback.
+<listitem><simpara>the password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppPkcs12LoadMemory" role="function">
 <title>xmlSecCryptoAppPkcs12LoadMemory ()</title>
-<indexterm zone="xmlSecCryptoAppPkcs12LoadMemory"><primary sortas="xmlSecCryptoAppPkcs12LoadMemory">xmlSecCryptoAppPkcs12LoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecCryptoAppPkcs12LoadMemory     (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<indexterm zone="xmlSecCryptoAppPkcs12LoadMemory"><primary>xmlSecCryptoAppPkcs12LoadMemory</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecCryptoAppPkcs12LoadMemory     (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</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>
+in format=xmlSecKeyDataFormatPkcs12.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the PKCS12 binary data.
+<listitem><simpara>the PKCS12 binary data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the PKCS12 binary data size.
+<listitem><simpara>the PKCS12 binary data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the PKCS12 file password.
+<listitem><simpara>the PKCS12 file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the password callback.
+<listitem><simpara>the password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppKeyCertLoad" role="function">
 <title>xmlSecCryptoAppKeyCertLoad ()</title>
-<indexterm zone="xmlSecCryptoAppKeyCertLoad"><primary sortas="xmlSecCryptoAppKeyCertLoad">xmlSecCryptoAppKeyCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoAppKeyCertLoad          (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
-<para>
-Reads the certificate from $<parameter>filename</parameter> and adds it to key.</para>
+<indexterm zone="xmlSecCryptoAppKeyCertLoad"><primary>xmlSecCryptoAppKeyCertLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCryptoAppKeyCertLoad          (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);</programlisting>
 <para>
+Reads the certificate from $<parameter>filename</parameter> and adds it to key.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the certificate filename.
+<listitem><simpara>the certificate filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppKeyCertLoadMemory" role="function">
 <title>xmlSecCryptoAppKeyCertLoadMemory ()</title>
-<indexterm zone="xmlSecCryptoAppKeyCertLoadMemory"><primary sortas="xmlSecCryptoAppKeyCertLoadMemory">xmlSecCryptoAppKeyCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoAppKeyCertLoadMemory    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
-<para>
-Reads the certificate from memory buffer and adds it to key.</para>
+<indexterm zone="xmlSecCryptoAppKeyCertLoadMemory"><primary>xmlSecCryptoAppKeyCertLoadMemory</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCryptoAppKeyCertLoadMemory    (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);</programlisting>
 <para>
+Reads the certificate from memory buffer and adds it to key.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the certificate binary data.
+<listitem><simpara>the certificate binary data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the certificate binary data size.
+<listitem><simpara>the certificate binary data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppGetDefaultPwdCallback" role="function">
 <title>xmlSecCryptoAppGetDefaultPwdCallback ()</title>
-<indexterm zone="xmlSecCryptoAppGetDefaultPwdCallback"><primary sortas="xmlSecCryptoAppGetDefaultPwdCallback">xmlSecCryptoAppGetDefaultPwdCallback</primary></indexterm><programlisting><link linkend="void">void</link>*               xmlSecCryptoAppGetDefaultPwdCallback
-                                                        (void);</programlisting>
-<para>
-Gets default password callback.</para>
+<indexterm zone="xmlSecCryptoAppGetDefaultPwdCallback"><primary>xmlSecCryptoAppGetDefaultPwdCallback</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>*               xmlSecCryptoAppGetDefaultPwdCallback
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets default password callback.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> default password callback.
 </simpara></listitem></varlistentry>
@@ -1407,7 +1398,4 @@ Gets default password callback.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/base64.sgml b/docs/api/sgml/base64.sgml
index a094dc2..2b0241a 100644
--- a/docs/api/sgml/base64.sgml
+++ b/docs/api/sgml/base64.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-base64.top_of_page">base64</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>base64</refname>
 <refpurpose>Base64 encoding/decoding functions.</refpurpose>
@@ -13,93 +14,83 @@
 <refsynopsisdiv id="xmlsec-base64.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-#define             <link linkend="XMLSEC-BASE64-LINESIZE--CAPS">XMLSEC_BASE64_LINESIZE</link>
-<link linkend="int">int</link>                 <link linkend="xmlSecBase64GetDefaultLineSize">xmlSecBase64GetDefaultLineSize</link>      (void);
-<link linkend="void">void</link>                <link linkend="xmlSecBase64SetDefaultLineSize">xmlSecBase64SetDefaultLineSize</link>      (<link linkend="int">int</link> columns);
-<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link>  <link linkend="xmlSecBase64CtxCreate">xmlSecBase64CtxCreate</link>               (<link linkend="int">int</link> encode,
-                                                         <link linkend="int">int</link> columns);
-<link linkend="void">void</link>                <link linkend="xmlSecBase64CtxDestroy">xmlSecBase64CtxDestroy</link>              (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx);
-<link linkend="int">int</link>                 <link linkend="xmlSecBase64CtxInitialize">xmlSecBase64CtxInitialize</link>           (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx,
-                                                         <link linkend="int">int</link> encode,
-                                                         <link linkend="int">int</link> columns);
-<link linkend="void">void</link>                <link linkend="xmlSecBase64CtxFinalize">xmlSecBase64CtxFinalize</link>             (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx);
-<link linkend="int">int</link>                 <link linkend="xmlSecBase64CtxUpdate">xmlSecBase64CtxUpdate</link>               (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *in,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> inSize,
-                                                         <link linkend="xmlSecByte">xmlSecByte</link> *out,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> outSize);
-<link linkend="int">int</link>                 <link linkend="xmlSecBase64CtxFinal">xmlSecBase64CtxFinal</link>                (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx,
-                                                         <link linkend="xmlSecByte">xmlSecByte</link> *out,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> outSize);
-<link linkend="xmlChar">xmlChar</link>*            <link linkend="xmlSecBase64Encode">xmlSecBase64Encode</link>                  (const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> len,
-                                                         <link linkend="int">int</link> columns);
-<link linkend="int">int</link>                 <link linkend="xmlSecBase64Decode">xmlSecBase64Decode</link>                  (const <link linkend="xmlChar">xmlChar</link> *str,
-                                                         <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> len);
+<synopsis>#define             <link linkend="XMLSEC-BASE64-LINESIZE:CAPS">XMLSEC_BASE64_LINESIZE</link>
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBase64GetDefaultLineSize">xmlSecBase64GetDefaultLineSize</link>      (<parameter><type>void</type></parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecBase64SetDefaultLineSize">xmlSecBase64SetDefaultLineSize</link>      (<parameter><link linkend="int"><type>int</type></link> columns</parameter>);
+<link linkend="xmlSecBase64Ctx"><returnvalue>xmlSecBase64CtxPtr</returnvalue></link>  <link linkend="xmlSecBase64CtxCreate">xmlSecBase64CtxCreate</link>               (<parameter><link linkend="int"><type>int</type></link> encode</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> columns</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecBase64CtxDestroy">xmlSecBase64CtxDestroy</link>              (<parameter><link linkend="xmlSecBase64Ctx"><type>xmlSecBase64CtxPtr</type></link> ctx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBase64CtxInitialize">xmlSecBase64CtxInitialize</link>           (<parameter><link linkend="xmlSecBase64Ctx"><type>xmlSecBase64CtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> encode</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> columns</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecBase64CtxFinalize">xmlSecBase64CtxFinalize</link>             (<parameter><link linkend="xmlSecBase64Ctx"><type>xmlSecBase64CtxPtr</type></link> ctx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBase64CtxUpdate">xmlSecBase64CtxUpdate</link>               (<parameter><link linkend="xmlSecBase64Ctx"><type>xmlSecBase64CtxPtr</type></link> ctx</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *in</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> inSize</parameter>,
+                                                         <parameter><link linkend="xmlSecByte"><type>xmlSecByte</type></link> *out</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> outSize</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBase64CtxFinal">xmlSecBase64CtxFinal</link>                (<parameter><link linkend="xmlSecBase64Ctx"><type>xmlSecBase64CtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="xmlSecByte"><type>xmlSecByte</type></link> *out</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> outSize</parameter>);
+<link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*            <link linkend="xmlSecBase64Encode">xmlSecBase64Encode</link>                  (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> len</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> columns</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBase64Decode">xmlSecBase64Decode</link>                  (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *str</parameter>,
+                                                         <parameter><link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> len</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-base64.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Base64 encoding/decoding functions.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-base64.details" role="details">
 <title role="details.title">Details</title>
-<refsect2 id="XMLSEC-BASE64-LINESIZE--CAPS" role="macro">
+<refsect2 id="XMLSEC-BASE64-LINESIZE:CAPS" role="macro">
 <title>XMLSEC_BASE64_LINESIZE</title>
-<indexterm zone="XMLSEC-BASE64-LINESIZE--CAPS"><primary sortas="XMLSEC_BASE64_LINESIZE">XMLSEC_BASE64_LINESIZE</primary></indexterm><programlisting>#define XMLSEC_BASE64_LINESIZE                          64
+<indexterm zone="XMLSEC-BASE64-LINESIZE:CAPS"><primary>XMLSEC_BASE64_LINESIZE</primary></indexterm>
+<programlisting>#define XMLSEC_BASE64_LINESIZE                          64
 </programlisting>
 <para>
-The default maximum base64 encoded line size.</para>
-<para>
+The default maximum base64 encoded line size.
 </para></refsect2>
 <refsect2 id="xmlSecBase64GetDefaultLineSize" role="function">
 <title>xmlSecBase64GetDefaultLineSize ()</title>
-<indexterm zone="xmlSecBase64GetDefaultLineSize"><primary sortas="xmlSecBase64GetDefaultLineSize">xmlSecBase64GetDefaultLineSize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBase64GetDefaultLineSize      (void);</programlisting>
-<para>
-Gets the current default line size.</para>
+<indexterm zone="xmlSecBase64GetDefaultLineSize"><primary>xmlSecBase64GetDefaultLineSize</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBase64GetDefaultLineSize      (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets the current default line size.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the current default line size.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBase64SetDefaultLineSize" role="function">
 <title>xmlSecBase64SetDefaultLineSize ()</title>
-<indexterm zone="xmlSecBase64SetDefaultLineSize"><primary sortas="xmlSecBase64SetDefaultLineSize">xmlSecBase64SetDefaultLineSize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecBase64SetDefaultLineSize      (<link linkend="int">int</link> columns);</programlisting>
-<para>
-Sets the current default line size.</para>
+<indexterm zone="xmlSecBase64SetDefaultLineSize"><primary>xmlSecBase64SetDefaultLineSize</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecBase64SetDefaultLineSize      (<parameter><link linkend="int"><type>int</type></link> columns</parameter>);</programlisting>
 <para>
+Sets the current default line size.
 </para><variablelist role="params">
 <varlistentry><term><parameter>columns</parameter>&#160;:</term>
-<listitem><simpara> number of columns
+<listitem><simpara>number of columns
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBase64CtxCreate" role="function">
 <title>xmlSecBase64CtxCreate ()</title>
-<indexterm zone="xmlSecBase64CtxCreate"><primary sortas="xmlSecBase64CtxCreate">xmlSecBase64CtxCreate</primary></indexterm><programlisting><link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link>  xmlSecBase64CtxCreate               (<link linkend="int">int</link> encode,
-                                                         <link linkend="int">int</link> columns);</programlisting>
-<para>
-Allocates and initializes new base64 context.</para>
+<indexterm zone="xmlSecBase64CtxCreate"><primary>xmlSecBase64CtxCreate</primary></indexterm>
+<programlisting><link linkend="xmlSecBase64Ctx"><returnvalue>xmlSecBase64CtxPtr</returnvalue></link>  xmlSecBase64CtxCreate               (<parameter><link linkend="int"><type>int</type></link> encode</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> columns</parameter>);</programlisting>
 <para>
+Allocates and initializes new base64 context.
 </para><variablelist role="params">
 <varlistentry><term><parameter>encode</parameter>&#160;:</term>
-<listitem><simpara>             the encode/decode flag (1 - encode, 0 - decode)
+<listitem><simpara>the encode/decode flag (1 - encode, 0 - decode)
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>columns</parameter>&#160;:</term>
-<listitem><simpara>            the max line length.
+<listitem><simpara>the max line length.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a pointer to newly created <link linkend="xmlSecBase64Ctx"><type>xmlSecBase64Ctx</type></link> structure
 or NULL if an error occurs.
@@ -107,72 +98,72 @@ or NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecBase64CtxDestroy" role="function">
 <title>xmlSecBase64CtxDestroy ()</title>
-<indexterm zone="xmlSecBase64CtxDestroy"><primary sortas="xmlSecBase64CtxDestroy">xmlSecBase64CtxDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecBase64CtxDestroy              (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx);</programlisting>
-<para>
-Destroys base64 context.</para>
+<indexterm zone="xmlSecBase64CtxDestroy"><primary>xmlSecBase64CtxDestroy</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecBase64CtxDestroy              (<parameter><link linkend="xmlSecBase64Ctx"><type>xmlSecBase64CtxPtr</type></link> ctx</parameter>);</programlisting>
 <para>
+Destroys base64 context.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to <link linkend="xmlSecBase64Ctx"><type>xmlSecBase64Ctx</type></link> structure.
+<listitem><simpara>the pointer to <link linkend="xmlSecBase64Ctx"><type>xmlSecBase64Ctx</type></link> structure.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBase64CtxInitialize" role="function">
 <title>xmlSecBase64CtxInitialize ()</title>
-<indexterm zone="xmlSecBase64CtxInitialize"><primary sortas="xmlSecBase64CtxInitialize">xmlSecBase64CtxInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBase64CtxInitialize           (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx,
-                                                         <link linkend="int">int</link> encode,
-                                                         <link linkend="int">int</link> columns);</programlisting>
-<para>
-Initializes new base64 context.</para>
+<indexterm zone="xmlSecBase64CtxInitialize"><primary>xmlSecBase64CtxInitialize</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBase64CtxInitialize           (<parameter><link linkend="xmlSecBase64Ctx"><type>xmlSecBase64CtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> encode</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> columns</parameter>);</programlisting>
 <para>
+Initializes new base64 context.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to <link linkend="xmlSecBase64Ctx"><type>xmlSecBase64Ctx</type></link> structure,
+<listitem><simpara>the pointer to <link linkend="xmlSecBase64Ctx"><type>xmlSecBase64Ctx</type></link> structure,
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>encode</parameter>&#160;:</term>
-<listitem><simpara>             the encode/decode flag (1 - encode, 0 - decode)
+<listitem><simpara>the encode/decode flag (1 - encode, 0 - decode)
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>columns</parameter>&#160;:</term>
-<listitem><simpara>            the max line length.
+<listitem><simpara>the max line length.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success and a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBase64CtxFinalize" role="function">
 <title>xmlSecBase64CtxFinalize ()</title>
-<indexterm zone="xmlSecBase64CtxFinalize"><primary sortas="xmlSecBase64CtxFinalize">xmlSecBase64CtxFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecBase64CtxFinalize             (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx);</programlisting>
-<para>
-Frees all the resources allocated by <parameter>ctx</parameter>.</para>
+<indexterm zone="xmlSecBase64CtxFinalize"><primary>xmlSecBase64CtxFinalize</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecBase64CtxFinalize             (<parameter><link linkend="xmlSecBase64Ctx"><type>xmlSecBase64CtxPtr</type></link> ctx</parameter>);</programlisting>
 <para>
+Frees all the resources allocated by <parameter>ctx</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to <link linkend="xmlSecBase64Ctx"><type>xmlSecBase64Ctx</type></link> structure,
+<listitem><simpara>the pointer to <link linkend="xmlSecBase64Ctx"><type>xmlSecBase64Ctx</type></link> structure,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBase64CtxUpdate" role="function">
 <title>xmlSecBase64CtxUpdate ()</title>
-<indexterm zone="xmlSecBase64CtxUpdate"><primary sortas="xmlSecBase64CtxUpdate">xmlSecBase64CtxUpdate</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBase64CtxUpdate               (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *in,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> inSize,
-                                                         <link linkend="xmlSecByte">xmlSecByte</link> *out,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> outSize);</programlisting>
-<para>
-Encodes or decodes the next piece of data from input buffer.</para>
-<para>
+<indexterm zone="xmlSecBase64CtxUpdate"><primary>xmlSecBase64CtxUpdate</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBase64CtxUpdate               (<parameter><link linkend="xmlSecBase64Ctx"><type>xmlSecBase64CtxPtr</type></link> ctx</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *in</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> inSize</parameter>,
+                                                         <parameter><link linkend="xmlSecByte"><type>xmlSecByte</type></link> *out</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> outSize</parameter>);</programlisting>
+<para>
+Encodes or decodes the next piece of data from input buffer.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to <link linkend="xmlSecBase64Ctx"><type>xmlSecBase64Ctx</type></link> structure
+<listitem><simpara>the pointer to <link linkend="xmlSecBase64Ctx"><type>xmlSecBase64Ctx</type></link> structure
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>in</parameter>&#160;:</term>
-<listitem><simpara>                 the input buffer
+<listitem><simpara>the input buffer
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>inSize</parameter>&#160;:</term>
-<listitem><simpara>             the input buffer size
+<listitem><simpara>the input buffer size
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>out</parameter>&#160;:</term>
-<listitem><simpara>                the output buffer
+<listitem><simpara>the output buffer
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>outSize</parameter>&#160;:</term>
-<listitem><simpara>            the output buffer size
+<listitem><simpara>the output buffer size
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the number of bytes written to output buffer or
 -1 if an error occurs.
@@ -180,22 +171,22 @@ Encodes or decodes the next piece of data from input buffer.</para>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBase64CtxFinal" role="function">
 <title>xmlSecBase64CtxFinal ()</title>
-<indexterm zone="xmlSecBase64CtxFinal"><primary sortas="xmlSecBase64CtxFinal">xmlSecBase64CtxFinal</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBase64CtxFinal                (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx,
-                                                         <link linkend="xmlSecByte">xmlSecByte</link> *out,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> outSize);</programlisting>
+<indexterm zone="xmlSecBase64CtxFinal"><primary>xmlSecBase64CtxFinal</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBase64CtxFinal                (<parameter><link linkend="xmlSecBase64Ctx"><type>xmlSecBase64CtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="xmlSecByte"><type>xmlSecByte</type></link> *out</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> outSize</parameter>);</programlisting>
 <para>
 Encodes or decodes the last piece of data stored in the context
-and finalizes the result.</para>
-<para>
+and finalizes the result.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to <link linkend="xmlSecBase64Ctx"><type>xmlSecBase64Ctx</type></link> structure
+<listitem><simpara>the pointer to <link linkend="xmlSecBase64Ctx"><type>xmlSecBase64Ctx</type></link> structure
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>out</parameter>&#160;:</term>
-<listitem><simpara>                the output buffer
+<listitem><simpara>the output buffer
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>outSize</parameter>&#160;:</term>
-<listitem><simpara>            the output buffer size
+<listitem><simpara>the output buffer size
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the number of bytes written to output buffer or
 -1 if an error occurs.
@@ -203,23 +194,23 @@ and finalizes the result.</para>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBase64Encode" role="function">
 <title>xmlSecBase64Encode ()</title>
-<indexterm zone="xmlSecBase64Encode"><primary sortas="xmlSecBase64Encode">xmlSecBase64Encode</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*            xmlSecBase64Encode                  (const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> len,
-                                                         <link linkend="int">int</link> columns);</programlisting>
+<indexterm zone="xmlSecBase64Encode"><primary>xmlSecBase64Encode</primary></indexterm>
+<programlisting><link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*            xmlSecBase64Encode                  (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> len</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> columns</parameter>);</programlisting>
 <para>
 Encodes the data from input buffer and allocates the string for the result.
 The caller is responsible for freeing returned buffer using
-<link linkend="xmlFree"><function>xmlFree()</function></link> function.</para>
-<para>
+<link linkend="xmlFree"><function>xmlFree()</function></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the input buffer.
+<listitem><simpara>the input buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>len</parameter>&#160;:</term>
-<listitem><simpara>                the input buffer size.
+<listitem><simpara>the input buffer size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>columns</parameter>&#160;:</term>
-<listitem><simpara>            the output max line length (if 0 then no line breaks
+<listitem><simpara>the output max line length (if 0 then no line breaks
                      would be inserted)
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> newly allocated string with base64 encoded data
@@ -228,22 +219,22 @@ or NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecBase64Decode" role="function">
 <title>xmlSecBase64Decode ()</title>
-<indexterm zone="xmlSecBase64Decode"><primary sortas="xmlSecBase64Decode">xmlSecBase64Decode</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBase64Decode                  (const <link linkend="xmlChar">xmlChar</link> *str,
-                                                         <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> len);</programlisting>
+<indexterm zone="xmlSecBase64Decode"><primary>xmlSecBase64Decode</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBase64Decode                  (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *str</parameter>,
+                                                         <parameter><link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> len</parameter>);</programlisting>
 <para>
 Decodes input base64 encoded string and puts result into
-the output buffer.</para>
-<para>
+the output buffer.
 </para><variablelist role="params">
 <varlistentry><term><parameter>str</parameter>&#160;:</term>
-<listitem><simpara>                the input buffer with base64 encoded string
+<listitem><simpara>the input buffer with base64 encoded string
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the output buffer
+<listitem><simpara>the output buffer
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>len</parameter>&#160;:</term>
-<listitem><simpara>                the output buffer size
+<listitem><simpara>the output buffer size
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the number of bytes written to the output buffer or
 a negative value if an error occurs
@@ -252,7 +243,4 @@ a negative value if an error occurs
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/bn.sgml b/docs/api/sgml/bn.sgml
index a47b2af..a76855e 100644
--- a/docs/api/sgml/bn.sgml
+++ b/docs/api/sgml/bn.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-bn.top_of_page">bn</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>bn</refname>
 <refpurpose>Big numbers support functions.</refpurpose>
@@ -13,405 +14,395 @@
 <refsynopsisdiv id="xmlsec-bn.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-enum                <link linkend="xmlSecBnFormat">xmlSecBnFormat</link>;
-<link linkend="xmlSecBn">xmlSecBnPtr</link>         <link linkend="xmlSecBnCreate">xmlSecBnCreate</link>                      (<link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="void">void</link>                <link linkend="xmlSecBnDestroy">xmlSecBnDestroy</link>                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
-<link linkend="int">int</link>                 <link linkend="xmlSecBnInitialize">xmlSecBnInitialize</link>                  (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="void">void</link>                <link linkend="xmlSecBnFinalize">xmlSecBnFinalize</link>                    (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
-<link linkend="xmlSecByte">xmlSecByte</link>*         <link linkend="xmlSecBnGetData">xmlSecBnGetData</link>                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
-<link linkend="int">int</link>                 <link linkend="xmlSecBnSetData">xmlSecBnSetData</link>                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecBnGetSize">xmlSecBnGetSize</link>                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
-<link linkend="void">void</link>                <link linkend="xmlSecBnZero">xmlSecBnZero</link>                        (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
-<link linkend="int">int</link>                 <link linkend="xmlSecBnFromString">xmlSecBnFromString</link>                  (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         const <link linkend="xmlChar">xmlChar</link> *str,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> base);
-<link linkend="xmlChar">xmlChar</link>*            <link linkend="xmlSecBnToString">xmlSecBnToString</link>                    (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> base);
-<link linkend="int">int</link>                 <link linkend="xmlSecBnFromHexString">xmlSecBnFromHexString</link>               (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         const <link linkend="xmlChar">xmlChar</link> *str);
-<link linkend="xmlChar">xmlChar</link>*            <link linkend="xmlSecBnToHexString">xmlSecBnToHexString</link>                 (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
-<link linkend="int">int</link>                 <link linkend="xmlSecBnFromDecString">xmlSecBnFromDecString</link>               (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         const <link linkend="xmlChar">xmlChar</link> *str);
-<link linkend="xmlChar">xmlChar</link>*            <link linkend="xmlSecBnToDecString">xmlSecBnToDecString</link>                 (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
-<link linkend="int">int</link>                 <link linkend="xmlSecBnMul">xmlSecBnMul</link>                         (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         <link linkend="int">int</link> multiplier);
-<link linkend="int">int</link>                 <link linkend="xmlSecBnDiv">xmlSecBnDiv</link>                         (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         <link linkend="int">int</link> divider,
-                                                         <link linkend="int">int</link> *mod);
-<link linkend="int">int</link>                 <link linkend="xmlSecBnAdd">xmlSecBnAdd</link>                         (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         <link linkend="int">int</link> delta);
-<link linkend="int">int</link>                 <link linkend="xmlSecBnReverse">xmlSecBnReverse</link>                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
-<link linkend="int">int</link>                 <link linkend="xmlSecBnCompare">xmlSecBnCompare</link>                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize);
-<link linkend="int">int</link>                 <link linkend="xmlSecBnCompareReverse">xmlSecBnCompareReverse</link>              (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize);
-<link linkend="int">int</link>                 <link linkend="xmlSecBnGetNodeValue">xmlSecBnGetNodeValue</link>                (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         <link linkend="xmlSecBnFormat">xmlSecBnFormat</link> format,
-                                                         <link linkend="int">int</link> reverse);
-<link linkend="int">int</link>                 <link linkend="xmlSecBnSetNodeValue">xmlSecBnSetNodeValue</link>                (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         <link linkend="xmlSecBnFormat">xmlSecBnFormat</link> format,
-                                                         <link linkend="int">int</link> reverse,
-                                                         <link linkend="int">int</link> addLineBreaks);
-<link linkend="int">int</link>                 <link linkend="xmlSecBnBlobSetNodeValue">xmlSecBnBlobSetNodeValue</link>            (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         <link linkend="xmlSecBnFormat">xmlSecBnFormat</link> format,
-                                                         <link linkend="int">int</link> reverse,
-                                                         <link linkend="int">int</link> addLineBreaks);
+<synopsis>enum                <link linkend="xmlSecBnFormat">xmlSecBnFormat</link>;
+<link linkend="xmlSecBn"><returnvalue>xmlSecBnPtr</returnvalue></link>         <link linkend="xmlSecBnCreate">xmlSecBnCreate</link>                      (<parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecBnDestroy">xmlSecBnDestroy</link>                     (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBnInitialize">xmlSecBnInitialize</link>                  (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecBnFinalize">xmlSecBnFinalize</link>                    (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>);
+<link linkend="xmlSecByte"><returnvalue>xmlSecByte</returnvalue></link>*         <link linkend="xmlSecBnGetData">xmlSecBnGetData</link>                     (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBnSetData">xmlSecBnSetData</link>                     (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);
+<link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          <link linkend="xmlSecBnGetSize">xmlSecBnGetSize</link>                     (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecBnZero">xmlSecBnZero</link>                        (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBnFromString">xmlSecBnFromString</link>                  (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *str</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> base</parameter>);
+<link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*            <link linkend="xmlSecBnToString">xmlSecBnToString</link>                    (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> base</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBnFromHexString">xmlSecBnFromHexString</link>               (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *str</parameter>);
+<link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*            <link linkend="xmlSecBnToHexString">xmlSecBnToHexString</link>                 (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBnFromDecString">xmlSecBnFromDecString</link>               (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *str</parameter>);
+<link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*            <link linkend="xmlSecBnToDecString">xmlSecBnToDecString</link>                 (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBnMul">xmlSecBnMul</link>                         (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> multiplier</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBnDiv">xmlSecBnDiv</link>                         (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> divider</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> *mod</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBnAdd">xmlSecBnAdd</link>                         (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> delta</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBnReverse">xmlSecBnReverse</link>                     (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBnCompare">xmlSecBnCompare</link>                     (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBnCompareReverse">xmlSecBnCompareReverse</link>              (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBnGetNodeValue">xmlSecBnGetNodeValue</link>                (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter><link linkend="xmlSecBnFormat"><type>xmlSecBnFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> reverse</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBnSetNodeValue">xmlSecBnSetNodeValue</link>                (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter><link linkend="xmlSecBnFormat"><type>xmlSecBnFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> reverse</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> addLineBreaks</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBnBlobSetNodeValue">xmlSecBnBlobSetNodeValue</link>            (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter><link linkend="xmlSecBnFormat"><type>xmlSecBnFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> reverse</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> addLineBreaks</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-bn.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Big numbers support functions.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-bn.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecBnFormat" role="enum">
 <title>enum xmlSecBnFormat</title>
-<indexterm zone="xmlSecBnFormat"><primary sortas="xmlSecBnFormat">xmlSecBnFormat</primary></indexterm><programlisting>typedef enum {
+<indexterm zone="xmlSecBnFormat"><primary>xmlSecBnFormat</primary></indexterm>
+<programlisting>typedef enum {
     xmlSecBnBase64,
     xmlSecBnHex,
     xmlSecBnDec
 } xmlSecBnFormat;
 </programlisting>
 <para>
-The big numbers formats.</para>
-<para>
+The big numbers formats.
 </para><variablelist role="enum">
 <varlistentry id="xmlSecBnBase64" role="constant">
 <term><literal>xmlSecBnBase64</literal></term>
-<listitem><simpara>             the base64 decoded binary blob.
+<listitem><simpara>the base64 decoded binary blob.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecBnHex" role="constant">
 <term><literal>xmlSecBnHex</literal></term>
-<listitem><simpara>                the hex number.
+<listitem><simpara>the hex number.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecBnDec" role="constant">
 <term><literal>xmlSecBnDec</literal></term>
-<listitem><simpara>                the decimal number.
+<listitem><simpara>the decimal number.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnCreate" role="function">
 <title>xmlSecBnCreate ()</title>
-<indexterm zone="xmlSecBnCreate"><primary sortas="xmlSecBnCreate">xmlSecBnCreate</primary></indexterm><programlisting><link linkend="xmlSecBn">xmlSecBnPtr</link>         xmlSecBnCreate                      (<link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<indexterm zone="xmlSecBnCreate"><primary>xmlSecBnCreate</primary></indexterm>
+<programlisting><link linkend="xmlSecBn"><returnvalue>xmlSecBnPtr</returnvalue></link>         xmlSecBnCreate                      (<parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);</programlisting>
 <para>
 Creates a new BN object. Caller is responsible for destroying it
-by calling <parameter>xmlSecBnDestroy</parameter> function.</para>
-<para>
+by calling <parameter>xmlSecBnDestroy</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>       the initial allocated BN size.
+<listitem><simpara>the initial allocated BN size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the newly BN or a NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnDestroy" role="function">
 <title>xmlSecBnDestroy ()</title>
-<indexterm zone="xmlSecBnDestroy"><primary sortas="xmlSecBnDestroy">xmlSecBnDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecBnDestroy                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
-<para>
-Destroys <parameter>bn</parameter> object created with <parameter>xmlSecBnCreate</parameter> function.</para>
+<indexterm zone="xmlSecBnDestroy"><primary>xmlSecBnDestroy</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecBnDestroy                     (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>);</programlisting>
 <para>
+Destroys <parameter>bn</parameter> object created with <parameter>xmlSecBnCreate</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnInitialize" role="function">
 <title>xmlSecBnInitialize ()</title>
-<indexterm zone="xmlSecBnInitialize"><primary sortas="xmlSecBnInitialize">xmlSecBnInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnInitialize                  (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<indexterm zone="xmlSecBnInitialize"><primary>xmlSecBnInitialize</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBnInitialize                  (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);</programlisting>
 <para>
 Initializes a BN object. Caller is responsible for destroying it
-by calling <parameter>xmlSecBnFinalize</parameter> function.</para>
-<para>
+by calling <parameter>xmlSecBnFinalize</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>       the initial allocated BN size.
+<listitem><simpara>the initial allocated BN size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnFinalize" role="function">
 <title>xmlSecBnFinalize ()</title>
-<indexterm zone="xmlSecBnFinalize"><primary sortas="xmlSecBnFinalize">xmlSecBnFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecBnFinalize                    (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
-<para>
-Destroys <parameter>bn</parameter> object created with <parameter>xmlSecBnInitialize</parameter> function.</para>
+<indexterm zone="xmlSecBnFinalize"><primary>xmlSecBnFinalize</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecBnFinalize                    (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>);</programlisting>
 <para>
+Destroys <parameter>bn</parameter> object created with <parameter>xmlSecBnInitialize</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnGetData" role="function">
 <title>xmlSecBnGetData ()</title>
-<indexterm zone="xmlSecBnGetData"><primary sortas="xmlSecBnGetData">xmlSecBnGetData</primary></indexterm><programlisting><link linkend="xmlSecByte">xmlSecByte</link>*         xmlSecBnGetData                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
-<para>
-Gets pointer to the binary <parameter>bn</parameter> representation.</para>
+<indexterm zone="xmlSecBnGetData"><primary>xmlSecBnGetData</primary></indexterm>
+<programlisting><link linkend="xmlSecByte"><returnvalue>xmlSecByte</returnvalue></link>*         xmlSecBnGetData                     (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>);</programlisting>
 <para>
+Gets pointer to the binary <parameter>bn</parameter> representation.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to binary BN data or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnSetData" role="function">
 <title>xmlSecBnSetData ()</title>
-<indexterm zone="xmlSecBnSetData"><primary sortas="xmlSecBnSetData">xmlSecBnSetData</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnSetData                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
-<para>
-Sets the value of <parameter>bn</parameter> to <parameter>data</parameter>.</para>
+<indexterm zone="xmlSecBnSetData"><primary>xmlSecBnSetData</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBnSetData                     (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);</programlisting>
 <para>
+Sets the value of <parameter>bn</parameter> to <parameter>data</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to new BN binary data.
+<listitem><simpara>the pointer to new BN binary data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>       the size of new BN data.
+<listitem><simpara>the size of new BN data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnGetSize" role="function">
 <title>xmlSecBnGetSize ()</title>
-<indexterm zone="xmlSecBnGetSize"><primary sortas="xmlSecBnGetSize">xmlSecBnGetSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecBnGetSize                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
-<para>
-Gets the size of binary data in <parameter>bn</parameter>.</para>
+<indexterm zone="xmlSecBnGetSize"><primary>xmlSecBnGetSize</primary></indexterm>
+<programlisting><link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          xmlSecBnGetSize                     (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>);</programlisting>
 <para>
+Gets the size of binary data in <parameter>bn</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the size of binary data.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnZero" role="function">
 <title>xmlSecBnZero ()</title>
-<indexterm zone="xmlSecBnZero"><primary sortas="xmlSecBnZero">xmlSecBnZero</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecBnZero                        (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
-<para>
-Sets the value of <parameter>bn</parameter> to zero.</para>
+<indexterm zone="xmlSecBnZero"><primary>xmlSecBnZero</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecBnZero                        (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>);</programlisting>
 <para>
+Sets the value of <parameter>bn</parameter> to zero.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnFromString" role="function">
 <title>xmlSecBnFromString ()</title>
-<indexterm zone="xmlSecBnFromString"><primary sortas="xmlSecBnFromString">xmlSecBnFromString</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnFromString                  (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         const <link linkend="xmlChar">xmlChar</link> *str,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> base);</programlisting>
-<para>
-Reads <parameter>bn</parameter> from string <parameter>str</parameter> assuming it has base <parameter>base</parameter>.</para>
+<indexterm zone="xmlSecBnFromString"><primary>xmlSecBnFromString</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBnFromString                  (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *str</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> base</parameter>);</programlisting>
 <para>
+Reads <parameter>bn</parameter> from string <parameter>str</parameter> assuming it has base <parameter>base</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>str</parameter>&#160;:</term>
-<listitem><simpara>        the string with BN.
+<listitem><simpara>the string with BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>base</parameter>&#160;:</term>
-<listitem><simpara>       the base for <parameter>str</parameter>.
+<listitem><simpara>the base for <parameter>str</parameter>.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnToString" role="function">
 <title>xmlSecBnToString ()</title>
-<indexterm zone="xmlSecBnToString"><primary sortas="xmlSecBnToString">xmlSecBnToString</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*            xmlSecBnToString                    (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> base);</programlisting>
+<indexterm zone="xmlSecBnToString"><primary>xmlSecBnToString</primary></indexterm>
+<programlisting><link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*            xmlSecBnToString                    (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> base</parameter>);</programlisting>
 <para>
 Writes <parameter>bn</parameter> to string with base <parameter>base</parameter>. Caller is responsible for
-freeing returned string with <parameter>xmlFree</parameter>.</para>
-<para>
+freeing returned string with <parameter>xmlFree</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>base</parameter>&#160;:</term>
-<listitem><simpara>       the base for returned string.
+<listitem><simpara>the base for returned string.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the string represenataion if BN or a NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnFromHexString" role="function">
 <title>xmlSecBnFromHexString ()</title>
-<indexterm zone="xmlSecBnFromHexString"><primary sortas="xmlSecBnFromHexString">xmlSecBnFromHexString</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnFromHexString               (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         const <link linkend="xmlChar">xmlChar</link> *str);</programlisting>
-<para>
-Reads <parameter>bn</parameter> from hex string <parameter>str</parameter>.</para>
+<indexterm zone="xmlSecBnFromHexString"><primary>xmlSecBnFromHexString</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBnFromHexString               (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *str</parameter>);</programlisting>
 <para>
+Reads <parameter>bn</parameter> from hex string <parameter>str</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>str</parameter>&#160;:</term>
-<listitem><simpara>        the string with BN.
+<listitem><simpara>the string with BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnToHexString" role="function">
 <title>xmlSecBnToHexString ()</title>
-<indexterm zone="xmlSecBnToHexString"><primary sortas="xmlSecBnToHexString">xmlSecBnToHexString</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*            xmlSecBnToHexString                 (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
+<indexterm zone="xmlSecBnToHexString"><primary>xmlSecBnToHexString</primary></indexterm>
+<programlisting><link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*            xmlSecBnToHexString                 (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>);</programlisting>
 <para>
 Writes <parameter>bn</parameter> to hex string. Caller is responsible for
-freeing returned string with <parameter>xmlFree</parameter>.</para>
-<para>
+freeing returned string with <parameter>xmlFree</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the string represenataion if BN or a NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnFromDecString" role="function">
 <title>xmlSecBnFromDecString ()</title>
-<indexterm zone="xmlSecBnFromDecString"><primary sortas="xmlSecBnFromDecString">xmlSecBnFromDecString</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnFromDecString               (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         const <link linkend="xmlChar">xmlChar</link> *str);</programlisting>
-<para>
-Reads <parameter>bn</parameter> from decimal string <parameter>str</parameter>.</para>
+<indexterm zone="xmlSecBnFromDecString"><primary>xmlSecBnFromDecString</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBnFromDecString               (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *str</parameter>);</programlisting>
 <para>
+Reads <parameter>bn</parameter> from decimal string <parameter>str</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>str</parameter>&#160;:</term>
-<listitem><simpara>        the string with BN.
+<listitem><simpara>the string with BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnToDecString" role="function">
 <title>xmlSecBnToDecString ()</title>
-<indexterm zone="xmlSecBnToDecString"><primary sortas="xmlSecBnToDecString">xmlSecBnToDecString</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*            xmlSecBnToDecString                 (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
+<indexterm zone="xmlSecBnToDecString"><primary>xmlSecBnToDecString</primary></indexterm>
+<programlisting><link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*            xmlSecBnToDecString                 (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>);</programlisting>
 <para>
 Writes <parameter>bn</parameter> to decimal string. Caller is responsible for
-freeing returned string with <parameter>xmlFree</parameter>.</para>
-<para>
+freeing returned string with <parameter>xmlFree</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the string represenataion if BN or a NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnMul" role="function">
 <title>xmlSecBnMul ()</title>
-<indexterm zone="xmlSecBnMul"><primary sortas="xmlSecBnMul">xmlSecBnMul</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnMul                         (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         <link linkend="int">int</link> multiplier);</programlisting>
-<para>
-Multiplies <parameter>bn</parameter> with <parameter>multiplier</parameter>.</para>
+<indexterm zone="xmlSecBnMul"><primary>xmlSecBnMul</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBnMul                         (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> multiplier</parameter>);</programlisting>
 <para>
+Multiplies <parameter>bn</parameter> with <parameter>multiplier</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>                 the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>multiplier</parameter>&#160;:</term>
-<listitem><simpara>         the multiplier.
+<listitem><simpara>the multiplier.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnDiv" role="function">
 <title>xmlSecBnDiv ()</title>
-<indexterm zone="xmlSecBnDiv"><primary sortas="xmlSecBnDiv">xmlSecBnDiv</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnDiv                         (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         <link linkend="int">int</link> divider,
-                                                         <link linkend="int">int</link> *mod);</programlisting>
-<para>
-Divides <parameter>bn</parameter> by <parameter>divider</parameter> and places modulus into <parameter>mod</parameter>.</para>
+<indexterm zone="xmlSecBnDiv"><primary>xmlSecBnDiv</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBnDiv                         (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> divider</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> *mod</parameter>);</programlisting>
 <para>
+Divides <parameter>bn</parameter> by <parameter>divider</parameter> and places modulus into <parameter>mod</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>divider</parameter>&#160;:</term>
-<listitem><simpara>    the divider
+<listitem><simpara>the divider
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>mod</parameter>&#160;:</term>
-<listitem><simpara>        the pointer for modulus result.
+<listitem><simpara>the pointer for modulus result.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnAdd" role="function">
 <title>xmlSecBnAdd ()</title>
-<indexterm zone="xmlSecBnAdd"><primary sortas="xmlSecBnAdd">xmlSecBnAdd</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnAdd                         (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         <link linkend="int">int</link> delta);</programlisting>
-<para>
-Adds <parameter>delta</parameter> to <parameter>bn</parameter>.</para>
+<indexterm zone="xmlSecBnAdd"><primary>xmlSecBnAdd</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBnAdd                         (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> delta</parameter>);</programlisting>
 <para>
+Adds <parameter>delta</parameter> to <parameter>bn</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>delta</parameter>&#160;:</term>
-<listitem><simpara>      the delta.
+<listitem><simpara>the delta.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnReverse" role="function">
 <title>xmlSecBnReverse ()</title>
-<indexterm zone="xmlSecBnReverse"><primary sortas="xmlSecBnReverse">xmlSecBnReverse</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnReverse                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
-<para>
-Reverses bytes order in <parameter>bn</parameter>.</para>
+<indexterm zone="xmlSecBnReverse"><primary>xmlSecBnReverse</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBnReverse                     (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>);</programlisting>
 <para>
+Reverses bytes order in <parameter>bn</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnCompare" role="function">
 <title>xmlSecBnCompare ()</title>
-<indexterm zone="xmlSecBnCompare"><primary sortas="xmlSecBnCompare">xmlSecBnCompare</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnCompare                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize);</programlisting>
-<para>
-Compares the <parameter>bn</parameter> with <parameter>data</parameter>.</para>
+<indexterm zone="xmlSecBnCompare"><primary>xmlSecBnCompare</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBnCompare                     (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>);</programlisting>
 <para>
+Compares the <parameter>bn</parameter> with <parameter>data</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>       the data to compare BN to.
+<listitem><simpara>the data to compare BN to.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>   the <parameter>data</parameter> size.
+<listitem><simpara>the <parameter>data</parameter> size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 if data is equal, negative value if <parameter>bn</parameter> is less or positive value if <parameter>bn</parameter>
 is greater than <parameter>data</parameter>.
@@ -419,21 +410,21 @@ is greater than <parameter>data</parameter>.
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnCompareReverse" role="function">
 <title>xmlSecBnCompareReverse ()</title>
-<indexterm zone="xmlSecBnCompareReverse"><primary sortas="xmlSecBnCompareReverse">xmlSecBnCompareReverse</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnCompareReverse              (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize);</programlisting>
-<para>
-Compares the <parameter>bn</parameter> with reverse <parameter>data</parameter>.</para>
+<indexterm zone="xmlSecBnCompareReverse"><primary>xmlSecBnCompareReverse</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBnCompareReverse              (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>);</programlisting>
 <para>
+Compares the <parameter>bn</parameter> with reverse <parameter>data</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>       the data to compare BN to.
+<listitem><simpara>the data to compare BN to.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>   the <parameter>data</parameter> size.
+<listitem><simpara>the <parameter>data</parameter> size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 if data is equal, negative value if <parameter>bn</parameter> is less or positive value if <parameter>bn</parameter>
 is greater than <parameter>data</parameter>.
@@ -441,87 +432,87 @@ is greater than <parameter>data</parameter>.
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnGetNodeValue" role="function">
 <title>xmlSecBnGetNodeValue ()</title>
-<indexterm zone="xmlSecBnGetNodeValue"><primary sortas="xmlSecBnGetNodeValue">xmlSecBnGetNodeValue</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnGetNodeValue                (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         <link linkend="xmlSecBnFormat">xmlSecBnFormat</link> format,
-                                                         <link linkend="int">int</link> reverse);</programlisting>
-<para>
-Converts the node content from <parameter>format</parameter> to <parameter>bn</parameter>.</para>
+<indexterm zone="xmlSecBnGetNodeValue"><primary>xmlSecBnGetNodeValue</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBnGetNodeValue                (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter><link linkend="xmlSecBnFormat"><type>xmlSecBnFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> reverse</parameter>);</programlisting>
 <para>
+Converts the node content from <parameter>format</parameter> to <parameter>bn</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>cur</parameter>&#160;:</term>
-<listitem><simpara>        the poitner to an XML node.
+<listitem><simpara>the poitner to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>     the BN format.
+<listitem><simpara>the BN format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>reverse</parameter>&#160;:</term>
-<listitem><simpara>    if set then reverse read buffer after reading.
+<listitem><simpara>if set then reverse read buffer after reading.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success and a negative values if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnSetNodeValue" role="function">
 <title>xmlSecBnSetNodeValue ()</title>
-<indexterm zone="xmlSecBnSetNodeValue"><primary sortas="xmlSecBnSetNodeValue">xmlSecBnSetNodeValue</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnSetNodeValue                (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         <link linkend="xmlSecBnFormat">xmlSecBnFormat</link> format,
-                                                         <link linkend="int">int</link> reverse,
-                                                         <link linkend="int">int</link> addLineBreaks);</programlisting>
-<para>
-Converts the <parameter>bn</parameter> and sets it to node content.</para>
-<para>
+<indexterm zone="xmlSecBnSetNodeValue"><primary>xmlSecBnSetNodeValue</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBnSetNodeValue                (<parameter><link linkend="xmlSecBn"><type>xmlSecBnPtr</type></link> bn</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter><link linkend="xmlSecBnFormat"><type>xmlSecBnFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> reverse</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> addLineBreaks</parameter>);</programlisting>
+<para>
+Converts the <parameter>bn</parameter> and sets it to node content.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bn</parameter>&#160;:</term>
-<listitem><simpara>                 the pointer to BN.
+<listitem><simpara>the pointer to BN.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>cur</parameter>&#160;:</term>
-<listitem><simpara>                the poitner to an XML node.
+<listitem><simpara>the poitner to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the BN format.
+<listitem><simpara>the BN format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>reverse</parameter>&#160;:</term>
-<listitem><simpara>            the flag that indicates whether to reverse the buffer before writing.
+<listitem><simpara>the flag that indicates whether to reverse the buffer before writing.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>addLineBreaks</parameter>&#160;:</term>
-<listitem><simpara>      the flag; it is equal to 1 then linebreaks will be added before and after new buffer content.
+<listitem><simpara>the flag; it is equal to 1 then linebreaks will be added before and after new buffer content.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success and a negative values if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBnBlobSetNodeValue" role="function">
 <title>xmlSecBnBlobSetNodeValue ()</title>
-<indexterm zone="xmlSecBnBlobSetNodeValue"><primary sortas="xmlSecBnBlobSetNodeValue">xmlSecBnBlobSetNodeValue</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnBlobSetNodeValue            (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         <link linkend="xmlSecBnFormat">xmlSecBnFormat</link> format,
-                                                         <link linkend="int">int</link> reverse,
-                                                         <link linkend="int">int</link> addLineBreaks);</programlisting>
-<para>
-Converts the <parameter>blob</parameter> and sets it to node content.</para>
-<para>
+<indexterm zone="xmlSecBnBlobSetNodeValue"><primary>xmlSecBnBlobSetNodeValue</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBnBlobSetNodeValue            (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter><link linkend="xmlSecBnFormat"><type>xmlSecBnFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> reverse</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> addLineBreaks</parameter>);</programlisting>
+<para>
+Converts the <parameter>blob</parameter> and sets it to node content.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to BN blob.
+<listitem><simpara>the pointer to BN blob.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>   the size of BN blob.
+<listitem><simpara>the size of BN blob.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>cur</parameter>&#160;:</term>
-<listitem><simpara>        the poitner to an XML node.
+<listitem><simpara>the poitner to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>     the BN format.
+<listitem><simpara>the BN format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>reverse</parameter>&#160;:</term>
-<listitem><simpara>    the flag that indicates whether to reverse the buffer before writing.
+<listitem><simpara>the flag that indicates whether to reverse the buffer before writing.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>addLineBreaks</parameter>&#160;:</term>
-<listitem><simpara>  if the flag is equal to 1 then
+<listitem><simpara>if the flag is equal to 1 then
              linebreaks will be added before and after
              new buffer content.
 </simpara></listitem></varlistentry>
@@ -531,7 +522,4 @@ Converts the <parameter>blob</parameter> and sets it to node content.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/buffer.sgml b/docs/api/sgml/buffer.sgml
index a5850c7..b1dc183 100644
--- a/docs/api/sgml/buffer.sgml
+++ b/docs/api/sgml/buffer.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-buffer.top_of_page">buffer</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>buffer</refname>
 <refpurpose>Binary buffer implementation.</refpurpose>
@@ -13,92 +14,83 @@
 <refsynopsisdiv id="xmlsec-buffer.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-enum                <link linkend="xmlSecAllocMode">xmlSecAllocMode</link>;
+<synopsis>enum                <link linkend="xmlSecAllocMode">xmlSecAllocMode</link>;
 struct              <link linkend="xmlSecBuffer">xmlSecBuffer</link>;
-<link linkend="void">void</link>                <link linkend="xmlSecBufferSetDefaultAllocMode">xmlSecBufferSetDefaultAllocMode</link>     (<link linkend="xmlSecAllocMode">xmlSecAllocMode</link> defAllocMode,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> defInitialSize);
-<link linkend="xmlSecBuffer">xmlSecBufferPtr</link>     <link linkend="xmlSecBufferCreate">xmlSecBufferCreate</link>                  (<link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="void">void</link>                <link linkend="xmlSecBufferDestroy">xmlSecBufferDestroy</link>                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
-<link linkend="int">int</link>                 <link linkend="xmlSecBufferInitialize">xmlSecBufferInitialize</link>              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="void">void</link>                <link linkend="xmlSecBufferFinalize">xmlSecBufferFinalize</link>                (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
-<link linkend="xmlSecByte">xmlSecByte</link>*         <link linkend="xmlSecBufferGetData">xmlSecBufferGetData</link>                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
-<link linkend="int">int</link>                 <link linkend="xmlSecBufferSetData">xmlSecBufferSetData</link>                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecBufferGetSize">xmlSecBufferGetSize</link>                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
-<link linkend="int">int</link>                 <link linkend="xmlSecBufferSetSize">xmlSecBufferSetSize</link>                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecBufferGetMaxSize">xmlSecBufferGetMaxSize</link>              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
-<link linkend="int">int</link>                 <link linkend="xmlSecBufferSetMaxSize">xmlSecBufferSetMaxSize</link>              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="void">void</link>                <link linkend="xmlSecBufferEmpty">xmlSecBufferEmpty</link>                   (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
-<link linkend="int">int</link>                 <link linkend="xmlSecBufferAppend">xmlSecBufferAppend</link>                  (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="int">int</link>                 <link linkend="xmlSecBufferPrepend">xmlSecBufferPrepend</link>                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="int">int</link>                 <link linkend="xmlSecBufferRemoveHead">xmlSecBufferRemoveHead</link>              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="int">int</link>                 <link linkend="xmlSecBufferRemoveTail">xmlSecBufferRemoveTail</link>              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="int">int</link>                 <link linkend="xmlSecBufferReadFile">xmlSecBufferReadFile</link>                (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         const <link linkend="char">char</link> *filename);
-<link linkend="int">int</link>                 <link linkend="xmlSecBufferBase64NodeContentRead">xmlSecBufferBase64NodeContentRead</link>   (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="int">int</link>                 <link linkend="xmlSecBufferBase64NodeContentWrite">xmlSecBufferBase64NodeContentWrite</link>  (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="int">int</link> columns);
-<link linkend="xmlOutputBufferPtr">xmlOutputBufferPtr</link>  <link linkend="xmlSecBufferCreateOutputBuffer">xmlSecBufferCreateOutputBuffer</link>      (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecBufferSetDefaultAllocMode">xmlSecBufferSetDefaultAllocMode</link>     (<parameter><link linkend="xmlSecAllocMode"><type>xmlSecAllocMode</type></link> defAllocMode</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> defInitialSize</parameter>);
+<link linkend="xmlSecBuffer"><returnvalue>xmlSecBufferPtr</returnvalue></link>     <link linkend="xmlSecBufferCreate">xmlSecBufferCreate</link>                  (<parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecBufferDestroy">xmlSecBufferDestroy</link>                 (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBufferInitialize">xmlSecBufferInitialize</link>              (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecBufferFinalize">xmlSecBufferFinalize</link>                (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>);
+<link linkend="xmlSecByte"><returnvalue>xmlSecByte</returnvalue></link>*         <link linkend="xmlSecBufferGetData">xmlSecBufferGetData</link>                 (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBufferSetData">xmlSecBufferSetData</link>                 (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);
+<link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          <link linkend="xmlSecBufferGetSize">xmlSecBufferGetSize</link>                 (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBufferSetSize">xmlSecBufferSetSize</link>                 (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);
+<link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          <link linkend="xmlSecBufferGetMaxSize">xmlSecBufferGetMaxSize</link>              (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBufferSetMaxSize">xmlSecBufferSetMaxSize</link>              (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecBufferEmpty">xmlSecBufferEmpty</link>                   (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBufferAppend">xmlSecBufferAppend</link>                  (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBufferPrepend">xmlSecBufferPrepend</link>                 (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBufferRemoveHead">xmlSecBufferRemoveHead</link>              (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBufferRemoveTail">xmlSecBufferRemoveTail</link>              (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBufferReadFile">xmlSecBufferReadFile</link>                (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBufferBase64NodeContentRead">xmlSecBufferBase64NodeContentRead</link>   (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecBufferBase64NodeContentWrite">xmlSecBufferBase64NodeContentWrite</link>  (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> columns</parameter>);
+<link linkend="xmlOutputBufferPtr"><returnvalue>xmlOutputBufferPtr</returnvalue></link>  <link linkend="xmlSecBufferCreateOutputBuffer">xmlSecBufferCreateOutputBuffer</link>      (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-buffer.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Binary buffer implementation.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-buffer.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecAllocMode" role="enum">
 <title>enum xmlSecAllocMode</title>
-<indexterm zone="xmlSecAllocMode"><primary sortas="xmlSecAllocMode">xmlSecAllocMode</primary></indexterm><programlisting>typedef enum {
+<indexterm zone="xmlSecAllocMode"><primary>xmlSecAllocMode</primary></indexterm>
+<programlisting>typedef enum {
     xmlSecAllocModeExact = 0,
     xmlSecAllocModeDouble
 } xmlSecAllocMode;
 </programlisting>
 <para>
-The memory allocation mode (used by <parameter>xmlSecBuffer</parameter> and <parameter>xmlSecList</parameter>).</para>
-<para>
+The memory allocation mode (used by <parameter>xmlSecBuffer</parameter> and <parameter>xmlSecList</parameter>).
 </para><variablelist role="enum">
 <varlistentry id="xmlSecAllocModeExact" role="constant">
 <term><literal>xmlSecAllocModeExact</literal></term>
-<listitem><simpara>       the memory allocation mode that minimizes total
+<listitem><simpara>the memory allocation mode that minimizes total
                              allocated memory size.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecAllocModeDouble" role="constant">
 <term><literal>xmlSecAllocModeDouble</literal></term>
-<listitem><simpara>      the memory allocation mode that tries to minimize
+<listitem><simpara>the memory allocation mode that tries to minimize
                              the number of malloc calls.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBuffer" role="struct">
 <title>struct xmlSecBuffer</title>
-<indexterm zone="xmlSecBuffer"><primary sortas="xmlSecBuffer">xmlSecBuffer</primary></indexterm><programlisting>struct xmlSecBuffer {
+<indexterm zone="xmlSecBuffer"><primary>xmlSecBuffer</primary></indexterm>
+<programlisting>struct xmlSecBuffer {
     xmlSecByte*         data;
     xmlSecSize          size;
     xmlSecSize          maxSize;
@@ -106,350 +98,345 @@ The memory allocation mode (used by <parameter>xmlSecBuffer</parameter> and <par
 };
 </programlisting>
 <para>
-Binary data buffer.</para>
-<para>
+Binary data buffer.
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="xmlSecByte">xmlSecByte</link>&#160;*<structfield>data</structfield>;</term>
-<listitem><simpara> the pointer to buffer data.
+<varlistentry><term><link linkend="xmlSecByte"><type>xmlSecByte</type></link>&#160;*<structfield id="xmlSecBuffer.data">data</structfield>;</term>
+<listitem><simpara>the pointer to buffer data.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>size</structfield>;</term>
-<listitem><simpara> the current data size.
+<varlistentry><term><link linkend="xmlSecSize"><type>xmlSecSize</type></link>&#160;<structfield id="xmlSecBuffer.size">size</structfield>;</term>
+<listitem><simpara>the current data size.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>maxSize</structfield>;</term>
-<listitem><simpara> the max data size (allocated buffer size).
+<varlistentry><term><link linkend="xmlSecSize"><type>xmlSecSize</type></link>&#160;<structfield id="xmlSecBuffer.maxSize">maxSize</structfield>;</term>
+<listitem><simpara>the max data size (allocated buffer size).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecAllocMode">xmlSecAllocMode</link>&#160;<structfield>allocMode</structfield>;</term>
-<listitem><simpara> the buffer memory allocation mode.
+<varlistentry><term><link linkend="xmlSecAllocMode"><type>xmlSecAllocMode</type></link>&#160;<structfield id="xmlSecBuffer.allocMode">allocMode</structfield>;</term>
+<listitem><simpara>the buffer memory allocation mode.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBufferSetDefaultAllocMode" role="function">
 <title>xmlSecBufferSetDefaultAllocMode ()</title>
-<indexterm zone="xmlSecBufferSetDefaultAllocMode"><primary sortas="xmlSecBufferSetDefaultAllocMode">xmlSecBufferSetDefaultAllocMode</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecBufferSetDefaultAllocMode     (<link linkend="xmlSecAllocMode">xmlSecAllocMode</link> defAllocMode,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> defInitialSize);</programlisting>
-<para>
-Sets new global default allocation mode and minimal intial size.</para>
+<indexterm zone="xmlSecBufferSetDefaultAllocMode"><primary>xmlSecBufferSetDefaultAllocMode</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecBufferSetDefaultAllocMode     (<parameter><link linkend="xmlSecAllocMode"><type>xmlSecAllocMode</type></link> defAllocMode</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> defInitialSize</parameter>);</programlisting>
 <para>
+Sets new global default allocation mode and minimal intial size.
 </para><variablelist role="params">
 <varlistentry><term><parameter>defAllocMode</parameter>&#160;:</term>
-<listitem><simpara>       the new default buffer allocation mode.
+<listitem><simpara>the new default buffer allocation mode.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>defInitialSize</parameter>&#160;:</term>
-<listitem><simpara>     the new default buffer minimal intial size.
+<listitem><simpara>the new default buffer minimal intial size.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBufferCreate" role="function">
 <title>xmlSecBufferCreate ()</title>
-<indexterm zone="xmlSecBufferCreate"><primary sortas="xmlSecBufferCreate">xmlSecBufferCreate</primary></indexterm><programlisting><link linkend="xmlSecBuffer">xmlSecBufferPtr</link>     xmlSecBufferCreate                  (<link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<indexterm zone="xmlSecBufferCreate"><primary>xmlSecBufferCreate</primary></indexterm>
+<programlisting><link linkend="xmlSecBuffer"><returnvalue>xmlSecBufferPtr</returnvalue></link>     xmlSecBufferCreate                  (<parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);</programlisting>
 <para>
 Allocates and initalizes new memory buffer with given size.
 Caller is responsible for calling <link linkend="xmlSecBufferDestroy"><type>xmlSecBufferDestroy</type></link> function
-to free the buffer.</para>
-<para>
+to free the buffer.
 </para><variablelist role="params">
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the intial size.
+<listitem><simpara>the intial size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated buffer or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBufferDestroy" role="function">
 <title>xmlSecBufferDestroy ()</title>
-<indexterm zone="xmlSecBufferDestroy"><primary sortas="xmlSecBufferDestroy">xmlSecBufferDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecBufferDestroy                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
-<para>
-Desrtoys buffer object created with <link linkend="xmlSecBufferCreate"><type>xmlSecBufferCreate</type></link> function.</para>
+<indexterm zone="xmlSecBufferDestroy"><primary>xmlSecBufferDestroy</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecBufferDestroy                 (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>);</programlisting>
 <para>
+Desrtoys buffer object created with <link linkend="xmlSecBufferCreate"><type>xmlSecBufferCreate</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to buffer object.
+<listitem><simpara>the pointer to buffer object.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBufferInitialize" role="function">
 <title>xmlSecBufferInitialize ()</title>
-<indexterm zone="xmlSecBufferInitialize"><primary sortas="xmlSecBufferInitialize">xmlSecBufferInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferInitialize              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<indexterm zone="xmlSecBufferInitialize"><primary>xmlSecBufferInitialize</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBufferInitialize              (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);</programlisting>
 <para>
 Initializes buffer object <parameter>buf</parameter>. Caller is responsible for calling
-<link linkend="xmlSecBufferFinalize"><type>xmlSecBufferFinalize</type></link> function to free allocated resources.</para>
-<para>
+<link linkend="xmlSecBufferFinalize"><type>xmlSecBufferFinalize</type></link> function to free allocated resources.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to buffer object.
+<listitem><simpara>the pointer to buffer object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the initial buffer size.
+<listitem><simpara>the initial buffer size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBufferFinalize" role="function">
 <title>xmlSecBufferFinalize ()</title>
-<indexterm zone="xmlSecBufferFinalize"><primary sortas="xmlSecBufferFinalize">xmlSecBufferFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecBufferFinalize                (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
+<indexterm zone="xmlSecBufferFinalize"><primary>xmlSecBufferFinalize</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecBufferFinalize                (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>);</programlisting>
 <para>
 Frees allocated resource for a buffer intialized with <link linkend="xmlSecBufferInitialize"><type>xmlSecBufferInitialize</type></link>
-function.</para>
-<para>
+function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to buffer object.
+<listitem><simpara>the pointer to buffer object.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBufferGetData" role="function">
 <title>xmlSecBufferGetData ()</title>
-<indexterm zone="xmlSecBufferGetData"><primary sortas="xmlSecBufferGetData">xmlSecBufferGetData</primary></indexterm><programlisting><link linkend="xmlSecByte">xmlSecByte</link>*         xmlSecBufferGetData                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
-<para>
-Gets pointer to buffer's data.</para>
+<indexterm zone="xmlSecBufferGetData"><primary>xmlSecBufferGetData</primary></indexterm>
+<programlisting><link linkend="xmlSecByte"><returnvalue>xmlSecByte</returnvalue></link>*         xmlSecBufferGetData                 (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>);</programlisting>
 <para>
+Gets pointer to buffer's data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to buffer object.
+<listitem><simpara>the pointer to buffer object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to buffer's data.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBufferSetData" role="function">
 <title>xmlSecBufferSetData ()</title>
-<indexterm zone="xmlSecBufferSetData"><primary sortas="xmlSecBufferSetData">xmlSecBufferSetData</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferSetData                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
-<para>
-Sets the value of the buffer to <parameter>data</parameter>.</para>
+<indexterm zone="xmlSecBufferSetData"><primary>xmlSecBufferSetData</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBufferSetData                 (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);</programlisting>
 <para>
+Sets the value of the buffer to <parameter>data</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to buffer object.
+<listitem><simpara>the pointer to buffer object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the data.
+<listitem><simpara>the data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the data size.
+<listitem><simpara>the data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBufferGetSize" role="function">
 <title>xmlSecBufferGetSize ()</title>
-<indexterm zone="xmlSecBufferGetSize"><primary sortas="xmlSecBufferGetSize">xmlSecBufferGetSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecBufferGetSize                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
-<para>
-Gets the current buffer data size.</para>
+<indexterm zone="xmlSecBufferGetSize"><primary>xmlSecBufferGetSize</primary></indexterm>
+<programlisting><link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          xmlSecBufferGetSize                 (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>);</programlisting>
 <para>
+Gets the current buffer data size.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to buffer object.
+<listitem><simpara>the pointer to buffer object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the current data size.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBufferSetSize" role="function">
 <title>xmlSecBufferSetSize ()</title>
-<indexterm zone="xmlSecBufferSetSize"><primary sortas="xmlSecBufferSetSize">xmlSecBufferSetSize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferSetSize                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<indexterm zone="xmlSecBufferSetSize"><primary>xmlSecBufferSetSize</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBufferSetSize                 (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);</programlisting>
 <para>
 Sets new buffer data size. If necessary, buffer grows to
-have at least <parameter>size</parameter> bytes.</para>
-<para>
+have at least <parameter>size</parameter> bytes.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to buffer object.
+<listitem><simpara>the pointer to buffer object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the new data size.
+<listitem><simpara>the new data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBufferGetMaxSize" role="function">
 <title>xmlSecBufferGetMaxSize ()</title>
-<indexterm zone="xmlSecBufferGetMaxSize"><primary sortas="xmlSecBufferGetMaxSize">xmlSecBufferGetMaxSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecBufferGetMaxSize              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
-<para>
-Gets the maximum (allocated) buffer size.</para>
+<indexterm zone="xmlSecBufferGetMaxSize"><primary>xmlSecBufferGetMaxSize</primary></indexterm>
+<programlisting><link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          xmlSecBufferGetMaxSize              (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>);</programlisting>
 <para>
+Gets the maximum (allocated) buffer size.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to buffer object.
+<listitem><simpara>the pointer to buffer object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the maximum (allocated) buffer size.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBufferSetMaxSize" role="function">
 <title>xmlSecBufferSetMaxSize ()</title>
-<indexterm zone="xmlSecBufferSetMaxSize"><primary sortas="xmlSecBufferSetMaxSize">xmlSecBufferSetMaxSize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferSetMaxSize              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<indexterm zone="xmlSecBufferSetMaxSize"><primary>xmlSecBufferSetMaxSize</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBufferSetMaxSize              (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);</programlisting>
 <para>
 Sets new buffer maximum size. If necessary, buffer grows to
-have at least <parameter>size</parameter> bytes.</para>
-<para>
+have at least <parameter>size</parameter> bytes.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to buffer object.
+<listitem><simpara>the pointer to buffer object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the new maximum size.
+<listitem><simpara>the new maximum size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBufferEmpty" role="function">
 <title>xmlSecBufferEmpty ()</title>
-<indexterm zone="xmlSecBufferEmpty"><primary sortas="xmlSecBufferEmpty">xmlSecBufferEmpty</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecBufferEmpty                   (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
-<para>
-Empties the buffer.</para>
+<indexterm zone="xmlSecBufferEmpty"><primary>xmlSecBufferEmpty</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecBufferEmpty                   (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>);</programlisting>
 <para>
+Empties the buffer.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to buffer object.
+<listitem><simpara>the pointer to buffer object.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBufferAppend" role="function">
 <title>xmlSecBufferAppend ()</title>
-<indexterm zone="xmlSecBufferAppend"><primary sortas="xmlSecBufferAppend">xmlSecBufferAppend</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferAppend                  (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
-<para>
-Appends the <parameter>data</parameter> after the current data stored in the buffer.</para>
+<indexterm zone="xmlSecBufferAppend"><primary>xmlSecBufferAppend</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBufferAppend                  (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);</programlisting>
 <para>
+Appends the <parameter>data</parameter> after the current data stored in the buffer.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to buffer object.
+<listitem><simpara>the pointer to buffer object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the data.
+<listitem><simpara>the data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the data size.
+<listitem><simpara>the data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBufferPrepend" role="function">
 <title>xmlSecBufferPrepend ()</title>
-<indexterm zone="xmlSecBufferPrepend"><primary sortas="xmlSecBufferPrepend">xmlSecBufferPrepend</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferPrepend                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
-<para>
-Prepends the <parameter>data</parameter> before the current data stored in the buffer.</para>
+<indexterm zone="xmlSecBufferPrepend"><primary>xmlSecBufferPrepend</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBufferPrepend                 (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);</programlisting>
 <para>
+Prepends the <parameter>data</parameter> before the current data stored in the buffer.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to buffer object.
+<listitem><simpara>the pointer to buffer object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the data.
+<listitem><simpara>the data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the data size.
+<listitem><simpara>the data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBufferRemoveHead" role="function">
 <title>xmlSecBufferRemoveHead ()</title>
-<indexterm zone="xmlSecBufferRemoveHead"><primary sortas="xmlSecBufferRemoveHead">xmlSecBufferRemoveHead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferRemoveHead              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
-<para>
-Removes <parameter>size</parameter> bytes from the beginning of the current buffer.</para>
+<indexterm zone="xmlSecBufferRemoveHead"><primary>xmlSecBufferRemoveHead</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBufferRemoveHead              (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);</programlisting>
 <para>
+Removes <parameter>size</parameter> bytes from the beginning of the current buffer.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to buffer object.
+<listitem><simpara>the pointer to buffer object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the number of bytes to be removed.
+<listitem><simpara>the number of bytes to be removed.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBufferRemoveTail" role="function">
 <title>xmlSecBufferRemoveTail ()</title>
-<indexterm zone="xmlSecBufferRemoveTail"><primary sortas="xmlSecBufferRemoveTail">xmlSecBufferRemoveTail</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferRemoveTail              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
-<para>
-Removes <parameter>size</parameter> bytes from the end of current buffer.</para>
+<indexterm zone="xmlSecBufferRemoveTail"><primary>xmlSecBufferRemoveTail</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBufferRemoveTail              (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);</programlisting>
 <para>
+Removes <parameter>size</parameter> bytes from the end of current buffer.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to buffer object.
+<listitem><simpara>the pointer to buffer object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the number of bytes to be removed.
+<listitem><simpara>the number of bytes to be removed.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBufferReadFile" role="function">
 <title>xmlSecBufferReadFile ()</title>
-<indexterm zone="xmlSecBufferReadFile"><primary sortas="xmlSecBufferReadFile">xmlSecBufferReadFile</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferReadFile                (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         const <link linkend="char">char</link> *filename);</programlisting>
-<para>
-Reads the content of the file <parameter>filename</parameter> in the buffer.</para>
+<indexterm zone="xmlSecBufferReadFile"><primary>xmlSecBufferReadFile</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBufferReadFile                (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>);</programlisting>
 <para>
+Reads the content of the file <parameter>filename</parameter> in the buffer.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to buffer object.
+<listitem><simpara>the pointer to buffer object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the filename.
+<listitem><simpara>the filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBufferBase64NodeContentRead" role="function">
 <title>xmlSecBufferBase64NodeContentRead ()</title>
-<indexterm zone="xmlSecBufferBase64NodeContentRead"><primary sortas="xmlSecBufferBase64NodeContentRead">xmlSecBufferBase64NodeContentRead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferBase64NodeContentRead   (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
+<indexterm zone="xmlSecBufferBase64NodeContentRead"><primary>xmlSecBufferBase64NodeContentRead</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBufferBase64NodeContentRead   (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>);</programlisting>
 <para>
 Reads the content of the <parameter>node</parameter>, base64 decodes it and stores the
-result in the buffer.</para>
-<para>
+result in the buffer.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to buffer object.
+<listitem><simpara>the pointer to buffer object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to node.
+<listitem><simpara>the pointer to node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBufferBase64NodeContentWrite" role="function">
 <title>xmlSecBufferBase64NodeContentWrite ()</title>
-<indexterm zone="xmlSecBufferBase64NodeContentWrite"><primary sortas="xmlSecBufferBase64NodeContentWrite">xmlSecBufferBase64NodeContentWrite</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferBase64NodeContentWrite  (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="int">int</link> columns);</programlisting>
-<para>
-Sets the content of the <parameter>node</parameter> to the base64 encoded buffer data.</para>
+<indexterm zone="xmlSecBufferBase64NodeContentWrite"><primary>xmlSecBufferBase64NodeContentWrite</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecBufferBase64NodeContentWrite  (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> columns</parameter>);</programlisting>
 <para>
+Sets the content of the <parameter>node</parameter> to the base64 encoded buffer data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to buffer object.
+<listitem><simpara>the pointer to buffer object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to a node.
+<listitem><simpara>the pointer to a node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>columns</parameter>&#160;:</term>
-<listitem><simpara>            the max line size fro base64 encoded data.
+<listitem><simpara>the max line size fro base64 encoded data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBufferCreateOutputBuffer" role="function">
 <title>xmlSecBufferCreateOutputBuffer ()</title>
-<indexterm zone="xmlSecBufferCreateOutputBuffer"><primary sortas="xmlSecBufferCreateOutputBuffer">xmlSecBufferCreateOutputBuffer</primary></indexterm><programlisting><link linkend="xmlOutputBufferPtr">xmlOutputBufferPtr</link>  xmlSecBufferCreateOutputBuffer      (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
+<indexterm zone="xmlSecBufferCreateOutputBuffer"><primary>xmlSecBufferCreateOutputBuffer</primary></indexterm>
+<programlisting><link linkend="xmlOutputBufferPtr"><returnvalue>xmlOutputBufferPtr</returnvalue></link>  xmlSecBufferCreateOutputBuffer      (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buf</parameter>);</programlisting>
 <para>
 Creates new LibXML output buffer to store data in the <parameter>buf</parameter>. Caller is
-responsible for destroying <parameter>buf</parameter> when processing is done.</para>
-<para>
+responsible for destroying <parameter>buf</parameter> when processing is done.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to buffer.
+<listitem><simpara>the pointer to buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated output buffer or NULL if an error
 occurs.
@@ -458,7 +445,4 @@ occurs.
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/dl.sgml b/docs/api/sgml/dl.sgml
index 93711c8..3ab1f2b 100644
--- a/docs/api/sgml/dl.sgml
+++ b/docs/api/sgml/dl.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-dl.top_of_page">dl</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>dl</refname>
 <refpurpose>Dynamic crypto-engine library loading support.</refpurpose>
@@ -13,139 +14,129 @@
 <refsynopsisdiv id="xmlsec-dl.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="int">int</link>                 <link linkend="xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms">xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms</link>
-                                                        (<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> functions);
-<link linkend="int">int</link>                 <link linkend="xmlSecCryptoDLInit">xmlSecCryptoDLInit</link>                  (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecCryptoDLShutdown">xmlSecCryptoDLShutdown</link>              (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecCryptoDLLoadLibrary">xmlSecCryptoDLLoadLibrary</link>           (const <link linkend="xmlChar">xmlChar</link> *crypto);
-<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  <link linkend="xmlSecCryptoDLGetLibraryFunctions">xmlSecCryptoDLGetLibraryFunctions</link>
-                                                        (const <link linkend="xmlChar">xmlChar</link> *crypto);
-<link linkend="int">int</link>                 <link linkend="xmlSecCryptoDLUnloadLibrary">xmlSecCryptoDLUnloadLibrary</link>         (const <link linkend="xmlChar">xmlChar</link> *crypto);
-<link linkend="int">int</link>                 <link linkend="xmlSecCryptoDLSetFunctions">xmlSecCryptoDLSetFunctions</link>          (<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> functions);
-<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  <link linkend="xmlSecCryptoDLGetFunctions">xmlSecCryptoDLGetFunctions</link>  (void);
+<synopsis><link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms">xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms</link>
+                                                        (<parameter><link linkend="xmlSecCryptoDLFunctions"><type>xmlSecCryptoDLFunctionsPtr</type></link> functions</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCryptoDLInit">xmlSecCryptoDLInit</link>                  (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCryptoDLShutdown">xmlSecCryptoDLShutdown</link>              (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCryptoDLLoadLibrary">xmlSecCryptoDLLoadLibrary</link>           (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *crypto</parameter>);
+<link linkend="xmlSecCryptoDLFunctions"><returnvalue>xmlSecCryptoDLFunctionsPtr</returnvalue></link>  <link linkend="xmlSecCryptoDLGetLibraryFunctions">xmlSecCryptoDLGetLibraryFunctions</link>
+                                                        (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *crypto</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCryptoDLUnloadLibrary">xmlSecCryptoDLUnloadLibrary</link>         (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *crypto</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCryptoDLSetFunctions">xmlSecCryptoDLSetFunctions</link>          (<parameter><link linkend="xmlSecCryptoDLFunctions"><type>xmlSecCryptoDLFunctionsPtr</type></link> functions</parameter>);
+<link linkend="xmlSecCryptoDLFunctions"><returnvalue>xmlSecCryptoDLFunctionsPtr</returnvalue></link>  <link linkend="xmlSecCryptoDLGetFunctions">xmlSecCryptoDLGetFunctions</link>  (<parameter><type>void</type></parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-dl.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Dynamic crypto-engine library loading support.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-dl.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms" role="function">
 <title>xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms ()</title>
-<indexterm zone="xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms"><primary sortas="xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms">xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms
-                                                        (<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> functions);</programlisting>
-<para>
-Registers the key data and transforms klasses from <parameter>functions</parameter> table in xmlsec.</para>
+<indexterm zone="xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms"><primary>xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms
+                                                        (<parameter><link linkend="xmlSecCryptoDLFunctions"><type>xmlSecCryptoDLFunctionsPtr</type></link> functions</parameter>);</programlisting>
 <para>
+Registers the key data and transforms klasses from <parameter>functions</parameter> table in xmlsec.
 </para><variablelist role="params">
 <varlistentry><term><parameter>functions</parameter>&#160;:</term>
-<listitem><simpara>          the functions table.
+<listitem><simpara>the functions table.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoDLInit" role="function">
 <title>xmlSecCryptoDLInit ()</title>
-<indexterm zone="xmlSecCryptoDLInit"><primary sortas="xmlSecCryptoDLInit">xmlSecCryptoDLInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoDLInit                  (void);</programlisting>
+<indexterm zone="xmlSecCryptoDLInit"><primary>xmlSecCryptoDLInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCryptoDLInit                  (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 Initializes dynamic loading engine. This is an internal function
-and should not be called by application directly.</para>
-<para>
+and should not be called by application directly.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoDLShutdown" role="function">
 <title>xmlSecCryptoDLShutdown ()</title>
-<indexterm zone="xmlSecCryptoDLShutdown"><primary sortas="xmlSecCryptoDLShutdown">xmlSecCryptoDLShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoDLShutdown              (void);</programlisting>
+<indexterm zone="xmlSecCryptoDLShutdown"><primary>xmlSecCryptoDLShutdown</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCryptoDLShutdown              (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 Shutdowns dynamic loading engine. This is an internal function
-and should not be called by application directly.</para>
-<para>
+and should not be called by application directly.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoDLLoadLibrary" role="function">
 <title>xmlSecCryptoDLLoadLibrary ()</title>
-<indexterm zone="xmlSecCryptoDLLoadLibrary"><primary sortas="xmlSecCryptoDLLoadLibrary">xmlSecCryptoDLLoadLibrary</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoDLLoadLibrary           (const <link linkend="xmlChar">xmlChar</link> *crypto);</programlisting>
+<indexterm zone="xmlSecCryptoDLLoadLibrary"><primary>xmlSecCryptoDLLoadLibrary</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCryptoDLLoadLibrary           (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *crypto</parameter>);</programlisting>
 <para>
 Loads the xmlsec-&lt;crypto&gt; library. This function is NOT thread safe,
 application MUST NOT call <link linkend="xmlSecCryptoDLLoadLibrary"><type>xmlSecCryptoDLLoadLibrary</type></link>, <link linkend="xmlSecCryptoDLGetLibraryFunctions"><type>xmlSecCryptoDLGetLibraryFunctions</type></link>,
-and <link linkend="xmlSecCryptoDLUnloadLibrary"><type>xmlSecCryptoDLUnloadLibrary</type></link> functions from multiple threads.</para>
-<para>
+and <link linkend="xmlSecCryptoDLUnloadLibrary"><type>xmlSecCryptoDLUnloadLibrary</type></link> functions from multiple threads.
 </para><variablelist role="params">
 <varlistentry><term><parameter>crypto</parameter>&#160;:</term>
-<listitem><simpara>             the desired crypto library name ("openssl", "nss", ...).
+<listitem><simpara>the desired crypto library name ("openssl", "nss", ...).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoDLGetLibraryFunctions" role="function">
 <title>xmlSecCryptoDLGetLibraryFunctions ()</title>
-<indexterm zone="xmlSecCryptoDLGetLibraryFunctions"><primary sortas="xmlSecCryptoDLGetLibraryFunctions">xmlSecCryptoDLGetLibraryFunctions</primary></indexterm><programlisting><link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  xmlSecCryptoDLGetLibraryFunctions
-                                                        (const <link linkend="xmlChar">xmlChar</link> *crypto);</programlisting>
+<indexterm zone="xmlSecCryptoDLGetLibraryFunctions"><primary>xmlSecCryptoDLGetLibraryFunctions</primary></indexterm>
+<programlisting><link linkend="xmlSecCryptoDLFunctions"><returnvalue>xmlSecCryptoDLFunctionsPtr</returnvalue></link>  xmlSecCryptoDLGetLibraryFunctions
+                                                        (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *crypto</parameter>);</programlisting>
 <para>
 Loads the xmlsec-&lt;crypto&gt; library and gets global crypto functions/transforms/keys data/keys store
 table. This function is NOT thread safe, application MUST NOT call <link linkend="xmlSecCryptoDLLoadLibrary"><type>xmlSecCryptoDLLoadLibrary</type></link>,
-<link linkend="xmlSecCryptoDLGetLibraryFunctions"><type>xmlSecCryptoDLGetLibraryFunctions</type></link>, and <link linkend="xmlSecCryptoDLUnloadLibrary"><type>xmlSecCryptoDLUnloadLibrary</type></link> functions from multiple threads.</para>
-<para>
+<link linkend="xmlSecCryptoDLGetLibraryFunctions"><type>xmlSecCryptoDLGetLibraryFunctions</type></link>, and <link linkend="xmlSecCryptoDLUnloadLibrary"><type>xmlSecCryptoDLUnloadLibrary</type></link> functions from multiple threads.
 </para><variablelist role="params">
 <varlistentry><term><parameter>crypto</parameter>&#160;:</term>
-<listitem><simpara>             the desired crypto library name ("openssl", "nss", ...).
+<listitem><simpara>the desired crypto library name ("openssl", "nss", ...).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the table or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoDLUnloadLibrary" role="function">
 <title>xmlSecCryptoDLUnloadLibrary ()</title>
-<indexterm zone="xmlSecCryptoDLUnloadLibrary"><primary sortas="xmlSecCryptoDLUnloadLibrary">xmlSecCryptoDLUnloadLibrary</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoDLUnloadLibrary         (const <link linkend="xmlChar">xmlChar</link> *crypto);</programlisting>
+<indexterm zone="xmlSecCryptoDLUnloadLibrary"><primary>xmlSecCryptoDLUnloadLibrary</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCryptoDLUnloadLibrary         (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *crypto</parameter>);</programlisting>
 <para>
 Unloads the xmlsec-&lt;crypto&gt; library. All pointers to this library
 functions tables became invalid. This function is NOT thread safe,
 application MUST NOT call <link linkend="xmlSecCryptoDLLoadLibrary"><type>xmlSecCryptoDLLoadLibrary</type></link>, <link linkend="xmlSecCryptoDLGetLibraryFunctions"><type>xmlSecCryptoDLGetLibraryFunctions</type></link>,
-and <link linkend="xmlSecCryptoDLUnloadLibrary"><type>xmlSecCryptoDLUnloadLibrary</type></link> functions from multiple threads.</para>
-<para>
+and <link linkend="xmlSecCryptoDLUnloadLibrary"><type>xmlSecCryptoDLUnloadLibrary</type></link> functions from multiple threads.
 </para><variablelist role="params">
 <varlistentry><term><parameter>crypto</parameter>&#160;:</term>
-<listitem><simpara>             the desired crypto library name ("openssl", "nss", ...).
+<listitem><simpara>the desired crypto library name ("openssl", "nss", ...).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoDLSetFunctions" role="function">
 <title>xmlSecCryptoDLSetFunctions ()</title>
-<indexterm zone="xmlSecCryptoDLSetFunctions"><primary sortas="xmlSecCryptoDLSetFunctions">xmlSecCryptoDLSetFunctions</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoDLSetFunctions          (<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> functions);</programlisting>
-<para>
-Sets global crypto functions/transforms/keys data/keys store table.</para>
+<indexterm zone="xmlSecCryptoDLSetFunctions"><primary>xmlSecCryptoDLSetFunctions</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCryptoDLSetFunctions          (<parameter><link linkend="xmlSecCryptoDLFunctions"><type>xmlSecCryptoDLFunctionsPtr</type></link> functions</parameter>);</programlisting>
 <para>
+Sets global crypto functions/transforms/keys data/keys store table.
 </para><variablelist role="params">
 <varlistentry><term><parameter>functions</parameter>&#160;:</term>
-<listitem><simpara>          the new table
+<listitem><simpara>the new table
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoDLGetFunctions" role="function">
 <title>xmlSecCryptoDLGetFunctions ()</title>
-<indexterm zone="xmlSecCryptoDLGetFunctions"><primary sortas="xmlSecCryptoDLGetFunctions">xmlSecCryptoDLGetFunctions</primary></indexterm><programlisting><link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  xmlSecCryptoDLGetFunctions  (void);</programlisting>
-<para>
-Gets global crypto functions/transforms/keys data/keys store table.</para>
+<indexterm zone="xmlSecCryptoDLGetFunctions"><primary>xmlSecCryptoDLGetFunctions</primary></indexterm>
+<programlisting><link linkend="xmlSecCryptoDLFunctions"><returnvalue>xmlSecCryptoDLFunctionsPtr</returnvalue></link>  xmlSecCryptoDLGetFunctions  (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets global crypto functions/transforms/keys data/keys store table.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the table.
 </simpara></listitem></varlistentry>
@@ -153,7 +144,4 @@ Gets global crypto functions/transforms/keys data/keys store table.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/errors.sgml b/docs/api/sgml/errors.sgml
index dc8cbc1..05e7727 100644
--- a/docs/api/sgml/errors.sgml
+++ b/docs/api/sgml/errors.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-errors.top_of_page">errors</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>errors</refname>
 <refpurpose>Error/log messages support.</refpurpose>
@@ -13,617 +14,608 @@
 <refsynopsisdiv id="xmlsec-errors.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-#define             <link linkend="XMLSEC-ERRORS-R-XMLSEC-FAILED--CAPS">XMLSEC_ERRORS_R_XMLSEC_FAILED</link>
-#define             <link linkend="XMLSEC-ERRORS-R-MALLOC-FAILED--CAPS">XMLSEC_ERRORS_R_MALLOC_FAILED</link>
-#define             <link linkend="XMLSEC-ERRORS-R-STRDUP-FAILED--CAPS">XMLSEC_ERRORS_R_STRDUP_FAILED</link>
-#define             <link linkend="XMLSEC-ERRORS-R-CRYPTO-FAILED--CAPS">XMLSEC_ERRORS_R_CRYPTO_FAILED</link>
-#define             <link linkend="XMLSEC-ERRORS-R-XML-FAILED--CAPS">XMLSEC_ERRORS_R_XML_FAILED</link>
-#define             <link linkend="XMLSEC-ERRORS-R-XSLT-FAILED--CAPS">XMLSEC_ERRORS_R_XSLT_FAILED</link>
-#define             <link linkend="XMLSEC-ERRORS-R-IO-FAILED--CAPS">XMLSEC_ERRORS_R_IO_FAILED</link>
-#define             <link linkend="XMLSEC-ERRORS-R-DISABLED--CAPS">XMLSEC_ERRORS_R_DISABLED</link>
-#define             <link linkend="XMLSEC-ERRORS-R-NOT-IMPLEMENTED--CAPS">XMLSEC_ERRORS_R_NOT_IMPLEMENTED</link>
-#define             <link linkend="XMLSEC-ERRORS-R-INVALID-SIZE--CAPS">XMLSEC_ERRORS_R_INVALID_SIZE</link>
-#define             <link linkend="XMLSEC-ERRORS-R-INVALID-DATA--CAPS">XMLSEC_ERRORS_R_INVALID_DATA</link>
-#define             <link linkend="XMLSEC-ERRORS-R-INVALID-RESULT--CAPS">XMLSEC_ERRORS_R_INVALID_RESULT</link>
-#define             <link linkend="XMLSEC-ERRORS-R-INVALID-TYPE--CAPS">XMLSEC_ERRORS_R_INVALID_TYPE</link>
-#define             <link linkend="XMLSEC-ERRORS-R-INVALID-OPERATION--CAPS">XMLSEC_ERRORS_R_INVALID_OPERATION</link>
-#define             <link linkend="XMLSEC-ERRORS-R-INVALID-STATUS--CAPS">XMLSEC_ERRORS_R_INVALID_STATUS</link>
-#define             <link linkend="XMLSEC-ERRORS-R-INVALID-FORMAT--CAPS">XMLSEC_ERRORS_R_INVALID_FORMAT</link>
-#define             <link linkend="XMLSEC-ERRORS-R-DATA-NOT-MATCH--CAPS">XMLSEC_ERRORS_R_DATA_NOT_MATCH</link>
-#define             <link linkend="XMLSEC-ERRORS-R-INVALID-NODE--CAPS">XMLSEC_ERRORS_R_INVALID_NODE</link>
-#define             <link linkend="XMLSEC-ERRORS-R-INVALID-NODE-CONTENT--CAPS">XMLSEC_ERRORS_R_INVALID_NODE_CONTENT</link>
-#define             <link linkend="XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE--CAPS">XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE</link>
-#define             <link linkend="XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE--CAPS">XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE</link>
-#define             <link linkend="XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT--CAPS">XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT</link>
-#define             <link linkend="XMLSEC-ERRORS-R-UNEXPECTED-NODE--CAPS">XMLSEC_ERRORS_R_UNEXPECTED_NODE</link>
-#define             <link linkend="XMLSEC-ERRORS-R-NODE-NOT-FOUND--CAPS">XMLSEC_ERRORS_R_NODE_NOT_FOUND</link>
-#define             <link linkend="XMLSEC-ERRORS-R-INVALID-TRANSFORM--CAPS">XMLSEC_ERRORS_R_INVALID_TRANSFORM</link>
-#define             <link linkend="XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY--CAPS">XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY</link>
-#define             <link linkend="XMLSEC-ERRORS-R-INVALID-URI-TYPE--CAPS">XMLSEC_ERRORS_R_INVALID_URI_TYPE</link>
-#define             <link linkend="XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED--CAPS">XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED</link>
-#define             <link linkend="XMLSEC-ERRORS-R-TRANSFORM-DISABLED--CAPS">XMLSEC_ERRORS_R_TRANSFORM_DISABLED</link>
-#define             <link linkend="XMLSEC-ERRORS-R-INVALID-KEY-DATA--CAPS">XMLSEC_ERRORS_R_INVALID_KEY_DATA</link>
-#define             <link linkend="XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND--CAPS">XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND</link>
-#define             <link linkend="XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST--CAPS">XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST</link>
-#define             <link linkend="XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE--CAPS">XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE</link>
-#define             <link linkend="XMLSEC-ERRORS-R-KEY-NOT-FOUND--CAPS">XMLSEC_ERRORS_R_KEY_NOT_FOUND</link>
-#define             <link linkend="XMLSEC-ERRORS-R-KEYDATA-DISABLED--CAPS">XMLSEC_ERRORS_R_KEYDATA_DISABLED</link>
-#define             <link linkend="XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL--CAPS">XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL</link>
-#define             <link linkend="XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH--CAPS">XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH</link>
-#define             <link linkend="XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL--CAPS">XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL</link>
-#define             <link linkend="XMLSEC-ERRORS-R-CERT-VERIFY-FAILED--CAPS">XMLSEC_ERRORS_R_CERT_VERIFY_FAILED</link>
-#define             <link linkend="XMLSEC-ERRORS-R-CERT-NOT-FOUND--CAPS">XMLSEC_ERRORS_R_CERT_NOT_FOUND</link>
-#define             <link linkend="XMLSEC-ERRORS-R-CERT-REVOKED--CAPS">XMLSEC_ERRORS_R_CERT_REVOKED</link>
-#define             <link linkend="XMLSEC-ERRORS-R-CERT-ISSUER-FAILED--CAPS">XMLSEC_ERRORS_R_CERT_ISSUER_FAILED</link>
-#define             <link linkend="XMLSEC-ERRORS-R-CERT-NOT-YET-VALID--CAPS">XMLSEC_ERRORS_R_CERT_NOT_YET_VALID</link>
-#define             <link linkend="XMLSEC-ERRORS-R-CERT-HAS-EXPIRED--CAPS">XMLSEC_ERRORS_R_CERT_HAS_EXPIRED</link>
-#define             <link linkend="XMLSEC-ERRORS-R-DSIG-NO-REFERENCES--CAPS">XMLSEC_ERRORS_R_DSIG_NO_REFERENCES</link>
-#define             <link linkend="XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE--CAPS">XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE</link>
-#define             <link linkend="XMLSEC-ERRORS-R-ASSERTION--CAPS">XMLSEC_ERRORS_R_ASSERTION</link>
-#define             <link linkend="XMLSEC-ERRORS-MAX-NUMBER--CAPS">XMLSEC_ERRORS_MAX_NUMBER</link>
-<link linkend="void">void</link>                (<link linkend="xmlSecErrorsCallback">*xmlSecErrorsCallback</link>)             (const <link linkend="char">char</link> *file,
-                                                         <link linkend="int">int</link> line,
-                                                         const <link linkend="char">char</link> *func,
-                                                         const <link linkend="char">char</link> *errorObject,
-                                                         const <link linkend="char">char</link> *errorSubject,
-                                                         <link linkend="int">int</link> reason,
-                                                         const <link linkend="char">char</link> *msg);
-<link linkend="void">void</link>                <link linkend="xmlSecErrorsInit">xmlSecErrorsInit</link>                    (void);
-<link linkend="void">void</link>                <link linkend="xmlSecErrorsShutdown">xmlSecErrorsShutdown</link>                (void);
-<link linkend="void">void</link>                <link linkend="xmlSecErrorsSetCallback">xmlSecErrorsSetCallback</link>             (<link linkend="xmlSecErrorsCallback">xmlSecErrorsCallback</link> callback);
-<link linkend="void">void</link>                <link linkend="xmlSecErrorsDefaultCallback">xmlSecErrorsDefaultCallback</link>         (const <link linkend="char">char</link> *file,
-                                                         <link linkend="int">int</link> line,
-                                                         const <link linkend="char">char</link> *func,
-                                                         const <link linkend="char">char</link> *errorObject,
-                                                         const <link linkend="char">char</link> *errorSubject,
-                                                         <link linkend="int">int</link> reason,
-                                                         const <link linkend="char">char</link> *msg);
-<link linkend="void">void</link>                <link linkend="xmlSecErrorsDefaultCallbackEnableOutput">xmlSecErrorsDefaultCallbackEnableOutput</link>
-                                                        (<link linkend="int">int</link> enabled);
-<link linkend="int">int</link>                 <link linkend="xmlSecErrorsGetCode">xmlSecErrorsGetCode</link>                 (<link linkend="xmlSecSize">xmlSecSize</link> pos);
-const <link linkend="char">char</link>*         <link linkend="xmlSecErrorsGetMsg">xmlSecErrorsGetMsg</link>                  (<link linkend="xmlSecSize">xmlSecSize</link> pos);
-#define             <link linkend="XMLSEC-ERRORS-HERE--CAPS">XMLSEC_ERRORS_HERE</link>
+<synopsis>#define             <link linkend="XMLSEC-ERRORS-R-XMLSEC-FAILED:CAPS">XMLSEC_ERRORS_R_XMLSEC_FAILED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-MALLOC-FAILED:CAPS">XMLSEC_ERRORS_R_MALLOC_FAILED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-STRDUP-FAILED:CAPS">XMLSEC_ERRORS_R_STRDUP_FAILED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-CRYPTO-FAILED:CAPS">XMLSEC_ERRORS_R_CRYPTO_FAILED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-XML-FAILED:CAPS">XMLSEC_ERRORS_R_XML_FAILED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-XSLT-FAILED:CAPS">XMLSEC_ERRORS_R_XSLT_FAILED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-IO-FAILED:CAPS">XMLSEC_ERRORS_R_IO_FAILED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-DISABLED:CAPS">XMLSEC_ERRORS_R_DISABLED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-NOT-IMPLEMENTED:CAPS">XMLSEC_ERRORS_R_NOT_IMPLEMENTED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-SIZE:CAPS">XMLSEC_ERRORS_R_INVALID_SIZE</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-DATA:CAPS">XMLSEC_ERRORS_R_INVALID_DATA</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-RESULT:CAPS">XMLSEC_ERRORS_R_INVALID_RESULT</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-TYPE:CAPS">XMLSEC_ERRORS_R_INVALID_TYPE</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-OPERATION:CAPS">XMLSEC_ERRORS_R_INVALID_OPERATION</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-STATUS:CAPS">XMLSEC_ERRORS_R_INVALID_STATUS</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-FORMAT:CAPS">XMLSEC_ERRORS_R_INVALID_FORMAT</link>
+#define             <link linkend="XMLSEC-ERRORS-R-DATA-NOT-MATCH:CAPS">XMLSEC_ERRORS_R_DATA_NOT_MATCH</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-NODE:CAPS">XMLSEC_ERRORS_R_INVALID_NODE</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-NODE-CONTENT:CAPS">XMLSEC_ERRORS_R_INVALID_NODE_CONTENT</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE:CAPS">XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE</link>
+#define             <link linkend="XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE:CAPS">XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE</link>
+#define             <link linkend="XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT:CAPS">XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT</link>
+#define             <link linkend="XMLSEC-ERRORS-R-UNEXPECTED-NODE:CAPS">XMLSEC_ERRORS_R_UNEXPECTED_NODE</link>
+#define             <link linkend="XMLSEC-ERRORS-R-NODE-NOT-FOUND:CAPS">XMLSEC_ERRORS_R_NODE_NOT_FOUND</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-TRANSFORM:CAPS">XMLSEC_ERRORS_R_INVALID_TRANSFORM</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY:CAPS">XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-URI-TYPE:CAPS">XMLSEC_ERRORS_R_INVALID_URI_TYPE</link>
+#define             <link linkend="XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED:CAPS">XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-TRANSFORM-DISABLED:CAPS">XMLSEC_ERRORS_R_TRANSFORM_DISABLED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-KEY-DATA:CAPS">XMLSEC_ERRORS_R_INVALID_KEY_DATA</link>
+#define             <link linkend="XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND:CAPS">XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND</link>
+#define             <link linkend="XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST:CAPS">XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE:CAPS">XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE</link>
+#define             <link linkend="XMLSEC-ERRORS-R-KEY-NOT-FOUND:CAPS">XMLSEC_ERRORS_R_KEY_NOT_FOUND</link>
+#define             <link linkend="XMLSEC-ERRORS-R-KEYDATA-DISABLED:CAPS">XMLSEC_ERRORS_R_KEYDATA_DISABLED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL:CAPS">XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL</link>
+#define             <link linkend="XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH:CAPS">XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH</link>
+#define             <link linkend="XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL:CAPS">XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL</link>
+#define             <link linkend="XMLSEC-ERRORS-R-CERT-VERIFY-FAILED:CAPS">XMLSEC_ERRORS_R_CERT_VERIFY_FAILED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-CERT-NOT-FOUND:CAPS">XMLSEC_ERRORS_R_CERT_NOT_FOUND</link>
+#define             <link linkend="XMLSEC-ERRORS-R-CERT-REVOKED:CAPS">XMLSEC_ERRORS_R_CERT_REVOKED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-CERT-ISSUER-FAILED:CAPS">XMLSEC_ERRORS_R_CERT_ISSUER_FAILED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-CERT-NOT-YET-VALID:CAPS">XMLSEC_ERRORS_R_CERT_NOT_YET_VALID</link>
+#define             <link linkend="XMLSEC-ERRORS-R-CERT-HAS-EXPIRED:CAPS">XMLSEC_ERRORS_R_CERT_HAS_EXPIRED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-DSIG-NO-REFERENCES:CAPS">XMLSEC_ERRORS_R_DSIG_NO_REFERENCES</link>
+#define             <link linkend="XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE:CAPS">XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE</link>
+#define             <link linkend="XMLSEC-ERRORS-R-ASSERTION:CAPS">XMLSEC_ERRORS_R_ASSERTION</link>
+#define             <link linkend="XMLSEC-ERRORS-MAX-NUMBER:CAPS">XMLSEC_ERRORS_MAX_NUMBER</link>
+<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="xmlSecErrorsCallback">*xmlSecErrorsCallback</link>)             (<parameter>const <link linkend="char"><type>char</type></link> *file</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> line</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *func</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorObject</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorSubject</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> reason</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *msg</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecErrorsInit">xmlSecErrorsInit</link>                    (<parameter><type>void</type></parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecErrorsShutdown">xmlSecErrorsShutdown</link>                (<parameter><type>void</type></parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecErrorsSetCallback">xmlSecErrorsSetCallback</link>             (<parameter><link linkend="xmlSecErrorsCallback"><type>xmlSecErrorsCallback</type></link> callback</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecErrorsDefaultCallback">xmlSecErrorsDefaultCallback</link>         (<parameter>const <link linkend="char"><type>char</type></link> *file</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> line</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *func</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorObject</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorSubject</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> reason</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *msg</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecErrorsDefaultCallbackEnableOutput">xmlSecErrorsDefaultCallbackEnableOutput</link>
+                                                        (<parameter><link linkend="int"><type>int</type></link> enabled</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecErrorsGetCode">xmlSecErrorsGetCode</link>                 (<parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);
+const <link linkend="char"><returnvalue>char</returnvalue></link>*         <link linkend="xmlSecErrorsGetMsg">xmlSecErrorsGetMsg</link>                  (<parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);
+#define             <link linkend="XMLSEC-ERRORS-HERE:CAPS">XMLSEC_ERRORS_HERE</link>
 #define             <link linkend="xmlSecErrorsSafeString">xmlSecErrorsSafeString</link>              (str)
-#define             <link linkend="XMLSEC-ERRORS-NO-MESSAGE--CAPS">XMLSEC_ERRORS_NO_MESSAGE</link>
-<link linkend="void">void</link>                <link linkend="xmlSecError">xmlSecError</link>                         (const <link linkend="char">char</link> *file,
-                                                         <link linkend="int">int</link> line,
-                                                         const <link linkend="char">char</link> *func,
-                                                         const <link linkend="char">char</link> *errorObject,
-                                                         const <link linkend="char">char</link> *errorSubject,
-                                                         <link linkend="int">int</link> reason,
-                                                         const <link linkend="char">char</link> *msg,
-                                                         ...);
-#define             <link linkend="xmlSecAssert">xmlSecAssert</link>                        ( p )
-#define             <link linkend="xmlSecAssert2">xmlSecAssert2</link>                       ( p, ret )
+#define             <link linkend="XMLSEC-ERRORS-NO-MESSAGE:CAPS">XMLSEC_ERRORS_NO_MESSAGE</link>
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecError">xmlSecError</link>                         (<parameter>const <link linkend="char"><type>char</type></link> *file</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> line</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *func</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorObject</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorSubject</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> reason</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *msg</parameter>,
+                                                         <parameter>...</parameter>);
+#define             <link linkend="xmlSecAssert">xmlSecAssert</link>                        (p)
+#define             <link linkend="xmlSecAssert2">xmlSecAssert2</link>                       (p,
+                                                         ret)
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-errors.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Error/log messages support.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-errors.details" role="details">
 <title role="details.title">Details</title>
-<refsect2 id="XMLSEC-ERRORS-R-XMLSEC-FAILED--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-XMLSEC-FAILED:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_XMLSEC_FAILED</title>
-<indexterm zone="XMLSEC-ERRORS-R-XMLSEC-FAILED--CAPS"><primary sortas="XMLSEC_ERRORS_R_XMLSEC_FAILED">XMLSEC_ERRORS_R_XMLSEC_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_XMLSEC_FAILED                   1
+<indexterm zone="XMLSEC-ERRORS-R-XMLSEC-FAILED:CAPS"><primary>XMLSEC_ERRORS_R_XMLSEC_FAILED</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_XMLSEC_FAILED                   1
 </programlisting>
 <para>
-An XMLSec function failed (error subject is the failed function).</para>
-<para>
+An XMLSec function failed (error subject is the failed function).
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-MALLOC-FAILED--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-MALLOC-FAILED:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_MALLOC_FAILED</title>
-<indexterm zone="XMLSEC-ERRORS-R-MALLOC-FAILED--CAPS"><primary sortas="XMLSEC_ERRORS_R_MALLOC_FAILED">XMLSEC_ERRORS_R_MALLOC_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_MALLOC_FAILED                   2
+<indexterm zone="XMLSEC-ERRORS-R-MALLOC-FAILED:CAPS"><primary>XMLSEC_ERRORS_R_MALLOC_FAILED</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_MALLOC_FAILED                   2
 </programlisting>
 <para>
-Failed to allocate memory error.</para>
-<para>
+Failed to allocate memory error.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-STRDUP-FAILED--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-STRDUP-FAILED:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_STRDUP_FAILED</title>
-<indexterm zone="XMLSEC-ERRORS-R-STRDUP-FAILED--CAPS"><primary sortas="XMLSEC_ERRORS_R_STRDUP_FAILED">XMLSEC_ERRORS_R_STRDUP_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_STRDUP_FAILED                   3
+<indexterm zone="XMLSEC-ERRORS-R-STRDUP-FAILED:CAPS"><primary>XMLSEC_ERRORS_R_STRDUP_FAILED</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_STRDUP_FAILED                   3
 </programlisting>
 <para>
-Failed to duplicate string error.</para>
-<para>
+Failed to duplicate string error.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-CRYPTO-FAILED--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-CRYPTO-FAILED:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_CRYPTO_FAILED</title>
-<indexterm zone="XMLSEC-ERRORS-R-CRYPTO-FAILED--CAPS"><primary sortas="XMLSEC_ERRORS_R_CRYPTO_FAILED">XMLSEC_ERRORS_R_CRYPTO_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CRYPTO_FAILED                   4
+<indexterm zone="XMLSEC-ERRORS-R-CRYPTO-FAILED:CAPS"><primary>XMLSEC_ERRORS_R_CRYPTO_FAILED</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_CRYPTO_FAILED                   4
 </programlisting>
 <para>
-Crypto (OpenSSL) function failed (error subject is the failed function).</para>
-<para>
+Crypto (OpenSSL) function failed (error subject is the failed function).
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-XML-FAILED--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-XML-FAILED:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_XML_FAILED</title>
-<indexterm zone="XMLSEC-ERRORS-R-XML-FAILED--CAPS"><primary sortas="XMLSEC_ERRORS_R_XML_FAILED">XMLSEC_ERRORS_R_XML_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_XML_FAILED                      5
+<indexterm zone="XMLSEC-ERRORS-R-XML-FAILED:CAPS"><primary>XMLSEC_ERRORS_R_XML_FAILED</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_XML_FAILED                      5
 </programlisting>
 <para>
-LibXML function failed (error subject is the failed function).</para>
-<para>
+LibXML function failed (error subject is the failed function).
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-XSLT-FAILED--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-XSLT-FAILED:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_XSLT_FAILED</title>
-<indexterm zone="XMLSEC-ERRORS-R-XSLT-FAILED--CAPS"><primary sortas="XMLSEC_ERRORS_R_XSLT_FAILED">XMLSEC_ERRORS_R_XSLT_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_XSLT_FAILED                     6
+<indexterm zone="XMLSEC-ERRORS-R-XSLT-FAILED:CAPS"><primary>XMLSEC_ERRORS_R_XSLT_FAILED</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_XSLT_FAILED                     6
 </programlisting>
 <para>
-LibXSLT function failed (error subject is the failed function).</para>
-<para>
+LibXSLT function failed (error subject is the failed function).
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-IO-FAILED--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-IO-FAILED:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_IO_FAILED</title>
-<indexterm zone="XMLSEC-ERRORS-R-IO-FAILED--CAPS"><primary sortas="XMLSEC_ERRORS_R_IO_FAILED">XMLSEC_ERRORS_R_IO_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_IO_FAILED                       7
+<indexterm zone="XMLSEC-ERRORS-R-IO-FAILED:CAPS"><primary>XMLSEC_ERRORS_R_IO_FAILED</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_IO_FAILED                       7
 </programlisting>
 <para>
-IO operation failed.</para>
-<para>
+IO operation failed.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-DISABLED--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-DISABLED:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_DISABLED</title>
-<indexterm zone="XMLSEC-ERRORS-R-DISABLED--CAPS"><primary sortas="XMLSEC_ERRORS_R_DISABLED">XMLSEC_ERRORS_R_DISABLED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_DISABLED                        8
+<indexterm zone="XMLSEC-ERRORS-R-DISABLED:CAPS"><primary>XMLSEC_ERRORS_R_DISABLED</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_DISABLED                        8
 </programlisting>
 <para>
 The feature is disabled during compilation.
 Check './configure --help' for details on how to
-enable it.</para>
-<para>
+enable it.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-NOT-IMPLEMENTED--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-NOT-IMPLEMENTED:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_NOT_IMPLEMENTED</title>
-<indexterm zone="XMLSEC-ERRORS-R-NOT-IMPLEMENTED--CAPS"><primary sortas="XMLSEC_ERRORS_R_NOT_IMPLEMENTED">XMLSEC_ERRORS_R_NOT_IMPLEMENTED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_NOT_IMPLEMENTED                 9
+<indexterm zone="XMLSEC-ERRORS-R-NOT-IMPLEMENTED:CAPS"><primary>XMLSEC_ERRORS_R_NOT_IMPLEMENTED</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_NOT_IMPLEMENTED                 9
 </programlisting>
 <para>
-Feature is not implemented.</para>
-<para>
+Feature is not implemented.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-INVALID-SIZE--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-SIZE:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_INVALID_SIZE</title>
-<indexterm zone="XMLSEC-ERRORS-R-INVALID-SIZE--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_SIZE">XMLSEC_ERRORS_R_INVALID_SIZE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_SIZE                    11
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-SIZE:CAPS"><primary>XMLSEC_ERRORS_R_INVALID_SIZE</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_INVALID_SIZE                    11
 </programlisting>
 <para>
-Invalid size.</para>
-<para>
+Invalid size.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-INVALID-DATA--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-DATA:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_INVALID_DATA</title>
-<indexterm zone="XMLSEC-ERRORS-R-INVALID-DATA--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_DATA">XMLSEC_ERRORS_R_INVALID_DATA</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_DATA                    12
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-DATA:CAPS"><primary>XMLSEC_ERRORS_R_INVALID_DATA</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_INVALID_DATA                    12
 </programlisting>
 <para>
-Invalid data.</para>
-<para>
+Invalid data.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-INVALID-RESULT--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-RESULT:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_INVALID_RESULT</title>
-<indexterm zone="XMLSEC-ERRORS-R-INVALID-RESULT--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_RESULT">XMLSEC_ERRORS_R_INVALID_RESULT</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_RESULT                  13
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-RESULT:CAPS"><primary>XMLSEC_ERRORS_R_INVALID_RESULT</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_INVALID_RESULT                  13
 </programlisting>
 <para>
-Invalid result.</para>
-<para>
+Invalid result.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-INVALID-TYPE--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-TYPE:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_INVALID_TYPE</title>
-<indexterm zone="XMLSEC-ERRORS-R-INVALID-TYPE--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_TYPE">XMLSEC_ERRORS_R_INVALID_TYPE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_TYPE                    14
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-TYPE:CAPS"><primary>XMLSEC_ERRORS_R_INVALID_TYPE</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_INVALID_TYPE                    14
 </programlisting>
 <para>
-Invalid type.</para>
-<para>
+Invalid type.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-INVALID-OPERATION--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-OPERATION:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_INVALID_OPERATION</title>
-<indexterm zone="XMLSEC-ERRORS-R-INVALID-OPERATION--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_OPERATION">XMLSEC_ERRORS_R_INVALID_OPERATION</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_OPERATION               15
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-OPERATION:CAPS"><primary>XMLSEC_ERRORS_R_INVALID_OPERATION</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_INVALID_OPERATION               15
 </programlisting>
 <para>
-Invalid operation.</para>
-<para>
+Invalid operation.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-INVALID-STATUS--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-STATUS:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_INVALID_STATUS</title>
-<indexterm zone="XMLSEC-ERRORS-R-INVALID-STATUS--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_STATUS">XMLSEC_ERRORS_R_INVALID_STATUS</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_STATUS                  16
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-STATUS:CAPS"><primary>XMLSEC_ERRORS_R_INVALID_STATUS</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_INVALID_STATUS                  16
 </programlisting>
 <para>
-Invalid status.</para>
-<para>
+Invalid status.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-INVALID-FORMAT--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-FORMAT:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_INVALID_FORMAT</title>
-<indexterm zone="XMLSEC-ERRORS-R-INVALID-FORMAT--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_FORMAT">XMLSEC_ERRORS_R_INVALID_FORMAT</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_FORMAT                  17
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-FORMAT:CAPS"><primary>XMLSEC_ERRORS_R_INVALID_FORMAT</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_INVALID_FORMAT                  17
 </programlisting>
 <para>
-Invalid format.</para>
-<para>
+Invalid format.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-DATA-NOT-MATCH--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-DATA-NOT-MATCH:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_DATA_NOT_MATCH</title>
-<indexterm zone="XMLSEC-ERRORS-R-DATA-NOT-MATCH--CAPS"><primary sortas="XMLSEC_ERRORS_R_DATA_NOT_MATCH">XMLSEC_ERRORS_R_DATA_NOT_MATCH</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_DATA_NOT_MATCH                  18
+<indexterm zone="XMLSEC-ERRORS-R-DATA-NOT-MATCH:CAPS"><primary>XMLSEC_ERRORS_R_DATA_NOT_MATCH</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_DATA_NOT_MATCH                  18
 </programlisting>
 <para>
-The data do not match our expectation.</para>
-<para>
+The data do not match our expectation.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-INVALID-NODE--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-NODE:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_INVALID_NODE</title>
-<indexterm zone="XMLSEC-ERRORS-R-INVALID-NODE--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_NODE">XMLSEC_ERRORS_R_INVALID_NODE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_NODE                    21
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-NODE:CAPS"><primary>XMLSEC_ERRORS_R_INVALID_NODE</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_INVALID_NODE                    21
 </programlisting>
 <para>
-Invalid node (error subject is the node name).</para>
-<para>
+Invalid node (error subject is the node name).
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-INVALID-NODE-CONTENT--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-NODE-CONTENT:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_INVALID_NODE_CONTENT</title>
-<indexterm zone="XMLSEC-ERRORS-R-INVALID-NODE-CONTENT--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_NODE_CONTENT">XMLSEC_ERRORS_R_INVALID_NODE_CONTENT</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_NODE_CONTENT            22
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-NODE-CONTENT:CAPS"><primary>XMLSEC_ERRORS_R_INVALID_NODE_CONTENT</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_INVALID_NODE_CONTENT            22
 </programlisting>
 <para>
-Invalid node content (error subject is the node name).</para>
-<para>
+Invalid node content (error subject is the node name).
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE</title>
-<indexterm zone="XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE">XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE          23
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE:CAPS"><primary>XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE          23
 </programlisting>
 <para>
-Invalid node attribute (error subject is the node name).</para>
-<para>
+Invalid node attribute (error subject is the node name).
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE</title>
-<indexterm zone="XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE--CAPS"><primary sortas="XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE">XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE          25
+<indexterm zone="XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE:CAPS"><primary>XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE          25
 </programlisting>
 <para>
-Missing node attribute (error subject is the node name).</para>
-<para>
+Missing node attribute (error subject is the node name).
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT</title>
-<indexterm zone="XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT--CAPS"><primary sortas="XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT">XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT            26
+<indexterm zone="XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT:CAPS"><primary>XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT            26
 </programlisting>
 <para>
-Node already present,</para>
-<para>
+Node already present,
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-UNEXPECTED-NODE--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-UNEXPECTED-NODE:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_UNEXPECTED_NODE</title>
-<indexterm zone="XMLSEC-ERRORS-R-UNEXPECTED-NODE--CAPS"><primary sortas="XMLSEC_ERRORS_R_UNEXPECTED_NODE">XMLSEC_ERRORS_R_UNEXPECTED_NODE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_UNEXPECTED_NODE                 27
+<indexterm zone="XMLSEC-ERRORS-R-UNEXPECTED-NODE:CAPS"><primary>XMLSEC_ERRORS_R_UNEXPECTED_NODE</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_UNEXPECTED_NODE                 27
 </programlisting>
 <para>
-Unexpected node (error subject is the node name).</para>
-<para>
+Unexpected node (error subject is the node name).
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-NODE-NOT-FOUND--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-NODE-NOT-FOUND:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_NODE_NOT_FOUND</title>
-<indexterm zone="XMLSEC-ERRORS-R-NODE-NOT-FOUND--CAPS"><primary sortas="XMLSEC_ERRORS_R_NODE_NOT_FOUND">XMLSEC_ERRORS_R_NODE_NOT_FOUND</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_NODE_NOT_FOUND                  28
+<indexterm zone="XMLSEC-ERRORS-R-NODE-NOT-FOUND:CAPS"><primary>XMLSEC_ERRORS_R_NODE_NOT_FOUND</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_NODE_NOT_FOUND                  28
 </programlisting>
 <para>
-Node not found (error subject is the required node name).</para>
-<para>
+Node not found (error subject is the required node name).
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-INVALID-TRANSFORM--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-TRANSFORM:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_INVALID_TRANSFORM</title>
-<indexterm zone="XMLSEC-ERRORS-R-INVALID-TRANSFORM--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_TRANSFORM">XMLSEC_ERRORS_R_INVALID_TRANSFORM</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_TRANSFORM               31
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-TRANSFORM:CAPS"><primary>XMLSEC_ERRORS_R_INVALID_TRANSFORM</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_INVALID_TRANSFORM               31
 </programlisting>
 <para>
-This transform is invlaid here.</para>
-<para>
+This transform is invlaid here.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY</title>
-<indexterm zone="XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY">XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY           32
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY:CAPS"><primary>XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY           32
 </programlisting>
 <para>
-Key is invalid for this transform.</para>
-<para>
+Key is invalid for this transform.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-INVALID-URI-TYPE--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-URI-TYPE:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_INVALID_URI_TYPE</title>
-<indexterm zone="XMLSEC-ERRORS-R-INVALID-URI-TYPE--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_URI_TYPE">XMLSEC_ERRORS_R_INVALID_URI_TYPE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_URI_TYPE                33
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-URI-TYPE:CAPS"><primary>XMLSEC_ERRORS_R_INVALID_URI_TYPE</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_INVALID_URI_TYPE                33
 </programlisting>
 <para>
-Invalid URI type.</para>
-<para>
+Invalid URI type.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED</title>
-<indexterm zone="XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED--CAPS"><primary sortas="XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED">XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED        34
+<indexterm zone="XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED:CAPS"><primary>XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED        34
 </programlisting>
 <para>
-The transform requires the input document to be the same as context.</para>
-<para>
+The transform requires the input document to be the same as context.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-TRANSFORM-DISABLED--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-TRANSFORM-DISABLED:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_TRANSFORM_DISABLED</title>
-<indexterm zone="XMLSEC-ERRORS-R-TRANSFORM-DISABLED--CAPS"><primary sortas="XMLSEC_ERRORS_R_TRANSFORM_DISABLED">XMLSEC_ERRORS_R_TRANSFORM_DISABLED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_TRANSFORM_DISABLED              35
+<indexterm zone="XMLSEC-ERRORS-R-TRANSFORM-DISABLED:CAPS"><primary>XMLSEC_ERRORS_R_TRANSFORM_DISABLED</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_TRANSFORM_DISABLED              35
 </programlisting>
 <para>
-The transform is disabled.</para>
-<para>
+The transform is disabled.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-INVALID-KEY-DATA--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-KEY-DATA:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_INVALID_KEY_DATA</title>
-<indexterm zone="XMLSEC-ERRORS-R-INVALID-KEY-DATA--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_KEY_DATA">XMLSEC_ERRORS_R_INVALID_KEY_DATA</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_KEY_DATA                41
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-KEY-DATA:CAPS"><primary>XMLSEC_ERRORS_R_INVALID_KEY_DATA</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_INVALID_KEY_DATA                41
 </programlisting>
 <para>
-Key data is invalid.</para>
-<para>
+Key data is invalid.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND</title>
-<indexterm zone="XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND--CAPS"><primary sortas="XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND">XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND              42
+<indexterm zone="XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND:CAPS"><primary>XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND              42
 </programlisting>
 <para>
-Data is not found (error subject is the data name).</para>
-<para>
+Data is not found (error subject is the data name).
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST</title>
-<indexterm zone="XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST--CAPS"><primary sortas="XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST">XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST          43
+<indexterm zone="XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST:CAPS"><primary>XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST          43
 </programlisting>
 <para>
-The key data is already exist.</para>
-<para>
+The key data is already exist.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE</title>
-<indexterm zone="XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE">XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE           44
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE:CAPS"><primary>XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE           44
 </programlisting>
 <para>
-Invalid key size.</para>
-<para>
+Invalid key size.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-KEY-NOT-FOUND--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-KEY-NOT-FOUND:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_KEY_NOT_FOUND</title>
-<indexterm zone="XMLSEC-ERRORS-R-KEY-NOT-FOUND--CAPS"><primary sortas="XMLSEC_ERRORS_R_KEY_NOT_FOUND">XMLSEC_ERRORS_R_KEY_NOT_FOUND</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_KEY_NOT_FOUND                   45
+<indexterm zone="XMLSEC-ERRORS-R-KEY-NOT-FOUND:CAPS"><primary>XMLSEC_ERRORS_R_KEY_NOT_FOUND</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_KEY_NOT_FOUND                   45
 </programlisting>
 <para>
-Key not found.</para>
-<para>
+Key not found.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-KEYDATA-DISABLED--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-KEYDATA-DISABLED:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_KEYDATA_DISABLED</title>
-<indexterm zone="XMLSEC-ERRORS-R-KEYDATA-DISABLED--CAPS"><primary sortas="XMLSEC_ERRORS_R_KEYDATA_DISABLED">XMLSEC_ERRORS_R_KEYDATA_DISABLED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_KEYDATA_DISABLED                46
+<indexterm zone="XMLSEC-ERRORS-R-KEYDATA-DISABLED:CAPS"><primary>XMLSEC_ERRORS_R_KEYDATA_DISABLED</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_KEYDATA_DISABLED                46
 </programlisting>
 <para>
-The key data type disabled.</para>
-<para>
+The key data type disabled.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL</title>
-<indexterm zone="XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL--CAPS"><primary sortas="XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL">XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL            51
+<indexterm zone="XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL:CAPS"><primary>XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL            51
 </programlisting>
 <para>
-Max allowed retrievals level reached.</para>
-<para>
+Max allowed retrievals level reached.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH</title>
-<indexterm zone="XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH--CAPS"><primary sortas="XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH">XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH     52
+<indexterm zone="XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH:CAPS"><primary>XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH     52
 </programlisting>
 <para>
 The retrieved key data type does not match the one specified
-in the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink> node.</para>
-<para>
+in the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink> node.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL</title>
-<indexterm zone="XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL--CAPS"><primary sortas="XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL">XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL                61
+<indexterm zone="XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL:CAPS"><primary>XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL                61
 </programlisting>
 <para>
-Max EncryptedKey level reached.</para>
-<para>
+Max EncryptedKey level reached.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-CERT-VERIFY-FAILED--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-CERT-VERIFY-FAILED:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_CERT_VERIFY_FAILED</title>
-<indexterm zone="XMLSEC-ERRORS-R-CERT-VERIFY-FAILED--CAPS"><primary sortas="XMLSEC_ERRORS_R_CERT_VERIFY_FAILED">XMLSEC_ERRORS_R_CERT_VERIFY_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CERT_VERIFY_FAILED              71
+<indexterm zone="XMLSEC-ERRORS-R-CERT-VERIFY-FAILED:CAPS"><primary>XMLSEC_ERRORS_R_CERT_VERIFY_FAILED</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_CERT_VERIFY_FAILED              71
 </programlisting>
 <para>
-Certificate verification failed.</para>
-<para>
+Certificate verification failed.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-CERT-NOT-FOUND--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-CERT-NOT-FOUND:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_CERT_NOT_FOUND</title>
-<indexterm zone="XMLSEC-ERRORS-R-CERT-NOT-FOUND--CAPS"><primary sortas="XMLSEC_ERRORS_R_CERT_NOT_FOUND">XMLSEC_ERRORS_R_CERT_NOT_FOUND</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CERT_NOT_FOUND                  72
+<indexterm zone="XMLSEC-ERRORS-R-CERT-NOT-FOUND:CAPS"><primary>XMLSEC_ERRORS_R_CERT_NOT_FOUND</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_CERT_NOT_FOUND                  72
 </programlisting>
 <para>
-Requested certificate is not found.</para>
-<para>
+Requested certificate is not found.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-CERT-REVOKED--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-CERT-REVOKED:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_CERT_REVOKED</title>
-<indexterm zone="XMLSEC-ERRORS-R-CERT-REVOKED--CAPS"><primary sortas="XMLSEC_ERRORS_R_CERT_REVOKED">XMLSEC_ERRORS_R_CERT_REVOKED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CERT_REVOKED                    73
+<indexterm zone="XMLSEC-ERRORS-R-CERT-REVOKED:CAPS"><primary>XMLSEC_ERRORS_R_CERT_REVOKED</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_CERT_REVOKED                    73
 </programlisting>
 <para>
-The certificate is revoked.</para>
-<para>
+The certificate is revoked.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-CERT-ISSUER-FAILED--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-CERT-ISSUER-FAILED:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_CERT_ISSUER_FAILED</title>
-<indexterm zone="XMLSEC-ERRORS-R-CERT-ISSUER-FAILED--CAPS"><primary sortas="XMLSEC_ERRORS_R_CERT_ISSUER_FAILED">XMLSEC_ERRORS_R_CERT_ISSUER_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CERT_ISSUER_FAILED              74
+<indexterm zone="XMLSEC-ERRORS-R-CERT-ISSUER-FAILED:CAPS"><primary>XMLSEC_ERRORS_R_CERT_ISSUER_FAILED</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_CERT_ISSUER_FAILED              74
 </programlisting>
 <para>
-Failed to get certificate issuer.</para>
-<para>
+Failed to get certificate issuer.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-CERT-NOT-YET-VALID--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-CERT-NOT-YET-VALID:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_CERT_NOT_YET_VALID</title>
-<indexterm zone="XMLSEC-ERRORS-R-CERT-NOT-YET-VALID--CAPS"><primary sortas="XMLSEC_ERRORS_R_CERT_NOT_YET_VALID">XMLSEC_ERRORS_R_CERT_NOT_YET_VALID</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CERT_NOT_YET_VALID              75
+<indexterm zone="XMLSEC-ERRORS-R-CERT-NOT-YET-VALID:CAPS"><primary>XMLSEC_ERRORS_R_CERT_NOT_YET_VALID</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_CERT_NOT_YET_VALID              75
 </programlisting>
 <para>
-"Not valid before" verification failed.</para>
-<para>
+"Not valid before" verification failed.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-CERT-HAS-EXPIRED--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-CERT-HAS-EXPIRED:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_CERT_HAS_EXPIRED</title>
-<indexterm zone="XMLSEC-ERRORS-R-CERT-HAS-EXPIRED--CAPS"><primary sortas="XMLSEC_ERRORS_R_CERT_HAS_EXPIRED">XMLSEC_ERRORS_R_CERT_HAS_EXPIRED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CERT_HAS_EXPIRED                76
+<indexterm zone="XMLSEC-ERRORS-R-CERT-HAS-EXPIRED:CAPS"><primary>XMLSEC_ERRORS_R_CERT_HAS_EXPIRED</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_CERT_HAS_EXPIRED                76
 </programlisting>
 <para>
-"Not valid after" verification failed.</para>
-<para>
+"Not valid after" verification failed.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-DSIG-NO-REFERENCES--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-DSIG-NO-REFERENCES:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_DSIG_NO_REFERENCES</title>
-<indexterm zone="XMLSEC-ERRORS-R-DSIG-NO-REFERENCES--CAPS"><primary sortas="XMLSEC_ERRORS_R_DSIG_NO_REFERENCES">XMLSEC_ERRORS_R_DSIG_NO_REFERENCES</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_DSIG_NO_REFERENCES              81
+<indexterm zone="XMLSEC-ERRORS-R-DSIG-NO-REFERENCES:CAPS"><primary>XMLSEC_ERRORS_R_DSIG_NO_REFERENCES</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_DSIG_NO_REFERENCES              81
 </programlisting>
 <para>
-The &lt;dsig:Reference&gt; nodes not found.</para>
-<para>
+The &lt;dsig:Reference&gt; nodes not found.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE</title>
-<indexterm zone="XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE--CAPS"><primary sortas="XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE">XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE          82
+<indexterm zone="XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE:CAPS"><primary>XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE          82
 </programlisting>
 <para>
-The &lt;dsig:Reference&gt; validation failed.</para>
-<para>
+The &lt;dsig:Reference&gt; validation failed.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-R-ASSERTION--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-R-ASSERTION:CAPS" role="macro">
 <title>XMLSEC_ERRORS_R_ASSERTION</title>
-<indexterm zone="XMLSEC-ERRORS-R-ASSERTION--CAPS"><primary sortas="XMLSEC_ERRORS_R_ASSERTION">XMLSEC_ERRORS_R_ASSERTION</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_ASSERTION                       100
+<indexterm zone="XMLSEC-ERRORS-R-ASSERTION:CAPS"><primary>XMLSEC_ERRORS_R_ASSERTION</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_R_ASSERTION                       100
 </programlisting>
 <para>
-Invalid assertion.</para>
-<para>
+Invalid assertion.
 </para></refsect2>
-<refsect2 id="XMLSEC-ERRORS-MAX-NUMBER--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-MAX-NUMBER:CAPS" role="macro">
 <title>XMLSEC_ERRORS_MAX_NUMBER</title>
-<indexterm zone="XMLSEC-ERRORS-MAX-NUMBER--CAPS"><primary sortas="XMLSEC_ERRORS_MAX_NUMBER">XMLSEC_ERRORS_MAX_NUMBER</primary></indexterm><programlisting>#define XMLSEC_ERRORS_MAX_NUMBER                        256
+<indexterm zone="XMLSEC-ERRORS-MAX-NUMBER:CAPS"><primary>XMLSEC_ERRORS_MAX_NUMBER</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_MAX_NUMBER                        256
 </programlisting>
 <para>
-The maximum xmlsec errors number.</para>
-<para>
+The maximum xmlsec errors number.
 </para></refsect2>
 <refsect2 id="xmlSecErrorsCallback" role="function">
 <title>xmlSecErrorsCallback ()</title>
-<indexterm zone="xmlSecErrorsCallback"><primary sortas="xmlSecErrorsCallback">xmlSecErrorsCallback</primary></indexterm><programlisting><link linkend="void">void</link>                (*xmlSecErrorsCallback)             (const <link linkend="char">char</link> *file,
-                                                         <link linkend="int">int</link> line,
-                                                         const <link linkend="char">char</link> *func,
-                                                         const <link linkend="char">char</link> *errorObject,
-                                                         const <link linkend="char">char</link> *errorSubject,
-                                                         <link linkend="int">int</link> reason,
-                                                         const <link linkend="char">char</link> *msg);</programlisting>
-<para>
-The errors reporting callback function.</para>
-<para>
+<indexterm zone="xmlSecErrorsCallback"><primary>xmlSecErrorsCallback</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*xmlSecErrorsCallback)             (<parameter>const <link linkend="char"><type>char</type></link> *file</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> line</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *func</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorObject</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorSubject</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> reason</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *msg</parameter>);</programlisting>
+<para>
+The errors reporting callback function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>file</parameter>&#160;:</term>
-<listitem><simpara>               the error location file name (__FILE__ macro).
+<listitem><simpara>the error location file name (__FILE__ macro).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>line</parameter>&#160;:</term>
-<listitem><simpara>               the error location line number (__LINE__ macro).
+<listitem><simpara>the error location line number (__LINE__ macro).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>func</parameter>&#160;:</term>
-<listitem><simpara>               the error location function name (__FUNCTION__ macro).
+<listitem><simpara>the error location function name (__FUNCTION__ macro).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>errorObject</parameter>&#160;:</term>
-<listitem><simpara>        the error specific error object
+<listitem><simpara>the error specific error object
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>errorSubject</parameter>&#160;:</term>
-<listitem><simpara>       the error specific error subject.
+<listitem><simpara>the error specific error subject.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>reason</parameter>&#160;:</term>
-<listitem><simpara>             the error code.
+<listitem><simpara>the error code.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>msg</parameter>&#160;:</term>
-<listitem><simpara>                the additional error message.
+<listitem><simpara>the additional error message.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecErrorsInit" role="function">
 <title>xmlSecErrorsInit ()</title>
-<indexterm zone="xmlSecErrorsInit"><primary sortas="xmlSecErrorsInit">xmlSecErrorsInit</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecErrorsInit                    (void);</programlisting>
+<indexterm zone="xmlSecErrorsInit"><primary>xmlSecErrorsInit</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecErrorsInit                    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 Initializes the errors reporting. It is called from <link linkend="xmlSecInit"><type>xmlSecInit</type></link> function.
-and applications must not call this function directly.</para>
-<para>
+and applications must not call this function directly.
 </para></refsect2>
 <refsect2 id="xmlSecErrorsShutdown" role="function">
 <title>xmlSecErrorsShutdown ()</title>
-<indexterm zone="xmlSecErrorsShutdown"><primary sortas="xmlSecErrorsShutdown">xmlSecErrorsShutdown</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecErrorsShutdown                (void);</programlisting>
+<indexterm zone="xmlSecErrorsShutdown"><primary>xmlSecErrorsShutdown</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecErrorsShutdown                (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 Cleanups the errors reporting. It is called from <link linkend="xmlSecShutdown"><type>xmlSecShutdown</type></link> function.
-and applications must not call this function directly.</para>
-<para>
+and applications must not call this function directly.
 </para></refsect2>
 <refsect2 id="xmlSecErrorsSetCallback" role="function">
 <title>xmlSecErrorsSetCallback ()</title>
-<indexterm zone="xmlSecErrorsSetCallback"><primary sortas="xmlSecErrorsSetCallback">xmlSecErrorsSetCallback</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecErrorsSetCallback             (<link linkend="xmlSecErrorsCallback">xmlSecErrorsCallback</link> callback);</programlisting>
+<indexterm zone="xmlSecErrorsSetCallback"><primary>xmlSecErrorsSetCallback</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecErrorsSetCallback             (<parameter><link linkend="xmlSecErrorsCallback"><type>xmlSecErrorsCallback</type></link> callback</parameter>);</programlisting>
 <para>
 Sets the errors callback function to <parameter>callback</parameter> that will be called
-every time an error occurs.</para>
-<para>
+every time an error occurs.
 </para><variablelist role="params">
 <varlistentry><term><parameter>callback</parameter>&#160;:</term>
-<listitem><simpara>           the new errors callback function.
+<listitem><simpara>the new errors callback function.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecErrorsDefaultCallback" role="function">
 <title>xmlSecErrorsDefaultCallback ()</title>
-<indexterm zone="xmlSecErrorsDefaultCallback"><primary sortas="xmlSecErrorsDefaultCallback">xmlSecErrorsDefaultCallback</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecErrorsDefaultCallback         (const <link linkend="char">char</link> *file,
-                                                         <link linkend="int">int</link> line,
-                                                         const <link linkend="char">char</link> *func,
-                                                         const <link linkend="char">char</link> *errorObject,
-                                                         const <link linkend="char">char</link> *errorSubject,
-                                                         <link linkend="int">int</link> reason,
-                                                         const <link linkend="char">char</link> *msg);</programlisting>
+<indexterm zone="xmlSecErrorsDefaultCallback"><primary>xmlSecErrorsDefaultCallback</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecErrorsDefaultCallback         (<parameter>const <link linkend="char"><type>char</type></link> *file</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> line</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *func</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorObject</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorSubject</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> reason</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *msg</parameter>);</programlisting>
 <para>
 The default error reporting callback that utilizes LibXML
-error reporting <link linkend="xmlGenericError"><type>xmlGenericError</type></link> function.</para>
-<para>
+error reporting <link linkend="xmlGenericError"><type>xmlGenericError</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>file</parameter>&#160;:</term>
-<listitem><simpara>               the error location file name (__FILE__ macro).
+<listitem><simpara>the error location file name (__FILE__ macro).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>line</parameter>&#160;:</term>
-<listitem><simpara>               the error location line number (__LINE__ macro).
+<listitem><simpara>the error location line number (__LINE__ macro).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>func</parameter>&#160;:</term>
-<listitem><simpara>               the error location function name (__FUNCTION__ macro).
+<listitem><simpara>the error location function name (__FUNCTION__ macro).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>errorObject</parameter>&#160;:</term>
-<listitem><simpara>        the error specific error object
+<listitem><simpara>the error specific error object
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>errorSubject</parameter>&#160;:</term>
-<listitem><simpara>       the error specific error subject.
+<listitem><simpara>the error specific error subject.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>reason</parameter>&#160;:</term>
-<listitem><simpara>             the error code.
+<listitem><simpara>the error code.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>msg</parameter>&#160;:</term>
-<listitem><simpara>                the additional error message.
+<listitem><simpara>the additional error message.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecErrorsDefaultCallbackEnableOutput" role="function">
 <title>xmlSecErrorsDefaultCallbackEnableOutput ()</title>
-<indexterm zone="xmlSecErrorsDefaultCallbackEnableOutput"><primary sortas="xmlSecErrorsDefaultCallbackEnableOutput">xmlSecErrorsDefaultCallbackEnableOutput</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecErrorsDefaultCallbackEnableOutput
-                                                        (<link linkend="int">int</link> enabled);</programlisting>
+<indexterm zone="xmlSecErrorsDefaultCallbackEnableOutput"><primary>xmlSecErrorsDefaultCallbackEnableOutput</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecErrorsDefaultCallbackEnableOutput
+                                                        (<parameter><link linkend="int"><type>int</type></link> enabled</parameter>);</programlisting>
 <para>
 Enables or disables calling LibXML2 callback from the default
-errors callback.</para>
-<para>
+errors callback.
 </para><variablelist role="params">
 <varlistentry><term><parameter>enabled</parameter>&#160;:</term>
-<listitem><simpara>            the flag.
+<listitem><simpara>the flag.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecErrorsGetCode" role="function">
 <title>xmlSecErrorsGetCode ()</title>
-<indexterm zone="xmlSecErrorsGetCode"><primary sortas="xmlSecErrorsGetCode">xmlSecErrorsGetCode</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecErrorsGetCode                 (<link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
-<para>
-Gets the known error code at position <parameter>pos</parameter>.</para>
+<indexterm zone="xmlSecErrorsGetCode"><primary>xmlSecErrorsGetCode</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecErrorsGetCode                 (<parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);</programlisting>
 <para>
+Gets the known error code at position <parameter>pos</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>pos</parameter>&#160;:</term>
-<listitem><simpara>                the error position.
+<listitem><simpara>the error position.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the known error code or 0 if <parameter>pos</parameter> is greater than
 total number of known error codes.
@@ -631,116 +623,113 @@ total number of known error codes.
 </variablelist></refsect2>
 <refsect2 id="xmlSecErrorsGetMsg" role="function">
 <title>xmlSecErrorsGetMsg ()</title>
-<indexterm zone="xmlSecErrorsGetMsg"><primary sortas="xmlSecErrorsGetMsg">xmlSecErrorsGetMsg</primary></indexterm><programlisting>const <link linkend="char">char</link>*         xmlSecErrorsGetMsg                  (<link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
-<para>
-Gets the known error message at position <parameter>pos</parameter>.</para>
+<indexterm zone="xmlSecErrorsGetMsg"><primary>xmlSecErrorsGetMsg</primary></indexterm>
+<programlisting>const <link linkend="char"><returnvalue>char</returnvalue></link>*         xmlSecErrorsGetMsg                  (<parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);</programlisting>
 <para>
+Gets the known error message at position <parameter>pos</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>pos</parameter>&#160;:</term>
-<listitem><simpara>                the error position.
+<listitem><simpara>the error position.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the known error message or NULL if <parameter>pos</parameter> is greater than
 total number of known error codes.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="XMLSEC-ERRORS-HERE--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-HERE:CAPS" role="macro">
 <title>XMLSEC_ERRORS_HERE</title>
-<indexterm zone="XMLSEC-ERRORS-HERE--CAPS"><primary sortas="XMLSEC_ERRORS_HERE">XMLSEC_ERRORS_HERE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_HERE                      __FILE__,__LINE__,__XMLSEC_FUNCTION__
+<indexterm zone="XMLSEC-ERRORS-HERE:CAPS"><primary>XMLSEC_ERRORS_HERE</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_HERE                      __FILE__,__LINE__,__XMLSEC_FUNCTION__
 </programlisting>
 <para>
 The macro that specifies the location (file, line and function)
-for the <link linkend="xmlSecError"><function>xmlSecError()</function></link> function.</para>
-<para>
+for the <link linkend="xmlSecError"><function>xmlSecError()</function></link> function.
 </para></refsect2>
 <refsect2 id="xmlSecErrorsSafeString" role="macro">
 <title>xmlSecErrorsSafeString()</title>
-<indexterm zone="xmlSecErrorsSafeString"><primary sortas="xmlSecErrorsSafeString">xmlSecErrorsSafeString</primary></indexterm><programlisting>#define             xmlSecErrorsSafeString(str)</programlisting>
-<para>
-Macro. Returns <parameter>str</parameter> if it is not NULL or pointer to "NULL" otherwise.</para>
+<indexterm zone="xmlSecErrorsSafeString"><primary>xmlSecErrorsSafeString</primary></indexterm>
+<programlisting>#define             xmlSecErrorsSafeString(str)</programlisting>
 <para>
+Macro. Returns <parameter>str</parameter> if it is not NULL or pointer to "NULL" otherwise.
 </para><variablelist role="params">
 <varlistentry><term><parameter>str</parameter>&#160;:</term>
-<listitem><simpara>                the string.
+<listitem><simpara>the string.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="XMLSEC-ERRORS-NO-MESSAGE--CAPS" role="macro">
+<refsect2 id="XMLSEC-ERRORS-NO-MESSAGE:CAPS" role="macro">
 <title>XMLSEC_ERRORS_NO_MESSAGE</title>
-<indexterm zone="XMLSEC-ERRORS-NO-MESSAGE--CAPS"><primary sortas="XMLSEC_ERRORS_NO_MESSAGE">XMLSEC_ERRORS_NO_MESSAGE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_NO_MESSAGE                " "
+<indexterm zone="XMLSEC-ERRORS-NO-MESSAGE:CAPS"><primary>XMLSEC_ERRORS_NO_MESSAGE</primary></indexterm>
+<programlisting>#define XMLSEC_ERRORS_NO_MESSAGE                " "
 </programlisting>
 <para>
-Empty error message " ".</para>
-<para>
+Empty error message " ".
 </para></refsect2>
 <refsect2 id="xmlSecError" role="function">
 <title>xmlSecError ()</title>
-<indexterm zone="xmlSecError"><primary sortas="xmlSecError">xmlSecError</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecError                         (const <link linkend="char">char</link> *file,
-                                                         <link linkend="int">int</link> line,
-                                                         const <link linkend="char">char</link> *func,
-                                                         const <link linkend="char">char</link> *errorObject,
-                                                         const <link linkend="char">char</link> *errorSubject,
-                                                         <link linkend="int">int</link> reason,
-                                                         const <link linkend="char">char</link> *msg,
-                                                         ...);</programlisting>
+<indexterm zone="xmlSecError"><primary>xmlSecError</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecError                         (<parameter>const <link linkend="char"><type>char</type></link> *file</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> line</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *func</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorObject</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorSubject</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> reason</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *msg</parameter>,
+                                                         <parameter>...</parameter>);</programlisting>
 <para>
 Reports an error to the default (<link linkend="xmlSecErrorsDefaultCallback"><type>xmlSecErrorsDefaultCallback</type></link>) or
 application specific callback installed using <link linkend="xmlSecErrorsSetCallback"><type>xmlSecErrorsSetCallback</type></link>
-function.</para>
-<para>
+function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>file</parameter>&#160;:</term>
-<listitem><simpara>               the error location filename (__FILE__).
+<listitem><simpara>the error location filename (__FILE__).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>line</parameter>&#160;:</term>
-<listitem><simpara>               the error location line number (__LINE__).
+<listitem><simpara>the error location line number (__LINE__).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>func</parameter>&#160;:</term>
-<listitem><simpara>               the error location function (__FUNCTIION__).
+<listitem><simpara>the error location function (__FUNCTIION__).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>errorObject</parameter>&#160;:</term>
-<listitem><simpara>        the error specific error object
+<listitem><simpara>the error specific error object
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>errorSubject</parameter>&#160;:</term>
-<listitem><simpara>       the error specific error subject.
+<listitem><simpara>the error specific error subject.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>reason</parameter>&#160;:</term>
-<listitem><simpara>             the error code.
+<listitem><simpara>the error code.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>msg</parameter>&#160;:</term>
-<listitem><simpara>                the error message in printf format.
+<listitem><simpara>the error message in printf format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>...</parameter>&#160;:</term>
-<listitem><simpara>                the parameters for the <parameter>msg</parameter>.
+<listitem><simpara>the parameters for the <parameter>msg</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecAssert" role="macro">
 <title>xmlSecAssert()</title>
-<indexterm zone="xmlSecAssert"><primary sortas="xmlSecAssert">xmlSecAssert</primary></indexterm><programlisting>#define             xmlSecAssert( p )</programlisting>
-<para>
-Macro. Verifies that <parameter>p</parameter> is true and calls <link linkend="return"><function>return()</function></link> otherwise.</para>
+<indexterm zone="xmlSecAssert"><primary>xmlSecAssert</primary></indexterm>
+<programlisting>#define             xmlSecAssert( p )</programlisting>
 <para>
+Macro. Verifies that <parameter>p</parameter> is true and calls <link linkend="return"><function>return()</function></link> otherwise.
 </para><variablelist role="params">
 <varlistentry><term><parameter>p</parameter>&#160;:</term>
-<listitem><simpara> the expression.
+<listitem><simpara>the expression.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecAssert2" role="macro">
 <title>xmlSecAssert2()</title>
-<indexterm zone="xmlSecAssert2"><primary sortas="xmlSecAssert2">xmlSecAssert2</primary></indexterm><programlisting>#define             xmlSecAssert2( p, ret )</programlisting>
-<para>
-Macro. Verifies that <parameter>p</parameter> is true and calls return(<parameter>ret</parameter>) otherwise.</para>
+<indexterm zone="xmlSecAssert2"><primary>xmlSecAssert2</primary></indexterm>
+<programlisting>#define             xmlSecAssert2( p, ret )</programlisting>
 <para>
+Macro. Verifies that <parameter>p</parameter> is true and calls return(<parameter>ret</parameter>) otherwise.
 </para><variablelist role="params">
 <varlistentry><term><parameter>p</parameter>&#160;:</term>
-<listitem><simpara> the expression.
+<listitem><simpara>the expression.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>ret</parameter>&#160;:</term>
-<listitem><simpara> the return value.
+<listitem><simpara>the return value.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/exports.sgml b/docs/api/sgml/exports.sgml
index a2790a4..6c6f1ae 100644
--- a/docs/api/sgml/exports.sgml
+++ b/docs/api/sgml/exports.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-exports.top_of_page">exports</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>exports</refname>
 <refpurpose>Black magic to export functions on Windows.</refpurpose>
@@ -13,37 +14,25 @@
 <refsynopsisdiv id="xmlsec-exports.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-#define             <link linkend="extern">extern</link>
+<synopsis>#define             <link linkend="extern">extern</link>
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-exports.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Black magic to export functions on Windows.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-exports.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="extern" role="macro">
 <title>extern</title>
-<indexterm zone="extern"><primary sortas="extern">extern</primary></indexterm><programlisting>#define             extern</programlisting>
+<indexterm zone="extern"><primary>extern</primary></indexterm>
+<programlisting>#define             extern</programlisting>
 <para>
 </para></refsect2>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/gcrypt/app.sgml b/docs/api/sgml/gcrypt/app.sgml
index 9596be6..581923c 100644
--- a/docs/api/sgml/gcrypt/app.sgml
+++ b/docs/api/sgml/gcrypt/app.sgml
@@ -1,421 +1,412 @@
-<refentry id="xmlsec-gnutls-app">
+<refentry id="xmlsec-gcrypt-app">
 <refmeta>
-<refentrytitle role="top_of_page" id="xmlsec-gnutls-app.top_of_page">app</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-gcrypt-app.top_of_page">app</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC-GNUTLS Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC-GCRYPT Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>app</refname>
 <refpurpose>Application functions implementation for GnuTLS.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv id="xmlsec-gnutls-app.synopsis" role="synopsis">
+<refsynopsisdiv id="xmlsec-gcrypt-app.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppInit">xmlSecGnuTLSAppInit</link>                 (const <link linkend="char">char</link> *config);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppShutdown">xmlSecGnuTLSAppShutdown</link>             (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppDefaultKeysMngrInit">xmlSecGnuTLSAppDefaultKeysMngrInit</link>  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppDefaultKeysMngrAdoptKey">xmlSecGnuTLSAppDefaultKeysMngrAdoptKey</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppDefaultKeysMngrLoad">xmlSecGnuTLSAppDefaultKeysMngrLoad</link>  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *uri);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppDefaultKeysMngrSave">xmlSecGnuTLSAppDefaultKeysMngrSave</link>  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppKeysMngrCertLoad">xmlSecGnuTLSAppKeysMngrCertLoad</link>     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppKeysMngrCertLoadMemory">xmlSecGnuTLSAppKeysMngrCertLoadMemory</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecGnuTLSAppKeyLoad">xmlSecGnuTLSAppKeyLoad</link>              (const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecGnuTLSAppKeyLoadMemory">xmlSecGnuTLSAppKeyLoadMemory</link>        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecGnuTLSAppPkcs12Load">xmlSecGnuTLSAppPkcs12Load</link>           (const <link linkend="char">char</link> *filename,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecGnuTLSAppPkcs12LoadMemory">xmlSecGnuTLSAppPkcs12LoadMemory</link>     (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppKeyCertLoad">xmlSecGnuTLSAppKeyCertLoad</link>          (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppKeyCertLoadMemory">xmlSecGnuTLSAppKeyCertLoadMemory</link>    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="void">void</link>*               <link linkend="xmlSecGnuTLSAppGetDefaultPwdCallback">xmlSecGnuTLSAppGetDefaultPwdCallback</link>
-                                                        (void);
+<synopsis><link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptAppInit">xmlSecGCryptAppInit</link>                 (<parameter>const <link linkend="char"><type>char</type></link> *config</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptAppShutdown">xmlSecGCryptAppShutdown</link>             (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptAppDefaultKeysMngrInit">xmlSecGCryptAppDefaultKeysMngrInit</link>  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptAppDefaultKeysMngrAdoptKey">xmlSecGCryptAppDefaultKeysMngrAdoptKey</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptAppDefaultKeysMngrLoad">xmlSecGCryptAppDefaultKeysMngrLoad</link>  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *uri</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptAppDefaultKeysMngrSave">xmlSecGCryptAppDefaultKeysMngrSave</link>  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptAppKeysMngrCertLoad">xmlSecGCryptAppKeysMngrCertLoad</link>     (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptAppKeysMngrCertLoadMemory">xmlSecGCryptAppKeysMngrCertLoadMemory</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecGCryptAppKeyLoad">xmlSecGCryptAppKeyLoad</link>              (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecGCryptAppKeyLoadMemory">xmlSecGCryptAppKeyLoadMemory</link>        (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecGCryptAppPkcs12Load">xmlSecGCryptAppPkcs12Load</link>           (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecGCryptAppPkcs12LoadMemory">xmlSecGCryptAppPkcs12LoadMemory</link>     (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptAppKeyCertLoad">xmlSecGCryptAppKeyCertLoad</link>          (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptAppKeyCertLoadMemory">xmlSecGCryptAppKeyCertLoadMemory</link>    (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>*               <link linkend="xmlSecGCryptAppGetDefaultPwdCallback">xmlSecGCryptAppGetDefaultPwdCallback</link>
+                                                        (<parameter><type>void</type></parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
-<refsect1 id="xmlsec-gnutls-app.description" role="desc">
+<refsect1 id="xmlsec-gcrypt-app.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
-Application functions implementation for GnuTLS.
+Application functions implementation for GCrypt.
 </para>
 </refsect1>
-
-<refsect1 id="xmlsec-gnutls-app.details" role="details">
+<refsect1 id="xmlsec-gcrypt-app.details" role="details">
 <title role="details.title">Details</title>
-<refsect2 id="xmlSecGnuTLSAppInit" role="function">
-<title>xmlSecGnuTLSAppInit ()</title>
-<indexterm zone="xmlSecGnuTLSAppInit"><primary sortas="xmlSecGnuTLSAppInit">xmlSecGnuTLSAppInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppInit                 (const <link linkend="char">char</link> *config);</programlisting>
+<refsect2 id="xmlSecGCryptAppInit" role="function">
+<title>xmlSecGCryptAppInit ()</title>
+<indexterm zone="xmlSecGCryptAppInit"><primary>xmlSecGCryptAppInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptAppInit                 (<parameter>const <link linkend="char"><type>char</type></link> *config</parameter>);</programlisting>
 <para>
 General crypto engine initialization. This function is used
 by XMLSec command line utility and called before
-<parameter>xmlSecInit</parameter> function.</para>
-<para>
+<parameter>xmlSecInit</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>config</parameter>&#160;:</term>
-<listitem><simpara>             the path to GnuTLS configuration (unused).
+<listitem><simpara>the path to GCrypt configuration (unused).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSAppShutdown" role="function">
-<title>xmlSecGnuTLSAppShutdown ()</title>
-<indexterm zone="xmlSecGnuTLSAppShutdown"><primary sortas="xmlSecGnuTLSAppShutdown">xmlSecGnuTLSAppShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppShutdown             (void);</programlisting>
+<refsect2 id="xmlSecGCryptAppShutdown" role="function">
+<title>xmlSecGCryptAppShutdown ()</title>
+<indexterm zone="xmlSecGCryptAppShutdown"><primary>xmlSecGCryptAppShutdown</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptAppShutdown             (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after
-<parameter>xmlSecShutdown</parameter> function.</para>
-<para>
+<parameter>xmlSecShutdown</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSAppDefaultKeysMngrInit" role="function">
-<title>xmlSecGnuTLSAppDefaultKeysMngrInit ()</title>
-<indexterm zone="xmlSecGnuTLSAppDefaultKeysMngrInit"><primary sortas="xmlSecGnuTLSAppDefaultKeysMngrInit">xmlSecGnuTLSAppDefaultKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppDefaultKeysMngrInit  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
+<refsect2 id="xmlSecGCryptAppDefaultKeysMngrInit" role="function">
+<title>xmlSecGCryptAppDefaultKeysMngrInit ()</title>
+<indexterm zone="xmlSecGCryptAppDefaultKeysMngrInit"><primary>xmlSecGCryptAppDefaultKeysMngrInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptAppDefaultKeysMngrInit  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);</programlisting>
 <para>
 Initializes <parameter>mngr</parameter> with simple keys store <link linkend="xmlSecSimpleKeysStoreId"><type>xmlSecSimpleKeysStoreId</type></link>
-and a default GnuTLS crypto key data stores.</para>
-<para>
+and a default GCrypt crypto key data stores.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSAppDefaultKeysMngrAdoptKey" role="function">
-<title>xmlSecGnuTLSAppDefaultKeysMngrAdoptKey ()</title>
-<indexterm zone="xmlSecGnuTLSAppDefaultKeysMngrAdoptKey"><primary sortas="xmlSecGnuTLSAppDefaultKeysMngrAdoptKey">xmlSecGnuTLSAppDefaultKeysMngrAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppDefaultKeysMngrAdoptKey
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
-<para>
-Adds <parameter>key</parameter> to the keys manager <parameter>mngr</parameter> created with <link linkend="xmlSecGnuTLSAppDefaultKeysMngrInit"><type>xmlSecGnuTLSAppDefaultKeysMngrInit</type></link>
-function.</para>
+<refsect2 id="xmlSecGCryptAppDefaultKeysMngrAdoptKey" role="function">
+<title>xmlSecGCryptAppDefaultKeysMngrAdoptKey ()</title>
+<indexterm zone="xmlSecGCryptAppDefaultKeysMngrAdoptKey"><primary>xmlSecGCryptAppDefaultKeysMngrAdoptKey</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptAppDefaultKeysMngrAdoptKey
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);</programlisting>
 <para>
+Adds <parameter>key</parameter> to the keys manager <parameter>mngr</parameter> created with <link linkend="xmlSecGCryptAppDefaultKeysMngrInit"><type>xmlSecGCryptAppDefaultKeysMngrInit</type></link>
+function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSAppDefaultKeysMngrLoad" role="function">
-<title>xmlSecGnuTLSAppDefaultKeysMngrLoad ()</title>
-<indexterm zone="xmlSecGnuTLSAppDefaultKeysMngrLoad"><primary sortas="xmlSecGnuTLSAppDefaultKeysMngrLoad">xmlSecGnuTLSAppDefaultKeysMngrLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppDefaultKeysMngrLoad  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *uri);</programlisting>
+<refsect2 id="xmlSecGCryptAppDefaultKeysMngrLoad" role="function">
+<title>xmlSecGCryptAppDefaultKeysMngrLoad ()</title>
+<indexterm zone="xmlSecGCryptAppDefaultKeysMngrLoad"><primary>xmlSecGCryptAppDefaultKeysMngrLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptAppDefaultKeysMngrLoad  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *uri</parameter>);</programlisting>
 <para>
 Loads XML keys file from <parameter>uri</parameter> to the keys manager <parameter>mngr</parameter> created
-with <link linkend="xmlSecGnuTLSAppDefaultKeysMngrInit"><type>xmlSecGnuTLSAppDefaultKeysMngrInit</type></link> function.</para>
-<para>
+with <link linkend="xmlSecGCryptAppDefaultKeysMngrInit"><type>xmlSecGCryptAppDefaultKeysMngrInit</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>uri</parameter>&#160;:</term>
-<listitem><simpara>                the uri.
+<listitem><simpara>the uri.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSAppDefaultKeysMngrSave" role="function">
-<title>xmlSecGnuTLSAppDefaultKeysMngrSave ()</title>
-<indexterm zone="xmlSecGnuTLSAppDefaultKeysMngrSave"><primary sortas="xmlSecGnuTLSAppDefaultKeysMngrSave">xmlSecGnuTLSAppDefaultKeysMngrSave</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppDefaultKeysMngrSave  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
-<para>
-Saves keys from <parameter>mngr</parameter> to  XML keys file.</para>
+<refsect2 id="xmlSecGCryptAppDefaultKeysMngrSave" role="function">
+<title>xmlSecGCryptAppDefaultKeysMngrSave ()</title>
+<indexterm zone="xmlSecGCryptAppDefaultKeysMngrSave"><primary>xmlSecGCryptAppDefaultKeysMngrSave</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptAppDefaultKeysMngrSave  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
+Saves keys from <parameter>mngr</parameter> to  XML keys file.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the destination filename.
+<listitem><simpara>the destination filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the type of keys to save (public/private/symmetric).
+<listitem><simpara>the type of keys to save (public/private/symmetric).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSAppKeysMngrCertLoad" role="function">
-<title>xmlSecGnuTLSAppKeysMngrCertLoad ()</title>
-<indexterm zone="xmlSecGnuTLSAppKeysMngrCertLoad"><primary sortas="xmlSecGnuTLSAppKeysMngrCertLoad">xmlSecGnuTLSAppKeysMngrCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppKeysMngrCertLoad     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecGCryptAppKeysMngrCertLoad" role="function">
+<title>xmlSecGCryptAppKeysMngrCertLoad ()</title>
+<indexterm zone="xmlSecGCryptAppKeysMngrCertLoad"><primary>xmlSecGCryptAppKeysMngrCertLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptAppKeysMngrCertLoad     (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
 Reads cert from <parameter>filename</parameter> and adds to the list of trusted or known
-untrusted certs in <parameter>store</parameter> (not implemented yet).</para>
-<para>
+untrusted certs in <parameter>store</parameter> (not implemented yet).
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the keys manager.
+<listitem><simpara>the keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the certificate file.
+<listitem><simpara>the certificate file.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the flag that indicates is the certificate in <parameter>filename</parameter>
+<listitem><simpara>the flag that indicates is the certificate in <parameter>filename</parameter>
                      trusted or not.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSAppKeysMngrCertLoadMemory" role="function">
-<title>xmlSecGnuTLSAppKeysMngrCertLoadMemory ()</title>
-<indexterm zone="xmlSecGnuTLSAppKeysMngrCertLoadMemory"><primary sortas="xmlSecGnuTLSAppKeysMngrCertLoadMemory">xmlSecGnuTLSAppKeysMngrCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppKeysMngrCertLoadMemory
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecGCryptAppKeysMngrCertLoadMemory" role="function">
+<title>xmlSecGCryptAppKeysMngrCertLoadMemory ()</title>
+<indexterm zone="xmlSecGCryptAppKeysMngrCertLoadMemory"><primary>xmlSecGCryptAppKeysMngrCertLoadMemory</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptAppKeysMngrCertLoadMemory
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</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>
+untrusted certs in <parameter>store</parameter> (not implemented yet).
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the keys manager.
+<listitem><simpara>the keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the certificate binary data.
+<listitem><simpara>the certificate binary data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the certificate binary data size.
+<listitem><simpara>the certificate binary data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the flag that indicates is the certificate trusted or not.
+<listitem><simpara>the flag that indicates is the certificate trusted or not.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSAppKeyLoad" role="function">
-<title>xmlSecGnuTLSAppKeyLoad ()</title>
-<indexterm zone="xmlSecGnuTLSAppKeyLoad"><primary sortas="xmlSecGnuTLSAppKeyLoad">xmlSecGnuTLSAppKeyLoad</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecGnuTLSAppKeyLoad              (const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
-<para>
-Reads key from the a file (not implemented yet).</para>
+<refsect2 id="xmlSecGCryptAppKeyLoad" role="function">
+<title>xmlSecGCryptAppKeyLoad ()</title>
+<indexterm zone="xmlSecGCryptAppKeyLoad"><primary>xmlSecGCryptAppKeyLoad</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecGCryptAppKeyLoad              (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
 <para>
+Reads key from the a file (not implemented yet).
 </para><variablelist role="params">
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the key filename.
+<listitem><simpara>the key filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the key file format.
+<listitem><simpara>the key file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the key file password.
+<listitem><simpara>the key file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the key password callback.
+<listitem><simpara>the key password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSAppKeyLoadMemory" role="function">
-<title>xmlSecGnuTLSAppKeyLoadMemory ()</title>
-<indexterm zone="xmlSecGnuTLSAppKeyLoadMemory"><primary sortas="xmlSecGnuTLSAppKeyLoadMemory">xmlSecGnuTLSAppKeyLoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecGnuTLSAppKeyLoadMemory        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
-<para>
-Reads key from the memory buffer (not implemented yet).</para>
+<refsect2 id="xmlSecGCryptAppKeyLoadMemory" role="function">
+<title>xmlSecGCryptAppKeyLoadMemory ()</title>
+<indexterm zone="xmlSecGCryptAppKeyLoadMemory"><primary>xmlSecGCryptAppKeyLoadMemory</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecGCryptAppKeyLoadMemory        (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
 <para>
+Reads key from the memory buffer (not implemented yet).
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the binary key data.
+<listitem><simpara>the binary key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the size of binary key.
+<listitem><simpara>the size of binary key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the key file format.
+<listitem><simpara>the key file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the key file password.
+<listitem><simpara>the key file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the key password callback.
+<listitem><simpara>the key password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSAppPkcs12Load" role="function">
-<title>xmlSecGnuTLSAppPkcs12Load ()</title>
-<indexterm zone="xmlSecGnuTLSAppPkcs12Load"><primary sortas="xmlSecGnuTLSAppPkcs12Load">xmlSecGnuTLSAppPkcs12Load</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecGnuTLSAppPkcs12Load           (const <link linkend="char">char</link> *filename,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecGCryptAppPkcs12Load" role="function">
+<title>xmlSecGCryptAppPkcs12Load ()</title>
+<indexterm zone="xmlSecGCryptAppPkcs12Load"><primary>xmlSecGCryptAppPkcs12Load</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecGCryptAppPkcs12Load           (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 file
 (not implemented yet).
-For uniformity, call xmlSecGnuTLSAppKeyLoad instead of this function. Pass
-in format=xmlSecKeyDataFormatPkcs12.</para>
-<para>
+For uniformity, call xmlSecGCryptAppKeyLoad instead of this function. Pass
+in format=xmlSecKeyDataFormatPkcs12.
 </para><variablelist role="params">
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the PKCS12 key filename.
+<listitem><simpara>the PKCS12 key filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the PKCS12 file password.
+<listitem><simpara>the PKCS12 file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the password callback.
+<listitem><simpara>the password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSAppPkcs12LoadMemory" role="function">
-<title>xmlSecGnuTLSAppPkcs12LoadMemory ()</title>
-<indexterm zone="xmlSecGnuTLSAppPkcs12LoadMemory"><primary sortas="xmlSecGnuTLSAppPkcs12LoadMemory">xmlSecGnuTLSAppPkcs12LoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecGnuTLSAppPkcs12LoadMemory     (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecGCryptAppPkcs12LoadMemory" role="function">
+<title>xmlSecGCryptAppPkcs12LoadMemory ()</title>
+<indexterm zone="xmlSecGCryptAppPkcs12LoadMemory"><primary>xmlSecGCryptAppPkcs12LoadMemory</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecGCryptAppPkcs12LoadMemory     (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</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>
+For uniformity, call xmlSecGCryptAppKeyLoadMemory instead of this function. Pass
+in format=xmlSecKeyDataFormatPkcs12 (not implemented yet).
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the PKCS12 binary data.
+<listitem><simpara>the PKCS12 binary data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the PKCS12 binary data size.
+<listitem><simpara>the PKCS12 binary data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the PKCS12 file password.
+<listitem><simpara>the PKCS12 file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the password callback.
+<listitem><simpara>the password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSAppKeyCertLoad" role="function">
-<title>xmlSecGnuTLSAppKeyCertLoad ()</title>
-<indexterm zone="xmlSecGnuTLSAppKeyCertLoad"><primary sortas="xmlSecGnuTLSAppKeyCertLoad">xmlSecGnuTLSAppKeyCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppKeyCertLoad          (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
+<refsect2 id="xmlSecGCryptAppKeyCertLoad" role="function">
+<title>xmlSecGCryptAppKeyCertLoad ()</title>
+<indexterm zone="xmlSecGCryptAppKeyCertLoad"><primary>xmlSecGCryptAppKeyCertLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptAppKeyCertLoad          (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);</programlisting>
 <para>
 Reads the certificate from $<parameter>filename</parameter> and adds it to key
-(not implemented yet).</para>
-<para>
+(not implemented yet).
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the certificate filename.
+<listitem><simpara>the certificate filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSAppKeyCertLoadMemory" role="function">
-<title>xmlSecGnuTLSAppKeyCertLoadMemory ()</title>
-<indexterm zone="xmlSecGnuTLSAppKeyCertLoadMemory"><primary sortas="xmlSecGnuTLSAppKeyCertLoadMemory">xmlSecGnuTLSAppKeyCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppKeyCertLoadMemory    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
-<para>
-Reads the certificate from memory buffer and adds it to key (not implemented yet).</para>
+<refsect2 id="xmlSecGCryptAppKeyCertLoadMemory" role="function">
+<title>xmlSecGCryptAppKeyCertLoadMemory ()</title>
+<indexterm zone="xmlSecGCryptAppKeyCertLoadMemory"><primary>xmlSecGCryptAppKeyCertLoadMemory</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptAppKeyCertLoadMemory    (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);</programlisting>
 <para>
+Reads the certificate from memory buffer and adds it to key (not implemented yet).
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the certificate binary data.
+<listitem><simpara>the certificate binary data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the certificate binary data size.
+<listitem><simpara>the certificate binary data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSAppGetDefaultPwdCallback" role="function">
-<title>xmlSecGnuTLSAppGetDefaultPwdCallback ()</title>
-<indexterm zone="xmlSecGnuTLSAppGetDefaultPwdCallback"><primary sortas="xmlSecGnuTLSAppGetDefaultPwdCallback">xmlSecGnuTLSAppGetDefaultPwdCallback</primary></indexterm><programlisting><link linkend="void">void</link>*               xmlSecGnuTLSAppGetDefaultPwdCallback
-                                                        (void);</programlisting>
-<para>
-Gets default password callback.</para>
+<refsect2 id="xmlSecGCryptAppGetDefaultPwdCallback" role="function">
+<title>xmlSecGCryptAppGetDefaultPwdCallback ()</title>
+<indexterm zone="xmlSecGCryptAppGetDefaultPwdCallback"><primary>xmlSecGCryptAppGetDefaultPwdCallback</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>*               xmlSecGCryptAppGetDefaultPwdCallback
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets default password callback.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> default password callback.
 </simpara></listitem></varlistentry>
@@ -423,7 +414,4 @@ Gets default password callback.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/gcrypt/crypto.sgml b/docs/api/sgml/gcrypt/crypto.sgml
index 025fac9..2c98ab0 100644
--- a/docs/api/sgml/gcrypt/crypto.sgml
+++ b/docs/api/sgml/gcrypt/crypto.sgml
@@ -1,581 +1,972 @@
-<refentry id="xmlsec-gnutls-crypto">
+<refentry id="xmlsec-gcrypt-crypto">
 <refmeta>
-<refentrytitle role="top_of_page" id="xmlsec-gnutls-crypto.top_of_page">crypto</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-gcrypt-crypto.top_of_page">crypto</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC-GNUTLS Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC-GCRYPT Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>crypto</refname>
-<refpurpose>Crypto transforms implementation for GnuTLS.</refpurpose>
+<refpurpose>Crypto transforms implementation for GCrypt.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv id="xmlsec-gnutls-crypto.synopsis" role="synopsis">
+<refsynopsisdiv id="xmlsec-gcrypt-crypto.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  <link linkend="xmlSecCryptoGetFunctions-gnutls">xmlSecCryptoGetFunctions_gnutls</link>
-                                                        (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSInit">xmlSecGnuTLSInit</link>                    (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSShutdown">xmlSecGnuTLSShutdown</link>                (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSKeysMngrInit">xmlSecGnuTLSKeysMngrInit</link>            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSGenerateRandom">xmlSecGnuTLSGenerateRandom</link>          (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
-#define             <link linkend="xmlSecGnuTLSKeyDataAesId">xmlSecGnuTLSKeyDataAesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecGnuTLSKeyDataAesGetKlass">xmlSecGnuTLSKeyDataAesGetKlass</link>      (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSKeyDataAesSet">xmlSecGnuTLSKeyDataAesSet</link>           (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
-#define             <link linkend="xmlSecGnuTLSTransformAes128CbcId">xmlSecGnuTLSTransformAes128CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformAes128CbcGetKlass">xmlSecGnuTLSTransformAes128CbcGetKlass</link>
-                                                        (void);
-#define             <link linkend="xmlSecGnuTLSTransformAes192CbcId">xmlSecGnuTLSTransformAes192CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformAes192CbcGetKlass">xmlSecGnuTLSTransformAes192CbcGetKlass</link>
-                                                        (void);
-#define             <link linkend="xmlSecGnuTLSTransformAes256CbcId">xmlSecGnuTLSTransformAes256CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformAes256CbcGetKlass">xmlSecGnuTLSTransformAes256CbcGetKlass</link>
-                                                        (void);
-#define             <link linkend="xmlSecGnuTLSKeyDataDesId">xmlSecGnuTLSKeyDataDesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecGnuTLSKeyDataDesGetKlass">xmlSecGnuTLSKeyDataDesGetKlass</link>      (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSKeyDataDesSet">xmlSecGnuTLSKeyDataDesSet</link>           (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
-#define             <link linkend="xmlSecGnuTLSTransformDes3CbcId">xmlSecGnuTLSTransformDes3CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformDes3CbcGetKlass">xmlSecGnuTLSTransformDes3CbcGetKlass</link>
-                                                        (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSHmacGetMinOutputLength">xmlSecGnuTLSHmacGetMinOutputLength</link>  (void);
-<link linkend="void">void</link>                <link linkend="xmlSecGnuTLSHmacSetMinOutputLength">xmlSecGnuTLSHmacSetMinOutputLength</link>  (<link linkend="int">int</link> min_length);
-#define             <link linkend="xmlSecGnuTLSKeyDataHmacId">xmlSecGnuTLSKeyDataHmacId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecGnuTLSKeyDataHmacGetKlass">xmlSecGnuTLSKeyDataHmacGetKlass</link>     (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSKeyDataHmacSet">xmlSecGnuTLSKeyDataHmacSet</link>          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
-#define             <link linkend="xmlSecGnuTLSTransformHmacMd5Id">xmlSecGnuTLSTransformHmacMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformHmacMd5GetKlass">xmlSecGnuTLSTransformHmacMd5GetKlass</link>
-                                                        (void);
-#define             <link linkend="xmlSecGnuTLSTransformHmacRipemd160Id">xmlSecGnuTLSTransformHmacRipemd160Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformHmacRipemd160GetKlass">xmlSecGnuTLSTransformHmacRipemd160GetKlass</link>
-                                                        (void);
-#define             <link linkend="xmlSecGnuTLSTransformHmacSha1Id">xmlSecGnuTLSTransformHmacSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformHmacSha1GetKlass">xmlSecGnuTLSTransformHmacSha1GetKlass</link>
-                                                        (void);
-#define             <link linkend="xmlSecGnuTLSTransformHmacSha256Id">xmlSecGnuTLSTransformHmacSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformHmacSha256GetKlass">xmlSecGnuTLSTransformHmacSha256GetKlass</link>
-                                                        (void);
-#define             <link linkend="xmlSecGnuTLSTransformHmacSha384Id">xmlSecGnuTLSTransformHmacSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformHmacSha384GetKlass">xmlSecGnuTLSTransformHmacSha384GetKlass</link>
-                                                        (void);
-#define             <link linkend="xmlSecGnuTLSTransformHmacSha512Id">xmlSecGnuTLSTransformHmacSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformHmacSha512GetKlass">xmlSecGnuTLSTransformHmacSha512GetKlass</link>
-                                                        (void);
-#define             <link linkend="xmlSecGnuTLSTransformSha1Id">xmlSecGnuTLSTransformSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformSha1GetKlass">xmlSecGnuTLSTransformSha1GetKlass</link>   (void);
-#define             <link linkend="xmlSecGnuTLSTransformSha256Id">xmlSecGnuTLSTransformSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformSha256GetKlass">xmlSecGnuTLSTransformSha256GetKlass</link> (void);
-#define             <link linkend="xmlSecGnuTLSTransformSha384Id">xmlSecGnuTLSTransformSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformSha384GetKlass">xmlSecGnuTLSTransformSha384GetKlass</link> (void);
-#define             <link linkend="xmlSecGnuTLSTransformSha512Id">xmlSecGnuTLSTransformSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformSha512GetKlass">xmlSecGnuTLSTransformSha512GetKlass</link> (void);
-#define             <link linkend="xmlSecGnuTLSTransformMd5Id">xmlSecGnuTLSTransformMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformMd5GetKlass">xmlSecGnuTLSTransformMd5GetKlass</link>    (void);
-#define             <link linkend="xmlSecGnuTLSTransformRipemd160Id">xmlSecGnuTLSTransformRipemd160Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformRipemd160GetKlass">xmlSecGnuTLSTransformRipemd160GetKlass</link>
-                                                        (void);
+<synopsis><link linkend="xmlSecCryptoDLFunctions"><returnvalue>xmlSecCryptoDLFunctionsPtr</returnvalue></link>  <link linkend="xmlSecCryptoGetFunctions-gcrypt">xmlSecCryptoGetFunctions_gcrypt</link>
+                                                        (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptInit">xmlSecGCryptInit</link>                    (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptShutdown">xmlSecGCryptShutdown</link>                (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptKeysMngrInit">xmlSecGCryptKeysMngrInit</link>            (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptGenerateRandom">xmlSecGCryptGenerateRandom</link>          (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buffer</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);
+#define             <link linkend="xmlSecGCryptKeyDataAesId">xmlSecGCryptKeyDataAesId</link>
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecGCryptKeyDataAesGetKlass">xmlSecGCryptKeyDataAesGetKlass</link>      (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptKeyDataAesSet">xmlSecGCryptKeyDataAesSet</link>           (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);
+#define             <link linkend="xmlSecGCryptTransformAes128CbcId">xmlSecGCryptTransformAes128CbcId</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformAes128CbcGetKlass">xmlSecGCryptTransformAes128CbcGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformAes192CbcId">xmlSecGCryptTransformAes192CbcId</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformAes192CbcGetKlass">xmlSecGCryptTransformAes192CbcGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformAes256CbcId">xmlSecGCryptTransformAes256CbcId</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformAes256CbcGetKlass">xmlSecGCryptTransformAes256CbcGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformKWAes128Id">xmlSecGCryptTransformKWAes128Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformKWAes128GetKlass">xmlSecGCryptTransformKWAes128GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformKWAes192Id">xmlSecGCryptTransformKWAes192Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformKWAes192GetKlass">xmlSecGCryptTransformKWAes192GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformKWAes256Id">xmlSecGCryptTransformKWAes256Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformKWAes256GetKlass">xmlSecGCryptTransformKWAes256GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptKeyDataDesId">xmlSecGCryptKeyDataDesId</link>
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecGCryptKeyDataDesGetKlass">xmlSecGCryptKeyDataDesGetKlass</link>      (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptKeyDataDesSet">xmlSecGCryptKeyDataDesSet</link>           (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);
+#define             <link linkend="xmlSecGCryptTransformDes3CbcId">xmlSecGCryptTransformDes3CbcId</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformDes3CbcGetKlass">xmlSecGCryptTransformDes3CbcGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformKWDes3Id">xmlSecGCryptTransformKWDes3Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformKWDes3GetKlass">xmlSecGCryptTransformKWDes3GetKlass</link> (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptKeyDataDsaId">xmlSecGCryptKeyDataDsaId</link>
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecGCryptKeyDataDsaGetKlass">xmlSecGCryptKeyDataDsaGetKlass</link>      (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptKeyDataDsaAdoptKey">xmlSecGCryptKeyDataDsaAdoptKey</link>      (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> dsa_key</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptKeyDataDsaAdoptKeyPair">xmlSecGCryptKeyDataDsaAdoptKeyPair</link>  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> pub_key</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> priv_key</parameter>);
+<link linkend="gcry-sexp-t"><returnvalue>gcry_sexp_t</returnvalue></link>         <link linkend="xmlSecGCryptKeyDataDsaGetPublicKey">xmlSecGCryptKeyDataDsaGetPublicKey</link>  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="gcry-sexp-t"><returnvalue>gcry_sexp_t</returnvalue></link>         <link linkend="xmlSecGCryptKeyDataDsaGetPrivateKey">xmlSecGCryptKeyDataDsaGetPrivateKey</link> (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+#define             <link linkend="xmlSecGCryptTransformDsaSha1Id">xmlSecGCryptTransformDsaSha1Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformDsaSha1GetKlass">xmlSecGCryptTransformDsaSha1GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptHmacGetMinOutputLength">xmlSecGCryptHmacGetMinOutputLength</link>  (<parameter><type>void</type></parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecGCryptHmacSetMinOutputLength">xmlSecGCryptHmacSetMinOutputLength</link>  (<parameter><link linkend="int"><type>int</type></link> min_length</parameter>);
+#define             <link linkend="xmlSecGCryptKeyDataHmacId">xmlSecGCryptKeyDataHmacId</link>
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecGCryptKeyDataHmacGetKlass">xmlSecGCryptKeyDataHmacGetKlass</link>     (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptKeyDataHmacSet">xmlSecGCryptKeyDataHmacSet</link>          (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);
+#define             <link linkend="xmlSecGCryptTransformHmacMd5Id">xmlSecGCryptTransformHmacMd5Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformHmacMd5GetKlass">xmlSecGCryptTransformHmacMd5GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformHmacRipemd160Id">xmlSecGCryptTransformHmacRipemd160Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformHmacRipemd160GetKlass">xmlSecGCryptTransformHmacRipemd160GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformHmacSha1Id">xmlSecGCryptTransformHmacSha1Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformHmacSha1GetKlass">xmlSecGCryptTransformHmacSha1GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformHmacSha256Id">xmlSecGCryptTransformHmacSha256Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformHmacSha256GetKlass">xmlSecGCryptTransformHmacSha256GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformHmacSha384Id">xmlSecGCryptTransformHmacSha384Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformHmacSha384GetKlass">xmlSecGCryptTransformHmacSha384GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformHmacSha512Id">xmlSecGCryptTransformHmacSha512Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformHmacSha512GetKlass">xmlSecGCryptTransformHmacSha512GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptKeyDataRsaId">xmlSecGCryptKeyDataRsaId</link>
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecGCryptKeyDataRsaGetKlass">xmlSecGCryptKeyDataRsaGetKlass</link>      (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptKeyDataRsaAdoptKey">xmlSecGCryptKeyDataRsaAdoptKey</link>      (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> rsa_key</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGCryptKeyDataRsaAdoptKeyPair">xmlSecGCryptKeyDataRsaAdoptKeyPair</link>  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> pub_key</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> priv_key</parameter>);
+<link linkend="gcry-sexp-t"><returnvalue>gcry_sexp_t</returnvalue></link>         <link linkend="xmlSecGCryptKeyDataRsaGetPublicKey">xmlSecGCryptKeyDataRsaGetPublicKey</link>  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="gcry-sexp-t"><returnvalue>gcry_sexp_t</returnvalue></link>         <link linkend="xmlSecGCryptKeyDataRsaGetPrivateKey">xmlSecGCryptKeyDataRsaGetPrivateKey</link> (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+#define             <link linkend="xmlSecGCryptTransformRsaMd5Id">xmlSecGCryptTransformRsaMd5Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformRsaMd5GetKlass">xmlSecGCryptTransformRsaMd5GetKlass</link> (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformRsaRipemd160Id">xmlSecGCryptTransformRsaRipemd160Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformRsaRipemd160GetKlass">xmlSecGCryptTransformRsaRipemd160GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformRsaSha1Id">xmlSecGCryptTransformRsaSha1Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformRsaSha1GetKlass">xmlSecGCryptTransformRsaSha1GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformRsaSha256Id">xmlSecGCryptTransformRsaSha256Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformRsaSha256GetKlass">xmlSecGCryptTransformRsaSha256GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformRsaSha384Id">xmlSecGCryptTransformRsaSha384Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformRsaSha384GetKlass">xmlSecGCryptTransformRsaSha384GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformRsaSha512Id">xmlSecGCryptTransformRsaSha512Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformRsaSha512GetKlass">xmlSecGCryptTransformRsaSha512GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformSha1Id">xmlSecGCryptTransformSha1Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformSha1GetKlass">xmlSecGCryptTransformSha1GetKlass</link>   (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformSha256Id">xmlSecGCryptTransformSha256Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformSha256GetKlass">xmlSecGCryptTransformSha256GetKlass</link> (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformSha384Id">xmlSecGCryptTransformSha384Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformSha384GetKlass">xmlSecGCryptTransformSha384GetKlass</link> (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformSha512Id">xmlSecGCryptTransformSha512Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformSha512GetKlass">xmlSecGCryptTransformSha512GetKlass</link> (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformMd5Id">xmlSecGCryptTransformMd5Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformMd5GetKlass">xmlSecGCryptTransformMd5GetKlass</link>    (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGCryptTransformRipemd160Id">xmlSecGCryptTransformRipemd160Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGCryptTransformRipemd160GetKlass">xmlSecGCryptTransformRipemd160GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
-<refsect1 id="xmlsec-gnutls-crypto.description" role="desc">
+<refsect1 id="xmlsec-gcrypt-crypto.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
-Crypto transforms implementation for GnuTLS.
+Crypto transforms implementation for GCrypt.
 </para>
 </refsect1>
-
-<refsect1 id="xmlsec-gnutls-crypto.details" role="details">
+<refsect1 id="xmlsec-gcrypt-crypto.details" role="details">
 <title role="details.title">Details</title>
-<refsect2 id="xmlSecCryptoGetFunctions-gnutls" role="function">
-<title>xmlSecCryptoGetFunctions_gnutls ()</title>
-<indexterm zone="xmlSecCryptoGetFunctions-gnutls"><primary sortas="xmlSecCryptoGetFunctions_gnutls">xmlSecCryptoGetFunctions_gnutls</primary></indexterm><programlisting><link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  xmlSecCryptoGetFunctions_gnutls
-                                                        (void);</programlisting>
-<para>
-Gets the pointer to xmlsec-gnutls functions table.</para>
+<refsect2 id="xmlSecCryptoGetFunctions-gcrypt" role="function">
+<title>xmlSecCryptoGetFunctions_gcrypt ()</title>
+<indexterm zone="xmlSecCryptoGetFunctions-gcrypt"><primary>xmlSecCryptoGetFunctions_gcrypt</primary></indexterm>
+<programlisting><link linkend="xmlSecCryptoDLFunctions"><returnvalue>xmlSecCryptoDLFunctionsPtr</returnvalue></link>  xmlSecCryptoGetFunctions_gcrypt
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets the pointer to xmlsec-gcrypt functions table.
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the xmlsec-gnutls functions table or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the xmlsec-gcrypt functions table or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSInit" role="function">
-<title>xmlSecGnuTLSInit ()</title>
-<indexterm zone="xmlSecGnuTLSInit"><primary sortas="xmlSecGnuTLSInit">xmlSecGnuTLSInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSInit                    (void);</programlisting>
-<para>
-XMLSec library specific crypto engine initialization.</para>
+<refsect2 id="xmlSecGCryptInit" role="function">
+<title>xmlSecGCryptInit ()</title>
+<indexterm zone="xmlSecGCryptInit"><primary>xmlSecGCryptInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptInit                    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+XMLSec library specific crypto engine initialization.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSShutdown" role="function">
-<title>xmlSecGnuTLSShutdown ()</title>
-<indexterm zone="xmlSecGnuTLSShutdown"><primary sortas="xmlSecGnuTLSShutdown">xmlSecGnuTLSShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSShutdown                (void);</programlisting>
-<para>
-XMLSec library specific crypto engine shutdown.</para>
+<refsect2 id="xmlSecGCryptShutdown" role="function">
+<title>xmlSecGCryptShutdown ()</title>
+<indexterm zone="xmlSecGCryptShutdown"><primary>xmlSecGCryptShutdown</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptShutdown                (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+XMLSec library specific crypto engine shutdown.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSKeysMngrInit" role="function">
-<title>xmlSecGnuTLSKeysMngrInit ()</title>
-<indexterm zone="xmlSecGnuTLSKeysMngrInit"><primary sortas="xmlSecGnuTLSKeysMngrInit">xmlSecGnuTLSKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSKeysMngrInit            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
-<para>
-Adds GnuTLS specific key data stores in keys manager.</para>
+<refsect2 id="xmlSecGCryptKeysMngrInit" role="function">
+<title>xmlSecGCryptKeysMngrInit ()</title>
+<indexterm zone="xmlSecGCryptKeysMngrInit"><primary>xmlSecGCryptKeysMngrInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptKeysMngrInit            (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);</programlisting>
 <para>
+Adds GCrypt specific key data stores in keys manager.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSGenerateRandom" role="function">
-<title>xmlSecGnuTLSGenerateRandom ()</title>
-<indexterm zone="xmlSecGnuTLSGenerateRandom"><primary sortas="xmlSecGnuTLSGenerateRandom">xmlSecGnuTLSGenerateRandom</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSGenerateRandom          (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
-<para>
-Generates <parameter>size</parameter> random bytes and puts result in <parameter>buffer</parameter>.</para>
+<refsect2 id="xmlSecGCryptGenerateRandom" role="function">
+<title>xmlSecGCryptGenerateRandom ()</title>
+<indexterm zone="xmlSecGCryptGenerateRandom"><primary>xmlSecGCryptGenerateRandom</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptGenerateRandom          (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buffer</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);</programlisting>
 <para>
+Generates <parameter>size</parameter> random bytes and puts result in <parameter>buffer</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buffer</parameter>&#160;:</term>
-<listitem><simpara>             the destination buffer.
+<listitem><simpara>the destination buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the numer of bytes to generate.
+<listitem><simpara>the numer of bytes to generate.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSKeyDataAesId" role="macro">
-<title>xmlSecGnuTLSKeyDataAesId</title>
-<indexterm zone="xmlSecGnuTLSKeyDataAesId"><primary sortas="xmlSecGnuTLSKeyDataAesId">xmlSecGnuTLSKeyDataAesId</primary></indexterm><programlisting>#define             xmlSecGnuTLSKeyDataAesId</programlisting>
-<para>
-The AES key data klass.</para>
+<refsect2 id="xmlSecGCryptKeyDataAesId" role="macro">
+<title>xmlSecGCryptKeyDataAesId</title>
+<indexterm zone="xmlSecGCryptKeyDataAesId"><primary>xmlSecGCryptKeyDataAesId</primary></indexterm>
+<programlisting>#define             xmlSecGCryptKeyDataAesId</programlisting>
 <para>
+The AES key data klass.
 </para></refsect2>
-<refsect2 id="xmlSecGnuTLSKeyDataAesGetKlass" role="function">
-<title>xmlSecGnuTLSKeyDataAesGetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSKeyDataAesGetKlass"><primary sortas="xmlSecGnuTLSKeyDataAesGetKlass">xmlSecGnuTLSKeyDataAesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecGnuTLSKeyDataAesGetKlass      (void);</programlisting>
-<para>
-The AES key data klass.</para>
+<refsect2 id="xmlSecGCryptKeyDataAesGetKlass" role="function">
+<title>xmlSecGCryptKeyDataAesGetKlass ()</title>
+<indexterm zone="xmlSecGCryptKeyDataAesGetKlass"><primary>xmlSecGCryptKeyDataAesGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecGCryptKeyDataAesGetKlass      (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The AES key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSKeyDataAesSet" role="function">
-<title>xmlSecGnuTLSKeyDataAesSet ()</title>
-<indexterm zone="xmlSecGnuTLSKeyDataAesSet"><primary sortas="xmlSecGnuTLSKeyDataAesSet">xmlSecGnuTLSKeyDataAesSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSKeyDataAesSet           (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
-<para>
-Sets the value of AES key data.</para>
-<para>
+<refsect2 id="xmlSecGCryptKeyDataAesSet" role="function">
+<title>xmlSecGCryptKeyDataAesSet ()</title>
+<indexterm zone="xmlSecGCryptKeyDataAesSet"><primary>xmlSecGCryptKeyDataAesSet</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptKeyDataAesSet           (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);</programlisting>
+<para>
+Sets the value of AES key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to AES key data.
+<listitem><simpara>the pointer to AES key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key value.
+<listitem><simpara>the pointer to key value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the key value size (in bytes).
+<listitem><simpara>the key value size (in bytes).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformAes128CbcId" role="macro">
-<title>xmlSecGnuTLSTransformAes128CbcId</title>
-<indexterm zone="xmlSecGnuTLSTransformAes128CbcId"><primary sortas="xmlSecGnuTLSTransformAes128CbcId">xmlSecGnuTLSTransformAes128CbcId</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformAes128CbcId</programlisting>
-<para>
-The AES128 CBC cipher transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformAes128CbcId" role="macro">
+<title>xmlSecGCryptTransformAes128CbcId</title>
+<indexterm zone="xmlSecGCryptTransformAes128CbcId"><primary>xmlSecGCryptTransformAes128CbcId</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformAes128CbcId</programlisting>
 <para>
+The AES128 CBC cipher transform klass.
 </para></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformAes128CbcGetKlass" role="function">
-<title>xmlSecGnuTLSTransformAes128CbcGetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformAes128CbcGetKlass"><primary sortas="xmlSecGnuTLSTransformAes128CbcGetKlass">xmlSecGnuTLSTransformAes128CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformAes128CbcGetKlass
-                                                        (void);</programlisting>
-<para>
-AES 128 CBC encryption transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformAes128CbcGetKlass" role="function">
+<title>xmlSecGCryptTransformAes128CbcGetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformAes128CbcGetKlass"><primary>xmlSecGCryptTransformAes128CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformAes128CbcGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+AES 128 CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 128 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformAes192CbcId" role="macro">
-<title>xmlSecGnuTLSTransformAes192CbcId</title>
-<indexterm zone="xmlSecGnuTLSTransformAes192CbcId"><primary sortas="xmlSecGnuTLSTransformAes192CbcId">xmlSecGnuTLSTransformAes192CbcId</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformAes192CbcId</programlisting>
-<para>
-The AES192 CBC cipher transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformAes192CbcId" role="macro">
+<title>xmlSecGCryptTransformAes192CbcId</title>
+<indexterm zone="xmlSecGCryptTransformAes192CbcId"><primary>xmlSecGCryptTransformAes192CbcId</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformAes192CbcId</programlisting>
 <para>
+The AES192 CBC cipher transform klass.
 </para></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformAes192CbcGetKlass" role="function">
-<title>xmlSecGnuTLSTransformAes192CbcGetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformAes192CbcGetKlass"><primary sortas="xmlSecGnuTLSTransformAes192CbcGetKlass">xmlSecGnuTLSTransformAes192CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformAes192CbcGetKlass
-                                                        (void);</programlisting>
-<para>
-AES 192 CBC encryption transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformAes192CbcGetKlass" role="function">
+<title>xmlSecGCryptTransformAes192CbcGetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformAes192CbcGetKlass"><primary>xmlSecGCryptTransformAes192CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformAes192CbcGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+AES 192 CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 192 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformAes256CbcId" role="macro">
-<title>xmlSecGnuTLSTransformAes256CbcId</title>
-<indexterm zone="xmlSecGnuTLSTransformAes256CbcId"><primary sortas="xmlSecGnuTLSTransformAes256CbcId">xmlSecGnuTLSTransformAes256CbcId</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformAes256CbcId</programlisting>
-<para>
-The AES256 CBC cipher transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformAes256CbcId" role="macro">
+<title>xmlSecGCryptTransformAes256CbcId</title>
+<indexterm zone="xmlSecGCryptTransformAes256CbcId"><primary>xmlSecGCryptTransformAes256CbcId</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformAes256CbcId</programlisting>
 <para>
+The AES256 CBC cipher transform klass.
 </para></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformAes256CbcGetKlass" role="function">
-<title>xmlSecGnuTLSTransformAes256CbcGetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformAes256CbcGetKlass"><primary sortas="xmlSecGnuTLSTransformAes256CbcGetKlass">xmlSecGnuTLSTransformAes256CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformAes256CbcGetKlass
-                                                        (void);</programlisting>
-<para>
-AES 256 CBC encryption transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformAes256CbcGetKlass" role="function">
+<title>xmlSecGCryptTransformAes256CbcGetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformAes256CbcGetKlass"><primary>xmlSecGCryptTransformAes256CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformAes256CbcGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+AES 256 CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 256 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSKeyDataDesId" role="macro">
-<title>xmlSecGnuTLSKeyDataDesId</title>
-<indexterm zone="xmlSecGnuTLSKeyDataDesId"><primary sortas="xmlSecGnuTLSKeyDataDesId">xmlSecGnuTLSKeyDataDesId</primary></indexterm><programlisting>#define             xmlSecGnuTLSKeyDataDesId</programlisting>
+<refsect2 id="xmlSecGCryptTransformKWAes128Id" role="macro">
+<title>xmlSecGCryptTransformKWAes128Id</title>
+<indexterm zone="xmlSecGCryptTransformKWAes128Id"><primary>xmlSecGCryptTransformKWAes128Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformKWAes128Id</programlisting>
 <para>
-The DES key data klass.</para>
+The AES 128 key wrap transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGCryptTransformKWAes128GetKlass" role="function">
+<title>xmlSecGCryptTransformKWAes128GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformKWAes128GetKlass"><primary>xmlSecGCryptTransformKWAes128GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformKWAes128GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The AES-128 kew wrapper transform klass.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-128 kew wrapper transform klass.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptTransformKWAes192Id" role="macro">
+<title>xmlSecGCryptTransformKWAes192Id</title>
+<indexterm zone="xmlSecGCryptTransformKWAes192Id"><primary>xmlSecGCryptTransformKWAes192Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformKWAes192Id</programlisting>
+<para>
+The AES 192 key wrap transform klass.
 </para></refsect2>
-<refsect2 id="xmlSecGnuTLSKeyDataDesGetKlass" role="function">
-<title>xmlSecGnuTLSKeyDataDesGetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSKeyDataDesGetKlass"><primary sortas="xmlSecGnuTLSKeyDataDesGetKlass">xmlSecGnuTLSKeyDataDesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecGnuTLSKeyDataDesGetKlass      (void);</programlisting>
+<refsect2 id="xmlSecGCryptTransformKWAes192GetKlass" role="function">
+<title>xmlSecGCryptTransformKWAes192GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformKWAes192GetKlass"><primary>xmlSecGCryptTransformKWAes192GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformKWAes192GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+The AES-192 kew wrapper transform klass.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-192 kew wrapper transform klass.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptTransformKWAes256Id" role="macro">
+<title>xmlSecGCryptTransformKWAes256Id</title>
+<indexterm zone="xmlSecGCryptTransformKWAes256Id"><primary>xmlSecGCryptTransformKWAes256Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformKWAes256Id</programlisting>
 <para>
-The DES key data klass.</para>
+The AES 256 key wrap transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGCryptTransformKWAes256GetKlass" role="function">
+<title>xmlSecGCryptTransformKWAes256GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformKWAes256GetKlass"><primary>xmlSecGCryptTransformKWAes256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformKWAes256GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The AES-256 kew wrapper transform klass.
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DES key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-256 kew wrapper transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSKeyDataDesSet" role="function">
-<title>xmlSecGnuTLSKeyDataDesSet ()</title>
-<indexterm zone="xmlSecGnuTLSKeyDataDesSet"><primary sortas="xmlSecGnuTLSKeyDataDesSet">xmlSecGnuTLSKeyDataDesSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSKeyDataDesSet           (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
+<refsect2 id="xmlSecGCryptKeyDataDesId" role="macro">
+<title>xmlSecGCryptKeyDataDesId</title>
+<indexterm zone="xmlSecGCryptKeyDataDesId"><primary>xmlSecGCryptKeyDataDesId</primary></indexterm>
+<programlisting>#define             xmlSecGCryptKeyDataDesId</programlisting>
 <para>
-Sets the value of DES key data.</para>
+The DES key data klass.
+</para></refsect2>
+<refsect2 id="xmlSecGCryptKeyDataDesGetKlass" role="function">
+<title>xmlSecGCryptKeyDataDesGetKlass ()</title>
+<indexterm zone="xmlSecGCryptKeyDataDesGetKlass"><primary>xmlSecGCryptKeyDataDesGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecGCryptKeyDataDesGetKlass      (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The DES key data klass.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DES key data klass.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptKeyDataDesSet" role="function">
+<title>xmlSecGCryptKeyDataDesSet ()</title>
+<indexterm zone="xmlSecGCryptKeyDataDesSet"><primary>xmlSecGCryptKeyDataDesSet</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptKeyDataDesSet           (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);</programlisting>
+<para>
+Sets the value of DES key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to DES key data.
+<listitem><simpara>the pointer to DES key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key value.
+<listitem><simpara>the pointer to key value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the key value size (in bytes).
+<listitem><simpara>the key value size (in bytes).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformDes3CbcId" role="macro">
-<title>xmlSecGnuTLSTransformDes3CbcId</title>
-<indexterm zone="xmlSecGnuTLSTransformDes3CbcId"><primary sortas="xmlSecGnuTLSTransformDes3CbcId">xmlSecGnuTLSTransformDes3CbcId</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformDes3CbcId</programlisting>
-<para>
-The DES3 CBC cipher transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformDes3CbcId" role="macro">
+<title>xmlSecGCryptTransformDes3CbcId</title>
+<indexterm zone="xmlSecGCryptTransformDes3CbcId"><primary>xmlSecGCryptTransformDes3CbcId</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformDes3CbcId</programlisting>
 <para>
+The DES3 CBC cipher transform klass.
 </para></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformDes3CbcGetKlass" role="function">
-<title>xmlSecGnuTLSTransformDes3CbcGetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformDes3CbcGetKlass"><primary sortas="xmlSecGnuTLSTransformDes3CbcGetKlass">xmlSecGnuTLSTransformDes3CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformDes3CbcGetKlass
-                                                        (void);</programlisting>
-<para>
-Triple DES CBC encryption transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformDes3CbcGetKlass" role="function">
+<title>xmlSecGCryptTransformDes3CbcGetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformDes3CbcGetKlass"><primary>xmlSecGCryptTransformDes3CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformDes3CbcGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Triple DES CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to Triple DES encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSHmacGetMinOutputLength" role="function">
-<title>xmlSecGnuTLSHmacGetMinOutputLength ()</title>
-<indexterm zone="xmlSecGnuTLSHmacGetMinOutputLength"><primary sortas="xmlSecGnuTLSHmacGetMinOutputLength">xmlSecGnuTLSHmacGetMinOutputLength</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSHmacGetMinOutputLength  (void);</programlisting>
+<refsect2 id="xmlSecGCryptTransformKWDes3Id" role="macro">
+<title>xmlSecGCryptTransformKWDes3Id</title>
+<indexterm zone="xmlSecGCryptTransformKWDes3Id"><primary>xmlSecGCryptTransformKWDes3Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformKWDes3Id</programlisting>
+<para>
+The DES3 KW transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGCryptTransformKWDes3GetKlass" role="function">
+<title>xmlSecGCryptTransformKWDes3GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformKWDes3GetKlass"><primary>xmlSecGCryptTransformKWDes3GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformKWDes3GetKlass (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+The Triple DES key wrapper transform klass.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Triple DES key wrapper transform klass.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptKeyDataDsaId" role="macro">
+<title>xmlSecGCryptKeyDataDsaId</title>
+<indexterm zone="xmlSecGCryptKeyDataDsaId"><primary>xmlSecGCryptKeyDataDsaId</primary></indexterm>
+<programlisting>#define             xmlSecGCryptKeyDataDsaId</programlisting>
 <para>
-Gets the value of min HMAC length.</para>
+The DSA key klass.
+</para></refsect2>
+<refsect2 id="xmlSecGCryptKeyDataDsaGetKlass" role="function">
+<title>xmlSecGCryptKeyDataDsaGetKlass ()</title>
+<indexterm zone="xmlSecGCryptKeyDataDsaGetKlass"><primary>xmlSecGCryptKeyDataDsaGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecGCryptKeyDataDsaGetKlass      (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The DSA key data klass.
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the min HMAC output length
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to DSA key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSHmacSetMinOutputLength" role="function">
-<title>xmlSecGnuTLSHmacSetMinOutputLength ()</title>
-<indexterm zone="xmlSecGnuTLSHmacSetMinOutputLength"><primary sortas="xmlSecGnuTLSHmacSetMinOutputLength">xmlSecGnuTLSHmacSetMinOutputLength</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecGnuTLSHmacSetMinOutputLength  (<link linkend="int">int</link> min_length);</programlisting>
+<refsect2 id="xmlSecGCryptKeyDataDsaAdoptKey" role="function">
+<title>xmlSecGCryptKeyDataDsaAdoptKey ()</title>
+<indexterm zone="xmlSecGCryptKeyDataDsaAdoptKey"><primary>xmlSecGCryptKeyDataDsaAdoptKey</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptKeyDataDsaAdoptKey      (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> dsa_key</parameter>);</programlisting>
 <para>
-Sets the min HMAC output length</para>
+Sets the value of DSA key data.
+</para><variablelist role="params">
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara>the pointer to DSA key data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>dsa_key</parameter>&#160;:</term>
+<listitem><simpara>the pointer to GCrypt DSA key.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptKeyDataDsaAdoptKeyPair" role="function">
+<title>xmlSecGCryptKeyDataDsaAdoptKeyPair ()</title>
+<indexterm zone="xmlSecGCryptKeyDataDsaAdoptKeyPair"><primary>xmlSecGCryptKeyDataDsaAdoptKeyPair</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptKeyDataDsaAdoptKeyPair  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> pub_key</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> priv_key</parameter>);</programlisting>
+<para>
+Sets the value of DSA key data.
+</para><variablelist role="params">
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara>the pointer to DSA key data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>pub_key</parameter>&#160;:</term>
+<listitem><simpara>the pointer to GCrypt DSA pub key.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>priv_key</parameter>&#160;:</term>
+<listitem><simpara>the pointer to GCrypt DSA priv key.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptKeyDataDsaGetPublicKey" role="function">
+<title>xmlSecGCryptKeyDataDsaGetPublicKey ()</title>
+<indexterm zone="xmlSecGCryptKeyDataDsaGetPublicKey"><primary>xmlSecGCryptKeyDataDsaGetPublicKey</primary></indexterm>
+<programlisting><link linkend="gcry-sexp-t"><returnvalue>gcry_sexp_t</returnvalue></link>         xmlSecGCryptKeyDataDsaGetPublicKey  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets the GCrypt DSA public key from DSA key data.
 </para><variablelist role="params">
-<varlistentry><term><parameter>min_length</parameter>&#160;:</term>
-<listitem><simpara> the new min length
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara>the pointer to DSA key data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to GCrypt public DSA key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSKeyDataHmacId" role="macro">
-<title>xmlSecGnuTLSKeyDataHmacId</title>
-<indexterm zone="xmlSecGnuTLSKeyDataHmacId"><primary sortas="xmlSecGnuTLSKeyDataHmacId">xmlSecGnuTLSKeyDataHmacId</primary></indexterm><programlisting>#define             xmlSecGnuTLSKeyDataHmacId</programlisting>
+<refsect2 id="xmlSecGCryptKeyDataDsaGetPrivateKey" role="function">
+<title>xmlSecGCryptKeyDataDsaGetPrivateKey ()</title>
+<indexterm zone="xmlSecGCryptKeyDataDsaGetPrivateKey"><primary>xmlSecGCryptKeyDataDsaGetPrivateKey</primary></indexterm>
+<programlisting><link linkend="gcry-sexp-t"><returnvalue>gcry_sexp_t</returnvalue></link>         xmlSecGCryptKeyDataDsaGetPrivateKey (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
-The HMAC key klass.</para>
+Gets the GCrypt DSA private key from DSA key data.
+</para><variablelist role="params">
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara>the pointer to DSA key data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to GCrypt private DSA key or NULL if an error occurs.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptTransformDsaSha1Id" role="macro">
+<title>xmlSecGCryptTransformDsaSha1Id</title>
+<indexterm zone="xmlSecGCryptTransformDsaSha1Id"><primary>xmlSecGCryptTransformDsaSha1Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformDsaSha1Id</programlisting>
 <para>
+The DSA SHA1 signature transform klass.
 </para></refsect2>
-<refsect2 id="xmlSecGnuTLSKeyDataHmacGetKlass" role="function">
-<title>xmlSecGnuTLSKeyDataHmacGetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSKeyDataHmacGetKlass"><primary sortas="xmlSecGnuTLSKeyDataHmacGetKlass">xmlSecGnuTLSKeyDataHmacGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecGnuTLSKeyDataHmacGetKlass     (void);</programlisting>
+<refsect2 id="xmlSecGCryptTransformDsaSha1GetKlass" role="function">
+<title>xmlSecGCryptTransformDsaSha1GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformDsaSha1GetKlass"><primary>xmlSecGCryptTransformDsaSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformDsaSha1GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptHmacGetMinOutputLength" role="function">
+<title>xmlSecGCryptHmacGetMinOutputLength ()</title>
+<indexterm zone="xmlSecGCryptHmacGetMinOutputLength"><primary>xmlSecGCryptHmacGetMinOutputLength</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptHmacGetMinOutputLength  (<parameter><type>void</type></parameter>);</programlisting>
 <para>
-The HMAC key data klass.</para>
+Gets the value of min HMAC length.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the min HMAC output length
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptHmacSetMinOutputLength" role="function">
+<title>xmlSecGCryptHmacSetMinOutputLength ()</title>
+<indexterm zone="xmlSecGCryptHmacSetMinOutputLength"><primary>xmlSecGCryptHmacSetMinOutputLength</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecGCryptHmacSetMinOutputLength  (<parameter><link linkend="int"><type>int</type></link> min_length</parameter>);</programlisting>
 <para>
+Sets the min HMAC output length
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> HMAC key data klass.
+<varlistentry><term><parameter>min_length</parameter>&#160;:</term>
+<listitem><simpara>the new min length
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSKeyDataHmacSet" role="function">
-<title>xmlSecGnuTLSKeyDataHmacSet ()</title>
-<indexterm zone="xmlSecGnuTLSKeyDataHmacSet"><primary sortas="xmlSecGnuTLSKeyDataHmacSet">xmlSecGnuTLSKeyDataHmacSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSKeyDataHmacSet          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
+<refsect2 id="xmlSecGCryptKeyDataHmacId" role="macro">
+<title>xmlSecGCryptKeyDataHmacId</title>
+<indexterm zone="xmlSecGCryptKeyDataHmacId"><primary>xmlSecGCryptKeyDataHmacId</primary></indexterm>
+<programlisting>#define             xmlSecGCryptKeyDataHmacId</programlisting>
 <para>
-Sets the value of HMAC key data.</para>
+The HMAC key klass.
+</para></refsect2>
+<refsect2 id="xmlSecGCryptKeyDataHmacGetKlass" role="function">
+<title>xmlSecGCryptKeyDataHmacGetKlass ()</title>
+<indexterm zone="xmlSecGCryptKeyDataHmacGetKlass"><primary>xmlSecGCryptKeyDataHmacGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecGCryptKeyDataHmacGetKlass     (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC key data klass.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> HMAC key data klass.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptKeyDataHmacSet" role="function">
+<title>xmlSecGCryptKeyDataHmacSet ()</title>
+<indexterm zone="xmlSecGCryptKeyDataHmacSet"><primary>xmlSecGCryptKeyDataHmacSet</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptKeyDataHmacSet          (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);</programlisting>
+<para>
+Sets the value of HMAC key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to HMAC key data.
+<listitem><simpara>the pointer to HMAC key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key value.
+<listitem><simpara>the pointer to key value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the key value size (in bytes).
+<listitem><simpara>the key value size (in bytes).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformHmacMd5Id" role="macro">
-<title>xmlSecGnuTLSTransformHmacMd5Id</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacMd5Id"><primary sortas="xmlSecGnuTLSTransformHmacMd5Id">xmlSecGnuTLSTransformHmacMd5Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformHmacMd5Id</programlisting>
-<para>
-The HMAC with MD5 signature transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformHmacMd5Id" role="macro">
+<title>xmlSecGCryptTransformHmacMd5Id</title>
+<indexterm zone="xmlSecGCryptTransformHmacMd5Id"><primary>xmlSecGCryptTransformHmacMd5Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformHmacMd5Id</programlisting>
 <para>
+The HMAC with MD5 signature transform klass.
 </para></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformHmacMd5GetKlass" role="function">
-<title>xmlSecGnuTLSTransformHmacMd5GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacMd5GetKlass"><primary sortas="xmlSecGnuTLSTransformHmacMd5GetKlass">xmlSecGnuTLSTransformHmacMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformHmacMd5GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-MD5 transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformHmacMd5GetKlass" role="function">
+<title>xmlSecGCryptTransformHmacMd5GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformHmacMd5GetKlass"><primary>xmlSecGCryptTransformHmacMd5GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformHmacMd5GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-MD5 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-MD5 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformHmacRipemd160Id" role="macro">
-<title>xmlSecGnuTLSTransformHmacRipemd160Id</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacRipemd160Id"><primary sortas="xmlSecGnuTLSTransformHmacRipemd160Id">xmlSecGnuTLSTransformHmacRipemd160Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformHmacRipemd160Id</programlisting>
-<para>
-The HMAC with RipeMD160 signature transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformHmacRipemd160Id" role="macro">
+<title>xmlSecGCryptTransformHmacRipemd160Id</title>
+<indexterm zone="xmlSecGCryptTransformHmacRipemd160Id"><primary>xmlSecGCryptTransformHmacRipemd160Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformHmacRipemd160Id</programlisting>
 <para>
+The HMAC with RipeMD160 signature transform klass.
 </para></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformHmacRipemd160GetKlass" role="function">
-<title>xmlSecGnuTLSTransformHmacRipemd160GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacRipemd160GetKlass"><primary sortas="xmlSecGnuTLSTransformHmacRipemd160GetKlass">xmlSecGnuTLSTransformHmacRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformHmacRipemd160GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-RIPEMD160 transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformHmacRipemd160GetKlass" role="function">
+<title>xmlSecGCryptTransformHmacRipemd160GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformHmacRipemd160GetKlass"><primary>xmlSecGCryptTransformHmacRipemd160GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformHmacRipemd160GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-RIPEMD160 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-RIPEMD160 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformHmacSha1Id" role="macro">
-<title>xmlSecGnuTLSTransformHmacSha1Id</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacSha1Id"><primary sortas="xmlSecGnuTLSTransformHmacSha1Id">xmlSecGnuTLSTransformHmacSha1Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformHmacSha1Id</programlisting>
-<para>
-The HMAC with SHA1 signature transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformHmacSha1Id" role="macro">
+<title>xmlSecGCryptTransformHmacSha1Id</title>
+<indexterm zone="xmlSecGCryptTransformHmacSha1Id"><primary>xmlSecGCryptTransformHmacSha1Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformHmacSha1Id</programlisting>
 <para>
+The HMAC with SHA1 signature transform klass.
 </para></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformHmacSha1GetKlass" role="function">
-<title>xmlSecGnuTLSTransformHmacSha1GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacSha1GetKlass"><primary sortas="xmlSecGnuTLSTransformHmacSha1GetKlass">xmlSecGnuTLSTransformHmacSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformHmacSha1GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-SHA1 transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformHmacSha1GetKlass" role="function">
+<title>xmlSecGCryptTransformHmacSha1GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformHmacSha1GetKlass"><primary>xmlSecGCryptTransformHmacSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformHmacSha1GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA1 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA1 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformHmacSha256Id" role="macro">
-<title>xmlSecGnuTLSTransformHmacSha256Id</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacSha256Id"><primary sortas="xmlSecGnuTLSTransformHmacSha256Id">xmlSecGnuTLSTransformHmacSha256Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformHmacSha256Id</programlisting>
-<para>
-The HMAC with SHA256 signature transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformHmacSha256Id" role="macro">
+<title>xmlSecGCryptTransformHmacSha256Id</title>
+<indexterm zone="xmlSecGCryptTransformHmacSha256Id"><primary>xmlSecGCryptTransformHmacSha256Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformHmacSha256Id</programlisting>
 <para>
+The HMAC with SHA256 signature transform klass.
 </para></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformHmacSha256GetKlass" role="function">
-<title>xmlSecGnuTLSTransformHmacSha256GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacSha256GetKlass"><primary sortas="xmlSecGnuTLSTransformHmacSha256GetKlass">xmlSecGnuTLSTransformHmacSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformHmacSha256GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-SHA256 transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformHmacSha256GetKlass" role="function">
+<title>xmlSecGCryptTransformHmacSha256GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformHmacSha256GetKlass"><primary>xmlSecGCryptTransformHmacSha256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformHmacSha256GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA256 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA256 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformHmacSha384Id" role="macro">
-<title>xmlSecGnuTLSTransformHmacSha384Id</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacSha384Id"><primary sortas="xmlSecGnuTLSTransformHmacSha384Id">xmlSecGnuTLSTransformHmacSha384Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformHmacSha384Id</programlisting>
-<para>
-The HMAC with SHA384 signature transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformHmacSha384Id" role="macro">
+<title>xmlSecGCryptTransformHmacSha384Id</title>
+<indexterm zone="xmlSecGCryptTransformHmacSha384Id"><primary>xmlSecGCryptTransformHmacSha384Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformHmacSha384Id</programlisting>
 <para>
+The HMAC with SHA384 signature transform klass.
 </para></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformHmacSha384GetKlass" role="function">
-<title>xmlSecGnuTLSTransformHmacSha384GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacSha384GetKlass"><primary sortas="xmlSecGnuTLSTransformHmacSha384GetKlass">xmlSecGnuTLSTransformHmacSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformHmacSha384GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-SHA384 transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformHmacSha384GetKlass" role="function">
+<title>xmlSecGCryptTransformHmacSha384GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformHmacSha384GetKlass"><primary>xmlSecGCryptTransformHmacSha384GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformHmacSha384GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA384 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA384 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformHmacSha512Id" role="macro">
-<title>xmlSecGnuTLSTransformHmacSha512Id</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacSha512Id"><primary sortas="xmlSecGnuTLSTransformHmacSha512Id">xmlSecGnuTLSTransformHmacSha512Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformHmacSha512Id</programlisting>
-<para>
-The HMAC with SHA512 signature transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformHmacSha512Id" role="macro">
+<title>xmlSecGCryptTransformHmacSha512Id</title>
+<indexterm zone="xmlSecGCryptTransformHmacSha512Id"><primary>xmlSecGCryptTransformHmacSha512Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformHmacSha512Id</programlisting>
 <para>
+The HMAC with SHA512 signature transform klass.
 </para></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformHmacSha512GetKlass" role="function">
-<title>xmlSecGnuTLSTransformHmacSha512GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacSha512GetKlass"><primary sortas="xmlSecGnuTLSTransformHmacSha512GetKlass">xmlSecGnuTLSTransformHmacSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformHmacSha512GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-SHA512 transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformHmacSha512GetKlass" role="function">
+<title>xmlSecGCryptTransformHmacSha512GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformHmacSha512GetKlass"><primary>xmlSecGCryptTransformHmacSha512GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformHmacSha512GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA512 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA512 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformSha1Id" role="macro">
-<title>xmlSecGnuTLSTransformSha1Id</title>
-<indexterm zone="xmlSecGnuTLSTransformSha1Id"><primary sortas="xmlSecGnuTLSTransformSha1Id">xmlSecGnuTLSTransformSha1Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformSha1Id</programlisting>
-<para>
-The HMAC with SHA1 signature transform klass.</para>
+<refsect2 id="xmlSecGCryptKeyDataRsaId" role="macro">
+<title>xmlSecGCryptKeyDataRsaId</title>
+<indexterm zone="xmlSecGCryptKeyDataRsaId"><primary>xmlSecGCryptKeyDataRsaId</primary></indexterm>
+<programlisting>#define             xmlSecGCryptKeyDataRsaId</programlisting>
 <para>
+The RSA key klass.
 </para></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformSha1GetKlass" role="function">
-<title>xmlSecGnuTLSTransformSha1GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformSha1GetKlass"><primary sortas="xmlSecGnuTLSTransformSha1GetKlass">xmlSecGnuTLSTransformSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformSha1GetKlass   (void);</programlisting>
+<refsect2 id="xmlSecGCryptKeyDataRsaGetKlass" role="function">
+<title>xmlSecGCryptKeyDataRsaGetKlass ()</title>
+<indexterm zone="xmlSecGCryptKeyDataRsaGetKlass"><primary>xmlSecGCryptKeyDataRsaGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecGCryptKeyDataRsaGetKlass      (<parameter><type>void</type></parameter>);</programlisting>
 <para>
-SHA-1 digest transform klass.</para>
+The GCrypt RSA key data klass.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to GCrypt RSA key data klass.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptKeyDataRsaAdoptKey" role="function">
+<title>xmlSecGCryptKeyDataRsaAdoptKey ()</title>
+<indexterm zone="xmlSecGCryptKeyDataRsaAdoptKey"><primary>xmlSecGCryptKeyDataRsaAdoptKey</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptKeyDataRsaAdoptKey      (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> rsa_key</parameter>);</programlisting>
 <para>
+Sets the value of RSA key data.
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-1 digest transform klass.
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara>the pointer to RSA key data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>rsa_key</parameter>&#160;:</term>
+<listitem><simpara>the pointer to GCrypt RSA key.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformSha256Id" role="macro">
-<title>xmlSecGnuTLSTransformSha256Id</title>
-<indexterm zone="xmlSecGnuTLSTransformSha256Id"><primary sortas="xmlSecGnuTLSTransformSha256Id">xmlSecGnuTLSTransformSha256Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformSha256Id</programlisting>
+<refsect2 id="xmlSecGCryptKeyDataRsaAdoptKeyPair" role="function">
+<title>xmlSecGCryptKeyDataRsaAdoptKeyPair ()</title>
+<indexterm zone="xmlSecGCryptKeyDataRsaAdoptKeyPair"><primary>xmlSecGCryptKeyDataRsaAdoptKeyPair</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGCryptKeyDataRsaAdoptKeyPair  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> pub_key</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> priv_key</parameter>);</programlisting>
+<para>
+Sets the value of RSA key data.
+</para><variablelist role="params">
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara>the pointer to RSA key data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>pub_key</parameter>&#160;:</term>
+<listitem><simpara>the pointer to GCrypt RSA pub key.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>priv_key</parameter>&#160;:</term>
+<listitem><simpara>the pointer to GCrypt RSA priv key.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptKeyDataRsaGetPublicKey" role="function">
+<title>xmlSecGCryptKeyDataRsaGetPublicKey ()</title>
+<indexterm zone="xmlSecGCryptKeyDataRsaGetPublicKey"><primary>xmlSecGCryptKeyDataRsaGetPublicKey</primary></indexterm>
+<programlisting><link linkend="gcry-sexp-t"><returnvalue>gcry_sexp_t</returnvalue></link>         xmlSecGCryptKeyDataRsaGetPublicKey  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
+<para>
+Gets the GCrypt RSA public key from RSA key data.
+</para><variablelist role="params">
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara>the pointer to RSA key data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to GCrypt public RSA key or NULL if an error occurs.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptKeyDataRsaGetPrivateKey" role="function">
+<title>xmlSecGCryptKeyDataRsaGetPrivateKey ()</title>
+<indexterm zone="xmlSecGCryptKeyDataRsaGetPrivateKey"><primary>xmlSecGCryptKeyDataRsaGetPrivateKey</primary></indexterm>
+<programlisting><link linkend="gcry-sexp-t"><returnvalue>gcry_sexp_t</returnvalue></link>         xmlSecGCryptKeyDataRsaGetPrivateKey (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
-The HMAC with SHA256 signature transform klass.</para>
+Gets the GCrypt RSA private key from RSA key data.
+</para><variablelist role="params">
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara>the pointer to RSA key data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to GCrypt private RSA key or NULL if an error occurs.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptTransformRsaMd5Id" role="macro">
+<title>xmlSecGCryptTransformRsaMd5Id</title>
+<indexterm zone="xmlSecGCryptTransformRsaMd5Id"><primary>xmlSecGCryptTransformRsaMd5Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformRsaMd5Id</programlisting>
 <para>
+The RSA-MD5 signature transform klass.
 </para></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformSha256GetKlass" role="function">
-<title>xmlSecGnuTLSTransformSha256GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformSha256GetKlass"><primary sortas="xmlSecGnuTLSTransformSha256GetKlass">xmlSecGnuTLSTransformSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformSha256GetKlass (void);</programlisting>
+<refsect2 id="xmlSecGCryptTransformRsaMd5GetKlass" role="function">
+<title>xmlSecGCryptTransformRsaMd5GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformRsaMd5GetKlass"><primary>xmlSecGCryptTransformRsaMd5GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformRsaMd5GetKlass (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptTransformRsaRipemd160Id" role="macro">
+<title>xmlSecGCryptTransformRsaRipemd160Id</title>
+<indexterm zone="xmlSecGCryptTransformRsaRipemd160Id"><primary>xmlSecGCryptTransformRsaRipemd160Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformRsaRipemd160Id</programlisting>
 <para>
-SHA256 digest transform klass.</para>
+The RSA-RIPEMD160 signature transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGCryptTransformRsaRipemd160GetKlass" role="function">
+<title>xmlSecGCryptTransformRsaRipemd160GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformRsaRipemd160GetKlass"><primary>xmlSecGCryptTransformRsaRipemd160GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformRsaRipemd160GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA256 digest transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformSha384Id" role="macro">
-<title>xmlSecGnuTLSTransformSha384Id</title>
-<indexterm zone="xmlSecGnuTLSTransformSha384Id"><primary sortas="xmlSecGnuTLSTransformSha384Id">xmlSecGnuTLSTransformSha384Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformSha384Id</programlisting>
+<refsect2 id="xmlSecGCryptTransformRsaSha1Id" role="macro">
+<title>xmlSecGCryptTransformRsaSha1Id</title>
+<indexterm zone="xmlSecGCryptTransformRsaSha1Id"><primary>xmlSecGCryptTransformRsaSha1Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformRsaSha1Id</programlisting>
 <para>
-The HMAC with SHA384 signature transform klass.</para>
+The RSA-SHA1 signature transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGCryptTransformRsaSha1GetKlass" role="function">
+<title>xmlSecGCryptTransformRsaSha1GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformRsaSha1GetKlass"><primary>xmlSecGCryptTransformRsaSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformRsaSha1GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptTransformRsaSha256Id" role="macro">
+<title>xmlSecGCryptTransformRsaSha256Id</title>
+<indexterm zone="xmlSecGCryptTransformRsaSha256Id"><primary>xmlSecGCryptTransformRsaSha256Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformRsaSha256Id</programlisting>
+<para>
+The RSA-SHA256 signature transform klass.
 </para></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformSha384GetKlass" role="function">
-<title>xmlSecGnuTLSTransformSha384GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformSha384GetKlass"><primary sortas="xmlSecGnuTLSTransformSha384GetKlass">xmlSecGnuTLSTransformSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformSha384GetKlass (void);</programlisting>
+<refsect2 id="xmlSecGCryptTransformRsaSha256GetKlass" role="function">
+<title>xmlSecGCryptTransformRsaSha256GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformRsaSha256GetKlass"><primary>xmlSecGCryptTransformRsaSha256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformRsaSha256GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptTransformRsaSha384Id" role="macro">
+<title>xmlSecGCryptTransformRsaSha384Id</title>
+<indexterm zone="xmlSecGCryptTransformRsaSha384Id"><primary>xmlSecGCryptTransformRsaSha384Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformRsaSha384Id</programlisting>
 <para>
-SHA384 digest transform klass.</para>
+The RSA-SHA384 signature transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGCryptTransformRsaSha384GetKlass" role="function">
+<title>xmlSecGCryptTransformRsaSha384GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformRsaSha384GetKlass"><primary>xmlSecGCryptTransformRsaSha384GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformRsaSha384GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA384 digest transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformSha512Id" role="macro">
-<title>xmlSecGnuTLSTransformSha512Id</title>
-<indexterm zone="xmlSecGnuTLSTransformSha512Id"><primary sortas="xmlSecGnuTLSTransformSha512Id">xmlSecGnuTLSTransformSha512Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformSha512Id</programlisting>
+<refsect2 id="xmlSecGCryptTransformRsaSha512Id" role="macro">
+<title>xmlSecGCryptTransformRsaSha512Id</title>
+<indexterm zone="xmlSecGCryptTransformRsaSha512Id"><primary>xmlSecGCryptTransformRsaSha512Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformRsaSha512Id</programlisting>
 <para>
-The HMAC with SHA512 signature transform klass.</para>
+The RSA-SHA512 signature transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGCryptTransformRsaSha512GetKlass" role="function">
+<title>xmlSecGCryptTransformRsaSha512GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformRsaSha512GetKlass"><primary>xmlSecGCryptTransformRsaSha512GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformRsaSha512GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptTransformSha1Id" role="macro">
+<title>xmlSecGCryptTransformSha1Id</title>
+<indexterm zone="xmlSecGCryptTransformSha1Id"><primary>xmlSecGCryptTransformSha1Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformSha1Id</programlisting>
+<para>
+The HMAC with SHA1 signature transform klass.
 </para></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformSha512GetKlass" role="function">
-<title>xmlSecGnuTLSTransformSha512GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformSha512GetKlass"><primary sortas="xmlSecGnuTLSTransformSha512GetKlass">xmlSecGnuTLSTransformSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformSha512GetKlass (void);</programlisting>
+<refsect2 id="xmlSecGCryptTransformSha1GetKlass" role="function">
+<title>xmlSecGCryptTransformSha1GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformSha1GetKlass"><primary>xmlSecGCryptTransformSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformSha1GetKlass   (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+SHA-1 digest transform klass.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-1 digest transform klass.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptTransformSha256Id" role="macro">
+<title>xmlSecGCryptTransformSha256Id</title>
+<indexterm zone="xmlSecGCryptTransformSha256Id"><primary>xmlSecGCryptTransformSha256Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformSha256Id</programlisting>
 <para>
-SHA512 digest transform klass.</para>
+The HMAC with SHA256 signature transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGCryptTransformSha256GetKlass" role="function">
+<title>xmlSecGCryptTransformSha256GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformSha256GetKlass"><primary>xmlSecGCryptTransformSha256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformSha256GetKlass (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA256 digest transform klass.
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA512 digest transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA256 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformMd5Id" role="macro">
-<title>xmlSecGnuTLSTransformMd5Id</title>
-<indexterm zone="xmlSecGnuTLSTransformMd5Id"><primary sortas="xmlSecGnuTLSTransformMd5Id">xmlSecGnuTLSTransformMd5Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformMd5Id</programlisting>
+<refsect2 id="xmlSecGCryptTransformSha384Id" role="macro">
+<title>xmlSecGCryptTransformSha384Id</title>
+<indexterm zone="xmlSecGCryptTransformSha384Id"><primary>xmlSecGCryptTransformSha384Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformSha384Id</programlisting>
 <para>
-The MD5 digest transform klass.</para>
+The HMAC with SHA384 signature transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGCryptTransformSha384GetKlass" role="function">
+<title>xmlSecGCryptTransformSha384GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformSha384GetKlass"><primary>xmlSecGCryptTransformSha384GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformSha384GetKlass (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+SHA384 digest transform klass.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA384 digest transform klass.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptTransformSha512Id" role="macro">
+<title>xmlSecGCryptTransformSha512Id</title>
+<indexterm zone="xmlSecGCryptTransformSha512Id"><primary>xmlSecGCryptTransformSha512Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformSha512Id</programlisting>
 <para>
+The HMAC with SHA512 signature transform klass.
 </para></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformMd5GetKlass" role="function">
-<title>xmlSecGnuTLSTransformMd5GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformMd5GetKlass"><primary sortas="xmlSecGnuTLSTransformMd5GetKlass">xmlSecGnuTLSTransformMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformMd5GetKlass    (void);</programlisting>
+<refsect2 id="xmlSecGCryptTransformSha512GetKlass" role="function">
+<title>xmlSecGCryptTransformSha512GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformSha512GetKlass"><primary>xmlSecGCryptTransformSha512GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformSha512GetKlass (<parameter><type>void</type></parameter>);</programlisting>
 <para>
-MD5 digest transform klass.</para>
+SHA512 digest transform klass.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA512 digest transform klass.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGCryptTransformMd5Id" role="macro">
+<title>xmlSecGCryptTransformMd5Id</title>
+<indexterm zone="xmlSecGCryptTransformMd5Id"><primary>xmlSecGCryptTransformMd5Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformMd5Id</programlisting>
+<para>
+The MD5 digest transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGCryptTransformMd5GetKlass" role="function">
+<title>xmlSecGCryptTransformMd5GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformMd5GetKlass"><primary>xmlSecGCryptTransformMd5GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformMd5GetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+MD5 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to MD5 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformRipemd160Id" role="macro">
-<title>xmlSecGnuTLSTransformRipemd160Id</title>
-<indexterm zone="xmlSecGnuTLSTransformRipemd160Id"><primary sortas="xmlSecGnuTLSTransformRipemd160Id">xmlSecGnuTLSTransformRipemd160Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformRipemd160Id</programlisting>
-<para>
-The RIPEMD160 digest transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformRipemd160Id" role="macro">
+<title>xmlSecGCryptTransformRipemd160Id</title>
+<indexterm zone="xmlSecGCryptTransformRipemd160Id"><primary>xmlSecGCryptTransformRipemd160Id</primary></indexterm>
+<programlisting>#define             xmlSecGCryptTransformRipemd160Id</programlisting>
 <para>
+The RIPEMD160 digest transform klass.
 </para></refsect2>
-<refsect2 id="xmlSecGnuTLSTransformRipemd160GetKlass" role="function">
-<title>xmlSecGnuTLSTransformRipemd160GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformRipemd160GetKlass"><primary sortas="xmlSecGnuTLSTransformRipemd160GetKlass">xmlSecGnuTLSTransformRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformRipemd160GetKlass
-                                                        (void);</programlisting>
-<para>
-RIPEMD160 digest transform klass.</para>
+<refsect2 id="xmlSecGCryptTransformRipemd160GetKlass" role="function">
+<title>xmlSecGCryptTransformRipemd160GetKlass ()</title>
+<indexterm zone="xmlSecGCryptTransformRipemd160GetKlass"><primary>xmlSecGCryptTransformRipemd160GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGCryptTransformRipemd160GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+RIPEMD160 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to RIPEMD160 digest transform klass.
 </simpara></listitem></varlistentry>
@@ -583,7 +974,4 @@ RIPEMD160 digest transform klass.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/gcrypt/xmlsec-gcrypt-doc.bottom b/docs/api/sgml/gcrypt/xmlsec-gcrypt-doc.bottom
index 2f589ee..8512452 100644
--- a/docs/api/sgml/gcrypt/xmlsec-gcrypt-doc.bottom
+++ b/docs/api/sgml/gcrypt/xmlsec-gcrypt-doc.bottom
@@ -1,2 +1,2 @@
-    &xmlsec-gnutls-app;
-    &xmlsec-gnutls-crypto;
+    &xmlsec-gcrypt-app;
+    &xmlsec-gcrypt-crypto;
diff --git a/docs/api/sgml/gcrypt/xmlsec-gcrypt-doc.top b/docs/api/sgml/gcrypt/xmlsec-gcrypt-doc.top
index 7e275a7..ffd47a4 100644
--- a/docs/api/sgml/gcrypt/xmlsec-gcrypt-doc.top
+++ b/docs/api/sgml/gcrypt/xmlsec-gcrypt-doc.top
@@ -1,2 +1,2 @@
-<!ENTITY xmlsec-gnutls-app SYSTEM "sgml/app.sgml">
-<!ENTITY xmlsec-gnutls-crypto SYSTEM "sgml/crypto.sgml">
+<!ENTITY xmlsec-gcrypt-app SYSTEM "sgml/app.sgml">
+<!ENTITY xmlsec-gcrypt-crypto SYSTEM "sgml/crypto.sgml">
diff --git a/docs/api/sgml/gnutls/app.sgml b/docs/api/sgml/gnutls/app.sgml
index 9596be6..9267d9d 100644
--- a/docs/api/sgml/gnutls/app.sgml
+++ b/docs/api/sgml/gnutls/app.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-gnutls-app.top_of_page">app</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC-GNUTLS Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC-GNUTLS Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>app</refname>
 <refpurpose>Application functions implementation for GnuTLS.</refpurpose>
@@ -13,198 +14,188 @@
 <refsynopsisdiv id="xmlsec-gnutls-app.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppInit">xmlSecGnuTLSAppInit</link>                 (const <link linkend="char">char</link> *config);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppShutdown">xmlSecGnuTLSAppShutdown</link>             (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppDefaultKeysMngrInit">xmlSecGnuTLSAppDefaultKeysMngrInit</link>  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppDefaultKeysMngrAdoptKey">xmlSecGnuTLSAppDefaultKeysMngrAdoptKey</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppDefaultKeysMngrLoad">xmlSecGnuTLSAppDefaultKeysMngrLoad</link>  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *uri);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppDefaultKeysMngrSave">xmlSecGnuTLSAppDefaultKeysMngrSave</link>  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppKeysMngrCertLoad">xmlSecGnuTLSAppKeysMngrCertLoad</link>     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppKeysMngrCertLoadMemory">xmlSecGnuTLSAppKeysMngrCertLoadMemory</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecGnuTLSAppKeyLoad">xmlSecGnuTLSAppKeyLoad</link>              (const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecGnuTLSAppKeyLoadMemory">xmlSecGnuTLSAppKeyLoadMemory</link>        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecGnuTLSAppPkcs12Load">xmlSecGnuTLSAppPkcs12Load</link>           (const <link linkend="char">char</link> *filename,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecGnuTLSAppPkcs12LoadMemory">xmlSecGnuTLSAppPkcs12LoadMemory</link>     (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppKeyCertLoad">xmlSecGnuTLSAppKeyCertLoad</link>          (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppKeyCertLoadMemory">xmlSecGnuTLSAppKeyCertLoadMemory</link>    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="void">void</link>*               <link linkend="xmlSecGnuTLSAppGetDefaultPwdCallback">xmlSecGnuTLSAppGetDefaultPwdCallback</link>
-                                                        (void);
+<synopsis><link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSAppInit">xmlSecGnuTLSAppInit</link>                 (<parameter>const <link linkend="char"><type>char</type></link> *config</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSAppShutdown">xmlSecGnuTLSAppShutdown</link>             (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSAppDefaultKeysMngrInit">xmlSecGnuTLSAppDefaultKeysMngrInit</link>  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSAppDefaultKeysMngrAdoptKey">xmlSecGnuTLSAppDefaultKeysMngrAdoptKey</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSAppDefaultKeysMngrLoad">xmlSecGnuTLSAppDefaultKeysMngrLoad</link>  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *uri</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSAppDefaultKeysMngrSave">xmlSecGnuTLSAppDefaultKeysMngrSave</link>  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSAppKeysMngrCertLoad">xmlSecGnuTLSAppKeysMngrCertLoad</link>     (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSAppKeysMngrCertLoadMemory">xmlSecGnuTLSAppKeysMngrCertLoadMemory</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecGnuTLSAppKeyLoad">xmlSecGnuTLSAppKeyLoad</link>              (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecGnuTLSAppKeyLoadMemory">xmlSecGnuTLSAppKeyLoadMemory</link>        (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecGnuTLSAppPkcs12Load">xmlSecGnuTLSAppPkcs12Load</link>           (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecGnuTLSAppPkcs12LoadMemory">xmlSecGnuTLSAppPkcs12LoadMemory</link>     (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSAppKeyCertLoad">xmlSecGnuTLSAppKeyCertLoad</link>          (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSAppKeyCertLoadMemory">xmlSecGnuTLSAppKeyCertLoadMemory</link>    (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>*               <link linkend="xmlSecGnuTLSAppGetDefaultPwdCallback">xmlSecGnuTLSAppGetDefaultPwdCallback</link>
+                                                        (<parameter><type>void</type></parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-gnutls-app.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Application functions implementation for GnuTLS.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-gnutls-app.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecGnuTLSAppInit" role="function">
 <title>xmlSecGnuTLSAppInit ()</title>
-<indexterm zone="xmlSecGnuTLSAppInit"><primary sortas="xmlSecGnuTLSAppInit">xmlSecGnuTLSAppInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppInit                 (const <link linkend="char">char</link> *config);</programlisting>
+<indexterm zone="xmlSecGnuTLSAppInit"><primary>xmlSecGnuTLSAppInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSAppInit                 (<parameter>const <link linkend="char"><type>char</type></link> *config</parameter>);</programlisting>
 <para>
 General crypto engine initialization. This function is used
 by XMLSec command line utility and called before
-<parameter>xmlSecInit</parameter> function.</para>
-<para>
+<parameter>xmlSecInit</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>config</parameter>&#160;:</term>
-<listitem><simpara>             the path to GnuTLS configuration (unused).
+<listitem><simpara>the path to GnuTLS configuration (unused).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSAppShutdown" role="function">
 <title>xmlSecGnuTLSAppShutdown ()</title>
-<indexterm zone="xmlSecGnuTLSAppShutdown"><primary sortas="xmlSecGnuTLSAppShutdown">xmlSecGnuTLSAppShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppShutdown             (void);</programlisting>
+<indexterm zone="xmlSecGnuTLSAppShutdown"><primary>xmlSecGnuTLSAppShutdown</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSAppShutdown             (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after
-<parameter>xmlSecShutdown</parameter> function.</para>
-<para>
+<parameter>xmlSecShutdown</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSAppDefaultKeysMngrInit" role="function">
 <title>xmlSecGnuTLSAppDefaultKeysMngrInit ()</title>
-<indexterm zone="xmlSecGnuTLSAppDefaultKeysMngrInit"><primary sortas="xmlSecGnuTLSAppDefaultKeysMngrInit">xmlSecGnuTLSAppDefaultKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppDefaultKeysMngrInit  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
+<indexterm zone="xmlSecGnuTLSAppDefaultKeysMngrInit"><primary>xmlSecGnuTLSAppDefaultKeysMngrInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSAppDefaultKeysMngrInit  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);</programlisting>
 <para>
 Initializes <parameter>mngr</parameter> with simple keys store <link linkend="xmlSecSimpleKeysStoreId"><type>xmlSecSimpleKeysStoreId</type></link>
-and a default GnuTLS crypto key data stores.</para>
-<para>
+and a default GnuTLS crypto key data stores.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSAppDefaultKeysMngrAdoptKey" role="function">
 <title>xmlSecGnuTLSAppDefaultKeysMngrAdoptKey ()</title>
-<indexterm zone="xmlSecGnuTLSAppDefaultKeysMngrAdoptKey"><primary sortas="xmlSecGnuTLSAppDefaultKeysMngrAdoptKey">xmlSecGnuTLSAppDefaultKeysMngrAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppDefaultKeysMngrAdoptKey
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<indexterm zone="xmlSecGnuTLSAppDefaultKeysMngrAdoptKey"><primary>xmlSecGnuTLSAppDefaultKeysMngrAdoptKey</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSAppDefaultKeysMngrAdoptKey
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);</programlisting>
 <para>
 Adds <parameter>key</parameter> to the keys manager <parameter>mngr</parameter> created with <link linkend="xmlSecGnuTLSAppDefaultKeysMngrInit"><type>xmlSecGnuTLSAppDefaultKeysMngrInit</type></link>
-function.</para>
-<para>
+function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSAppDefaultKeysMngrLoad" role="function">
 <title>xmlSecGnuTLSAppDefaultKeysMngrLoad ()</title>
-<indexterm zone="xmlSecGnuTLSAppDefaultKeysMngrLoad"><primary sortas="xmlSecGnuTLSAppDefaultKeysMngrLoad">xmlSecGnuTLSAppDefaultKeysMngrLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppDefaultKeysMngrLoad  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *uri);</programlisting>
+<indexterm zone="xmlSecGnuTLSAppDefaultKeysMngrLoad"><primary>xmlSecGnuTLSAppDefaultKeysMngrLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSAppDefaultKeysMngrLoad  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *uri</parameter>);</programlisting>
 <para>
 Loads XML keys file from <parameter>uri</parameter> to the keys manager <parameter>mngr</parameter> created
-with <link linkend="xmlSecGnuTLSAppDefaultKeysMngrInit"><type>xmlSecGnuTLSAppDefaultKeysMngrInit</type></link> function.</para>
-<para>
+with <link linkend="xmlSecGnuTLSAppDefaultKeysMngrInit"><type>xmlSecGnuTLSAppDefaultKeysMngrInit</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>uri</parameter>&#160;:</term>
-<listitem><simpara>                the uri.
+<listitem><simpara>the uri.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSAppDefaultKeysMngrSave" role="function">
 <title>xmlSecGnuTLSAppDefaultKeysMngrSave ()</title>
-<indexterm zone="xmlSecGnuTLSAppDefaultKeysMngrSave"><primary sortas="xmlSecGnuTLSAppDefaultKeysMngrSave">xmlSecGnuTLSAppDefaultKeysMngrSave</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppDefaultKeysMngrSave  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
-<para>
-Saves keys from <parameter>mngr</parameter> to  XML keys file.</para>
+<indexterm zone="xmlSecGnuTLSAppDefaultKeysMngrSave"><primary>xmlSecGnuTLSAppDefaultKeysMngrSave</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSAppDefaultKeysMngrSave  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
+Saves keys from <parameter>mngr</parameter> to  XML keys file.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the destination filename.
+<listitem><simpara>the destination filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the type of keys to save (public/private/symmetric).
+<listitem><simpara>the type of keys to save (public/private/symmetric).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSAppKeysMngrCertLoad" role="function">
 <title>xmlSecGnuTLSAppKeysMngrCertLoad ()</title>
-<indexterm zone="xmlSecGnuTLSAppKeysMngrCertLoad"><primary sortas="xmlSecGnuTLSAppKeysMngrCertLoad">xmlSecGnuTLSAppKeysMngrCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppKeysMngrCertLoad     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<indexterm zone="xmlSecGnuTLSAppKeysMngrCertLoad"><primary>xmlSecGnuTLSAppKeysMngrCertLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSAppKeysMngrCertLoad     (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
 Reads cert from <parameter>filename</parameter> and adds to the list of trusted or known
-untrusted certs in <parameter>store</parameter> (not implemented yet).</para>
-<para>
+untrusted certs in <parameter>store</parameter> (not implemented yet).
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the keys manager.
+<listitem><simpara>the keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the certificate file.
+<listitem><simpara>the certificate file.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the flag that indicates is the certificate in <parameter>filename</parameter>
+<listitem><simpara>the flag that indicates is the certificate in <parameter>filename</parameter>
                      trusted or not.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
@@ -212,210 +203,210 @@ untrusted certs in <parameter>store</parameter> (not implemented yet).</para>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSAppKeysMngrCertLoadMemory" role="function">
 <title>xmlSecGnuTLSAppKeysMngrCertLoadMemory ()</title>
-<indexterm zone="xmlSecGnuTLSAppKeysMngrCertLoadMemory"><primary sortas="xmlSecGnuTLSAppKeysMngrCertLoadMemory">xmlSecGnuTLSAppKeysMngrCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppKeysMngrCertLoadMemory
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<indexterm zone="xmlSecGnuTLSAppKeysMngrCertLoadMemory"><primary>xmlSecGnuTLSAppKeysMngrCertLoadMemory</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSAppKeysMngrCertLoadMemory
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</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>
+untrusted certs in <parameter>store</parameter> (not implemented yet).
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the keys manager.
+<listitem><simpara>the keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the certificate binary data.
+<listitem><simpara>the certificate binary data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the certificate binary data size.
+<listitem><simpara>the certificate binary data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the flag that indicates is the certificate trusted or not.
+<listitem><simpara>the flag that indicates is the certificate trusted or not.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSAppKeyLoad" role="function">
 <title>xmlSecGnuTLSAppKeyLoad ()</title>
-<indexterm zone="xmlSecGnuTLSAppKeyLoad"><primary sortas="xmlSecGnuTLSAppKeyLoad">xmlSecGnuTLSAppKeyLoad</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecGnuTLSAppKeyLoad              (const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
-<para>
-Reads key from the a file (not implemented yet).</para>
+<indexterm zone="xmlSecGnuTLSAppKeyLoad"><primary>xmlSecGnuTLSAppKeyLoad</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecGnuTLSAppKeyLoad              (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
 <para>
+Reads key from the a file (not implemented yet).
 </para><variablelist role="params">
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the key filename.
+<listitem><simpara>the key filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the key file format.
+<listitem><simpara>the key file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the key file password.
+<listitem><simpara>the key file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the key password callback.
+<listitem><simpara>the key password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSAppKeyLoadMemory" role="function">
 <title>xmlSecGnuTLSAppKeyLoadMemory ()</title>
-<indexterm zone="xmlSecGnuTLSAppKeyLoadMemory"><primary sortas="xmlSecGnuTLSAppKeyLoadMemory">xmlSecGnuTLSAppKeyLoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecGnuTLSAppKeyLoadMemory        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
-<para>
-Reads key from the memory buffer (not implemented yet).</para>
+<indexterm zone="xmlSecGnuTLSAppKeyLoadMemory"><primary>xmlSecGnuTLSAppKeyLoadMemory</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecGnuTLSAppKeyLoadMemory        (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
 <para>
+Reads key from the memory buffer (not implemented yet).
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the binary key data.
+<listitem><simpara>the binary key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the size of binary key.
+<listitem><simpara>the size of binary key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the key file format.
+<listitem><simpara>the key file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the key file password.
+<listitem><simpara>the key file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the key password callback.
+<listitem><simpara>the key password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSAppPkcs12Load" role="function">
 <title>xmlSecGnuTLSAppPkcs12Load ()</title>
-<indexterm zone="xmlSecGnuTLSAppPkcs12Load"><primary sortas="xmlSecGnuTLSAppPkcs12Load">xmlSecGnuTLSAppPkcs12Load</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecGnuTLSAppPkcs12Load           (const <link linkend="char">char</link> *filename,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<indexterm zone="xmlSecGnuTLSAppPkcs12Load"><primary>xmlSecGnuTLSAppPkcs12Load</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecGnuTLSAppPkcs12Load           (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 file
 (not implemented yet).
 For uniformity, call xmlSecGnuTLSAppKeyLoad instead of this function. Pass
-in format=xmlSecKeyDataFormatPkcs12.</para>
-<para>
+in format=xmlSecKeyDataFormatPkcs12.
 </para><variablelist role="params">
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the PKCS12 key filename.
+<listitem><simpara>the PKCS12 key filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the PKCS12 file password.
+<listitem><simpara>the PKCS12 file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the password callback.
+<listitem><simpara>the password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSAppPkcs12LoadMemory" role="function">
 <title>xmlSecGnuTLSAppPkcs12LoadMemory ()</title>
-<indexterm zone="xmlSecGnuTLSAppPkcs12LoadMemory"><primary sortas="xmlSecGnuTLSAppPkcs12LoadMemory">xmlSecGnuTLSAppPkcs12LoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecGnuTLSAppPkcs12LoadMemory     (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<indexterm zone="xmlSecGnuTLSAppPkcs12LoadMemory"><primary>xmlSecGnuTLSAppPkcs12LoadMemory</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecGnuTLSAppPkcs12LoadMemory     (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</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>
+in format=xmlSecKeyDataFormatPkcs12 (not implemented yet).
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the PKCS12 binary data.
+<listitem><simpara>the PKCS12 binary data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the PKCS12 binary data size.
+<listitem><simpara>the PKCS12 binary data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the PKCS12 file password.
+<listitem><simpara>the PKCS12 file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the password callback.
+<listitem><simpara>the password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSAppKeyCertLoad" role="function">
 <title>xmlSecGnuTLSAppKeyCertLoad ()</title>
-<indexterm zone="xmlSecGnuTLSAppKeyCertLoad"><primary sortas="xmlSecGnuTLSAppKeyCertLoad">xmlSecGnuTLSAppKeyCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppKeyCertLoad          (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
+<indexterm zone="xmlSecGnuTLSAppKeyCertLoad"><primary>xmlSecGnuTLSAppKeyCertLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSAppKeyCertLoad          (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);</programlisting>
 <para>
 Reads the certificate from $<parameter>filename</parameter> and adds it to key
-(not implemented yet).</para>
-<para>
+(not implemented yet).
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the certificate filename.
+<listitem><simpara>the certificate filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSAppKeyCertLoadMemory" role="function">
 <title>xmlSecGnuTLSAppKeyCertLoadMemory ()</title>
-<indexterm zone="xmlSecGnuTLSAppKeyCertLoadMemory"><primary sortas="xmlSecGnuTLSAppKeyCertLoadMemory">xmlSecGnuTLSAppKeyCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppKeyCertLoadMemory    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
-<para>
-Reads the certificate from memory buffer and adds it to key (not implemented yet).</para>
+<indexterm zone="xmlSecGnuTLSAppKeyCertLoadMemory"><primary>xmlSecGnuTLSAppKeyCertLoadMemory</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSAppKeyCertLoadMemory    (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);</programlisting>
 <para>
+Reads the certificate from memory buffer and adds it to key (not implemented yet).
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the certificate binary data.
+<listitem><simpara>the certificate binary data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the certificate binary data size.
+<listitem><simpara>the certificate binary data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSAppGetDefaultPwdCallback" role="function">
 <title>xmlSecGnuTLSAppGetDefaultPwdCallback ()</title>
-<indexterm zone="xmlSecGnuTLSAppGetDefaultPwdCallback"><primary sortas="xmlSecGnuTLSAppGetDefaultPwdCallback">xmlSecGnuTLSAppGetDefaultPwdCallback</primary></indexterm><programlisting><link linkend="void">void</link>*               xmlSecGnuTLSAppGetDefaultPwdCallback
-                                                        (void);</programlisting>
-<para>
-Gets default password callback.</para>
+<indexterm zone="xmlSecGnuTLSAppGetDefaultPwdCallback"><primary>xmlSecGnuTLSAppGetDefaultPwdCallback</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>*               xmlSecGnuTLSAppGetDefaultPwdCallback
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets default password callback.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> default password callback.
 </simpara></listitem></varlistentry>
@@ -423,7 +414,4 @@ Gets default password callback.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/gnutls/crypto.sgml b/docs/api/sgml/gnutls/crypto.sgml
index 025fac9..6032c4c 100644
--- a/docs/api/sgml/gnutls/crypto.sgml
+++ b/docs/api/sgml/gnutls/crypto.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-gnutls-crypto.top_of_page">crypto</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC-GNUTLS Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC-GNUTLS Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>crypto</refname>
 <refpurpose>Crypto transforms implementation for GnuTLS.</refpurpose>
@@ -13,569 +14,959 @@
 <refsynopsisdiv id="xmlsec-gnutls-crypto.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  <link linkend="xmlSecCryptoGetFunctions-gnutls">xmlSecCryptoGetFunctions_gnutls</link>
-                                                        (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSInit">xmlSecGnuTLSInit</link>                    (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSShutdown">xmlSecGnuTLSShutdown</link>                (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSKeysMngrInit">xmlSecGnuTLSKeysMngrInit</link>            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSGenerateRandom">xmlSecGnuTLSGenerateRandom</link>          (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
+<synopsis><link linkend="xmlSecCryptoDLFunctions"><returnvalue>xmlSecCryptoDLFunctionsPtr</returnvalue></link>  <link linkend="xmlSecCryptoGetFunctions-gnutls">xmlSecCryptoGetFunctions_gnutls</link>
+                                                        (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSInit">xmlSecGnuTLSInit</link>                    (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSShutdown">xmlSecGnuTLSShutdown</link>                (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSKeysMngrInit">xmlSecGnuTLSKeysMngrInit</link>            (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSGenerateRandom">xmlSecGnuTLSGenerateRandom</link>          (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buffer</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);
 #define             <link linkend="xmlSecGnuTLSKeyDataAesId">xmlSecGnuTLSKeyDataAesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecGnuTLSKeyDataAesGetKlass">xmlSecGnuTLSKeyDataAesGetKlass</link>      (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSKeyDataAesSet">xmlSecGnuTLSKeyDataAesSet</link>           (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecGnuTLSKeyDataAesGetKlass">xmlSecGnuTLSKeyDataAesGetKlass</link>      (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSKeyDataAesSet">xmlSecGnuTLSKeyDataAesSet</link>           (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);
 #define             <link linkend="xmlSecGnuTLSTransformAes128CbcId">xmlSecGnuTLSTransformAes128CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformAes128CbcGetKlass">xmlSecGnuTLSTransformAes128CbcGetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformAes128CbcGetKlass">xmlSecGnuTLSTransformAes128CbcGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecGnuTLSTransformAes192CbcId">xmlSecGnuTLSTransformAes192CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformAes192CbcGetKlass">xmlSecGnuTLSTransformAes192CbcGetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformAes192CbcGetKlass">xmlSecGnuTLSTransformAes192CbcGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecGnuTLSTransformAes256CbcId">xmlSecGnuTLSTransformAes256CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformAes256CbcGetKlass">xmlSecGnuTLSTransformAes256CbcGetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformAes256CbcGetKlass">xmlSecGnuTLSTransformAes256CbcGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGnuTLSTransformKWAes128Id">xmlSecGnuTLSTransformKWAes128Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformKWAes128GetKlass">xmlSecGnuTLSTransformKWAes128GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGnuTLSTransformKWAes192Id">xmlSecGnuTLSTransformKWAes192Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformKWAes192GetKlass">xmlSecGnuTLSTransformKWAes192GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGnuTLSTransformKWAes256Id">xmlSecGnuTLSTransformKWAes256Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformKWAes256GetKlass">xmlSecGnuTLSTransformKWAes256GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecGnuTLSKeyDataDesId">xmlSecGnuTLSKeyDataDesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecGnuTLSKeyDataDesGetKlass">xmlSecGnuTLSKeyDataDesGetKlass</link>      (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSKeyDataDesSet">xmlSecGnuTLSKeyDataDesSet</link>           (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecGnuTLSKeyDataDesGetKlass">xmlSecGnuTLSKeyDataDesGetKlass</link>      (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSKeyDataDesSet">xmlSecGnuTLSKeyDataDesSet</link>           (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);
 #define             <link linkend="xmlSecGnuTLSTransformDes3CbcId">xmlSecGnuTLSTransformDes3CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformDes3CbcGetKlass">xmlSecGnuTLSTransformDes3CbcGetKlass</link>
-                                                        (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSHmacGetMinOutputLength">xmlSecGnuTLSHmacGetMinOutputLength</link>  (void);
-<link linkend="void">void</link>                <link linkend="xmlSecGnuTLSHmacSetMinOutputLength">xmlSecGnuTLSHmacSetMinOutputLength</link>  (<link linkend="int">int</link> min_length);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformDes3CbcGetKlass">xmlSecGnuTLSTransformDes3CbcGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGnuTLSTransformKWDes3Id">xmlSecGnuTLSTransformKWDes3Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformKWDes3GetKlass">xmlSecGnuTLSTransformKWDes3GetKlass</link> (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGnuTLSKeyDataDsaId">xmlSecGnuTLSKeyDataDsaId</link>
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecGnuTLSKeyDataDsaGetKlass">xmlSecGnuTLSKeyDataDsaGetKlass</link>      (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSKeyDataDsaAdoptKey">xmlSecGnuTLSKeyDataDsaAdoptKey</link>      (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> dsa_key</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSKeyDataDsaAdoptKeyPair">xmlSecGnuTLSKeyDataDsaAdoptKeyPair</link>  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> pub_key</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> priv_key</parameter>);
+<link linkend="gcry-sexp-t"><returnvalue>gcry_sexp_t</returnvalue></link>         <link linkend="xmlSecGnuTLSKeyDataDsaGetPublicKey">xmlSecGnuTLSKeyDataDsaGetPublicKey</link>  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="gcry-sexp-t"><returnvalue>gcry_sexp_t</returnvalue></link>         <link linkend="xmlSecGnuTLSKeyDataDsaGetPrivateKey">xmlSecGnuTLSKeyDataDsaGetPrivateKey</link> (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+#define             <link linkend="xmlSecGnuTLSTransformDsaSha1Id">xmlSecGnuTLSTransformDsaSha1Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformDsaSha1GetKlass">xmlSecGnuTLSTransformDsaSha1GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSHmacGetMinOutputLength">xmlSecGnuTLSHmacGetMinOutputLength</link>  (<parameter><type>void</type></parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecGnuTLSHmacSetMinOutputLength">xmlSecGnuTLSHmacSetMinOutputLength</link>  (<parameter><link linkend="int"><type>int</type></link> min_length</parameter>);
 #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);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecGnuTLSKeyDataHmacGetKlass">xmlSecGnuTLSKeyDataHmacGetKlass</link>     (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSKeyDataHmacSet">xmlSecGnuTLSKeyDataHmacSet</link>          (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);
 #define             <link linkend="xmlSecGnuTLSTransformHmacMd5Id">xmlSecGnuTLSTransformHmacMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformHmacMd5GetKlass">xmlSecGnuTLSTransformHmacMd5GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformHmacMd5GetKlass">xmlSecGnuTLSTransformHmacMd5GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecGnuTLSTransformHmacRipemd160Id">xmlSecGnuTLSTransformHmacRipemd160Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformHmacRipemd160GetKlass">xmlSecGnuTLSTransformHmacRipemd160GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformHmacRipemd160GetKlass">xmlSecGnuTLSTransformHmacRipemd160GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecGnuTLSTransformHmacSha1Id">xmlSecGnuTLSTransformHmacSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformHmacSha1GetKlass">xmlSecGnuTLSTransformHmacSha1GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformHmacSha1GetKlass">xmlSecGnuTLSTransformHmacSha1GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecGnuTLSTransformHmacSha256Id">xmlSecGnuTLSTransformHmacSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformHmacSha256GetKlass">xmlSecGnuTLSTransformHmacSha256GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformHmacSha256GetKlass">xmlSecGnuTLSTransformHmacSha256GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecGnuTLSTransformHmacSha384Id">xmlSecGnuTLSTransformHmacSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformHmacSha384GetKlass">xmlSecGnuTLSTransformHmacSha384GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformHmacSha384GetKlass">xmlSecGnuTLSTransformHmacSha384GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecGnuTLSTransformHmacSha512Id">xmlSecGnuTLSTransformHmacSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformHmacSha512GetKlass">xmlSecGnuTLSTransformHmacSha512GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformHmacSha512GetKlass">xmlSecGnuTLSTransformHmacSha512GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGnuTLSKeyDataRsaId">xmlSecGnuTLSKeyDataRsaId</link>
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecGnuTLSKeyDataRsaGetKlass">xmlSecGnuTLSKeyDataRsaGetKlass</link>      (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSKeyDataRsaAdoptKey">xmlSecGnuTLSKeyDataRsaAdoptKey</link>      (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> rsa_key</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGnuTLSKeyDataRsaAdoptKeyPair">xmlSecGnuTLSKeyDataRsaAdoptKeyPair</link>  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> pub_key</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> priv_key</parameter>);
+<link linkend="gcry-sexp-t"><returnvalue>gcry_sexp_t</returnvalue></link>         <link linkend="xmlSecGnuTLSKeyDataRsaGetPublicKey">xmlSecGnuTLSKeyDataRsaGetPublicKey</link>  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="gcry-sexp-t"><returnvalue>gcry_sexp_t</returnvalue></link>         <link linkend="xmlSecGnuTLSKeyDataRsaGetPrivateKey">xmlSecGnuTLSKeyDataRsaGetPrivateKey</link> (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+#define             <link linkend="xmlSecGnuTLSTransformRsaMd5Id">xmlSecGnuTLSTransformRsaMd5Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformRsaMd5GetKlass">xmlSecGnuTLSTransformRsaMd5GetKlass</link> (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGnuTLSTransformRsaRipemd160Id">xmlSecGnuTLSTransformRsaRipemd160Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformRsaRipemd160GetKlass">xmlSecGnuTLSTransformRsaRipemd160GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGnuTLSTransformRsaSha1Id">xmlSecGnuTLSTransformRsaSha1Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformRsaSha1GetKlass">xmlSecGnuTLSTransformRsaSha1GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGnuTLSTransformRsaSha256Id">xmlSecGnuTLSTransformRsaSha256Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformRsaSha256GetKlass">xmlSecGnuTLSTransformRsaSha256GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGnuTLSTransformRsaSha384Id">xmlSecGnuTLSTransformRsaSha384Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformRsaSha384GetKlass">xmlSecGnuTLSTransformRsaSha384GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecGnuTLSTransformRsaSha512Id">xmlSecGnuTLSTransformRsaSha512Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformRsaSha512GetKlass">xmlSecGnuTLSTransformRsaSha512GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecGnuTLSTransformSha1Id">xmlSecGnuTLSTransformSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformSha1GetKlass">xmlSecGnuTLSTransformSha1GetKlass</link>   (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformSha1GetKlass">xmlSecGnuTLSTransformSha1GetKlass</link>   (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecGnuTLSTransformSha256Id">xmlSecGnuTLSTransformSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformSha256GetKlass">xmlSecGnuTLSTransformSha256GetKlass</link> (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformSha256GetKlass">xmlSecGnuTLSTransformSha256GetKlass</link> (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecGnuTLSTransformSha384Id">xmlSecGnuTLSTransformSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformSha384GetKlass">xmlSecGnuTLSTransformSha384GetKlass</link> (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformSha384GetKlass">xmlSecGnuTLSTransformSha384GetKlass</link> (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecGnuTLSTransformSha512Id">xmlSecGnuTLSTransformSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformSha512GetKlass">xmlSecGnuTLSTransformSha512GetKlass</link> (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformSha512GetKlass">xmlSecGnuTLSTransformSha512GetKlass</link> (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecGnuTLSTransformMd5Id">xmlSecGnuTLSTransformMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformMd5GetKlass">xmlSecGnuTLSTransformMd5GetKlass</link>    (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformMd5GetKlass">xmlSecGnuTLSTransformMd5GetKlass</link>    (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecGnuTLSTransformRipemd160Id">xmlSecGnuTLSTransformRipemd160Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformRipemd160GetKlass">xmlSecGnuTLSTransformRipemd160GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecGnuTLSTransformRipemd160GetKlass">xmlSecGnuTLSTransformRipemd160GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-gnutls-crypto.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Crypto transforms implementation for GnuTLS.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-gnutls-crypto.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecCryptoGetFunctions-gnutls" role="function">
 <title>xmlSecCryptoGetFunctions_gnutls ()</title>
-<indexterm zone="xmlSecCryptoGetFunctions-gnutls"><primary sortas="xmlSecCryptoGetFunctions_gnutls">xmlSecCryptoGetFunctions_gnutls</primary></indexterm><programlisting><link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  xmlSecCryptoGetFunctions_gnutls
-                                                        (void);</programlisting>
-<para>
-Gets the pointer to xmlsec-gnutls functions table.</para>
+<indexterm zone="xmlSecCryptoGetFunctions-gnutls"><primary>xmlSecCryptoGetFunctions_gnutls</primary></indexterm>
+<programlisting><link linkend="xmlSecCryptoDLFunctions"><returnvalue>xmlSecCryptoDLFunctionsPtr</returnvalue></link>  xmlSecCryptoGetFunctions_gnutls
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets the pointer to xmlsec-gnutls functions table.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the xmlsec-gnutls functions table or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSInit" role="function">
 <title>xmlSecGnuTLSInit ()</title>
-<indexterm zone="xmlSecGnuTLSInit"><primary sortas="xmlSecGnuTLSInit">xmlSecGnuTLSInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSInit                    (void);</programlisting>
-<para>
-XMLSec library specific crypto engine initialization.</para>
+<indexterm zone="xmlSecGnuTLSInit"><primary>xmlSecGnuTLSInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSInit                    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+XMLSec library specific crypto engine initialization.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSShutdown" role="function">
 <title>xmlSecGnuTLSShutdown ()</title>
-<indexterm zone="xmlSecGnuTLSShutdown"><primary sortas="xmlSecGnuTLSShutdown">xmlSecGnuTLSShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSShutdown                (void);</programlisting>
-<para>
-XMLSec library specific crypto engine shutdown.</para>
+<indexterm zone="xmlSecGnuTLSShutdown"><primary>xmlSecGnuTLSShutdown</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSShutdown                (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+XMLSec library specific crypto engine shutdown.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSKeysMngrInit" role="function">
 <title>xmlSecGnuTLSKeysMngrInit ()</title>
-<indexterm zone="xmlSecGnuTLSKeysMngrInit"><primary sortas="xmlSecGnuTLSKeysMngrInit">xmlSecGnuTLSKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSKeysMngrInit            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
-<para>
-Adds GnuTLS specific key data stores in keys manager.</para>
+<indexterm zone="xmlSecGnuTLSKeysMngrInit"><primary>xmlSecGnuTLSKeysMngrInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSKeysMngrInit            (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);</programlisting>
 <para>
+Adds GnuTLS specific key data stores in keys manager.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSGenerateRandom" role="function">
 <title>xmlSecGnuTLSGenerateRandom ()</title>
-<indexterm zone="xmlSecGnuTLSGenerateRandom"><primary sortas="xmlSecGnuTLSGenerateRandom">xmlSecGnuTLSGenerateRandom</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSGenerateRandom          (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
-<para>
-Generates <parameter>size</parameter> random bytes and puts result in <parameter>buffer</parameter>.</para>
+<indexterm zone="xmlSecGnuTLSGenerateRandom"><primary>xmlSecGnuTLSGenerateRandom</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSGenerateRandom          (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buffer</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);</programlisting>
 <para>
+Generates <parameter>size</parameter> random bytes and puts result in <parameter>buffer</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buffer</parameter>&#160;:</term>
-<listitem><simpara>             the destination buffer.
+<listitem><simpara>the destination buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the numer of bytes to generate.
+<listitem><simpara>the numer of bytes to generate.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSKeyDataAesId" role="macro">
 <title>xmlSecGnuTLSKeyDataAesId</title>
-<indexterm zone="xmlSecGnuTLSKeyDataAesId"><primary sortas="xmlSecGnuTLSKeyDataAesId">xmlSecGnuTLSKeyDataAesId</primary></indexterm><programlisting>#define             xmlSecGnuTLSKeyDataAesId</programlisting>
-<para>
-The AES key data klass.</para>
+<indexterm zone="xmlSecGnuTLSKeyDataAesId"><primary>xmlSecGnuTLSKeyDataAesId</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSKeyDataAesId</programlisting>
 <para>
+The AES key data klass.
 </para></refsect2>
 <refsect2 id="xmlSecGnuTLSKeyDataAesGetKlass" role="function">
 <title>xmlSecGnuTLSKeyDataAesGetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSKeyDataAesGetKlass"><primary sortas="xmlSecGnuTLSKeyDataAesGetKlass">xmlSecGnuTLSKeyDataAesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecGnuTLSKeyDataAesGetKlass      (void);</programlisting>
-<para>
-The AES key data klass.</para>
+<indexterm zone="xmlSecGnuTLSKeyDataAesGetKlass"><primary>xmlSecGnuTLSKeyDataAesGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecGnuTLSKeyDataAesGetKlass      (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The AES key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSKeyDataAesSet" role="function">
 <title>xmlSecGnuTLSKeyDataAesSet ()</title>
-<indexterm zone="xmlSecGnuTLSKeyDataAesSet"><primary sortas="xmlSecGnuTLSKeyDataAesSet">xmlSecGnuTLSKeyDataAesSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSKeyDataAesSet           (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
-<para>
-Sets the value of AES key data.</para>
+<indexterm zone="xmlSecGnuTLSKeyDataAesSet"><primary>xmlSecGnuTLSKeyDataAesSet</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSKeyDataAesSet           (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);</programlisting>
 <para>
+Sets the value of AES key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to AES key data.
+<listitem><simpara>the pointer to AES key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key value.
+<listitem><simpara>the pointer to key value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the key value size (in bytes).
+<listitem><simpara>the key value size (in bytes).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformAes128CbcId" role="macro">
 <title>xmlSecGnuTLSTransformAes128CbcId</title>
-<indexterm zone="xmlSecGnuTLSTransformAes128CbcId"><primary sortas="xmlSecGnuTLSTransformAes128CbcId">xmlSecGnuTLSTransformAes128CbcId</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformAes128CbcId</programlisting>
-<para>
-The AES128 CBC cipher transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformAes128CbcId"><primary>xmlSecGnuTLSTransformAes128CbcId</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformAes128CbcId</programlisting>
 <para>
+The AES128 CBC cipher transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformAes128CbcGetKlass" role="function">
 <title>xmlSecGnuTLSTransformAes128CbcGetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformAes128CbcGetKlass"><primary sortas="xmlSecGnuTLSTransformAes128CbcGetKlass">xmlSecGnuTLSTransformAes128CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformAes128CbcGetKlass
-                                                        (void);</programlisting>
-<para>
-AES 128 CBC encryption transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformAes128CbcGetKlass"><primary>xmlSecGnuTLSTransformAes128CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformAes128CbcGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+AES 128 CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 128 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformAes192CbcId" role="macro">
 <title>xmlSecGnuTLSTransformAes192CbcId</title>
-<indexterm zone="xmlSecGnuTLSTransformAes192CbcId"><primary sortas="xmlSecGnuTLSTransformAes192CbcId">xmlSecGnuTLSTransformAes192CbcId</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformAes192CbcId</programlisting>
-<para>
-The AES192 CBC cipher transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformAes192CbcId"><primary>xmlSecGnuTLSTransformAes192CbcId</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformAes192CbcId</programlisting>
 <para>
+The AES192 CBC cipher transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformAes192CbcGetKlass" role="function">
 <title>xmlSecGnuTLSTransformAes192CbcGetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformAes192CbcGetKlass"><primary sortas="xmlSecGnuTLSTransformAes192CbcGetKlass">xmlSecGnuTLSTransformAes192CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformAes192CbcGetKlass
-                                                        (void);</programlisting>
-<para>
-AES 192 CBC encryption transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformAes192CbcGetKlass"><primary>xmlSecGnuTLSTransformAes192CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformAes192CbcGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+AES 192 CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 192 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformAes256CbcId" role="macro">
 <title>xmlSecGnuTLSTransformAes256CbcId</title>
-<indexterm zone="xmlSecGnuTLSTransformAes256CbcId"><primary sortas="xmlSecGnuTLSTransformAes256CbcId">xmlSecGnuTLSTransformAes256CbcId</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformAes256CbcId</programlisting>
-<para>
-The AES256 CBC cipher transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformAes256CbcId"><primary>xmlSecGnuTLSTransformAes256CbcId</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformAes256CbcId</programlisting>
 <para>
+The AES256 CBC cipher transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformAes256CbcGetKlass" role="function">
 <title>xmlSecGnuTLSTransformAes256CbcGetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformAes256CbcGetKlass"><primary sortas="xmlSecGnuTLSTransformAes256CbcGetKlass">xmlSecGnuTLSTransformAes256CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformAes256CbcGetKlass
-                                                        (void);</programlisting>
-<para>
-AES 256 CBC encryption transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformAes256CbcGetKlass"><primary>xmlSecGnuTLSTransformAes256CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformAes256CbcGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+AES 256 CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 256 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformKWAes128Id" role="macro">
+<title>xmlSecGnuTLSTransformKWAes128Id</title>
+<indexterm zone="xmlSecGnuTLSTransformKWAes128Id"><primary>xmlSecGnuTLSTransformKWAes128Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformKWAes128Id</programlisting>
+<para>
+The AES 128 key wrap transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformKWAes128GetKlass" role="function">
+<title>xmlSecGnuTLSTransformKWAes128GetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSTransformKWAes128GetKlass"><primary>xmlSecGnuTLSTransformKWAes128GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformKWAes128GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+The AES-128 kew wrapper transform klass.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-128 kew wrapper transform klass.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformKWAes192Id" role="macro">
+<title>xmlSecGnuTLSTransformKWAes192Id</title>
+<indexterm zone="xmlSecGnuTLSTransformKWAes192Id"><primary>xmlSecGnuTLSTransformKWAes192Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformKWAes192Id</programlisting>
+<para>
+The AES 192 key wrap transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformKWAes192GetKlass" role="function">
+<title>xmlSecGnuTLSTransformKWAes192GetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSTransformKWAes192GetKlass"><primary>xmlSecGnuTLSTransformKWAes192GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformKWAes192GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+The AES-192 kew wrapper transform klass.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-192 kew wrapper transform klass.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformKWAes256Id" role="macro">
+<title>xmlSecGnuTLSTransformKWAes256Id</title>
+<indexterm zone="xmlSecGnuTLSTransformKWAes256Id"><primary>xmlSecGnuTLSTransformKWAes256Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformKWAes256Id</programlisting>
+<para>
+The AES 256 key wrap transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformKWAes256GetKlass" role="function">
+<title>xmlSecGnuTLSTransformKWAes256GetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSTransformKWAes256GetKlass"><primary>xmlSecGnuTLSTransformKWAes256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformKWAes256GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+The AES-256 kew wrapper transform klass.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-256 kew wrapper transform klass.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSKeyDataDesId" role="macro">
 <title>xmlSecGnuTLSKeyDataDesId</title>
-<indexterm zone="xmlSecGnuTLSKeyDataDesId"><primary sortas="xmlSecGnuTLSKeyDataDesId">xmlSecGnuTLSKeyDataDesId</primary></indexterm><programlisting>#define             xmlSecGnuTLSKeyDataDesId</programlisting>
-<para>
-The DES key data klass.</para>
+<indexterm zone="xmlSecGnuTLSKeyDataDesId"><primary>xmlSecGnuTLSKeyDataDesId</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSKeyDataDesId</programlisting>
 <para>
+The DES key data klass.
 </para></refsect2>
 <refsect2 id="xmlSecGnuTLSKeyDataDesGetKlass" role="function">
 <title>xmlSecGnuTLSKeyDataDesGetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSKeyDataDesGetKlass"><primary sortas="xmlSecGnuTLSKeyDataDesGetKlass">xmlSecGnuTLSKeyDataDesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecGnuTLSKeyDataDesGetKlass      (void);</programlisting>
-<para>
-The DES key data klass.</para>
+<indexterm zone="xmlSecGnuTLSKeyDataDesGetKlass"><primary>xmlSecGnuTLSKeyDataDesGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecGnuTLSKeyDataDesGetKlass      (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The DES key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DES key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSKeyDataDesSet" role="function">
 <title>xmlSecGnuTLSKeyDataDesSet ()</title>
-<indexterm zone="xmlSecGnuTLSKeyDataDesSet"><primary sortas="xmlSecGnuTLSKeyDataDesSet">xmlSecGnuTLSKeyDataDesSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSKeyDataDesSet           (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
-<para>
-Sets the value of DES key data.</para>
+<indexterm zone="xmlSecGnuTLSKeyDataDesSet"><primary>xmlSecGnuTLSKeyDataDesSet</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSKeyDataDesSet           (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);</programlisting>
 <para>
+Sets the value of DES key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to DES key data.
+<listitem><simpara>the pointer to DES key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key value.
+<listitem><simpara>the pointer to key value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the key value size (in bytes).
+<listitem><simpara>the key value size (in bytes).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformDes3CbcId" role="macro">
 <title>xmlSecGnuTLSTransformDes3CbcId</title>
-<indexterm zone="xmlSecGnuTLSTransformDes3CbcId"><primary sortas="xmlSecGnuTLSTransformDes3CbcId">xmlSecGnuTLSTransformDes3CbcId</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformDes3CbcId</programlisting>
-<para>
-The DES3 CBC cipher transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformDes3CbcId"><primary>xmlSecGnuTLSTransformDes3CbcId</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformDes3CbcId</programlisting>
 <para>
+The DES3 CBC cipher transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformDes3CbcGetKlass" role="function">
 <title>xmlSecGnuTLSTransformDes3CbcGetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformDes3CbcGetKlass"><primary sortas="xmlSecGnuTLSTransformDes3CbcGetKlass">xmlSecGnuTLSTransformDes3CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformDes3CbcGetKlass
-                                                        (void);</programlisting>
-<para>
-Triple DES CBC encryption transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformDes3CbcGetKlass"><primary>xmlSecGnuTLSTransformDes3CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformDes3CbcGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Triple DES CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to Triple DES encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformKWDes3Id" role="macro">
+<title>xmlSecGnuTLSTransformKWDes3Id</title>
+<indexterm zone="xmlSecGnuTLSTransformKWDes3Id"><primary>xmlSecGnuTLSTransformKWDes3Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformKWDes3Id</programlisting>
+<para>
+The DES3 KW transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformKWDes3GetKlass" role="function">
+<title>xmlSecGnuTLSTransformKWDes3GetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSTransformKWDes3GetKlass"><primary>xmlSecGnuTLSTransformKWDes3GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformKWDes3GetKlass (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+The Triple DES key wrapper transform klass.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Triple DES key wrapper transform klass.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSKeyDataDsaId" role="macro">
+<title>xmlSecGnuTLSKeyDataDsaId</title>
+<indexterm zone="xmlSecGnuTLSKeyDataDsaId"><primary>xmlSecGnuTLSKeyDataDsaId</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSKeyDataDsaId</programlisting>
+<para>
+The DSA key klass.
+</para></refsect2>
+<refsect2 id="xmlSecGnuTLSKeyDataDsaGetKlass" role="function">
+<title>xmlSecGnuTLSKeyDataDsaGetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSKeyDataDsaGetKlass"><primary>xmlSecGnuTLSKeyDataDsaGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecGnuTLSKeyDataDsaGetKlass      (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+The DSA key data klass.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to DSA key data klass.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSKeyDataDsaAdoptKey" role="function">
+<title>xmlSecGnuTLSKeyDataDsaAdoptKey ()</title>
+<indexterm zone="xmlSecGnuTLSKeyDataDsaAdoptKey"><primary>xmlSecGnuTLSKeyDataDsaAdoptKey</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSKeyDataDsaAdoptKey      (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> dsa_key</parameter>);</programlisting>
+<para>
+Sets the value of DSA key data.
+</para><variablelist role="params">
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara>the pointer to DSA key data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>dsa_key</parameter>&#160;:</term>
+<listitem><simpara>the pointer to GnuTLS DSA key.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSKeyDataDsaAdoptKeyPair" role="function">
+<title>xmlSecGnuTLSKeyDataDsaAdoptKeyPair ()</title>
+<indexterm zone="xmlSecGnuTLSKeyDataDsaAdoptKeyPair"><primary>xmlSecGnuTLSKeyDataDsaAdoptKeyPair</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSKeyDataDsaAdoptKeyPair  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> pub_key</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> priv_key</parameter>);</programlisting>
+<para>
+Sets the value of DSA key data.
+</para><variablelist role="params">
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara>the pointer to DSA key data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>pub_key</parameter>&#160;:</term>
+<listitem><simpara>the pointer to GnuTLS DSA pub key.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>priv_key</parameter>&#160;:</term>
+<listitem><simpara>the pointer to GnuTLS DSA priv key.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSKeyDataDsaGetPublicKey" role="function">
+<title>xmlSecGnuTLSKeyDataDsaGetPublicKey ()</title>
+<indexterm zone="xmlSecGnuTLSKeyDataDsaGetPublicKey"><primary>xmlSecGnuTLSKeyDataDsaGetPublicKey</primary></indexterm>
+<programlisting><link linkend="gcry-sexp-t"><returnvalue>gcry_sexp_t</returnvalue></link>         xmlSecGnuTLSKeyDataDsaGetPublicKey  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
+<para>
+Gets the GnuTLS DSA public key from DSA key data.
+</para><variablelist role="params">
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara>the pointer to DSA key data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to GnuTLS public DSA key or NULL if an error occurs.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSKeyDataDsaGetPrivateKey" role="function">
+<title>xmlSecGnuTLSKeyDataDsaGetPrivateKey ()</title>
+<indexterm zone="xmlSecGnuTLSKeyDataDsaGetPrivateKey"><primary>xmlSecGnuTLSKeyDataDsaGetPrivateKey</primary></indexterm>
+<programlisting><link linkend="gcry-sexp-t"><returnvalue>gcry_sexp_t</returnvalue></link>         xmlSecGnuTLSKeyDataDsaGetPrivateKey (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
+<para>
+Gets the GnuTLS DSA private key from DSA key data.
+</para><variablelist role="params">
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara>the pointer to DSA key data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to GnuTLS private DSA key or NULL if an error occurs.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformDsaSha1Id" role="macro">
+<title>xmlSecGnuTLSTransformDsaSha1Id</title>
+<indexterm zone="xmlSecGnuTLSTransformDsaSha1Id"><primary>xmlSecGnuTLSTransformDsaSha1Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformDsaSha1Id</programlisting>
+<para>
+The DSA SHA1 signature transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformDsaSha1GetKlass" role="function">
+<title>xmlSecGnuTLSTransformDsaSha1GetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSTransformDsaSha1GetKlass"><primary>xmlSecGnuTLSTransformDsaSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformDsaSha1GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSHmacGetMinOutputLength" role="function">
 <title>xmlSecGnuTLSHmacGetMinOutputLength ()</title>
-<indexterm zone="xmlSecGnuTLSHmacGetMinOutputLength"><primary sortas="xmlSecGnuTLSHmacGetMinOutputLength">xmlSecGnuTLSHmacGetMinOutputLength</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSHmacGetMinOutputLength  (void);</programlisting>
-<para>
-Gets the value of min HMAC length.</para>
+<indexterm zone="xmlSecGnuTLSHmacGetMinOutputLength"><primary>xmlSecGnuTLSHmacGetMinOutputLength</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSHmacGetMinOutputLength  (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets the value of min HMAC length.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the min HMAC output length
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSHmacSetMinOutputLength" role="function">
 <title>xmlSecGnuTLSHmacSetMinOutputLength ()</title>
-<indexterm zone="xmlSecGnuTLSHmacSetMinOutputLength"><primary sortas="xmlSecGnuTLSHmacSetMinOutputLength">xmlSecGnuTLSHmacSetMinOutputLength</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecGnuTLSHmacSetMinOutputLength  (<link linkend="int">int</link> min_length);</programlisting>
-<para>
-Sets the min HMAC output length</para>
+<indexterm zone="xmlSecGnuTLSHmacSetMinOutputLength"><primary>xmlSecGnuTLSHmacSetMinOutputLength</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecGnuTLSHmacSetMinOutputLength  (<parameter><link linkend="int"><type>int</type></link> min_length</parameter>);</programlisting>
 <para>
+Sets the min HMAC output length
 </para><variablelist role="params">
 <varlistentry><term><parameter>min_length</parameter>&#160;:</term>
-<listitem><simpara> the new min length
+<listitem><simpara>the new min length
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSKeyDataHmacId" role="macro">
 <title>xmlSecGnuTLSKeyDataHmacId</title>
-<indexterm zone="xmlSecGnuTLSKeyDataHmacId"><primary sortas="xmlSecGnuTLSKeyDataHmacId">xmlSecGnuTLSKeyDataHmacId</primary></indexterm><programlisting>#define             xmlSecGnuTLSKeyDataHmacId</programlisting>
-<para>
-The HMAC key klass.</para>
+<indexterm zone="xmlSecGnuTLSKeyDataHmacId"><primary>xmlSecGnuTLSKeyDataHmacId</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSKeyDataHmacId</programlisting>
 <para>
+The HMAC key klass.
 </para></refsect2>
 <refsect2 id="xmlSecGnuTLSKeyDataHmacGetKlass" role="function">
 <title>xmlSecGnuTLSKeyDataHmacGetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSKeyDataHmacGetKlass"><primary sortas="xmlSecGnuTLSKeyDataHmacGetKlass">xmlSecGnuTLSKeyDataHmacGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecGnuTLSKeyDataHmacGetKlass     (void);</programlisting>
-<para>
-The HMAC key data klass.</para>
+<indexterm zone="xmlSecGnuTLSKeyDataHmacGetKlass"><primary>xmlSecGnuTLSKeyDataHmacGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecGnuTLSKeyDataHmacGetKlass     (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> HMAC key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSKeyDataHmacSet" role="function">
 <title>xmlSecGnuTLSKeyDataHmacSet ()</title>
-<indexterm zone="xmlSecGnuTLSKeyDataHmacSet"><primary sortas="xmlSecGnuTLSKeyDataHmacSet">xmlSecGnuTLSKeyDataHmacSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSKeyDataHmacSet          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
-<para>
-Sets the value of HMAC key data.</para>
+<indexterm zone="xmlSecGnuTLSKeyDataHmacSet"><primary>xmlSecGnuTLSKeyDataHmacSet</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSKeyDataHmacSet          (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);</programlisting>
 <para>
+Sets the value of HMAC key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to HMAC key data.
+<listitem><simpara>the pointer to HMAC key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key value.
+<listitem><simpara>the pointer to key value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the key value size (in bytes).
+<listitem><simpara>the key value size (in bytes).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformHmacMd5Id" role="macro">
 <title>xmlSecGnuTLSTransformHmacMd5Id</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacMd5Id"><primary sortas="xmlSecGnuTLSTransformHmacMd5Id">xmlSecGnuTLSTransformHmacMd5Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformHmacMd5Id</programlisting>
-<para>
-The HMAC with MD5 signature transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformHmacMd5Id"><primary>xmlSecGnuTLSTransformHmacMd5Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformHmacMd5Id</programlisting>
 <para>
+The HMAC with MD5 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformHmacMd5GetKlass" role="function">
 <title>xmlSecGnuTLSTransformHmacMd5GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacMd5GetKlass"><primary sortas="xmlSecGnuTLSTransformHmacMd5GetKlass">xmlSecGnuTLSTransformHmacMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformHmacMd5GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-MD5 transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformHmacMd5GetKlass"><primary>xmlSecGnuTLSTransformHmacMd5GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformHmacMd5GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-MD5 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-MD5 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformHmacRipemd160Id" role="macro">
 <title>xmlSecGnuTLSTransformHmacRipemd160Id</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacRipemd160Id"><primary sortas="xmlSecGnuTLSTransformHmacRipemd160Id">xmlSecGnuTLSTransformHmacRipemd160Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformHmacRipemd160Id</programlisting>
-<para>
-The HMAC with RipeMD160 signature transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformHmacRipemd160Id"><primary>xmlSecGnuTLSTransformHmacRipemd160Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformHmacRipemd160Id</programlisting>
 <para>
+The HMAC with RipeMD160 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformHmacRipemd160GetKlass" role="function">
 <title>xmlSecGnuTLSTransformHmacRipemd160GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacRipemd160GetKlass"><primary sortas="xmlSecGnuTLSTransformHmacRipemd160GetKlass">xmlSecGnuTLSTransformHmacRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformHmacRipemd160GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-RIPEMD160 transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformHmacRipemd160GetKlass"><primary>xmlSecGnuTLSTransformHmacRipemd160GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformHmacRipemd160GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-RIPEMD160 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-RIPEMD160 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformHmacSha1Id" role="macro">
 <title>xmlSecGnuTLSTransformHmacSha1Id</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacSha1Id"><primary sortas="xmlSecGnuTLSTransformHmacSha1Id">xmlSecGnuTLSTransformHmacSha1Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformHmacSha1Id</programlisting>
-<para>
-The HMAC with SHA1 signature transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformHmacSha1Id"><primary>xmlSecGnuTLSTransformHmacSha1Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformHmacSha1Id</programlisting>
 <para>
+The HMAC with SHA1 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformHmacSha1GetKlass" role="function">
 <title>xmlSecGnuTLSTransformHmacSha1GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacSha1GetKlass"><primary sortas="xmlSecGnuTLSTransformHmacSha1GetKlass">xmlSecGnuTLSTransformHmacSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformHmacSha1GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-SHA1 transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformHmacSha1GetKlass"><primary>xmlSecGnuTLSTransformHmacSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformHmacSha1GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA1 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA1 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformHmacSha256Id" role="macro">
 <title>xmlSecGnuTLSTransformHmacSha256Id</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacSha256Id"><primary sortas="xmlSecGnuTLSTransformHmacSha256Id">xmlSecGnuTLSTransformHmacSha256Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformHmacSha256Id</programlisting>
-<para>
-The HMAC with SHA256 signature transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformHmacSha256Id"><primary>xmlSecGnuTLSTransformHmacSha256Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformHmacSha256Id</programlisting>
 <para>
+The HMAC with SHA256 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformHmacSha256GetKlass" role="function">
 <title>xmlSecGnuTLSTransformHmacSha256GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacSha256GetKlass"><primary sortas="xmlSecGnuTLSTransformHmacSha256GetKlass">xmlSecGnuTLSTransformHmacSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformHmacSha256GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-SHA256 transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformHmacSha256GetKlass"><primary>xmlSecGnuTLSTransformHmacSha256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformHmacSha256GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA256 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA256 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformHmacSha384Id" role="macro">
 <title>xmlSecGnuTLSTransformHmacSha384Id</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacSha384Id"><primary sortas="xmlSecGnuTLSTransformHmacSha384Id">xmlSecGnuTLSTransformHmacSha384Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformHmacSha384Id</programlisting>
-<para>
-The HMAC with SHA384 signature transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformHmacSha384Id"><primary>xmlSecGnuTLSTransformHmacSha384Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformHmacSha384Id</programlisting>
 <para>
+The HMAC with SHA384 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformHmacSha384GetKlass" role="function">
 <title>xmlSecGnuTLSTransformHmacSha384GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacSha384GetKlass"><primary sortas="xmlSecGnuTLSTransformHmacSha384GetKlass">xmlSecGnuTLSTransformHmacSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformHmacSha384GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-SHA384 transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformHmacSha384GetKlass"><primary>xmlSecGnuTLSTransformHmacSha384GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformHmacSha384GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA384 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA384 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformHmacSha512Id" role="macro">
 <title>xmlSecGnuTLSTransformHmacSha512Id</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacSha512Id"><primary sortas="xmlSecGnuTLSTransformHmacSha512Id">xmlSecGnuTLSTransformHmacSha512Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformHmacSha512Id</programlisting>
-<para>
-The HMAC with SHA512 signature transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformHmacSha512Id"><primary>xmlSecGnuTLSTransformHmacSha512Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformHmacSha512Id</programlisting>
 <para>
+The HMAC with SHA512 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformHmacSha512GetKlass" role="function">
 <title>xmlSecGnuTLSTransformHmacSha512GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformHmacSha512GetKlass"><primary sortas="xmlSecGnuTLSTransformHmacSha512GetKlass">xmlSecGnuTLSTransformHmacSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformHmacSha512GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-SHA512 transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformHmacSha512GetKlass"><primary>xmlSecGnuTLSTransformHmacSha512GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformHmacSha512GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA512 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA512 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSKeyDataRsaId" role="macro">
+<title>xmlSecGnuTLSKeyDataRsaId</title>
+<indexterm zone="xmlSecGnuTLSKeyDataRsaId"><primary>xmlSecGnuTLSKeyDataRsaId</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSKeyDataRsaId</programlisting>
+<para>
+The RSA key klass.
+</para></refsect2>
+<refsect2 id="xmlSecGnuTLSKeyDataRsaGetKlass" role="function">
+<title>xmlSecGnuTLSKeyDataRsaGetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSKeyDataRsaGetKlass"><primary>xmlSecGnuTLSKeyDataRsaGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecGnuTLSKeyDataRsaGetKlass      (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+The GnuTLS RSA key data klass.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to GnuTLS RSA key data klass.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSKeyDataRsaAdoptKey" role="function">
+<title>xmlSecGnuTLSKeyDataRsaAdoptKey ()</title>
+<indexterm zone="xmlSecGnuTLSKeyDataRsaAdoptKey"><primary>xmlSecGnuTLSKeyDataRsaAdoptKey</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSKeyDataRsaAdoptKey      (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> rsa_key</parameter>);</programlisting>
+<para>
+Sets the value of RSA key data.
+</para><variablelist role="params">
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara>the pointer to RSA key data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>rsa_key</parameter>&#160;:</term>
+<listitem><simpara>the pointer to GnuTLS RSA key.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSKeyDataRsaAdoptKeyPair" role="function">
+<title>xmlSecGnuTLSKeyDataRsaAdoptKeyPair ()</title>
+<indexterm zone="xmlSecGnuTLSKeyDataRsaAdoptKeyPair"><primary>xmlSecGnuTLSKeyDataRsaAdoptKeyPair</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGnuTLSKeyDataRsaAdoptKeyPair  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> pub_key</parameter>,
+                                                         <parameter><link linkend="gcry-sexp-t"><type>gcry_sexp_t</type></link> priv_key</parameter>);</programlisting>
+<para>
+Sets the value of RSA key data.
+</para><variablelist role="params">
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara>the pointer to RSA key data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>pub_key</parameter>&#160;:</term>
+<listitem><simpara>the pointer to GnuTLS RSA pub key.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>priv_key</parameter>&#160;:</term>
+<listitem><simpara>the pointer to GnuTLS RSA priv key.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSKeyDataRsaGetPublicKey" role="function">
+<title>xmlSecGnuTLSKeyDataRsaGetPublicKey ()</title>
+<indexterm zone="xmlSecGnuTLSKeyDataRsaGetPublicKey"><primary>xmlSecGnuTLSKeyDataRsaGetPublicKey</primary></indexterm>
+<programlisting><link linkend="gcry-sexp-t"><returnvalue>gcry_sexp_t</returnvalue></link>         xmlSecGnuTLSKeyDataRsaGetPublicKey  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
+<para>
+Gets the GnuTLS RSA public key from RSA key data.
+</para><variablelist role="params">
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara>the pointer to RSA key data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to GnuTLS public RSA key or NULL if an error occurs.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSKeyDataRsaGetPrivateKey" role="function">
+<title>xmlSecGnuTLSKeyDataRsaGetPrivateKey ()</title>
+<indexterm zone="xmlSecGnuTLSKeyDataRsaGetPrivateKey"><primary>xmlSecGnuTLSKeyDataRsaGetPrivateKey</primary></indexterm>
+<programlisting><link linkend="gcry-sexp-t"><returnvalue>gcry_sexp_t</returnvalue></link>         xmlSecGnuTLSKeyDataRsaGetPrivateKey (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
+<para>
+Gets the GnuTLS RSA private key from RSA key data.
+</para><variablelist role="params">
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
+<listitem><simpara>the pointer to RSA key data.
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to GnuTLS private RSA key or NULL if an error occurs.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformRsaMd5Id" role="macro">
+<title>xmlSecGnuTLSTransformRsaMd5Id</title>
+<indexterm zone="xmlSecGnuTLSTransformRsaMd5Id"><primary>xmlSecGnuTLSTransformRsaMd5Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformRsaMd5Id</programlisting>
+<para>
+The RSA-MD5 signature transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformRsaMd5GetKlass" role="function">
+<title>xmlSecGnuTLSTransformRsaMd5GetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSTransformRsaMd5GetKlass"><primary>xmlSecGnuTLSTransformRsaMd5GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformRsaMd5GetKlass (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformRsaRipemd160Id" role="macro">
+<title>xmlSecGnuTLSTransformRsaRipemd160Id</title>
+<indexterm zone="xmlSecGnuTLSTransformRsaRipemd160Id"><primary>xmlSecGnuTLSTransformRsaRipemd160Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformRsaRipemd160Id</programlisting>
+<para>
+The RSA-RIPEMD160 signature transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformRsaRipemd160GetKlass" role="function">
+<title>xmlSecGnuTLSTransformRsaRipemd160GetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSTransformRsaRipemd160GetKlass"><primary>xmlSecGnuTLSTransformRsaRipemd160GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformRsaRipemd160GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformRsaSha1Id" role="macro">
+<title>xmlSecGnuTLSTransformRsaSha1Id</title>
+<indexterm zone="xmlSecGnuTLSTransformRsaSha1Id"><primary>xmlSecGnuTLSTransformRsaSha1Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformRsaSha1Id</programlisting>
+<para>
+The RSA-SHA1 signature transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformRsaSha1GetKlass" role="function">
+<title>xmlSecGnuTLSTransformRsaSha1GetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSTransformRsaSha1GetKlass"><primary>xmlSecGnuTLSTransformRsaSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformRsaSha1GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformRsaSha256Id" role="macro">
+<title>xmlSecGnuTLSTransformRsaSha256Id</title>
+<indexterm zone="xmlSecGnuTLSTransformRsaSha256Id"><primary>xmlSecGnuTLSTransformRsaSha256Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformRsaSha256Id</programlisting>
+<para>
+The RSA-SHA256 signature transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformRsaSha256GetKlass" role="function">
+<title>xmlSecGnuTLSTransformRsaSha256GetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSTransformRsaSha256GetKlass"><primary>xmlSecGnuTLSTransformRsaSha256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformRsaSha256GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformRsaSha384Id" role="macro">
+<title>xmlSecGnuTLSTransformRsaSha384Id</title>
+<indexterm zone="xmlSecGnuTLSTransformRsaSha384Id"><primary>xmlSecGnuTLSTransformRsaSha384Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformRsaSha384Id</programlisting>
+<para>
+The RSA-SHA384 signature transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformRsaSha384GetKlass" role="function">
+<title>xmlSecGnuTLSTransformRsaSha384GetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSTransformRsaSha384GetKlass"><primary>xmlSecGnuTLSTransformRsaSha384GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformRsaSha384GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformRsaSha512Id" role="macro">
+<title>xmlSecGnuTLSTransformRsaSha512Id</title>
+<indexterm zone="xmlSecGnuTLSTransformRsaSha512Id"><primary>xmlSecGnuTLSTransformRsaSha512Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformRsaSha512Id</programlisting>
+<para>
+The RSA-SHA512 signature transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecGnuTLSTransformRsaSha512GetKlass" role="function">
+<title>xmlSecGnuTLSTransformRsaSha512GetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSTransformRsaSha512GetKlass"><primary>xmlSecGnuTLSTransformRsaSha512GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformRsaSha512GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformSha1Id" role="macro">
 <title>xmlSecGnuTLSTransformSha1Id</title>
-<indexterm zone="xmlSecGnuTLSTransformSha1Id"><primary sortas="xmlSecGnuTLSTransformSha1Id">xmlSecGnuTLSTransformSha1Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformSha1Id</programlisting>
-<para>
-The HMAC with SHA1 signature transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformSha1Id"><primary>xmlSecGnuTLSTransformSha1Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformSha1Id</programlisting>
 <para>
+The HMAC with SHA1 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformSha1GetKlass" role="function">
 <title>xmlSecGnuTLSTransformSha1GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformSha1GetKlass"><primary sortas="xmlSecGnuTLSTransformSha1GetKlass">xmlSecGnuTLSTransformSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformSha1GetKlass   (void);</programlisting>
-<para>
-SHA-1 digest transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformSha1GetKlass"><primary>xmlSecGnuTLSTransformSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformSha1GetKlass   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA-1 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-1 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformSha256Id" role="macro">
 <title>xmlSecGnuTLSTransformSha256Id</title>
-<indexterm zone="xmlSecGnuTLSTransformSha256Id"><primary sortas="xmlSecGnuTLSTransformSha256Id">xmlSecGnuTLSTransformSha256Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformSha256Id</programlisting>
-<para>
-The HMAC with SHA256 signature transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformSha256Id"><primary>xmlSecGnuTLSTransformSha256Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformSha256Id</programlisting>
 <para>
+The HMAC with SHA256 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformSha256GetKlass" role="function">
 <title>xmlSecGnuTLSTransformSha256GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformSha256GetKlass"><primary sortas="xmlSecGnuTLSTransformSha256GetKlass">xmlSecGnuTLSTransformSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformSha256GetKlass (void);</programlisting>
-<para>
-SHA256 digest transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformSha256GetKlass"><primary>xmlSecGnuTLSTransformSha256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformSha256GetKlass (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA256 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA256 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformSha384Id" role="macro">
 <title>xmlSecGnuTLSTransformSha384Id</title>
-<indexterm zone="xmlSecGnuTLSTransformSha384Id"><primary sortas="xmlSecGnuTLSTransformSha384Id">xmlSecGnuTLSTransformSha384Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformSha384Id</programlisting>
-<para>
-The HMAC with SHA384 signature transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformSha384Id"><primary>xmlSecGnuTLSTransformSha384Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformSha384Id</programlisting>
 <para>
+The HMAC with SHA384 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformSha384GetKlass" role="function">
 <title>xmlSecGnuTLSTransformSha384GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformSha384GetKlass"><primary sortas="xmlSecGnuTLSTransformSha384GetKlass">xmlSecGnuTLSTransformSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformSha384GetKlass (void);</programlisting>
-<para>
-SHA384 digest transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformSha384GetKlass"><primary>xmlSecGnuTLSTransformSha384GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformSha384GetKlass (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA384 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA384 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformSha512Id" role="macro">
 <title>xmlSecGnuTLSTransformSha512Id</title>
-<indexterm zone="xmlSecGnuTLSTransformSha512Id"><primary sortas="xmlSecGnuTLSTransformSha512Id">xmlSecGnuTLSTransformSha512Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformSha512Id</programlisting>
-<para>
-The HMAC with SHA512 signature transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformSha512Id"><primary>xmlSecGnuTLSTransformSha512Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformSha512Id</programlisting>
 <para>
+The HMAC with SHA512 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformSha512GetKlass" role="function">
 <title>xmlSecGnuTLSTransformSha512GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformSha512GetKlass"><primary sortas="xmlSecGnuTLSTransformSha512GetKlass">xmlSecGnuTLSTransformSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformSha512GetKlass (void);</programlisting>
-<para>
-SHA512 digest transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformSha512GetKlass"><primary>xmlSecGnuTLSTransformSha512GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformSha512GetKlass (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA512 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA512 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformMd5Id" role="macro">
 <title>xmlSecGnuTLSTransformMd5Id</title>
-<indexterm zone="xmlSecGnuTLSTransformMd5Id"><primary sortas="xmlSecGnuTLSTransformMd5Id">xmlSecGnuTLSTransformMd5Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformMd5Id</programlisting>
-<para>
-The MD5 digest transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformMd5Id"><primary>xmlSecGnuTLSTransformMd5Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformMd5Id</programlisting>
 <para>
+The MD5 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformMd5GetKlass" role="function">
 <title>xmlSecGnuTLSTransformMd5GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformMd5GetKlass"><primary sortas="xmlSecGnuTLSTransformMd5GetKlass">xmlSecGnuTLSTransformMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformMd5GetKlass    (void);</programlisting>
-<para>
-MD5 digest transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformMd5GetKlass"><primary>xmlSecGnuTLSTransformMd5GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformMd5GetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+MD5 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to MD5 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformRipemd160Id" role="macro">
 <title>xmlSecGnuTLSTransformRipemd160Id</title>
-<indexterm zone="xmlSecGnuTLSTransformRipemd160Id"><primary sortas="xmlSecGnuTLSTransformRipemd160Id">xmlSecGnuTLSTransformRipemd160Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformRipemd160Id</programlisting>
-<para>
-The RIPEMD160 digest transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformRipemd160Id"><primary>xmlSecGnuTLSTransformRipemd160Id</primary></indexterm>
+<programlisting>#define             xmlSecGnuTLSTransformRipemd160Id</programlisting>
 <para>
+The RIPEMD160 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecGnuTLSTransformRipemd160GetKlass" role="function">
 <title>xmlSecGnuTLSTransformRipemd160GetKlass ()</title>
-<indexterm zone="xmlSecGnuTLSTransformRipemd160GetKlass"><primary sortas="xmlSecGnuTLSTransformRipemd160GetKlass">xmlSecGnuTLSTransformRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformRipemd160GetKlass
-                                                        (void);</programlisting>
-<para>
-RIPEMD160 digest transform klass.</para>
+<indexterm zone="xmlSecGnuTLSTransformRipemd160GetKlass"><primary>xmlSecGnuTLSTransformRipemd160GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecGnuTLSTransformRipemd160GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+RIPEMD160 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to RIPEMD160 digest transform klass.
 </simpara></listitem></varlistentry>
@@ -583,7 +974,4 @@ RIPEMD160 digest transform klass.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/io.sgml b/docs/api/sgml/io.sgml
index e330e07..7fde071 100644
--- a/docs/api/sgml/io.sgml
+++ b/docs/api/sgml/io.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-io.top_of_page">io</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>io</refname>
 <refpurpose>Input/output support.</refpurpose>
@@ -13,131 +14,121 @@
 <refsynopsisdiv id="xmlsec-io.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="int">int</link>                 <link linkend="xmlSecIOInit">xmlSecIOInit</link>                        (void);
-<link linkend="void">void</link>                <link linkend="xmlSecIOShutdown">xmlSecIOShutdown</link>                    (void);
-<link linkend="void">void</link>                <link linkend="xmlSecIOCleanupCallbacks">xmlSecIOCleanupCallbacks</link>            (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecIORegisterDefaultCallbacks">xmlSecIORegisterDefaultCallbacks</link>    (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecIORegisterCallbacks">xmlSecIORegisterCallbacks</link>           (<link linkend="xmlInputMatchCallback">xmlInputMatchCallback</link> matchFunc,
-                                                         <link linkend="xmlInputOpenCallback">xmlInputOpenCallback</link> openFunc,
-                                                         <link linkend="xmlInputReadCallback">xmlInputReadCallback</link> readFunc,
-                                                         <link linkend="xmlInputCloseCallback">xmlInputCloseCallback</link> closeFunc);
+<synopsis><link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecIOInit">xmlSecIOInit</link>                        (<parameter><type>void</type></parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecIOShutdown">xmlSecIOShutdown</link>                    (<parameter><type>void</type></parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecIOCleanupCallbacks">xmlSecIOCleanupCallbacks</link>            (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecIORegisterDefaultCallbacks">xmlSecIORegisterDefaultCallbacks</link>    (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecIORegisterCallbacks">xmlSecIORegisterCallbacks</link>           (<parameter><link linkend="xmlInputMatchCallback"><type>xmlInputMatchCallback</type></link> matchFunc</parameter>,
+                                                         <parameter><link linkend="xmlInputOpenCallback"><type>xmlInputOpenCallback</type></link> openFunc</parameter>,
+                                                         <parameter><link linkend="xmlInputReadCallback"><type>xmlInputReadCallback</type></link> readFunc</parameter>,
+                                                         <parameter><link linkend="xmlInputCloseCallback"><type>xmlInputCloseCallback</type></link> closeFunc</parameter>);
 #define             <link linkend="xmlSecTransformInputURIId">xmlSecTransformInputURIId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformInputURIGetKlass">xmlSecTransformInputURIGetKlass</link>     (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformInputURIOpen">xmlSecTransformInputURIOpen</link>         (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformInputURIGetKlass">xmlSecTransformInputURIGetKlass</link>     (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformInputURIOpen">xmlSecTransformInputURIOpen</link>         (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-io.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Input/output support.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-io.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecIOInit" role="function">
 <title>xmlSecIOInit ()</title>
-<indexterm zone="xmlSecIOInit"><primary sortas="xmlSecIOInit">xmlSecIOInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecIOInit                        (void);</programlisting>
+<indexterm zone="xmlSecIOInit"><primary>xmlSecIOInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecIOInit                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 The IO initialization (called from <link linkend="xmlSecInit"><type>xmlSecInit</type></link> function).
-Applications should not call this function directly.</para>
-<para>
+Applications should not call this function directly.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecIOShutdown" role="function">
 <title>xmlSecIOShutdown ()</title>
-<indexterm zone="xmlSecIOShutdown"><primary sortas="xmlSecIOShutdown">xmlSecIOShutdown</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecIOShutdown                    (void);</programlisting>
+<indexterm zone="xmlSecIOShutdown"><primary>xmlSecIOShutdown</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecIOShutdown                    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 The IO clenaup (called from <link linkend="xmlSecShutdown"><type>xmlSecShutdown</type></link> function).
-Applications should not call this function directly.</para>
-<para>
+Applications should not call this function directly.
 </para></refsect2>
 <refsect2 id="xmlSecIOCleanupCallbacks" role="function">
 <title>xmlSecIOCleanupCallbacks ()</title>
-<indexterm zone="xmlSecIOCleanupCallbacks"><primary sortas="xmlSecIOCleanupCallbacks">xmlSecIOCleanupCallbacks</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecIOCleanupCallbacks            (void);</programlisting>
+<indexterm zone="xmlSecIOCleanupCallbacks"><primary>xmlSecIOCleanupCallbacks</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecIOCleanupCallbacks            (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 Clears the entire input callback table. this includes the
-compiled-in I/O.</para>
-<para>
+compiled-in I/O.
 </para></refsect2>
 <refsect2 id="xmlSecIORegisterDefaultCallbacks" role="function">
 <title>xmlSecIORegisterDefaultCallbacks ()</title>
-<indexterm zone="xmlSecIORegisterDefaultCallbacks"><primary sortas="xmlSecIORegisterDefaultCallbacks">xmlSecIORegisterDefaultCallbacks</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecIORegisterDefaultCallbacks    (void);</programlisting>
-<para>
-Registers the default compiled-in I/O handlers.</para>
+<indexterm zone="xmlSecIORegisterDefaultCallbacks"><primary>xmlSecIORegisterDefaultCallbacks</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecIORegisterDefaultCallbacks    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Registers the default compiled-in I/O handlers.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecIORegisterCallbacks" role="function">
 <title>xmlSecIORegisterCallbacks ()</title>
-<indexterm zone="xmlSecIORegisterCallbacks"><primary sortas="xmlSecIORegisterCallbacks">xmlSecIORegisterCallbacks</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecIORegisterCallbacks           (<link linkend="xmlInputMatchCallback">xmlInputMatchCallback</link> matchFunc,
-                                                         <link linkend="xmlInputOpenCallback">xmlInputOpenCallback</link> openFunc,
-                                                         <link linkend="xmlInputReadCallback">xmlInputReadCallback</link> readFunc,
-                                                         <link linkend="xmlInputCloseCallback">xmlInputCloseCallback</link> closeFunc);</programlisting>
-<para>
-Register a new set of I/O callback for handling parser input.</para>
+<indexterm zone="xmlSecIORegisterCallbacks"><primary>xmlSecIORegisterCallbacks</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecIORegisterCallbacks           (<parameter><link linkend="xmlInputMatchCallback"><type>xmlInputMatchCallback</type></link> matchFunc</parameter>,
+                                                         <parameter><link linkend="xmlInputOpenCallback"><type>xmlInputOpenCallback</type></link> openFunc</parameter>,
+                                                         <parameter><link linkend="xmlInputReadCallback"><type>xmlInputReadCallback</type></link> readFunc</parameter>,
+                                                         <parameter><link linkend="xmlInputCloseCallback"><type>xmlInputCloseCallback</type></link> closeFunc</parameter>);</programlisting>
 <para>
+Register a new set of I/O callback for handling parser input.
 </para><variablelist role="params">
 <varlistentry><term><parameter>matchFunc</parameter>&#160;:</term>
-<listitem><simpara>          the protocol match callback.
+<listitem><simpara>the protocol match callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>openFunc</parameter>&#160;:</term>
-<listitem><simpara>           the open stream callback.
+<listitem><simpara>the open stream callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>readFunc</parameter>&#160;:</term>
-<listitem><simpara>           the read from stream callback.
+<listitem><simpara>the read from stream callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>closeFunc</parameter>&#160;:</term>
-<listitem><simpara>          the close stream callback.
+<listitem><simpara>the close stream callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformInputURIId" role="macro">
 <title>xmlSecTransformInputURIId</title>
-<indexterm zone="xmlSecTransformInputURIId"><primary sortas="xmlSecTransformInputURIId">xmlSecTransformInputURIId</primary></indexterm><programlisting>#define             xmlSecTransformInputURIId</programlisting>
-<para>
-The Input URI transform id.</para>
+<indexterm zone="xmlSecTransformInputURIId"><primary>xmlSecTransformInputURIId</primary></indexterm>
+<programlisting>#define             xmlSecTransformInputURIId</programlisting>
 <para>
+The Input URI transform id.
 </para></refsect2>
 <refsect2 id="xmlSecTransformInputURIGetKlass" role="function">
 <title>xmlSecTransformInputURIGetKlass ()</title>
-<indexterm zone="xmlSecTransformInputURIGetKlass"><primary sortas="xmlSecTransformInputURIGetKlass">xmlSecTransformInputURIGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformInputURIGetKlass     (void);</programlisting>
-<para>
-The input uri transform klass. Reads binary data from an uri.</para>
+<indexterm zone="xmlSecTransformInputURIGetKlass"><primary>xmlSecTransformInputURIGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformInputURIGetKlass     (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The input uri transform klass. Reads binary data from an uri.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> input URI transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformInputURIOpen" role="function">
 <title>xmlSecTransformInputURIOpen ()</title>
-<indexterm zone="xmlSecTransformInputURIOpen"><primary sortas="xmlSecTransformInputURIOpen">xmlSecTransformInputURIOpen</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformInputURIOpen         (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
-<para>
-Opens the given <parameter>uri</parameter> for reading.</para>
+<indexterm zone="xmlSecTransformInputURIOpen"><primary>xmlSecTransformInputURIOpen</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformInputURIOpen         (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>);</programlisting>
 <para>
+Opens the given <parameter>uri</parameter> for reading.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to IO transform.
+<listitem><simpara>the pointer to IO transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>uri</parameter>&#160;:</term>
-<listitem><simpara>                the URL to open.
+<listitem><simpara>the URL to open.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
@@ -145,7 +136,4 @@ Opens the given <parameter>uri</parameter> for reading.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/keyinfo.sgml b/docs/api/sgml/keyinfo.sgml
index da4156c..99a8c28 100644
--- a/docs/api/sgml/keyinfo.sgml
+++ b/docs/api/sgml/keyinfo.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-keyinfo.top_of_page">keyinfo</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>keyinfo</refname>
 <refpurpose><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node parser.</refpurpose>
@@ -13,255 +14,246 @@
 <refsynopsisdiv id="xmlsec-keyinfo.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyInfoNodeRead">xmlSecKeyInfoNodeRead</link>               (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyInfoNodeWrite">xmlSecKeyInfoNodeWrite</link>              (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<synopsis><link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyInfoNodeRead">xmlSecKeyInfoNodeRead</link>               (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> keyInfoNode</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyInfoNodeWrite">xmlSecKeyInfoNodeWrite</link>              (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> keyInfoNode</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
 enum                <link linkend="xmlSecKeyInfoMode">xmlSecKeyInfoMode</link>;
-#define             <link linkend="XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND--CAPS">XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND</link>
-#define             <link linkend="XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD--CAPS">XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD</link>
-#define             <link linkend="XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN--CAPS">XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN</link>
-#define             <link linkend="XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD--CAPS">XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD</link>
-#define             <link linkend="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF--CAPS">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF</link>
-#define             <link linkend="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF--CAPS">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF</link>
-#define             <link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD--CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD</link>
-#define             <link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS--CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS</link>
-#define             <link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT--CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT</link>
-#define             <link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT--CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT</link>
-#define             <link linkend="XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION--CAPS">XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION</link>
-#define             <link linkend="XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE--CAPS">XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE</link>
-#define             <link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS--CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND:CAPS">XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD:CAPS">XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN:CAPS">XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD:CAPS">XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF:CAPS">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF:CAPS">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD:CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS:CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT:CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT:CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION:CAPS">XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE:CAPS">XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS:CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS</link>
 struct              <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link>;
-<link linkend="xmlSecKeyInfoCtxPtr">xmlSecKeyInfoCtxPtr</link>  <link linkend="xmlSecKeyInfoCtxCreate">xmlSecKeyInfoCtxCreate</link>             (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyInfoCtxDestroy">xmlSecKeyInfoCtxDestroy</link>             (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyInfoCtxInitialize">xmlSecKeyInfoCtxInitialize</link>          (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx,
-                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyInfoCtxFinalize">xmlSecKeyInfoCtxFinalize</link>            (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyInfoCtxReset">xmlSecKeyInfoCtxReset</link>               (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyInfoCtxCopyUserPref">xmlSecKeyInfoCtxCopyUserPref</link>        (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> dst,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> src);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyInfoCtxCreateEncCtx">xmlSecKeyInfoCtxCreateEncCtx</link>        (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyInfoCtxDebugDump">xmlSecKeyInfoCtxDebugDump</link>           (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyInfoCtxDebugXmlDump">xmlSecKeyInfoCtxDebugXmlDump</link>        (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="xmlSecKeyInfoCtxPtr"><returnvalue>xmlSecKeyInfoCtxPtr</returnvalue></link>  <link linkend="xmlSecKeyInfoCtxCreate">xmlSecKeyInfoCtxCreate</link>             (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> keysMngr</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyInfoCtxDestroy">xmlSecKeyInfoCtxDestroy</link>             (<parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyInfoCtxInitialize">xmlSecKeyInfoCtxInitialize</link>          (<parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>,
+                                                         <parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> keysMngr</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyInfoCtxFinalize">xmlSecKeyInfoCtxFinalize</link>            (<parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyInfoCtxReset">xmlSecKeyInfoCtxReset</link>               (<parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyInfoCtxCopyUserPref">xmlSecKeyInfoCtxCopyUserPref</link>        (<parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> dst</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> src</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyInfoCtxCreateEncCtx">xmlSecKeyInfoCtxCreateEncCtx</link>        (<parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyInfoCtxDebugDump">xmlSecKeyInfoCtxDebugDump</link>           (<parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyInfoCtxDebugXmlDump">xmlSecKeyInfoCtxDebugXmlDump</link>        (<parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
 #define             <link linkend="xmlSecKeyDataNameId">xmlSecKeyDataNameId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataNameGetKlass">xmlSecKeyDataNameGetKlass</link>           (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecKeyDataNameGetKlass">xmlSecKeyDataNameGetKlass</link>           (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecKeyDataValueId">xmlSecKeyDataValueId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataValueGetKlass">xmlSecKeyDataValueGetKlass</link>          (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecKeyDataValueGetKlass">xmlSecKeyDataValueGetKlass</link>          (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecKeyDataRetrievalMethodId">xmlSecKeyDataRetrievalMethodId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataRetrievalMethodGetKlass">xmlSecKeyDataRetrievalMethodGetKlass</link>
-                                                        (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecKeyDataRetrievalMethodGetKlass">xmlSecKeyDataRetrievalMethodGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecKeyDataEncryptedKeyId">xmlSecKeyDataEncryptedKeyId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataEncryptedKeyGetKlass">xmlSecKeyDataEncryptedKeyGetKlass</link>   (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecKeyDataEncryptedKeyGetKlass">xmlSecKeyDataEncryptedKeyGetKlass</link>   (<parameter><type>void</type></parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-keyinfo.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node parser.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-keyinfo.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecKeyInfoNodeRead" role="function">
 <title>xmlSecKeyInfoNodeRead ()</title>
-<indexterm zone="xmlSecKeyInfoNodeRead"><primary sortas="xmlSecKeyInfoNodeRead">xmlSecKeyInfoNodeRead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyInfoNodeRead               (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<indexterm zone="xmlSecKeyInfoNodeRead"><primary>xmlSecKeyInfoNodeRead</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyInfoNodeRead               (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> keyInfoNode</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
 Parses the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element <parameter>keyInfoNode</parameter>, extracts the key data
-and stores into <parameter>key</parameter>.</para>
-<para>
+and stores into <parameter>key</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoNode</parameter>&#160;:</term>
-<listitem><simpara>        the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>                the pointer to result key object.
+<listitem><simpara>the pointer to result key object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
+<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>&#160;:</term><listitem><simpara> 0 on success or -1 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyInfoNodeWrite" role="function">
 <title>xmlSecKeyInfoNodeWrite ()</title>
-<indexterm zone="xmlSecKeyInfoNodeWrite"><primary sortas="xmlSecKeyInfoNodeWrite">xmlSecKeyInfoNodeWrite</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyInfoNodeWrite              (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
-<para>
-Writes the <parameter>key</parameter> into the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element template <parameter>keyInfoNode</parameter>.</para>
+<indexterm zone="xmlSecKeyInfoNodeWrite"><primary>xmlSecKeyInfoNodeWrite</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyInfoNodeWrite              (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> keyInfoNode</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
+Writes the <parameter>key</parameter> into the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element template <parameter>keyInfoNode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoNode</parameter>&#160;:</term>
-<listitem><simpara>        the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>                the pointer to key object.
+<listitem><simpara>the pointer to key object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
+<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>&#160;:</term><listitem><simpara> 0 on success or -1 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyInfoMode" role="enum">
 <title>enum xmlSecKeyInfoMode</title>
-<indexterm zone="xmlSecKeyInfoMode"><primary sortas="xmlSecKeyInfoMode">xmlSecKeyInfoMode</primary></indexterm><programlisting>typedef enum {
+<indexterm zone="xmlSecKeyInfoMode"><primary>xmlSecKeyInfoMode</primary></indexterm>
+<programlisting>typedef enum {
     xmlSecKeyInfoModeRead = 0,
     xmlSecKeyInfoModeWrite
 } xmlSecKeyInfoMode;
 </programlisting>
 <para>
-The <parameter>xmlSecKeyInfoCtx</parameter> operation mode (read or write).</para>
-<para>
+The <parameter>xmlSecKeyInfoCtx</parameter> operation mode (read or write).
 </para><variablelist role="enum">
 <varlistentry id="xmlSecKeyInfoModeRead" role="constant">
 <term><literal>xmlSecKeyInfoModeRead</literal></term>
-<listitem><simpara> read <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink> element.
+<listitem><simpara>read <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink> element.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecKeyInfoModeWrite" role="constant">
 <term><literal>xmlSecKeyInfoModeWrite</literal></term>
-<listitem><simpara> write <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink> element.
+<listitem><simpara>write <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink> element.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2 id="XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND--CAPS" role="macro">
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND:CAPS" role="macro">
 <title>XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND</title>
-<indexterm zone="XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND">XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND             0x00000001
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND:CAPS"><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 ">&lt;dsig:KeyInfo /&gt;</ulink>
-element even when key is already found.</para>
-<para>
+element even when key is already found.
 </para></refsect2>
-<refsect2 id="XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD--CAPS" role="macro">
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD:CAPS" role="macro">
 <title>XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD</title>
-<indexterm zone="XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD">XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD              0x00000002
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD:CAPS"><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 ">&lt;dsig:KeyInfo /&gt;</ulink>
-child is found.</para>
-<para>
+child is found.
 </para></refsect2>
-<refsect2 id="XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN--CAPS" role="macro">
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN:CAPS" role="macro">
 <title>XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN</title>
-<indexterm zone="XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN">XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN            0x00000004
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN:CAPS"><primary>XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN</primary></indexterm>
+<programlisting>#define XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN            0x00000004
 </programlisting>
 <para>
 If flags is set then we abort if an unknown key name
-(content of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName ">&lt;dsig:KeyName /&gt;</ulink> element) is found.</para>
-<para>
+(content of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName ">&lt;dsig:KeyName /&gt;</ulink> element) is found.
 </para></refsect2>
-<refsect2 id="XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD--CAPS" role="macro">
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD:CAPS" role="macro">
 <title>XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD</title>
-<indexterm zone="XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD">XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD     0x00000008
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD:CAPS"><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 ">&lt;dsig:KeyValue /&gt;</ulink>
-child is found.</para>
-<para>
+child is found.
 </para></refsect2>
-<refsect2 id="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF--CAPS" role="macro">
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF:CAPS" role="macro">
 <title>XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF</title>
-<indexterm zone="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF    0x00000010
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF:CAPS"><primary>XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF</primary></indexterm>
+<programlisting>#define XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF    0x00000010
 </programlisting>
 <para>
 If flag is set then we abort if an unknown href attribute
-of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink> element is found.</para>
-<para>
+of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink> element is found.
 </para></refsect2>
-<refsect2 id="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF--CAPS" role="macro">
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF:CAPS" role="macro">
 <title>XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF</title>
-<indexterm zone="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF   0x00000020
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF:CAPS"><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 ">&lt;dsig:RetrievalMethod /&gt;</ulink>
-element does not match the real key data type.</para>
-<para>
+element does not match the real key data type.
 </para></refsect2>
-<refsect2 id="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD--CAPS" role="macro">
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD:CAPS" role="macro">
 <title>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD</title>
-<indexterm zone="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD     0x00000100
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD:CAPS"><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 ">&lt;dsig:X509Data /&gt;</ulink>
-child is found.</para>
-<para>
+child is found.
 </para></refsect2>
-<refsect2 id="XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS--CAPS" role="macro">
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS:CAPS" role="macro">
 <title>XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS</title>
-<indexterm zone="XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS">XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS         0x00000200
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS:CAPS"><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 ">&lt;dsig:X509Data /&gt;</ulink>
-element without verification.</para>
-<para>
+element without verification.
 </para></refsect2>
-<refsect2 id="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT--CAPS" role="macro">
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT:CAPS" role="macro">
 <title>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT</title>
-<indexterm zone="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT      0x00000400
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT:CAPS"><primary>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT</primary></indexterm>
+<programlisting>#define XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT      0x00000400
 </programlisting>
 <para>
 If flag is set then we'll stop when we could not resolve reference
 to certificate from <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial ">&lt;dsig:X509IssuerSerial /&gt;</ulink>, <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SKI ">&lt;dsig:X509SKI /&gt;</ulink> or
-<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName ">&lt;dsig:X509SubjectName /&gt;</ulink> elements.</para>
-<para>
+<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName ">&lt;dsig:X509SubjectName /&gt;</ulink> elements.
 </para></refsect2>
-<refsect2 id="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT--CAPS" role="macro">
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT:CAPS" role="macro">
 <title>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT</title>
-<indexterm zone="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT      0x00000800
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT:CAPS"><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 ">&lt;dsig:X509Data /&gt;</ulink> element
-processing does not return a verified certificate.</para>
-<para>
+processing does not return a verified certificate.
 </para></refsect2>
-<refsect2 id="XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION--CAPS" role="macro">
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION:CAPS" role="macro">
 <title>XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION</title>
-<indexterm zone="XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION">XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION 0x00001000
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION:CAPS"><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 ">&lt;enc:EncryptedKey /&gt;</ulink> element
-processing fails.</para>
-<para>
+processing fails.
 </para></refsect2>
-<refsect2 id="XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE--CAPS" role="macro">
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE:CAPS" role="macro">
 <title>XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE</title>
-<indexterm zone="XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE">XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE                 0x00002000
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE:CAPS"><primary>XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE</primary></indexterm>
+<programlisting>#define XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE                 0x00002000
 </programlisting>
 <para>
 If the flag is set then we'll stop when we found an empty node.
-Otherwise we just ignore it.</para>
-<para>
+Otherwise we just ignore it.
 </para></refsect2>
-<refsect2 id="XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS--CAPS" role="macro">
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS:CAPS" role="macro">
 <title>XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS</title>
-<indexterm zone="XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS">XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS        0x00004000
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS:CAPS"><primary>XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS</primary></indexterm>
+<programlisting>#define XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS        0x00004000
 </programlisting>
 <para>
-If the flag is set then we'll skip strict checking of certs and CRLs</para>
-<para>
+If the flag is set then we'll skip strict checking of certs and CRLs
 </para></refsect2>
 <refsect2 id="xmlSecKeyInfoCtx" role="struct">
 <title>struct xmlSecKeyInfoCtx</title>
-<indexterm zone="xmlSecKeyInfoCtx"><primary sortas="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</primary></indexterm><programlisting>struct xmlSecKeyInfoCtx {
+<indexterm zone="xmlSecKeyInfoCtx"><primary>xmlSecKeyInfoCtx</primary></indexterm>
+<programlisting>struct xmlSecKeyInfoCtx {
     void*                               userData;
     unsigned int                        flags;
     unsigned int                        flags2;
@@ -300,258 +292,239 @@ 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 ">&lt;dsig:KeyInfo /&gt;</ulink> reading or writing context.</para>
-<para>
+The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink> reading or writing context.
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>userData</structfield>;</term>
-<listitem><simpara>           the pointer to user data (xmlsec and xmlsec-crypto
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecKeyInfoCtx.userData">userData</structfield>;</term>
+<listitem><simpara>the pointer to user data (xmlsec and xmlsec-crypto
                      never touch this).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term>unsigned&#160;<link linkend="int">int</link>&#160;<structfield>flags</structfield>;</term>
-<listitem><simpara>              the bit mask for flags that control processin.
+<varlistentry><term>unsigned&#160;<link linkend="int"><type>int</type></link>&#160;<structfield id="xmlSecKeyInfoCtx.flags">flags</structfield>;</term>
+<listitem><simpara>the bit mask for flags that control processin.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term>unsigned&#160;<link linkend="int">int</link>&#160;<structfield>flags2</structfield>;</term>
-<listitem><simpara>             reserved for future.
+<varlistentry><term>unsigned&#160;<link linkend="int"><type>int</type></link>&#160;<structfield id="xmlSecKeyInfoCtx.flags2">flags2</structfield>;</term>
+<listitem><simpara>reserved for future.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link>&#160;<structfield>keysMngr</structfield>;</term>
-<listitem><simpara>           the pointer to current keys manager.
+<varlistentry><term><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link>&#160;<structfield id="xmlSecKeyInfoCtx.keysMngr">keysMngr</structfield>;</term>
+<listitem><simpara>the pointer to current keys manager.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyInfoMode">xmlSecKeyInfoMode</link>&#160;<structfield>mode</structfield>;</term>
-<listitem><simpara>               do we read or write <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink> element.
+<varlistentry><term><link linkend="xmlSecKeyInfoMode"><type>xmlSecKeyInfoMode</type></link>&#160;<structfield id="xmlSecKeyInfoCtx.mode">mode</structfield>;</term>
+<listitem><simpara>do we read or write <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink> element.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrList</link>&#160;<structfield>enabledKeyData</structfield>;</term>
-<listitem><simpara>     the list of enabled <parameter>xmlSecKeyDataId</parameter> (if list is
+<varlistentry><term><link linkend="xmlSecPtrList"><type>xmlSecPtrList</type></link>&#160;<structfield id="xmlSecKeyInfoCtx.enabledKeyData">enabledKeyData</structfield>;</term>
+<listitem><simpara>the list of enabled <parameter>xmlSecKeyDataId</parameter> (if list is
                      empty then all data ids are enabled).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="int">int</link>&#160;<structfield>base64LineSize</structfield>;</term>
-<listitem><simpara>     the max columns size for base64 encoding.
+<varlistentry><term><link linkend="int"><type>int</type></link>&#160;<structfield id="xmlSecKeyInfoCtx.base64LineSize">base64LineSize</structfield>;</term>
+<listitem><simpara>the max columns size for base64 encoding.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformCtx">xmlSecTransformCtx</link>&#160;<structfield>retrievalMethodCtx</structfield>;</term>
-<listitem><simpara> the transforms context for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink>
+<varlistentry><term><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtx</type></link>&#160;<structfield id="xmlSecKeyInfoCtx.retrievalMethodCtx">retrievalMethodCtx</structfield>;</term>
+<listitem><simpara>the transforms context for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink>
                      element processing.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="int">int</link>&#160;<structfield>maxRetrievalMethodLevel</structfield>;</term>
-<listitem><simpara> the max recursion level when processing
+<varlistentry><term><link linkend="int"><type>int</type></link>&#160;<structfield id="xmlSecKeyInfoCtx.maxRetrievalMethodLevel">maxRetrievalMethodLevel</structfield>;</term>
+<listitem><simpara>the max recursion level when processing
                      <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink> element; default level is 1
                      (see also <parameter>curRetrievalMethodLevel</parameter>).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link>&#160;<structfield>encCtx</structfield>;</term>
-<listitem><simpara>             the encryption context for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-EncryptedKey ">&lt;dsig:EncryptedKey /&gt;</ulink> element
+<varlistentry><term><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link>&#160;<structfield id="xmlSecKeyInfoCtx.encCtx">encCtx</structfield>;</term>
+<listitem><simpara>the encryption context for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-EncryptedKey ">&lt;dsig:EncryptedKey /&gt;</ulink> element
                      processing.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="int">int</link>&#160;<structfield>maxEncryptedKeyLevel</structfield>;</term>
-<listitem><simpara> the max recursion level when processing
+<varlistentry><term><link linkend="int"><type>int</type></link>&#160;<structfield id="xmlSecKeyInfoCtx.maxEncryptedKeyLevel">maxEncryptedKeyLevel</structfield>;</term>
+<listitem><simpara>the max recursion level when processing
                      <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey ">&lt;enc:EncryptedKey /&gt;</ulink> element; default level is 1
                      (see <parameter>curEncryptedKeyLevel</parameter>).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="time-t">time_t</link>&#160;<structfield>certsVerificationTime</structfield>;</term>
-<listitem><simpara> the time to use for X509 certificates verification
+<varlistentry><term><link linkend="time-t"><type>time_t</type></link>&#160;<structfield id="xmlSecKeyInfoCtx.certsVerificationTime">certsVerificationTime</structfield>;</term>
+<listitem><simpara>the time to use for X509 certificates verification
                      ("not valid before" and "not valid after" checks);
                      if <parameter>certsVerificationTime</parameter> is equal to 0 (default)
                      then we verify certificates against the system's
                      clock "now".
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="int">int</link>&#160;<structfield>certsVerificationDepth</structfield>;</term>
-<listitem><simpara> the max certifications chain length (default is 9).
+<varlistentry><term><link linkend="int"><type>int</type></link>&#160;<structfield id="xmlSecKeyInfoCtx.certsVerificationDepth">certsVerificationDepth</structfield>;</term>
+<listitem><simpara>the max certifications chain length (default is 9).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>pgpReserved</structfield>;</term>
-<listitem><simpara>        reserved for PGP.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecKeyInfoCtx.pgpReserved">pgpReserved</structfield>;</term>
+<listitem><simpara>reserved for PGP.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="int">int</link>&#160;<structfield>curRetrievalMethodLevel</structfield>;</term>
-<listitem><simpara> the current <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink> element
+<varlistentry><term><link linkend="int"><type>int</type></link>&#160;<structfield id="xmlSecKeyInfoCtx.curRetrievalMethodLevel">curRetrievalMethodLevel</structfield>;</term>
+<listitem><simpara>the current <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink> element
                      processing level (see <parameter>maxRetrievalMethodLevel</parameter>).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="int">int</link>&#160;<structfield>curEncryptedKeyLevel</structfield>;</term>
-<listitem><simpara> the current <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey ">&lt;enc:EncryptedKey /&gt;</ulink> element
+<varlistentry><term><link linkend="int"><type>int</type></link>&#160;<structfield id="xmlSecKeyInfoCtx.curEncryptedKeyLevel">curEncryptedKeyLevel</structfield>;</term>
+<listitem><simpara>the current <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey ">&lt;enc:EncryptedKey /&gt;</ulink> element
                      processing level (see <parameter>maxEncryptedKeyLevel</parameter>).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyReq">xmlSecKeyReq</link>&#160;<structfield>keyReq</structfield>;</term>
-<listitem><simpara>             the current key requirements.
+<varlistentry><term><link linkend="xmlSecKeyReq"><type>xmlSecKeyReq</type></link>&#160;<structfield id="xmlSecKeyInfoCtx.keyReq">keyReq</structfield>;</term>
+<listitem><simpara>the current key requirements.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
-<listitem><simpara>          reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecKeyInfoCtx.reserved0">reserved0</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
-<listitem><simpara>          reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecKeyInfoCtx.reserved1">reserved1</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyInfoCtxCreate" role="function">
 <title>xmlSecKeyInfoCtxCreate ()</title>
-<indexterm zone="xmlSecKeyInfoCtxCreate"><primary sortas="xmlSecKeyInfoCtxCreate">xmlSecKeyInfoCtxCreate</primary></indexterm><programlisting><link linkend="xmlSecKeyInfoCtxPtr">xmlSecKeyInfoCtxPtr</link>  xmlSecKeyInfoCtxCreate             (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
+<indexterm zone="xmlSecKeyInfoCtxCreate"><primary>xmlSecKeyInfoCtxCreate</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyInfoCtxPtr"><returnvalue>xmlSecKeyInfoCtxPtr</returnvalue></link>  xmlSecKeyInfoCtxCreate             (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> keysMngr</parameter>);</programlisting>
 <para>
 Allocates and initializes <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 Caller is responsible for freeing it by calling <link linkend="xmlSecKeyInfoCtxDestroy"><type>xmlSecKeyInfoCtxDestroy</type></link>
-function.</para>
-<para>
+function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keysMngr</parameter>&#160;:</term>
-<listitem><simpara>           the pointer to keys manager (may be NULL).
+<listitem><simpara>the pointer to keys manager (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated object or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyInfoCtxDestroy" role="function">
 <title>xmlSecKeyInfoCtxDestroy ()</title>
-<indexterm zone="xmlSecKeyInfoCtxDestroy"><primary sortas="xmlSecKeyInfoCtxDestroy">xmlSecKeyInfoCtxDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyInfoCtxDestroy             (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
-<para>
-Destroys <parameter>keyInfoCtx</parameter> object created with <link linkend="xmlSecKeyInfoCtxCreate"><type>xmlSecKeyInfoCtxCreate</type></link> function.</para>
+<indexterm zone="xmlSecKeyInfoCtxDestroy"><primary>xmlSecKeyInfoCtxDestroy</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyInfoCtxDestroy             (<parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
+Destroys <parameter>keyInfoCtx</parameter> object created with <link linkend="xmlSecKeyInfoCtxCreate"><type>xmlSecKeyInfoCtxCreate</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
+<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 id="xmlSecKeyInfoCtxInitialize" role="function">
 <title>xmlSecKeyInfoCtxInitialize ()</title>
-<indexterm zone="xmlSecKeyInfoCtxInitialize"><primary sortas="xmlSecKeyInfoCtxInitialize">xmlSecKeyInfoCtxInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyInfoCtxInitialize          (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx,
-                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
+<indexterm zone="xmlSecKeyInfoCtxInitialize"><primary>xmlSecKeyInfoCtxInitialize</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyInfoCtxInitialize          (<parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>,
+                                                         <parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> keysMngr</parameter>);</programlisting>
 <para>
 Initializes <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context. Caller is
-responsible for cleaning it up by <link linkend="xmlSecKeyInfoCtxFinalize"><type>xmlSecKeyInfoCtxFinalize</type></link> function.</para>
-<para>
+responsible for cleaning it up by <link linkend="xmlSecKeyInfoCtxFinalize"><type>xmlSecKeyInfoCtxFinalize</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
+<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>&#160;:</term>
-<listitem><simpara>           the pointer to keys manager (may be NULL).
+<listitem><simpara>the pointer to keys manager (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success and a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyInfoCtxFinalize" role="function">
 <title>xmlSecKeyInfoCtxFinalize ()</title>
-<indexterm zone="xmlSecKeyInfoCtxFinalize"><primary sortas="xmlSecKeyInfoCtxFinalize">xmlSecKeyInfoCtxFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyInfoCtxFinalize            (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<indexterm zone="xmlSecKeyInfoCtxFinalize"><primary>xmlSecKeyInfoCtxFinalize</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyInfoCtxFinalize            (<parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
 Cleans up the <parameter>keyInfoCtx</parameter> initialized with <link linkend="xmlSecKeyInfoCtxInitialize"><type>xmlSecKeyInfoCtxInitialize</type></link>
-function.</para>
-<para>
+function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
+<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 id="xmlSecKeyInfoCtxReset" role="function">
 <title>xmlSecKeyInfoCtxReset ()</title>
-<indexterm zone="xmlSecKeyInfoCtxReset"><primary sortas="xmlSecKeyInfoCtxReset">xmlSecKeyInfoCtxReset</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyInfoCtxReset               (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
-<para>
-Resets the <parameter>keyInfoCtx</parameter> state. User settings are not changed.</para>
+<indexterm zone="xmlSecKeyInfoCtxReset"><primary>xmlSecKeyInfoCtxReset</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyInfoCtxReset               (<parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
+Resets the <parameter>keyInfoCtx</parameter> state. User settings are not changed.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
+<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 id="xmlSecKeyInfoCtxCopyUserPref" role="function">
 <title>xmlSecKeyInfoCtxCopyUserPref ()</title>
-<indexterm zone="xmlSecKeyInfoCtxCopyUserPref"><primary sortas="xmlSecKeyInfoCtxCopyUserPref">xmlSecKeyInfoCtxCopyUserPref</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyInfoCtxCopyUserPref        (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> dst,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> src);</programlisting>
-<para>
-Copies user preferences from <parameter>src</parameter> context to <parameter>dst</parameter> context.</para>
+<indexterm zone="xmlSecKeyInfoCtxCopyUserPref"><primary>xmlSecKeyInfoCtxCopyUserPref</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyInfoCtxCopyUserPref        (<parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> dst</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> src</parameter>);</programlisting>
 <para>
+Copies user preferences from <parameter>src</parameter> context to <parameter>dst</parameter> context.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dst</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to destination context object.
+<listitem><simpara>the pointer to destination context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>src</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to source context object.
+<listitem><simpara>the pointer to source context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success and a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyInfoCtxCreateEncCtx" role="function">
 <title>xmlSecKeyInfoCtxCreateEncCtx ()</title>
-<indexterm zone="xmlSecKeyInfoCtxCreateEncCtx"><primary sortas="xmlSecKeyInfoCtxCreateEncCtx">xmlSecKeyInfoCtxCreateEncCtx</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyInfoCtxCreateEncCtx        (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<indexterm zone="xmlSecKeyInfoCtxCreateEncCtx"><primary>xmlSecKeyInfoCtxCreateEncCtx</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyInfoCtxCreateEncCtx        (<parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
 Creates encryption context form processing <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> child
-of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element.</para>
-<para>
+of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
+<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>&#160;:</term><listitem><simpara> 0 on success and a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyInfoCtxDebugDump" role="function">
 <title>xmlSecKeyInfoCtxDebugDump ()</title>
-<indexterm zone="xmlSecKeyInfoCtxDebugDump"><primary sortas="xmlSecKeyInfoCtxDebugDump">xmlSecKeyInfoCtxDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyInfoCtxDebugDump           (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints user settings and current context state to <parameter>output</parameter>.</para>
+<indexterm zone="xmlSecKeyInfoCtxDebugDump"><primary>xmlSecKeyInfoCtxDebugDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyInfoCtxDebugDump           (<parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints user settings and current context state to <parameter>output</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
+<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>&#160;:</term>
-<listitem><simpara>             the output file pointer.
+<listitem><simpara>the output file pointer.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyInfoCtxDebugXmlDump" role="function">
 <title>xmlSecKeyInfoCtxDebugXmlDump ()</title>
-<indexterm zone="xmlSecKeyInfoCtxDebugXmlDump"><primary sortas="xmlSecKeyInfoCtxDebugXmlDump">xmlSecKeyInfoCtxDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyInfoCtxDebugXmlDump        (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints user settings and current context state in XML format to <parameter>output</parameter>.</para>
+<indexterm zone="xmlSecKeyInfoCtxDebugXmlDump"><primary>xmlSecKeyInfoCtxDebugXmlDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyInfoCtxDebugXmlDump        (<parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints user settings and current context state in XML format to <parameter>output</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
+<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>&#160;:</term>
-<listitem><simpara>             the output file pointer.
+<listitem><simpara>the output file pointer.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataNameId" role="macro">
 <title>xmlSecKeyDataNameId</title>
-<indexterm zone="xmlSecKeyDataNameId"><primary sortas="xmlSecKeyDataNameId">xmlSecKeyDataNameId</primary></indexterm><programlisting>#define xmlSecKeyDataNameId             xmlSecKeyDataNameGetKlass()
+<indexterm zone="xmlSecKeyDataNameId"><primary>xmlSecKeyDataNameId</primary></indexterm>
+<programlisting>#define xmlSecKeyDataNameId             xmlSecKeyDataNameGetKlass()
 </programlisting>
 <para>
-The &lt;dsig:KeyName&gt; processing class.</para>
-<para>
+The &lt;dsig:KeyName&gt; processing class.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataNameGetKlass" role="function">
 <title>xmlSecKeyDataNameGetKlass ()</title>
-<indexterm zone="xmlSecKeyDataNameGetKlass"><primary sortas="xmlSecKeyDataNameGetKlass">xmlSecKeyDataNameGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataNameGetKlass           (void);</programlisting>
+<indexterm zone="xmlSecKeyDataNameGetKlass"><primary>xmlSecKeyDataNameGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecKeyDataNameGetKlass           (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";>&lt;dsig:KeyName/&gt;</ulink> element key data klass
 (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-KeyName"><type>sec-KeyName</type></link>):
@@ -563,47 +536,47 @@ identifier to the recipient. Typically, KeyName contains an identifier
 related to the key pair used to sign the message, but it may contain
 other protocol-related information that indirectly identifies a key pair.
 (Common uses of KeyName include simple string names for keys, a key index,
-a distinguished name (DN), an email address, etc.)</para>
-<para>
+a distinguished name (DN), an email address, etc.)
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";>&lt;dsig:KeyName/&gt;</ulink> element processing key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataValueId" role="macro">
 <title>xmlSecKeyDataValueId</title>
-<indexterm zone="xmlSecKeyDataValueId"><primary sortas="xmlSecKeyDataValueId">xmlSecKeyDataValueId</primary></indexterm><programlisting>#define xmlSecKeyDataValueId            xmlSecKeyDataValueGetKlass()
+<indexterm zone="xmlSecKeyDataValueId"><primary>xmlSecKeyDataValueId</primary></indexterm>
+<programlisting>#define xmlSecKeyDataValueId            xmlSecKeyDataValueGetKlass()
 </programlisting>
 <para>
-The &lt;dsig:KeyValue&gt; processing class.</para>
-<para>
+The &lt;dsig:KeyValue&gt; processing class.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataValueGetKlass" role="function">
 <title>xmlSecKeyDataValueGetKlass ()</title>
-<indexterm zone="xmlSecKeyDataValueGetKlass"><primary sortas="xmlSecKeyDataValueGetKlass">xmlSecKeyDataValueGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataValueGetKlass          (void);</programlisting>
+<indexterm zone="xmlSecKeyDataValueGetKlass"><primary>xmlSecKeyDataValueGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecKeyDataValueGetKlass          (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";>&lt;dsig:KeyValue/&gt;</ulink> element key data klass
 (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-KeyValue"><type>sec-KeyValue</type></link>):
 </para>
 <para>
 The KeyValue element contains a single public key that may be useful in
-validating the signature.</para>
-<para>
+validating the signature.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";>&lt;dsig:KeyValue/&gt;</ulink> element processing key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataRetrievalMethodId" role="macro">
 <title>xmlSecKeyDataRetrievalMethodId</title>
-<indexterm zone="xmlSecKeyDataRetrievalMethodId"><primary sortas="xmlSecKeyDataRetrievalMethodId">xmlSecKeyDataRetrievalMethodId</primary></indexterm><programlisting>#define xmlSecKeyDataRetrievalMethodId  xmlSecKeyDataRetrievalMethodGetKlass()
+<indexterm zone="xmlSecKeyDataRetrievalMethodId"><primary>xmlSecKeyDataRetrievalMethodId</primary></indexterm>
+<programlisting>#define xmlSecKeyDataRetrievalMethodId  xmlSecKeyDataRetrievalMethodGetKlass()
 </programlisting>
 <para>
-The &lt;dsig:RetrievalMethod&gt; processing class.</para>
-<para>
+The &lt;dsig:RetrievalMethod&gt; processing class.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataRetrievalMethodGetKlass" role="function">
 <title>xmlSecKeyDataRetrievalMethodGetKlass ()</title>
-<indexterm zone="xmlSecKeyDataRetrievalMethodGetKlass"><primary sortas="xmlSecKeyDataRetrievalMethodGetKlass">xmlSecKeyDataRetrievalMethodGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataRetrievalMethodGetKlass
-                                                        (void);</programlisting>
+<indexterm zone="xmlSecKeyDataRetrievalMethodGetKlass"><primary>xmlSecKeyDataRetrievalMethodGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecKeyDataRetrievalMethodGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink> element key data klass
 (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-RetrievalMethod"><type>sec-RetrievalMethod</type></link>):
@@ -617,23 +590,23 @@ sequence of X509Certificate elements.
 </para>
 <para>
 RetrievalMethod uses the same syntax and dereferencing behavior as
-Reference's URI and The Reference Processing Model.</para>
-<para>
+Reference's URI and The Reference Processing Model.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink> element processing key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataEncryptedKeyId" role="macro">
 <title>xmlSecKeyDataEncryptedKeyId</title>
-<indexterm zone="xmlSecKeyDataEncryptedKeyId"><primary sortas="xmlSecKeyDataEncryptedKeyId">xmlSecKeyDataEncryptedKeyId</primary></indexterm><programlisting>#define xmlSecKeyDataEncryptedKeyId     xmlSecKeyDataEncryptedKeyGetKlass()
+<indexterm zone="xmlSecKeyDataEncryptedKeyId"><primary>xmlSecKeyDataEncryptedKeyId</primary></indexterm>
+<programlisting>#define xmlSecKeyDataEncryptedKeyId     xmlSecKeyDataEncryptedKeyGetKlass()
 </programlisting>
 <para>
-The &lt;enc:EncryptedKey&gt; processing class.</para>
-<para>
+The &lt;enc:EncryptedKey&gt; processing class.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataEncryptedKeyGetKlass" role="function">
 <title>xmlSecKeyDataEncryptedKeyGetKlass ()</title>
-<indexterm zone="xmlSecKeyDataEncryptedKeyGetKlass"><primary sortas="xmlSecKeyDataEncryptedKeyGetKlass">xmlSecKeyDataEncryptedKeyGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataEncryptedKeyGetKlass   (void);</programlisting>
+<indexterm zone="xmlSecKeyDataEncryptedKeyGetKlass"><primary>xmlSecKeyDataEncryptedKeyGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecKeyDataEncryptedKeyGetKlass   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 The <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> element key data klass
 (http://www.w3.org/TR/xmlenc-core/<link linkend="sec-EncryptedKey"><type>sec-EncryptedKey</type></link>):
@@ -645,8 +618,7 @@ XML document, be placed within an application document, or appear inside
 an EncryptedData element as a child of a ds:KeyInfo element. The key value
 is always encrypted to the recipient(s). When EncryptedKey is decrypted the
 resulting octets are made available to the EncryptionMethod algorithm
-without any additional processing.</para>
-<para>
+without any additional processing.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> element processing key data klass.
 </simpara></listitem></varlistentry>
@@ -654,7 +626,4 @@ without any additional processing.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/keys.sgml b/docs/api/sgml/keys.sgml
index 06f1c1e..b9cdba6 100644
--- a/docs/api/sgml/keys.sgml
+++ b/docs/api/sgml/keys.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-keys.top_of_page">keys</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>keys</refname>
 <refpurpose>Crypto key object definition.</refpurpose>
@@ -13,317 +14,309 @@
 <refsynopsisdiv id="xmlsec-keys.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-typedef             <link linkend="xmlSecKeyUsage">xmlSecKeyUsage</link>;
+<synopsis>typedef             <link linkend="xmlSecKeyUsage">xmlSecKeyUsage</link>;
 #define             <link linkend="xmlSecKeyUsageSign">xmlSecKeyUsageSign</link>
 #define             <link linkend="xmlSecKeyUsageVerify">xmlSecKeyUsageVerify</link>
 #define             <link linkend="xmlSecKeyUsageEncrypt">xmlSecKeyUsageEncrypt</link>
 #define             <link linkend="xmlSecKeyUsageDecrypt">xmlSecKeyUsageDecrypt</link>
 #define             <link linkend="xmlSecKeyUsageKeyExchange">xmlSecKeyUsageKeyExchange</link>
 #define             <link linkend="xmlSecKeyUsageAny">xmlSecKeyUsageAny</link>
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyUseWithInitialize">xmlSecKeyUseWithInitialize</link>          (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyUseWithFinalize">xmlSecKeyUseWithFinalize</link>            (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyUseWithReset">xmlSecKeyUseWithReset</link>               (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyUseWithCopy">xmlSecKeyUseWithCopy</link>                (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> dst,
-                                                         <link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> src);
-<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link>  <link linkend="xmlSecKeyUseWithCreate">xmlSecKeyUseWithCreate</link>             (const <link linkend="xmlChar">xmlChar</link> *application,
-                                                         const <link linkend="xmlChar">xmlChar</link> *identifier);
-<link linkend="xmlSecKeyUseWithPtr">xmlSecKeyUseWithPtr</link>  <link linkend="xmlSecKeyUseWithDuplicate">xmlSecKeyUseWithDuplicate</link>          (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyUseWithDestroy">xmlSecKeyUseWithDestroy</link>             (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyUseWithSet">xmlSecKeyUseWithSet</link>                 (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith,
-                                                         const <link linkend="xmlChar">xmlChar</link> *application,
-                                                         const <link linkend="xmlChar">xmlChar</link> *identifier);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyUseWithDebugDump">xmlSecKeyUseWithDebugDump</link>           (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyUseWithDebugXmlDump">xmlSecKeyUseWithDebugXmlDump</link>        (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyUseWithInitialize">xmlSecKeyUseWithInitialize</link>          (<parameter><link linkend="xmlSecKeyUseWith"><type>xmlSecKeyUseWithPtr</type></link> keyUseWith</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyUseWithFinalize">xmlSecKeyUseWithFinalize</link>            (<parameter><link linkend="xmlSecKeyUseWith"><type>xmlSecKeyUseWithPtr</type></link> keyUseWith</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyUseWithReset">xmlSecKeyUseWithReset</link>               (<parameter><link linkend="xmlSecKeyUseWith"><type>xmlSecKeyUseWithPtr</type></link> keyUseWith</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyUseWithCopy">xmlSecKeyUseWithCopy</link>                (<parameter><link linkend="xmlSecKeyUseWith"><type>xmlSecKeyUseWithPtr</type></link> dst</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyUseWith"><type>xmlSecKeyUseWithPtr</type></link> src</parameter>);
+<link linkend="xmlSecKeyUseWith"><returnvalue>xmlSecKeyUseWithPtr</returnvalue></link>  <link linkend="xmlSecKeyUseWithCreate">xmlSecKeyUseWithCreate</link>             (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *application</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *identifier</parameter>);
+<link linkend="xmlSecKeyUseWithPtr"><returnvalue>xmlSecKeyUseWithPtr</returnvalue></link>  <link linkend="xmlSecKeyUseWithDuplicate">xmlSecKeyUseWithDuplicate</link>          (<parameter><link linkend="xmlSecKeyUseWith"><type>xmlSecKeyUseWithPtr</type></link> keyUseWith</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyUseWithDestroy">xmlSecKeyUseWithDestroy</link>             (<parameter><link linkend="xmlSecKeyUseWith"><type>xmlSecKeyUseWithPtr</type></link> keyUseWith</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyUseWithSet">xmlSecKeyUseWithSet</link>                 (<parameter><link linkend="xmlSecKeyUseWith"><type>xmlSecKeyUseWithPtr</type></link> keyUseWith</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *application</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *identifier</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyUseWithDebugDump">xmlSecKeyUseWithDebugDump</link>           (<parameter><link linkend="xmlSecKeyUseWith"><type>xmlSecKeyUseWithPtr</type></link> keyUseWith</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyUseWithDebugXmlDump">xmlSecKeyUseWithDebugXmlDump</link>        (<parameter><link linkend="xmlSecKeyUseWith"><type>xmlSecKeyUseWithPtr</type></link> keyUseWith</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
 struct              <link linkend="xmlSecKeyUseWith">xmlSecKeyUseWith</link>;
 #define             <link linkend="xmlSecKeyUseWithPtrListId">xmlSecKeyUseWithPtrListId</link>
-<link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     <link linkend="xmlSecKeyUseWithPtrListGetKlass">xmlSecKeyUseWithPtrListGetKlass</link>     (void);
+<link linkend="xmlSecPtrListId"><returnvalue>xmlSecPtrListId</returnvalue></link>     <link linkend="xmlSecKeyUseWithPtrListGetKlass">xmlSecKeyUseWithPtrListGetKlass</link>     (<parameter><type>void</type></parameter>);
 struct              <link linkend="xmlSecKeyReq">xmlSecKeyReq</link>;
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyReqInitialize">xmlSecKeyReqInitialize</link>              (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyReqFinalize">xmlSecKeyReqFinalize</link>                (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyReqReset">xmlSecKeyReqReset</link>                   (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyReqCopy">xmlSecKeyReqCopy</link>                    (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> dst,
-                                                         <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> src);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyReqMatchKey">xmlSecKeyReqMatchKey</link>                (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyReqMatchKeyValue">xmlSecKeyReqMatchKeyValue</link>           (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
-                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> value);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyReqDebugDump">xmlSecKeyReqDebugDump</link>               (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyReqDebugXmlDump">xmlSecKeyReqDebugXmlDump</link>            (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyReqInitialize">xmlSecKeyReqInitialize</link>              (<parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> keyReq</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyReqFinalize">xmlSecKeyReqFinalize</link>                (<parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> keyReq</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyReqReset">xmlSecKeyReqReset</link>                   (<parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> keyReq</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyReqCopy">xmlSecKeyReqCopy</link>                    (<parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> dst</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> src</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyReqMatchKey">xmlSecKeyReqMatchKey</link>                (<parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> keyReq</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyReqMatchKeyValue">xmlSecKeyReqMatchKeyValue</link>           (<parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> keyReq</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> value</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyReqDebugDump">xmlSecKeyReqDebugDump</link>               (<parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> keyReq</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyReqDebugXmlDump">xmlSecKeyReqDebugXmlDump</link>            (<parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> keyReq</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
 struct              <link linkend="xmlSecKey">xmlSecKey</link>;
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecKeyCreate">xmlSecKeyCreate</link>                     (void);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyDestroy">xmlSecKeyDestroy</link>                    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyEmpty">xmlSecKeyEmpty</link>                      (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        <link linkend="xmlSecKeyDuplicate">xmlSecKeyDuplicate</link>                  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyCopy">xmlSecKeyCopy</link>                       (<link linkend="xmlSecKey">xmlSecKeyPtr</link> keyDst,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> keySrc);
-const <link linkend="xmlChar">xmlChar</link>*      <link linkend="xmlSecKeyGetName">xmlSecKeyGetName</link>                    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeySetName">xmlSecKeySetName</link>                    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name);
-<link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link>   <link linkend="xmlSecKeyGetType">xmlSecKeyGetType</link>                    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link>    <link linkend="xmlSecKeyGetValue">xmlSecKeyGetValue</link>                   (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeySetValue">xmlSecKeySetValue</link>                   (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> value);
-<link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link>    <link linkend="xmlSecKeyGetData">xmlSecKeyGetData</link>                    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId);
-<link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link>    <link linkend="xmlSecKeyEnsureData">xmlSecKeyEnsureData</link>                 (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyAdoptData">xmlSecKeyAdoptData</link>                  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyDebugDump">xmlSecKeyDebugDump</link>                  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyDebugXmlDump">xmlSecKeyDebugXmlDump</link>               (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecKeyGenerate">xmlSecKeyGenerate</link>                   (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecKeyGenerateByName">xmlSecKeyGenerateByName</link>             (const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyMatch">xmlSecKeyMatch</link>                      (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecKeyReadBuffer">xmlSecKeyReadBuffer</link>                 (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
-                                                         <link linkend="xmlSecBuffer">xmlSecBuffer</link> *buffer);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecKeyReadBinaryFile">xmlSecKeyReadBinaryFile</link>             (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
-                                                         const <link linkend="char">char</link> *filename);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecKeyReadMemory">xmlSecKeyReadMemory</link>                 (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecKeyCreate">xmlSecKeyCreate</link>                     (<parameter><type>void</type></parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyDestroy">xmlSecKeyDestroy</link>                    (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyEmpty">xmlSecKeyEmpty</link>                      (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);
+<link linkend="xmlSecKeyPtr"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecKeyDuplicate">xmlSecKeyDuplicate</link>                  (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyCopy">xmlSecKeyCopy</link>                       (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> keyDst</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> keySrc</parameter>);
+const <link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*      <link linkend="xmlSecKeyGetName">xmlSecKeyGetName</link>                    (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeySetName">xmlSecKeySetName</link>                    (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>);
+<link linkend="xmlSecKeyDataType"><returnvalue>xmlSecKeyDataType</returnvalue></link>   <link linkend="xmlSecKeyGetType">xmlSecKeyGetType</link>                    (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);
+<link linkend="xmlSecKeyDataPtr"><returnvalue>xmlSecKeyDataPtr</returnvalue></link>    <link linkend="xmlSecKeyGetValue">xmlSecKeyGetValue</link>                   (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeySetValue">xmlSecKeySetValue</link>                   (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> value</parameter>);
+<link linkend="xmlSecKeyDataPtr"><returnvalue>xmlSecKeyDataPtr</returnvalue></link>    <link linkend="xmlSecKeyGetData">xmlSecKeyGetData</link>                    (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> dataId</parameter>);
+<link linkend="xmlSecKeyDataPtr"><returnvalue>xmlSecKeyDataPtr</returnvalue></link>    <link linkend="xmlSecKeyEnsureData">xmlSecKeyEnsureData</link>                 (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> dataId</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyAdoptData">xmlSecKeyAdoptData</link>                  (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyDebugDump">xmlSecKeyDebugDump</link>                  (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyDebugXmlDump">xmlSecKeyDebugXmlDump</link>               (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecKeyGenerate">xmlSecKeyGenerate</link>                   (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> dataId</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> sizeBits</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecKeyGenerateByName">xmlSecKeyGenerateByName</link>             (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> sizeBits</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyMatch">xmlSecKeyMatch</link>                      (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> keyReq</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecKeyReadBuffer">xmlSecKeyReadBuffer</link>                 (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> dataId</parameter>,
+                                                         <parameter><link linkend="xmlSecBuffer"><type>xmlSecBuffer</type></link> *buffer</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecKeyReadBinaryFile">xmlSecKeyReadBinaryFile</link>             (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> dataId</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecKeyReadMemory">xmlSecKeyReadMemory</link>                 (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> dataId</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>);
 #define             <link linkend="xmlSecKeyIsValid">xmlSecKeyIsValid</link>                    (key)
-#define             <link linkend="xmlSecKeyCheckId">xmlSecKeyCheckId</link>                    (key, keyId)
+#define             <link linkend="xmlSecKeyCheckId">xmlSecKeyCheckId</link>                    (key,
+                                                         keyId)
 #define             <link linkend="xmlSecKeyPtrListId">xmlSecKeyPtrListId</link>
-<link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     <link linkend="xmlSecKeyPtrListGetKlass">xmlSecKeyPtrListGetKlass</link>            (void);
+<link linkend="xmlSecPtrListId"><returnvalue>xmlSecPtrListId</returnvalue></link>     <link linkend="xmlSecKeyPtrListGetKlass">xmlSecKeyPtrListGetKlass</link>            (<parameter><type>void</type></parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-keys.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Crypto key object definition.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-keys.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecKeyUsage" role="typedef">
 <title>xmlSecKeyUsage</title>
-<indexterm zone="xmlSecKeyUsage"><primary sortas="xmlSecKeyUsage">xmlSecKeyUsage</primary></indexterm><programlisting>typedef unsigned int                    xmlSecKeyUsage;
+<indexterm zone="xmlSecKeyUsage"><primary>xmlSecKeyUsage</primary></indexterm>
+<programlisting>typedef unsigned int                    xmlSecKeyUsage;
 </programlisting>
 <para>
-The key usage.</para>
-<para>
+The key usage.
 </para></refsect2>
 <refsect2 id="xmlSecKeyUsageSign" role="macro">
 <title>xmlSecKeyUsageSign</title>
-<indexterm zone="xmlSecKeyUsageSign"><primary sortas="xmlSecKeyUsageSign">xmlSecKeyUsageSign</primary></indexterm><programlisting>#define xmlSecKeyUsageSign              0x00000001
+<indexterm zone="xmlSecKeyUsageSign"><primary>xmlSecKeyUsageSign</primary></indexterm>
+<programlisting>#define xmlSecKeyUsageSign              0x00000001
 </programlisting>
 <para>
-Key can be used in any way.</para>
-<para>
+Key can be used in any way.
 </para></refsect2>
 <refsect2 id="xmlSecKeyUsageVerify" role="macro">
 <title>xmlSecKeyUsageVerify</title>
-<indexterm zone="xmlSecKeyUsageVerify"><primary sortas="xmlSecKeyUsageVerify">xmlSecKeyUsageVerify</primary></indexterm><programlisting>#define xmlSecKeyUsageVerify            0x00000002
+<indexterm zone="xmlSecKeyUsageVerify"><primary>xmlSecKeyUsageVerify</primary></indexterm>
+<programlisting>#define xmlSecKeyUsageVerify            0x00000002
 </programlisting>
 <para>
-Key for signing.</para>
-<para>
+Key for signing.
 </para></refsect2>
 <refsect2 id="xmlSecKeyUsageEncrypt" role="macro">
 <title>xmlSecKeyUsageEncrypt</title>
-<indexterm zone="xmlSecKeyUsageEncrypt"><primary sortas="xmlSecKeyUsageEncrypt">xmlSecKeyUsageEncrypt</primary></indexterm><programlisting>#define xmlSecKeyUsageEncrypt           0x00000004
+<indexterm zone="xmlSecKeyUsageEncrypt"><primary>xmlSecKeyUsageEncrypt</primary></indexterm>
+<programlisting>#define xmlSecKeyUsageEncrypt           0x00000004
 </programlisting>
 <para>
-Key for signature verification.</para>
-<para>
+Key for signature verification.
 </para></refsect2>
 <refsect2 id="xmlSecKeyUsageDecrypt" role="macro">
 <title>xmlSecKeyUsageDecrypt</title>
-<indexterm zone="xmlSecKeyUsageDecrypt"><primary sortas="xmlSecKeyUsageDecrypt">xmlSecKeyUsageDecrypt</primary></indexterm><programlisting>#define xmlSecKeyUsageDecrypt           0x00000008
+<indexterm zone="xmlSecKeyUsageDecrypt"><primary>xmlSecKeyUsageDecrypt</primary></indexterm>
+<programlisting>#define xmlSecKeyUsageDecrypt           0x00000008
 </programlisting>
 <para>
-An encryption key.</para>
-<para>
+An encryption key.
 </para></refsect2>
 <refsect2 id="xmlSecKeyUsageKeyExchange" role="macro">
 <title>xmlSecKeyUsageKeyExchange</title>
-<indexterm zone="xmlSecKeyUsageKeyExchange"><primary sortas="xmlSecKeyUsageKeyExchange">xmlSecKeyUsageKeyExchange</primary></indexterm><programlisting>#define xmlSecKeyUsageKeyExchange       0x00000010
+<indexterm zone="xmlSecKeyUsageKeyExchange"><primary>xmlSecKeyUsageKeyExchange</primary></indexterm>
+<programlisting>#define xmlSecKeyUsageKeyExchange       0x00000010
 </programlisting>
 <para>
-The key is used for key exchange.</para>
-<para>
+The key is used for key exchange.
 </para></refsect2>
 <refsect2 id="xmlSecKeyUsageAny" role="macro">
 <title>xmlSecKeyUsageAny</title>
-<indexterm zone="xmlSecKeyUsageAny"><primary sortas="xmlSecKeyUsageAny">xmlSecKeyUsageAny</primary></indexterm><programlisting>#define xmlSecKeyUsageAny               0xFFFFFFFF
+<indexterm zone="xmlSecKeyUsageAny"><primary>xmlSecKeyUsageAny</primary></indexterm>
+<programlisting>#define xmlSecKeyUsageAny               0xFFFFFFFF
 </programlisting>
 <para>
-A decryption key.</para>
-<para>
+A decryption key.
 </para></refsect2>
 <refsect2 id="xmlSecKeyUseWithInitialize" role="function">
 <title>xmlSecKeyUseWithInitialize ()</title>
-<indexterm zone="xmlSecKeyUseWithInitialize"><primary sortas="xmlSecKeyUseWithInitialize">xmlSecKeyUseWithInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyUseWithInitialize          (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);</programlisting>
-<para>
-Initializes <parameter>keyUseWith</parameter> object.</para>
+<indexterm zone="xmlSecKeyUseWithInitialize"><primary>xmlSecKeyUseWithInitialize</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyUseWithInitialize          (<parameter><link linkend="xmlSecKeyUseWith"><type>xmlSecKeyUseWithPtr</type></link> keyUseWith</parameter>);</programlisting>
 <para>
+Initializes <parameter>keyUseWith</parameter> object.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyUseWith</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to information about key application/user.
+<listitem><simpara>the pointer to information about key application/user.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyUseWithFinalize" role="function">
 <title>xmlSecKeyUseWithFinalize ()</title>
-<indexterm zone="xmlSecKeyUseWithFinalize"><primary sortas="xmlSecKeyUseWithFinalize">xmlSecKeyUseWithFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyUseWithFinalize            (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);</programlisting>
-<para>
-Finalizes <parameter>keyUseWith</parameter> object.</para>
+<indexterm zone="xmlSecKeyUseWithFinalize"><primary>xmlSecKeyUseWithFinalize</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyUseWithFinalize            (<parameter><link linkend="xmlSecKeyUseWith"><type>xmlSecKeyUseWithPtr</type></link> keyUseWith</parameter>);</programlisting>
 <para>
+Finalizes <parameter>keyUseWith</parameter> object.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyUseWith</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to information about key application/user.
+<listitem><simpara>the pointer to information about key application/user.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyUseWithReset" role="function">
 <title>xmlSecKeyUseWithReset ()</title>
-<indexterm zone="xmlSecKeyUseWithReset"><primary sortas="xmlSecKeyUseWithReset">xmlSecKeyUseWithReset</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyUseWithReset               (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);</programlisting>
-<para>
-Resets the <parameter>keyUseWith</parameter> to its state after initialization.</para>
+<indexterm zone="xmlSecKeyUseWithReset"><primary>xmlSecKeyUseWithReset</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyUseWithReset               (<parameter><link linkend="xmlSecKeyUseWith"><type>xmlSecKeyUseWithPtr</type></link> keyUseWith</parameter>);</programlisting>
 <para>
+Resets the <parameter>keyUseWith</parameter> to its state after initialization.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyUseWith</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to information about key application/user.
+<listitem><simpara>the pointer to information about key application/user.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyUseWithCopy" role="function">
 <title>xmlSecKeyUseWithCopy ()</title>
-<indexterm zone="xmlSecKeyUseWithCopy"><primary sortas="xmlSecKeyUseWithCopy">xmlSecKeyUseWithCopy</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyUseWithCopy                (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> dst,
-                                                         <link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> src);</programlisting>
-<para>
-Copies information from <parameter>dst</parameter> to <parameter>src</parameter>.</para>
+<indexterm zone="xmlSecKeyUseWithCopy"><primary>xmlSecKeyUseWithCopy</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyUseWithCopy                (<parameter><link linkend="xmlSecKeyUseWith"><type>xmlSecKeyUseWithPtr</type></link> dst</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyUseWith"><type>xmlSecKeyUseWithPtr</type></link> src</parameter>);</programlisting>
 <para>
+Copies information from <parameter>dst</parameter> to <parameter>src</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dst</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to destination object.
+<listitem><simpara>the pointer to destination object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>src</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to source object.
+<listitem><simpara>the pointer to source object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyUseWithCreate" role="function">
 <title>xmlSecKeyUseWithCreate ()</title>
-<indexterm zone="xmlSecKeyUseWithCreate"><primary sortas="xmlSecKeyUseWithCreate">xmlSecKeyUseWithCreate</primary></indexterm><programlisting><link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link>  xmlSecKeyUseWithCreate             (const <link linkend="xmlChar">xmlChar</link> *application,
-                                                         const <link linkend="xmlChar">xmlChar</link> *identifier);</programlisting>
+<indexterm zone="xmlSecKeyUseWithCreate"><primary>xmlSecKeyUseWithCreate</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyUseWith"><returnvalue>xmlSecKeyUseWithPtr</returnvalue></link>  xmlSecKeyUseWithCreate             (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *application</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *identifier</parameter>);</programlisting>
 <para>
 Creates new xmlSecKeyUseWith object. The caller is responsible for destroying
-returned object with <parameter>xmlSecKeyUseWithDestroy</parameter> function.</para>
-<para>
+returned object with <parameter>xmlSecKeyUseWithDestroy</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>application</parameter>&#160;:</term>
-<listitem><simpara>        the application value.
+<listitem><simpara>the application value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>identifier</parameter>&#160;:</term>
-<listitem><simpara>         the identifier value.
+<listitem><simpara>the identifier value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created object or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyUseWithDuplicate" role="function">
 <title>xmlSecKeyUseWithDuplicate ()</title>
-<indexterm zone="xmlSecKeyUseWithDuplicate"><primary sortas="xmlSecKeyUseWithDuplicate">xmlSecKeyUseWithDuplicate</primary></indexterm><programlisting><link linkend="xmlSecKeyUseWithPtr">xmlSecKeyUseWithPtr</link>  xmlSecKeyUseWithDuplicate          (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);</programlisting>
+<indexterm zone="xmlSecKeyUseWithDuplicate"><primary>xmlSecKeyUseWithDuplicate</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyUseWithPtr"><returnvalue>xmlSecKeyUseWithPtr</returnvalue></link>  xmlSecKeyUseWithDuplicate          (<parameter><link linkend="xmlSecKeyUseWith"><type>xmlSecKeyUseWithPtr</type></link> keyUseWith</parameter>);</programlisting>
 <para>
 Duplicates <parameter>keyUseWith</parameter> object. The caller is responsible for destroying
-returned object with <parameter>xmlSecKeyUseWithDestroy</parameter> function.</para>
-<para>
+returned object with <parameter>xmlSecKeyUseWithDestroy</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyUseWith</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to information about key application/user.
+<listitem><simpara>the pointer to information about key application/user.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created object or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyUseWithDestroy" role="function">
 <title>xmlSecKeyUseWithDestroy ()</title>
-<indexterm zone="xmlSecKeyUseWithDestroy"><primary sortas="xmlSecKeyUseWithDestroy">xmlSecKeyUseWithDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyUseWithDestroy             (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);</programlisting>
+<indexterm zone="xmlSecKeyUseWithDestroy"><primary>xmlSecKeyUseWithDestroy</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyUseWithDestroy             (<parameter><link linkend="xmlSecKeyUseWith"><type>xmlSecKeyUseWithPtr</type></link> keyUseWith</parameter>);</programlisting>
 <para>
 Destroys <parameter>keyUseWith</parameter> created with <parameter>xmlSecKeyUseWithCreate</parameter> or <parameter>xmlSecKeyUseWithDuplicate</parameter>
-functions.</para>
-<para>
+functions.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyUseWith</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to information about key application/user.
+<listitem><simpara>the pointer to information about key application/user.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyUseWithSet" role="function">
 <title>xmlSecKeyUseWithSet ()</title>
-<indexterm zone="xmlSecKeyUseWithSet"><primary sortas="xmlSecKeyUseWithSet">xmlSecKeyUseWithSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyUseWithSet                 (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith,
-                                                         const <link linkend="xmlChar">xmlChar</link> *application,
-                                                         const <link linkend="xmlChar">xmlChar</link> *identifier);</programlisting>
-<para>
-Sets <parameter>application</parameter> and <parameter>identifier</parameter> in the <parameter>keyUseWith</parameter>.</para>
+<indexterm zone="xmlSecKeyUseWithSet"><primary>xmlSecKeyUseWithSet</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyUseWithSet                 (<parameter><link linkend="xmlSecKeyUseWith"><type>xmlSecKeyUseWithPtr</type></link> keyUseWith</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *application</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *identifier</parameter>);</programlisting>
 <para>
+Sets <parameter>application</parameter> and <parameter>identifier</parameter> in the <parameter>keyUseWith</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyUseWith</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to information about key application/user.
+<listitem><simpara>the pointer to information about key application/user.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>application</parameter>&#160;:</term>
-<listitem><simpara>        the new application value.
+<listitem><simpara>the new application value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>identifier</parameter>&#160;:</term>
-<listitem><simpara>         the new identifier value.
+<listitem><simpara>the new identifier value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyUseWithDebugDump" role="function">
 <title>xmlSecKeyUseWithDebugDump ()</title>
-<indexterm zone="xmlSecKeyUseWithDebugDump"><primary sortas="xmlSecKeyUseWithDebugDump">xmlSecKeyUseWithDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyUseWithDebugDump           (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints xmlSecKeyUseWith debug information to a file <parameter>output</parameter>.</para>
+<indexterm zone="xmlSecKeyUseWithDebugDump"><primary>xmlSecKeyUseWithDebugDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyUseWithDebugDump           (<parameter><link linkend="xmlSecKeyUseWith"><type>xmlSecKeyUseWithPtr</type></link> keyUseWith</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints xmlSecKeyUseWith debug information to a file <parameter>output</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyUseWith</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to information about key application/user.
+<listitem><simpara>the pointer to information about key application/user.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyUseWithDebugXmlDump" role="function">
 <title>xmlSecKeyUseWithDebugXmlDump ()</title>
-<indexterm zone="xmlSecKeyUseWithDebugXmlDump"><primary sortas="xmlSecKeyUseWithDebugXmlDump">xmlSecKeyUseWithDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyUseWithDebugXmlDump        (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints xmlSecKeyUseWith debug information to a file <parameter>output</parameter> in XML format.</para>
+<indexterm zone="xmlSecKeyUseWithDebugXmlDump"><primary>xmlSecKeyUseWithDebugXmlDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyUseWithDebugXmlDump        (<parameter><link linkend="xmlSecKeyUseWith"><type>xmlSecKeyUseWithPtr</type></link> keyUseWith</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints xmlSecKeyUseWith debug information to a file <parameter>output</parameter> in XML format.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyUseWith</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to information about key application/user.
+<listitem><simpara>the pointer to information about key application/user.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyUseWith" role="struct">
 <title>struct xmlSecKeyUseWith</title>
-<indexterm zone="xmlSecKeyUseWith"><primary sortas="xmlSecKeyUseWith">xmlSecKeyUseWith</primary></indexterm><programlisting>struct xmlSecKeyUseWith {
+<indexterm zone="xmlSecKeyUseWith"><primary>xmlSecKeyUseWith</primary></indexterm>
+<programlisting>struct xmlSecKeyUseWith {
     xmlChar*                    application;
     xmlChar*                    identifier;
 
@@ -332,51 +325,47 @@ Prints xmlSecKeyUseWith debug information to a file <parameter>output</parameter
 };
 </programlisting>
 <para>
-Information about application and user of the key.</para>
-<para>
+Information about application and user of the key.
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>application</structfield>;</term>
-<listitem><simpara>        the application.
+<varlistentry><term><link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecKeyUseWith.application">application</structfield>;</term>
+<listitem><simpara>the application.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>identifier</structfield>;</term>
-<listitem><simpara>         the identifier.
+<varlistentry><term><link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecKeyUseWith.identifier">identifier</structfield>;</term>
+<listitem><simpara>the identifier.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
-<listitem><simpara>          reserved for future use.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecKeyUseWith.reserved1">reserved1</structfield>;</term>
+<listitem><simpara>reserved for future use.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved2</structfield>;</term>
-<listitem><simpara>          reserved for future use.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecKeyUseWith.reserved2">reserved2</structfield>;</term>
+<listitem><simpara>reserved for future use.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyUseWithPtrListId" role="macro">
 <title>xmlSecKeyUseWithPtrListId</title>
-<indexterm zone="xmlSecKeyUseWithPtrListId"><primary sortas="xmlSecKeyUseWithPtrListId">xmlSecKeyUseWithPtrListId</primary></indexterm><programlisting>#define xmlSecKeyUseWithPtrListId       xmlSecKeyUseWithPtrListGetKlass()
+<indexterm zone="xmlSecKeyUseWithPtrListId"><primary>xmlSecKeyUseWithPtrListId</primary></indexterm>
+<programlisting>#define xmlSecKeyUseWithPtrListId       xmlSecKeyUseWithPtrListGetKlass()
 </programlisting>
 <para>
-The keys list klass.</para>
-<para>
+The keys list klass.
 </para></refsect2>
 <refsect2 id="xmlSecKeyUseWithPtrListGetKlass" role="function">
 <title>xmlSecKeyUseWithPtrListGetKlass ()</title>
-<indexterm zone="xmlSecKeyUseWithPtrListGetKlass"><primary sortas="xmlSecKeyUseWithPtrListGetKlass">xmlSecKeyUseWithPtrListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     xmlSecKeyUseWithPtrListGetKlass     (void);</programlisting>
-<para>
-The key data list klass.</para>
+<indexterm zone="xmlSecKeyUseWithPtrListGetKlass"><primary>xmlSecKeyUseWithPtrListGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecPtrListId"><returnvalue>xmlSecPtrListId</returnvalue></link>     xmlSecKeyUseWithPtrListGetKlass     (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The key data list klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key data list klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyReq" role="struct">
 <title>struct xmlSecKeyReq</title>
-<indexterm zone="xmlSecKeyReq"><primary sortas="xmlSecKeyReq">xmlSecKeyReq</primary></indexterm><programlisting>struct xmlSecKeyReq {
+<indexterm zone="xmlSecKeyReq"><primary>xmlSecKeyReq</primary></indexterm>
+<programlisting>struct xmlSecKeyReq {
     xmlSecKeyDataId             keyId;
     xmlSecKeyDataType           keyType;
     xmlSecKeyUsage              keyUsage;
@@ -388,112 +377,104 @@ The key data list klass.</para>
 };
 </programlisting>
 <para>
-The key requirements information.</para>
-<para>
+The key requirements information.
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>&#160;<structfield>keyId</structfield>;</term>
-<listitem><simpara>              the desired key value klass.
+<varlistentry><term><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link>&#160;<structfield id="xmlSecKeyReq.keyId">keyId</structfield>;</term>
+<listitem><simpara>the desired key value klass.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link>&#160;<structfield>keyType</structfield>;</term>
-<listitem><simpara>            the desired key type.
+<varlistentry><term><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link>&#160;<structfield id="xmlSecKeyReq.keyType">keyType</structfield>;</term>
+<listitem><simpara>the desired key type.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyUsage">xmlSecKeyUsage</link>&#160;<structfield>keyUsage</structfield>;</term>
-<listitem><simpara>           the desired key usage.
+<varlistentry><term><link linkend="xmlSecKeyUsage"><type>xmlSecKeyUsage</type></link>&#160;<structfield id="xmlSecKeyReq.keyUsage">keyUsage</structfield>;</term>
+<listitem><simpara>the desired key usage.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>keyBitsSize</structfield>;</term>
-<listitem><simpara>        the desired key size (in bits!).
+<varlistentry><term><link linkend="xmlSecSize"><type>xmlSecSize</type></link>&#160;<structfield id="xmlSecKeyReq.keyBitsSize">keyBitsSize</structfield>;</term>
+<listitem><simpara>the desired key size (in bits!).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrList</link>&#160;<structfield>keyUseWithList</structfield>;</term>
-<listitem><simpara>     the desired key use with application/identifier information.
+<varlistentry><term><link linkend="xmlSecPtrList"><type>xmlSecPtrList</type></link>&#160;<structfield id="xmlSecKeyReq.keyUseWithList">keyUseWithList</structfield>;</term>
+<listitem><simpara>the desired key use with application/identifier information.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
-<listitem><simpara>          reserved for future use.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecKeyReq.reserved1">reserved1</structfield>;</term>
+<listitem><simpara>reserved for future use.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved2</structfield>;</term>
-<listitem><simpara>          reserved for future use.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecKeyReq.reserved2">reserved2</structfield>;</term>
+<listitem><simpara>reserved for future use.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyReqInitialize" role="function">
 <title>xmlSecKeyReqInitialize ()</title>
-<indexterm zone="xmlSecKeyReqInitialize"><primary sortas="xmlSecKeyReqInitialize">xmlSecKeyReqInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyReqInitialize              (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);</programlisting>
+<indexterm zone="xmlSecKeyReqInitialize"><primary>xmlSecKeyReqInitialize</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyReqInitialize              (<parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> keyReq</parameter>);</programlisting>
 <para>
 Initialize key requirements object. Caller is responsible for
-cleaning it with <link linkend="xmlSecKeyReqFinalize"><type>xmlSecKeyReqFinalize</type></link> function.</para>
-<para>
+cleaning it with <link linkend="xmlSecKeyReqFinalize"><type>xmlSecKeyReqFinalize</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyReq</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to key requirements object.
+<listitem><simpara>the pointer to key requirements object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyReqFinalize" role="function">
 <title>xmlSecKeyReqFinalize ()</title>
-<indexterm zone="xmlSecKeyReqFinalize"><primary sortas="xmlSecKeyReqFinalize">xmlSecKeyReqFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyReqFinalize                (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);</programlisting>
+<indexterm zone="xmlSecKeyReqFinalize"><primary>xmlSecKeyReqFinalize</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyReqFinalize                (<parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> keyReq</parameter>);</programlisting>
 <para>
 Cleans the key requirements object initialized with <link linkend="xmlSecKeyReqInitialize"><type>xmlSecKeyReqInitialize</type></link>
-function.</para>
-<para>
+function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyReq</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to key requirements object.
+<listitem><simpara>the pointer to key requirements object.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyReqReset" role="function">
 <title>xmlSecKeyReqReset ()</title>
-<indexterm zone="xmlSecKeyReqReset"><primary sortas="xmlSecKeyReqReset">xmlSecKeyReqReset</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyReqReset                   (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);</programlisting>
-<para>
-Resets key requirements object for new key search.</para>
+<indexterm zone="xmlSecKeyReqReset"><primary>xmlSecKeyReqReset</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyReqReset                   (<parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> keyReq</parameter>);</programlisting>
 <para>
+Resets key requirements object for new key search.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyReq</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to key requirements object.
+<listitem><simpara>the pointer to key requirements object.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyReqCopy" role="function">
 <title>xmlSecKeyReqCopy ()</title>
-<indexterm zone="xmlSecKeyReqCopy"><primary sortas="xmlSecKeyReqCopy">xmlSecKeyReqCopy</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyReqCopy                    (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> dst,
-                                                         <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> src);</programlisting>
-<para>
-Copies key requirements from <parameter>src</parameter> object to <parameter>dst</parameter> object.</para>
+<indexterm zone="xmlSecKeyReqCopy"><primary>xmlSecKeyReqCopy</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyReqCopy                    (<parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> dst</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> src</parameter>);</programlisting>
 <para>
+Copies key requirements from <parameter>src</parameter> object to <parameter>dst</parameter> object.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dst</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to destination object.
+<listitem><simpara>the pointer to destination object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>src</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to source object.
+<listitem><simpara>the pointer to source object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success and a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyReqMatchKey" role="function">
 <title>xmlSecKeyReqMatchKey ()</title>
-<indexterm zone="xmlSecKeyReqMatchKey"><primary sortas="xmlSecKeyReqMatchKey">xmlSecKeyReqMatchKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyReqMatchKey                (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
-<para>
-Checks whether <parameter>key</parameter> matches key requirements <parameter>keyReq</parameter>.</para>
+<indexterm zone="xmlSecKeyReqMatchKey"><primary>xmlSecKeyReqMatchKey</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyReqMatchKey                (<parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> keyReq</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);</programlisting>
 <para>
+Checks whether <parameter>key</parameter> matches key requirements <parameter>keyReq</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyReq</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to key requirements object.
+<listitem><simpara>the pointer to key requirements object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if key matches requirements, 0 if not and a negative value
 if an error occurs.
@@ -501,17 +482,17 @@ if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyReqMatchKeyValue" role="function">
 <title>xmlSecKeyReqMatchKeyValue ()</title>
-<indexterm zone="xmlSecKeyReqMatchKeyValue"><primary sortas="xmlSecKeyReqMatchKeyValue">xmlSecKeyReqMatchKeyValue</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyReqMatchKeyValue           (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
-                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> value);</programlisting>
-<para>
-Checks whether <parameter>keyValue</parameter> matches key requirements <parameter>keyReq</parameter>.</para>
+<indexterm zone="xmlSecKeyReqMatchKeyValue"><primary>xmlSecKeyReqMatchKeyValue</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyReqMatchKeyValue           (<parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> keyReq</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> value</parameter>);</programlisting>
 <para>
+Checks whether <parameter>keyValue</parameter> matches key requirements <parameter>keyReq</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyReq</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to key requirements.
+<listitem><simpara>the pointer to key requirements.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>value</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to key value.
+<listitem><simpara>the pointer to key value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if key value matches requirements, 0 if not and a negative value
 if an error occurs.
@@ -519,37 +500,38 @@ if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyReqDebugDump" role="function">
 <title>xmlSecKeyReqDebugDump ()</title>
-<indexterm zone="xmlSecKeyReqDebugDump"><primary sortas="xmlSecKeyReqDebugDump">xmlSecKeyReqDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyReqDebugDump               (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints debug information about <parameter>keyReq</parameter> into <parameter>output</parameter>.</para>
+<indexterm zone="xmlSecKeyReqDebugDump"><primary>xmlSecKeyReqDebugDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyReqDebugDump               (<parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> keyReq</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints debug information about <parameter>keyReq</parameter> into <parameter>output</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyReq</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to key requirements object.
+<listitem><simpara>the pointer to key requirements object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyReqDebugXmlDump" role="function">
 <title>xmlSecKeyReqDebugXmlDump ()</title>
-<indexterm zone="xmlSecKeyReqDebugXmlDump"><primary sortas="xmlSecKeyReqDebugXmlDump">xmlSecKeyReqDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyReqDebugXmlDump            (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints debug information about <parameter>keyReq</parameter> into <parameter>output</parameter> in XML format.</para>
+<indexterm zone="xmlSecKeyReqDebugXmlDump"><primary>xmlSecKeyReqDebugXmlDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyReqDebugXmlDump            (<parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> keyReq</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints debug information about <parameter>keyReq</parameter> into <parameter>output</parameter> in XML format.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyReq</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to key requirements object.
+<listitem><simpara>the pointer to key requirements object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKey" role="struct">
 <title>struct xmlSecKey</title>
-<indexterm zone="xmlSecKey"><primary sortas="xmlSecKey">xmlSecKey</primary></indexterm><programlisting>struct xmlSecKey {
+<indexterm zone="xmlSecKey"><primary>xmlSecKey</primary></indexterm>
+<programlisting>struct xmlSecKey {
     xmlChar*                            name;
     xmlSecKeyDataPtr                    value;
     xmlSecPtrListPtr                    dataList;
@@ -559,47 +541,40 @@ Prints debug information about <parameter>keyReq</parameter> into <parameter>out
 };
 </programlisting>
 <para>
-The key.</para>
-<para>
+The key.
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>name</structfield>;</term>
-<listitem><simpara>               the key name.
+<varlistentry><term><link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecKey.name">name</structfield>;</term>
+<listitem><simpara>the key name.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>&#160;<structfield>value</structfield>;</term>
-<listitem><simpara>              the key value.
+<varlistentry><term><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link>&#160;<structfield id="xmlSecKey.value">value</structfield>;</term>
+<listitem><simpara>the key value.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrListPtr</link>&#160;<structfield>dataList</structfield>;</term>
-<listitem><simpara>           the key data list.
+<varlistentry><term><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link>&#160;<structfield id="xmlSecKey.dataList">dataList</structfield>;</term>
+<listitem><simpara>the key data list.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyUsage">xmlSecKeyUsage</link>&#160;<structfield>usage</structfield>;</term>
-<listitem><simpara>              the key usage.
+<varlistentry><term><link linkend="xmlSecKeyUsage"><type>xmlSecKeyUsage</type></link>&#160;<structfield id="xmlSecKey.usage">usage</structfield>;</term>
+<listitem><simpara>the key usage.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="time-t">time_t</link>&#160;<structfield>notValidBefore</structfield>;</term>
-<listitem><simpara>     the start key validity interval.
+<varlistentry><term><link linkend="time-t"><type>time_t</type></link>&#160;<structfield id="xmlSecKey.notValidBefore">notValidBefore</structfield>;</term>
+<listitem><simpara>the start key validity interval.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="time-t">time_t</link>&#160;<structfield>notValidAfter</structfield>;</term>
-<listitem><simpara>      the end key validity interval.
+<varlistentry><term><link linkend="time-t"><type>time_t</type></link>&#160;<structfield id="xmlSecKey.notValidAfter">notValidAfter</structfield>;</term>
+<listitem><simpara>the end key validity interval.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyCreate" role="function">
 <title>xmlSecKeyCreate ()</title>
-<indexterm zone="xmlSecKeyCreate"><primary sortas="xmlSecKeyCreate">xmlSecKeyCreate</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecKeyCreate                     (void);</programlisting>
+<indexterm zone="xmlSecKeyCreate"><primary>xmlSecKeyCreate</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecKeyCreate                     (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 Allocates and initializes new key. Caller is responsible for
-freeing returned object with <link linkend="xmlSecKeyDestroy"><type>xmlSecKeyDestroy</type></link> function.</para>
-<para>
+freeing returned object with <link linkend="xmlSecKeyDestroy"><type>xmlSecKeyDestroy</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly allocated <parameter>xmlSecKey</parameter> structure
 or NULL if an error occurs.
@@ -607,35 +582,35 @@ or NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDestroy" role="function">
 <title>xmlSecKeyDestroy ()</title>
-<indexterm zone="xmlSecKeyDestroy"><primary sortas="xmlSecKeyDestroy">xmlSecKeyDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDestroy                    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
-<para>
-Destroys the key created using <link linkend="xmlSecKeyCreate"><type>xmlSecKeyCreate</type></link> function.</para>
+<indexterm zone="xmlSecKeyDestroy"><primary>xmlSecKeyDestroy</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyDestroy                    (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);</programlisting>
 <para>
+Destroys the key created using <link linkend="xmlSecKeyCreate"><type>xmlSecKeyCreate</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyEmpty" role="function">
 <title>xmlSecKeyEmpty ()</title>
-<indexterm zone="xmlSecKeyEmpty"><primary sortas="xmlSecKeyEmpty">xmlSecKeyEmpty</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyEmpty                      (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
-<para>
-Clears the <parameter>key</parameter> data.</para>
+<indexterm zone="xmlSecKeyEmpty"><primary>xmlSecKeyEmpty</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyEmpty                      (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);</programlisting>
 <para>
+Clears the <parameter>key</parameter> data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDuplicate" role="function">
 <title>xmlSecKeyDuplicate ()</title>
-<indexterm zone="xmlSecKeyDuplicate"><primary sortas="xmlSecKeyDuplicate">xmlSecKeyDuplicate</primary></indexterm><programlisting><link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        xmlSecKeyDuplicate                  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
-<para>
-Creates a duplicate of the given <parameter>key</parameter>.</para>
+<indexterm zone="xmlSecKeyDuplicate"><primary>xmlSecKeyDuplicate</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyPtr"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecKeyDuplicate                  (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);</programlisting>
 <para>
+Creates a duplicate of the given <parameter>key</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to the <link linkend="xmlSecKey"><type>xmlSecKey</type></link> structure.
+<listitem><simpara>the pointer to the <link linkend="xmlSecKey"><type>xmlSecKey</type></link> structure.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly allocated <link linkend="xmlSecKey"><type>xmlSecKey</type></link> structure
 or NULL if an error occurs.
@@ -643,107 +618,107 @@ or NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyCopy" role="function">
 <title>xmlSecKeyCopy ()</title>
-<indexterm zone="xmlSecKeyCopy"><primary sortas="xmlSecKeyCopy">xmlSecKeyCopy</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyCopy                       (<link linkend="xmlSecKey">xmlSecKeyPtr</link> keyDst,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> keySrc);</programlisting>
-<para>
-Copies key data from <parameter>keySrc</parameter> to <parameter>keyDst</parameter>.</para>
+<indexterm zone="xmlSecKeyCopy"><primary>xmlSecKeyCopy</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyCopy                       (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> keyDst</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> keySrc</parameter>);</programlisting>
 <para>
+Copies key data from <parameter>keySrc</parameter> to <parameter>keyDst</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyDst</parameter>&#160;:</term>
-<listitem><simpara>             the destination key.
+<listitem><simpara>the destination key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keySrc</parameter>&#160;:</term>
-<listitem><simpara>             the source key.
+<listitem><simpara>the source key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyGetName" role="function">
 <title>xmlSecKeyGetName ()</title>
-<indexterm zone="xmlSecKeyGetName"><primary sortas="xmlSecKeyGetName">xmlSecKeyGetName</primary></indexterm><programlisting>const <link linkend="xmlChar">xmlChar</link>*      xmlSecKeyGetName                    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
-<para>
-Gets key name (see also <link linkend="xmlSecKeySetName"><type>xmlSecKeySetName</type></link> function).</para>
+<indexterm zone="xmlSecKeyGetName"><primary>xmlSecKeyGetName</primary></indexterm>
+<programlisting>const <link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*      xmlSecKeyGetName                    (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);</programlisting>
 <para>
+Gets key name (see also <link linkend="xmlSecKeySetName"><type>xmlSecKeySetName</type></link> function).
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> key name.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeySetName" role="function">
 <title>xmlSecKeySetName ()</title>
-<indexterm zone="xmlSecKeySetName"><primary sortas="xmlSecKeySetName">xmlSecKeySetName</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeySetName                    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name);</programlisting>
-<para>
-Sets key name (see also <link linkend="xmlSecKeyGetName"><type>xmlSecKeyGetName</type></link> function).</para>
+<indexterm zone="xmlSecKeySetName"><primary>xmlSecKeySetName</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeySetName                    (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>);</programlisting>
 <para>
+Sets key name (see also <link linkend="xmlSecKeyGetName"><type>xmlSecKeyGetName</type></link> function).
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>name</parameter>&#160;:</term>
-<listitem><simpara>               the new key name.
+<listitem><simpara>the new key name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyGetType" role="function">
 <title>xmlSecKeyGetType ()</title>
-<indexterm zone="xmlSecKeyGetType"><primary sortas="xmlSecKeyGetType">xmlSecKeyGetType</primary></indexterm><programlisting><link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link>   xmlSecKeyGetType                    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
-<para>
-Gets <parameter>key</parameter> type.</para>
+<indexterm zone="xmlSecKeyGetType"><primary>xmlSecKeyGetType</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataType"><returnvalue>xmlSecKeyDataType</returnvalue></link>   xmlSecKeyGetType                    (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);</programlisting>
 <para>
+Gets <parameter>key</parameter> type.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> key type.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyGetValue" role="function">
 <title>xmlSecKeyGetValue ()</title>
-<indexterm zone="xmlSecKeyGetValue"><primary sortas="xmlSecKeyGetValue">xmlSecKeyGetValue</primary></indexterm><programlisting><link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link>    xmlSecKeyGetValue                   (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
-<para>
-Gets key value (see also <link linkend="xmlSecKeySetValue"><type>xmlSecKeySetValue</type></link> function).</para>
+<indexterm zone="xmlSecKeyGetValue"><primary>xmlSecKeyGetValue</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataPtr"><returnvalue>xmlSecKeyDataPtr</returnvalue></link>    xmlSecKeyGetValue                   (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);</programlisting>
 <para>
+Gets key value (see also <link linkend="xmlSecKeySetValue"><type>xmlSecKeySetValue</type></link> function).
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> key value (crypto material).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeySetValue" role="function">
 <title>xmlSecKeySetValue ()</title>
-<indexterm zone="xmlSecKeySetValue"><primary sortas="xmlSecKeySetValue">xmlSecKeySetValue</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeySetValue                   (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> value);</programlisting>
-<para>
-Sets key value (see also <link linkend="xmlSecKeyGetValue"><type>xmlSecKeyGetValue</type></link> function).</para>
+<indexterm zone="xmlSecKeySetValue"><primary>xmlSecKeySetValue</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeySetValue                   (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> value</parameter>);</programlisting>
 <para>
+Sets key value (see also <link linkend="xmlSecKeyGetValue"><type>xmlSecKeyGetValue</type></link> function).
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>value</parameter>&#160;:</term>
-<listitem><simpara>              the new value.
+<listitem><simpara>the new value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyGetData" role="function">
 <title>xmlSecKeyGetData ()</title>
-<indexterm zone="xmlSecKeyGetData"><primary sortas="xmlSecKeyGetData">xmlSecKeyGetData</primary></indexterm><programlisting><link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link>    xmlSecKeyGetData                    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId);</programlisting>
-<para>
-Gets key's data.</para>
+<indexterm zone="xmlSecKeyGetData"><primary>xmlSecKeyGetData</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataPtr"><returnvalue>xmlSecKeyDataPtr</returnvalue></link>    xmlSecKeyGetData                    (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> dataId</parameter>);</programlisting>
 <para>
+Gets key's data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataId</parameter>&#160;:</term>
-<listitem><simpara>             the requested data klass.
+<listitem><simpara>the requested data klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> additional data associated with the <parameter>key</parameter> (see also
 <link linkend="xmlSecKeyAdoptData"><type>xmlSecKeyAdoptData</type></link> function).
@@ -751,227 +726,227 @@ Gets key's data.</para>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyEnsureData" role="function">
 <title>xmlSecKeyEnsureData ()</title>
-<indexterm zone="xmlSecKeyEnsureData"><primary sortas="xmlSecKeyEnsureData">xmlSecKeyEnsureData</primary></indexterm><programlisting><link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link>    xmlSecKeyEnsureData                 (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId);</programlisting>
-<para>
-If necessary, creates key data of <parameter>dataId</parameter> klass and adds to <parameter>key</parameter>.</para>
+<indexterm zone="xmlSecKeyEnsureData"><primary>xmlSecKeyEnsureData</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataPtr"><returnvalue>xmlSecKeyDataPtr</returnvalue></link>    xmlSecKeyEnsureData                 (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> dataId</parameter>);</programlisting>
 <para>
+If necessary, creates key data of <parameter>dataId</parameter> klass and adds to <parameter>key</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataId</parameter>&#160;:</term>
-<listitem><simpara>             the requested data klass.
+<listitem><simpara>the requested data klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to key data or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyAdoptData" role="function">
 <title>xmlSecKeyAdoptData ()</title>
-<indexterm zone="xmlSecKeyAdoptData"><primary sortas="xmlSecKeyAdoptData">xmlSecKeyAdoptData</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyAdoptData                  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<indexterm zone="xmlSecKeyAdoptData"><primary>xmlSecKeyAdoptData</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyAdoptData                  (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
 Adds <parameter>data</parameter> to the <parameter>key</parameter>. The <parameter>data</parameter> object will be destroyed
-by <parameter>key</parameter>.</para>
-<para>
+by <parameter>key</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to key data.
+<listitem><simpara>the pointer to key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDebugDump" role="function">
 <title>xmlSecKeyDebugDump ()</title>
-<indexterm zone="xmlSecKeyDebugDump"><primary sortas="xmlSecKeyDebugDump">xmlSecKeyDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDebugDump                  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints the information about the <parameter>key</parameter> to the <parameter>output</parameter>.</para>
+<indexterm zone="xmlSecKeyDebugDump"><primary>xmlSecKeyDebugDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyDebugDump                  (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints the information about the <parameter>key</parameter> to the <parameter>output</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDebugXmlDump" role="function">
 <title>xmlSecKeyDebugXmlDump ()</title>
-<indexterm zone="xmlSecKeyDebugXmlDump"><primary sortas="xmlSecKeyDebugXmlDump">xmlSecKeyDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDebugXmlDump               (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints the information about the <parameter>key</parameter> to the <parameter>output</parameter> in XML format.</para>
+<indexterm zone="xmlSecKeyDebugXmlDump"><primary>xmlSecKeyDebugXmlDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyDebugXmlDump               (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints the information about the <parameter>key</parameter> to the <parameter>output</parameter> in XML format.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyGenerate" role="function">
 <title>xmlSecKeyGenerate ()</title>
-<indexterm zone="xmlSecKeyGenerate"><primary sortas="xmlSecKeyGenerate">xmlSecKeyGenerate</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecKeyGenerate                   (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
-<para>
-Generates new key of requested klass <parameter>dataId</parameter> and <parameter>type</parameter>.</para>
+<indexterm zone="xmlSecKeyGenerate"><primary>xmlSecKeyGenerate</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecKeyGenerate                   (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> dataId</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> sizeBits</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
+Generates new key of requested klass <parameter>dataId</parameter> and <parameter>type</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dataId</parameter>&#160;:</term>
-<listitem><simpara>             the requested key klass (rsa, dsa, aes, ...).
+<listitem><simpara>the requested key klass (rsa, dsa, aes, ...).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>sizeBits</parameter>&#160;:</term>
-<listitem><simpara>           the new key size (in bits!).
+<listitem><simpara>the new key size (in bits!).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the new key type (session, permanent, ...).
+<listitem><simpara>the new key type (session, permanent, ...).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyGenerateByName" role="function">
 <title>xmlSecKeyGenerateByName ()</title>
-<indexterm zone="xmlSecKeyGenerateByName"><primary sortas="xmlSecKeyGenerateByName">xmlSecKeyGenerateByName</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecKeyGenerateByName             (const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
-<para>
-Generates new key of requested <parameter>klass</parameter> and <parameter>type</parameter>.</para>
+<indexterm zone="xmlSecKeyGenerateByName"><primary>xmlSecKeyGenerateByName</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecKeyGenerateByName             (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> sizeBits</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
+Generates new key of requested <parameter>klass</parameter> and <parameter>type</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>name</parameter>&#160;:</term>
-<listitem><simpara>               the requested key klass name (rsa, dsa, aes, ...).
+<listitem><simpara>the requested key klass name (rsa, dsa, aes, ...).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>sizeBits</parameter>&#160;:</term>
-<listitem><simpara>           the new key size (in bits!).
+<listitem><simpara>the new key size (in bits!).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the new key type (session, permanent, ...).
+<listitem><simpara>the new key type (session, permanent, ...).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyMatch" role="function">
 <title>xmlSecKeyMatch ()</title>
-<indexterm zone="xmlSecKeyMatch"><primary sortas="xmlSecKeyMatch">xmlSecKeyMatch</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyMatch                      (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);</programlisting>
-<para>
-Checks whether the <parameter>key</parameter> matches the given criteria.</para>
+<indexterm zone="xmlSecKeyMatch"><primary>xmlSecKeyMatch</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyMatch                      (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> keyReq</parameter>);</programlisting>
 <para>
+Checks whether the <parameter>key</parameter> matches the given criteria.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>name</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to key name (may be NULL).
+<listitem><simpara>the pointer to key name (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyReq</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to key requirements.
+<listitem><simpara>the pointer to key requirements.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if the key satisfies the given criteria or 0 otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyReadBuffer" role="function">
 <title>xmlSecKeyReadBuffer ()</title>
-<indexterm zone="xmlSecKeyReadBuffer"><primary sortas="xmlSecKeyReadBuffer">xmlSecKeyReadBuffer</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecKeyReadBuffer                 (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
-                                                         <link linkend="xmlSecBuffer">xmlSecBuffer</link> *buffer);</programlisting>
-<para>
-Reads the key value of klass <parameter>dataId</parameter> from a buffer.</para>
+<indexterm zone="xmlSecKeyReadBuffer"><primary>xmlSecKeyReadBuffer</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecKeyReadBuffer                 (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> dataId</parameter>,
+                                                         <parameter><link linkend="xmlSecBuffer"><type>xmlSecBuffer</type></link> *buffer</parameter>);</programlisting>
 <para>
+Reads the key value of klass <parameter>dataId</parameter> from a buffer.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dataId</parameter>&#160;:</term>
-<listitem><simpara>             the key value data klass.
+<listitem><simpara>the key value data klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buffer</parameter>&#160;:</term>
-<listitem><simpara>             the buffer that contains the binary data.
+<listitem><simpara>the buffer that contains the binary data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyReadBinaryFile" role="function">
 <title>xmlSecKeyReadBinaryFile ()</title>
-<indexterm zone="xmlSecKeyReadBinaryFile"><primary sortas="xmlSecKeyReadBinaryFile">xmlSecKeyReadBinaryFile</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecKeyReadBinaryFile             (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
-                                                         const <link linkend="char">char</link> *filename);</programlisting>
-<para>
-Reads the key value of klass <parameter>dataId</parameter> from a binary file <parameter>filename</parameter>.</para>
+<indexterm zone="xmlSecKeyReadBinaryFile"><primary>xmlSecKeyReadBinaryFile</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecKeyReadBinaryFile             (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> dataId</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>);</programlisting>
 <para>
+Reads the key value of klass <parameter>dataId</parameter> from a binary file <parameter>filename</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dataId</parameter>&#160;:</term>
-<listitem><simpara>             the key value data klass.
+<listitem><simpara>the key value data klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the key binary filename.
+<listitem><simpara>the key binary filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyReadMemory" role="function">
 <title>xmlSecKeyReadMemory ()</title>
-<indexterm zone="xmlSecKeyReadMemory"><primary sortas="xmlSecKeyReadMemory">xmlSecKeyReadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecKeyReadMemory                 (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize);</programlisting>
-<para>
-Reads the key value of klass <parameter>dataId</parameter> from a memory block <parameter>data</parameter>.</para>
+<indexterm zone="xmlSecKeyReadMemory"><primary>xmlSecKeyReadMemory</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecKeyReadMemory                 (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> dataId</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>);</programlisting>
 <para>
+Reads the key value of klass <parameter>dataId</parameter> from a memory block <parameter>data</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dataId</parameter>&#160;:</term>
-<listitem><simpara>             the key value data klass.
+<listitem><simpara>the key value data klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the memory containing the key
+<listitem><simpara>the memory containing the key
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the size of the memory block
+<listitem><simpara>the size of the memory block
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyIsValid" role="macro">
 <title>xmlSecKeyIsValid()</title>
-<indexterm zone="xmlSecKeyIsValid"><primary sortas="xmlSecKeyIsValid">xmlSecKeyIsValid</primary></indexterm><programlisting>#define             xmlSecKeyIsValid(key)</programlisting>
+<indexterm zone="xmlSecKeyIsValid"><primary>xmlSecKeyIsValid</primary></indexterm>
+<programlisting>#define             xmlSecKeyIsValid(key)</programlisting>
 <para>
 Macro. Returns 1 if <parameter>key</parameter> is not NULL and <parameter>key</parameter>-&gt;id is not NULL
-or 0 otherwise.</para>
-<para>
+or 0 otherwise.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara> the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyCheckId" role="macro">
 <title>xmlSecKeyCheckId()</title>
-<indexterm zone="xmlSecKeyCheckId"><primary sortas="xmlSecKeyCheckId">xmlSecKeyCheckId</primary></indexterm><programlisting>#define             xmlSecKeyCheckId(key, keyId)</programlisting>
-<para>
-Macro. Returns 1 if <parameter>key</parameter> is valid and <parameter>key</parameter>'s id is equal to <parameter>keyId</parameter>.</para>
+<indexterm zone="xmlSecKeyCheckId"><primary>xmlSecKeyCheckId</primary></indexterm>
+<programlisting>#define             xmlSecKeyCheckId(key, keyId)</programlisting>
 <para>
+Macro. Returns 1 if <parameter>key</parameter> is valid and <parameter>key</parameter>'s id is equal to <parameter>keyId</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara> the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyId</parameter>&#160;:</term>
-<listitem><simpara> the key Id.
+<listitem><simpara>the key Id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyPtrListId" role="macro">
 <title>xmlSecKeyPtrListId</title>
-<indexterm zone="xmlSecKeyPtrListId"><primary sortas="xmlSecKeyPtrListId">xmlSecKeyPtrListId</primary></indexterm><programlisting>#define xmlSecKeyPtrListId      xmlSecKeyPtrListGetKlass()
+<indexterm zone="xmlSecKeyPtrListId"><primary>xmlSecKeyPtrListId</primary></indexterm>
+<programlisting>#define xmlSecKeyPtrListId      xmlSecKeyPtrListGetKlass()
 </programlisting>
 <para>
-The keys list klass.</para>
-<para>
+The keys list klass.
 </para></refsect2>
 <refsect2 id="xmlSecKeyPtrListGetKlass" role="function">
 <title>xmlSecKeyPtrListGetKlass ()</title>
-<indexterm zone="xmlSecKeyPtrListGetKlass"><primary sortas="xmlSecKeyPtrListGetKlass">xmlSecKeyPtrListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     xmlSecKeyPtrListGetKlass            (void);</programlisting>
-<para>
-The keys list klass.</para>
+<indexterm zone="xmlSecKeyPtrListGetKlass"><primary>xmlSecKeyPtrListGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecPtrListId"><returnvalue>xmlSecPtrListId</returnvalue></link>     xmlSecKeyPtrListGetKlass            (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The keys list klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> keys list id.
 </simpara></listitem></varlistentry>
@@ -979,7 +954,4 @@ The keys list klass.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/keysdata.sgml b/docs/api/sgml/keysdata.sgml
index fae0d4d..588d76c 100644
--- a/docs/api/sgml/keysdata.sgml
+++ b/docs/api/sgml/keysdata.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-keysdata.top_of_page">keysdata</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>keysdata</refname>
 <refpurpose>Crypto key data object definition.</refpurpose>
@@ -13,8 +14,7 @@
 <refsynopsisdiv id="xmlsec-keysdata.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-typedef             <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link>;
+<synopsis>typedef             <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link>;
 #define             <link linkend="xmlSecKeyDataUsageUnknown">xmlSecKeyDataUsageUnknown</link>
 #define             <link linkend="xmlSecKeyDataUsageKeyInfoNodeRead">xmlSecKeyDataUsageKeyInfoNodeRead</link>
 #define             <link linkend="xmlSecKeyDataUsageKeyInfoNodeWrite">xmlSecKeyDataUsageKeyInfoNodeWrite</link>
@@ -37,348 +37,345 @@ typedef             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link>;
 #define             <link linkend="xmlSecKeyDataTypeTrusted">xmlSecKeyDataTypeTrusted</link>
 #define             <link linkend="xmlSecKeyDataTypeAny">xmlSecKeyDataTypeAny</link>
 enum                <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link>;
-<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link>    <link linkend="xmlSecKeyDataIdsGet">xmlSecKeyDataIdsGet</link>                 (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataIdsInit">xmlSecKeyDataIdsInit</link>                (void);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyDataIdsShutdown">xmlSecKeyDataIdsShutdown</link>            (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataIdsRegisterDefault">xmlSecKeyDataIdsRegisterDefault</link>     (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataIdsRegister">xmlSecKeyDataIdsRegister</link>            (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id);
+<link linkend="xmlSecPtrList"><returnvalue>xmlSecPtrListPtr</returnvalue></link>    <link linkend="xmlSecKeyDataIdsGet">xmlSecKeyDataIdsGet</link>                 (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyDataIdsInit">xmlSecKeyDataIdsInit</link>                (<parameter><type>void</type></parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyDataIdsShutdown">xmlSecKeyDataIdsShutdown</link>            (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyDataIdsRegisterDefault">xmlSecKeyDataIdsRegisterDefault</link>     (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyDataIdsRegister">xmlSecKeyDataIdsRegister</link>            (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>);
 struct              <link linkend="xmlSecKeyData">xmlSecKeyData</link>;
-<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    <link linkend="xmlSecKeyDataCreate">xmlSecKeyDataCreate</link>                 (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id);
-<link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link>    <link linkend="xmlSecKeyDataDuplicate">xmlSecKeyDataDuplicate</link>              (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyDataDestroy">xmlSecKeyDataDestroy</link>                (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataGenerate">xmlSecKeyDataGenerate</link>               (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link>   <link linkend="xmlSecKeyDataGetType">xmlSecKeyDataGetType</link>                (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecKeyDataGetSize">xmlSecKeyDataGetSize</link>                (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-const <link linkend="xmlChar">xmlChar</link>*      <link linkend="xmlSecKeyDataGetIdentifier">xmlSecKeyDataGetIdentifier</link>          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyDataDebugDump">xmlSecKeyDataDebugDump</link>              (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyDataDebugXmlDump">xmlSecKeyDataDebugXmlDump</link>           (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataXmlRead">xmlSecKeyDataXmlRead</link>                (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataXmlWrite">xmlSecKeyDataXmlWrite</link>               (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataBinRead">xmlSecKeyDataBinRead</link>                (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataBinWrite">xmlSecKeyDataBinWrite</link>               (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlSecByte">xmlSecByte</link> **buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> *bufSize,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="xmlSecKeyData"><returnvalue>xmlSecKeyDataPtr</returnvalue></link>    <link linkend="xmlSecKeyDataCreate">xmlSecKeyDataCreate</link>                 (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>);
+<link linkend="xmlSecKeyDataPtr"><returnvalue>xmlSecKeyDataPtr</returnvalue></link>    <link linkend="xmlSecKeyDataDuplicate">xmlSecKeyDataDuplicate</link>              (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyDataDestroy">xmlSecKeyDataDestroy</link>                (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyDataGenerate">xmlSecKeyDataGenerate</link>               (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> sizeBits</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="xmlSecKeyDataType"><returnvalue>xmlSecKeyDataType</returnvalue></link>   <link linkend="xmlSecKeyDataGetType">xmlSecKeyDataGetType</link>                (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          <link linkend="xmlSecKeyDataGetSize">xmlSecKeyDataGetSize</link>                (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+const <link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*      <link linkend="xmlSecKeyDataGetIdentifier">xmlSecKeyDataGetIdentifier</link>          (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyDataDebugDump">xmlSecKeyDataDebugDump</link>              (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyDataDebugXmlDump">xmlSecKeyDataDebugXmlDump</link>           (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyDataXmlRead">xmlSecKeyDataXmlRead</link>                (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyDataXmlWrite">xmlSecKeyDataXmlWrite</link>               (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyDataBinRead">xmlSecKeyDataBinRead</link>                (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyDataBinWrite">xmlSecKeyDataBinWrite</link>               (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlSecByte"><type>xmlSecByte</type></link> **buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> *bufSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
 #define             <link linkend="xmlSecKeyDataGetName">xmlSecKeyDataGetName</link>                (data)
 #define             <link linkend="xmlSecKeyDataIsValid">xmlSecKeyDataIsValid</link>                (data)
-#define             <link linkend="xmlSecKeyDataCheckId">xmlSecKeyDataCheckId</link>                (data, dataId)
-#define             <link linkend="xmlSecKeyDataCheckUsage">xmlSecKeyDataCheckUsage</link>             (data, usg)
-#define             <link linkend="xmlSecKeyDataCheckSize">xmlSecKeyDataCheckSize</link>              (data, size)
+#define             <link linkend="xmlSecKeyDataCheckId">xmlSecKeyDataCheckId</link>                (data,
+                                                         dataId)
+#define             <link linkend="xmlSecKeyDataCheckUsage">xmlSecKeyDataCheckUsage</link>             (data,
+                                                         usg)
+#define             <link linkend="xmlSecKeyDataCheckSize">xmlSecKeyDataCheckSize</link>              (data,
+                                                         size)
 #define             <link linkend="xmlSecKeyDataIdUnknown">xmlSecKeyDataIdUnknown</link>
-<link linkend="int">int</link>                 (<link linkend="xmlSecKeyDataInitMethod">*xmlSecKeyDataInitMethod</link>)          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>                 (<link linkend="xmlSecKeyDataDuplicateMethod">*xmlSecKeyDataDuplicateMethod</link>)     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> dst,
-                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> src);
-<link linkend="void">void</link>                (<link linkend="xmlSecKeyDataFinalizeMethod">*xmlSecKeyDataFinalizeMethod</link>)      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>                 (<link linkend="xmlSecKeyDataXmlReadMethod">*xmlSecKeyDataXmlReadMethod</link>)       (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>                 (<link linkend="xmlSecKeyDataXmlWriteMethod">*xmlSecKeyDataXmlWriteMethod</link>)      (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>                 (<link linkend="xmlSecKeyDataBinReadMethod">*xmlSecKeyDataBinReadMethod</link>)       (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>                 (<link linkend="xmlSecKeyDataBinWriteMethod">*xmlSecKeyDataBinWriteMethod</link>)      (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlSecByte">xmlSecByte</link> **buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> *bufSize,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>                 (<link linkend="xmlSecKeyDataGenerateMethod">*xmlSecKeyDataGenerateMethod</link>)      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link>   (<link linkend="xmlSecKeyDataGetTypeMethod">*xmlSecKeyDataGetTypeMethod</link>)       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="xmlSecSize">xmlSecSize</link>          (<link linkend="xmlSecKeyDataGetSizeMethod">*xmlSecKeyDataGetSizeMethod</link>)       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-const <link linkend="xmlChar">xmlChar</link> *     (<link linkend="xmlSecKeyDataGetIdentifierMethod">*xmlSecKeyDataGetIdentifierMethod</link>) (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="void">void</link>                (<link linkend="xmlSecKeyDataDebugDumpMethod">*xmlSecKeyDataDebugDumpMethod</link>)     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecKeyDataInitMethod">*xmlSecKeyDataInitMethod</link>)          (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecKeyDataDuplicateMethod">*xmlSecKeyDataDuplicateMethod</link>)     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> dst</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> src</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="xmlSecKeyDataFinalizeMethod">*xmlSecKeyDataFinalizeMethod</link>)      (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecKeyDataXmlReadMethod">*xmlSecKeyDataXmlReadMethod</link>)       (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecKeyDataXmlWriteMethod">*xmlSecKeyDataXmlWriteMethod</link>)      (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecKeyDataBinReadMethod">*xmlSecKeyDataBinReadMethod</link>)       (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecKeyDataBinWriteMethod">*xmlSecKeyDataBinWriteMethod</link>)      (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlSecByte"><type>xmlSecByte</type></link> **buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> *bufSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecKeyDataGenerateMethod">*xmlSecKeyDataGenerateMethod</link>)      (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> sizeBits</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="xmlSecKeyDataType"><returnvalue>xmlSecKeyDataType</returnvalue></link>   (<link linkend="xmlSecKeyDataGetTypeMethod">*xmlSecKeyDataGetTypeMethod</link>)       (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          (<link linkend="xmlSecKeyDataGetSizeMethod">*xmlSecKeyDataGetSizeMethod</link>)       (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+const <link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link> *     (<link linkend="xmlSecKeyDataGetIdentifierMethod">*xmlSecKeyDataGetIdentifierMethod</link>) (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="xmlSecKeyDataDebugDumpMethod">*xmlSecKeyDataDebugDumpMethod</link>)     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
 struct              <link linkend="xmlSecKeyDataKlass">xmlSecKeyDataKlass</link>;
 #define             <link linkend="xmlSecKeyDataKlassGetName">xmlSecKeyDataKlassGetName</link>           (klass)
 #define             <link linkend="xmlSecKeyDataListId">xmlSecKeyDataListId</link>
-<link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     <link linkend="xmlSecKeyDataListGetKlass">xmlSecKeyDataListGetKlass</link>           (void);
+<link linkend="xmlSecPtrListId"><returnvalue>xmlSecPtrListId</returnvalue></link>     <link linkend="xmlSecKeyDataListGetKlass">xmlSecKeyDataListGetKlass</link>           (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecKeyDataIdListId">xmlSecKeyDataIdListId</link>
-<link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     <link linkend="xmlSecKeyDataIdListGetKlass">xmlSecKeyDataIdListGetKlass</link>         (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataIdListFind">xmlSecKeyDataIdListFind</link>             (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId);
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataIdListFindByNode">xmlSecKeyDataIdListFindByNode</link>       (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         const <link linkend="xmlChar">xmlChar</link> *nodeName,
-                                                         const <link linkend="xmlChar">xmlChar</link> *nodeNs,
-                                                         <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link> usage);
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataIdListFindByHref">xmlSecKeyDataIdListFindByHref</link>       (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         const <link linkend="xmlChar">xmlChar</link> *href,
-                                                         <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link> usage);
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataIdListFindByName">xmlSecKeyDataIdListFindByName</link>       (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link> usage);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyDataIdListDebugDump">xmlSecKeyDataIdListDebugDump</link>        (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyDataIdListDebugXmlDump">xmlSecKeyDataIdListDebugXmlDump</link>     (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="xmlSecPtrListId"><returnvalue>xmlSecPtrListId</returnvalue></link>     <link linkend="xmlSecKeyDataIdListGetKlass">xmlSecKeyDataIdListGetKlass</link>         (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyDataIdListFind">xmlSecKeyDataIdListFind</link>             (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> dataId</parameter>);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecKeyDataIdListFindByNode">xmlSecKeyDataIdListFindByNode</link>       (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *nodeName</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *nodeNs</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataUsage"><type>xmlSecKeyDataUsage</type></link> usage</parameter>);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecKeyDataIdListFindByHref">xmlSecKeyDataIdListFindByHref</link>       (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *href</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataUsage"><type>xmlSecKeyDataUsage</type></link> usage</parameter>);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecKeyDataIdListFindByName">xmlSecKeyDataIdListFindByName</link>       (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataUsage"><type>xmlSecKeyDataUsage</type></link> usage</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyDataIdListDebugDump">xmlSecKeyDataIdListDebugDump</link>        (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyDataIdListDebugXmlDump">xmlSecKeyDataIdListDebugXmlDump</link>     (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
 #define             <link linkend="xmlSecKeyDataBinarySize">xmlSecKeyDataBinarySize</link>
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataBinaryValueInitialize">xmlSecKeyDataBinaryValueInitialize</link>  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataBinaryValueDuplicate">xmlSecKeyDataBinaryValueDuplicate</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> dst,
-                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> src);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyDataBinaryValueFinalize">xmlSecKeyDataBinaryValueFinalize</link>    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataBinaryValueXmlRead">xmlSecKeyDataBinaryValueXmlRead</link>     (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataBinaryValueXmlWrite">xmlSecKeyDataBinaryValueXmlWrite</link>    (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataBinaryValueBinRead">xmlSecKeyDataBinaryValueBinRead</link>     (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataBinaryValueBinWrite">xmlSecKeyDataBinaryValueBinWrite</link>    (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlSecByte">xmlSecByte</link> **buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> *bufSize,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyDataBinaryValueDebugDump">xmlSecKeyDataBinaryValueDebugDump</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyDataBinaryValueDebugXmlDump">xmlSecKeyDataBinaryValueDebugXmlDump</link>
-                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
-<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecKeyDataBinaryValueGetSize">xmlSecKeyDataBinaryValueGetSize</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="xmlSecBufferPtr">xmlSecBufferPtr</link>     <link linkend="xmlSecKeyDataBinaryValueGetBuffer">xmlSecKeyDataBinaryValueGetBuffer</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataBinaryValueSetBuffer">xmlSecKeyDataBinaryValueSetBuffer</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyDataBinaryValueInitialize">xmlSecKeyDataBinaryValueInitialize</link>  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyDataBinaryValueDuplicate">xmlSecKeyDataBinaryValueDuplicate</link>   (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> dst</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> src</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyDataBinaryValueFinalize">xmlSecKeyDataBinaryValueFinalize</link>    (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyDataBinaryValueXmlRead">xmlSecKeyDataBinaryValueXmlRead</link>     (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyDataBinaryValueXmlWrite">xmlSecKeyDataBinaryValueXmlWrite</link>    (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyDataBinaryValueBinRead">xmlSecKeyDataBinaryValueBinRead</link>     (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyDataBinaryValueBinWrite">xmlSecKeyDataBinaryValueBinWrite</link>    (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlSecByte"><type>xmlSecByte</type></link> **buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> *bufSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyDataBinaryValueDebugDump">xmlSecKeyDataBinaryValueDebugDump</link>   (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyDataBinaryValueDebugXmlDump">xmlSecKeyDataBinaryValueDebugXmlDump</link>
+                                                        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
+<link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          <link linkend="xmlSecKeyDataBinaryValueGetSize">xmlSecKeyDataBinaryValueGetSize</link>     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="xmlSecBufferPtr"><returnvalue>xmlSecBufferPtr</returnvalue></link>     <link linkend="xmlSecKeyDataBinaryValueGetBuffer">xmlSecKeyDataBinaryValueGetBuffer</link>   (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeyDataBinaryValueSetBuffer">xmlSecKeyDataBinaryValueSetBuffer</link>   (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);
 struct              <link linkend="xmlSecKeyDataStore">xmlSecKeyDataStore</link>;
-<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link>  <link linkend="xmlSecKeyDataStoreCreate">xmlSecKeyDataStoreCreate</link>         (<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> id);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyDataStoreDestroy">xmlSecKeyDataStoreDestroy</link>           (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);
+<link linkend="xmlSecKeyDataStore"><returnvalue>xmlSecKeyDataStorePtr</returnvalue></link>  <link linkend="xmlSecKeyDataStoreCreate">xmlSecKeyDataStoreCreate</link>         (<parameter><link linkend="xmlSecKeyDataStoreId"><type>xmlSecKeyDataStoreId</type></link> id</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyDataStoreDestroy">xmlSecKeyDataStoreDestroy</link>           (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>);
 #define             <link linkend="xmlSecKeyDataStoreGetName">xmlSecKeyDataStoreGetName</link>           (store)
 #define             <link linkend="xmlSecKeyDataStoreIsValid">xmlSecKeyDataStoreIsValid</link>           (store)
-#define             <link linkend="xmlSecKeyDataStoreCheckId">xmlSecKeyDataStoreCheckId</link>           (store, storeId)
-#define             <link linkend="xmlSecKeyDataStoreCheckSize">xmlSecKeyDataStoreCheckSize</link>         (store, size)
+#define             <link linkend="xmlSecKeyDataStoreCheckId">xmlSecKeyDataStoreCheckId</link>           (store,
+                                                         storeId)
+#define             <link linkend="xmlSecKeyDataStoreCheckSize">xmlSecKeyDataStoreCheckSize</link>         (store,
+                                                         size)
 #define             <link linkend="xmlSecKeyDataStoreIdUnknown">xmlSecKeyDataStoreIdUnknown</link>
-<link linkend="int">int</link>                 (<link linkend="xmlSecKeyDataStoreInitializeMethod">*xmlSecKeyDataStoreInitializeMethod</link>)
-                                                        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);
-<link linkend="void">void</link>                (<link linkend="xmlSecKeyDataStoreFinalizeMethod">*xmlSecKeyDataStoreFinalizeMethod</link>) (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecKeyDataStoreInitializeMethod">*xmlSecKeyDataStoreInitializeMethod</link>)
+                                                        (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="xmlSecKeyDataStoreFinalizeMethod">*xmlSecKeyDataStoreFinalizeMethod</link>) (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>);
 struct              <link linkend="xmlSecKeyDataStoreKlass">xmlSecKeyDataStoreKlass</link>;
 #define             <link linkend="xmlSecKeyDataStoreKlassGetName">xmlSecKeyDataStoreKlassGetName</link>      (klass)
 #define             <link linkend="xmlSecKeyDataStorePtrListId">xmlSecKeyDataStorePtrListId</link>
-<link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     <link linkend="xmlSecKeyDataStorePtrListGetKlass">xmlSecKeyDataStorePtrListGetKlass</link>   (void);
+<link linkend="xmlSecPtrListId"><returnvalue>xmlSecPtrListId</returnvalue></link>     <link linkend="xmlSecKeyDataStorePtrListGetKlass">xmlSecKeyDataStorePtrListGetKlass</link>   (<parameter><type>void</type></parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-keysdata.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Crypto key data object definition.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-keysdata.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecKeyDataUsage" role="typedef">
 <title>xmlSecKeyDataUsage</title>
-<indexterm zone="xmlSecKeyDataUsage"><primary sortas="xmlSecKeyDataUsage">xmlSecKeyDataUsage</primary></indexterm><programlisting>typedef unsigned int                                    xmlSecKeyDataUsage;
+<indexterm zone="xmlSecKeyDataUsage"><primary>xmlSecKeyDataUsage</primary></indexterm>
+<programlisting>typedef unsigned int                                    xmlSecKeyDataUsage;
 </programlisting>
 <para>
-The bits mask that determines possible keys data usage.</para>
-<para>
+The bits mask that determines possible keys data usage.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataUsageUnknown" role="macro">
 <title>xmlSecKeyDataUsageUnknown</title>
-<indexterm zone="xmlSecKeyDataUsageUnknown"><primary sortas="xmlSecKeyDataUsageUnknown">xmlSecKeyDataUsageUnknown</primary></indexterm><programlisting>#define xmlSecKeyDataUsageUnknown                       0x00000
+<indexterm zone="xmlSecKeyDataUsageUnknown"><primary>xmlSecKeyDataUsageUnknown</primary></indexterm>
+<programlisting>#define xmlSecKeyDataUsageUnknown                       0x00000
 </programlisting>
 <para>
-The key data usage is unknown.</para>
-<para>
+The key data usage is unknown.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataUsageKeyInfoNodeRead" role="macro">
 <title>xmlSecKeyDataUsageKeyInfoNodeRead</title>
-<indexterm zone="xmlSecKeyDataUsageKeyInfoNodeRead"><primary sortas="xmlSecKeyDataUsageKeyInfoNodeRead">xmlSecKeyDataUsageKeyInfoNodeRead</primary></indexterm><programlisting>#define xmlSecKeyDataUsageKeyInfoNodeRead               0x00001
+<indexterm zone="xmlSecKeyDataUsageKeyInfoNodeRead"><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";>&lt;dsig:KeyInfo/&gt;</ulink> child.</para>
-<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></refsect2>
 <refsect2 id="xmlSecKeyDataUsageKeyInfoNodeWrite" role="macro">
 <title>xmlSecKeyDataUsageKeyInfoNodeWrite</title>
-<indexterm zone="xmlSecKeyDataUsageKeyInfoNodeWrite"><primary sortas="xmlSecKeyDataUsageKeyInfoNodeWrite">xmlSecKeyDataUsageKeyInfoNodeWrite</primary></indexterm><programlisting>#define xmlSecKeyDataUsageKeyInfoNodeWrite              0x00002
+<indexterm zone="xmlSecKeyDataUsageKeyInfoNodeWrite"><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 ">&lt;dsig:KeyInfo /&gt;</ulink> child.</para>
-<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></refsect2>
 <refsect2 id="xmlSecKeyDataUsageKeyValueNodeRead" role="macro">
 <title>xmlSecKeyDataUsageKeyValueNodeRead</title>
-<indexterm zone="xmlSecKeyDataUsageKeyValueNodeRead"><primary sortas="xmlSecKeyDataUsageKeyValueNodeRead">xmlSecKeyDataUsageKeyValueNodeRead</primary></indexterm><programlisting>#define xmlSecKeyDataUsageKeyValueNodeRead              0x00004
+<indexterm zone="xmlSecKeyDataUsageKeyValueNodeRead"><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 ">&lt;dsig:KeyValue /&gt;</ulink> child.</para>
-<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></refsect2>
 <refsect2 id="xmlSecKeyDataUsageKeyValueNodeWrite" role="macro">
 <title>xmlSecKeyDataUsageKeyValueNodeWrite</title>
-<indexterm zone="xmlSecKeyDataUsageKeyValueNodeWrite"><primary sortas="xmlSecKeyDataUsageKeyValueNodeWrite">xmlSecKeyDataUsageKeyValueNodeWrite</primary></indexterm><programlisting>#define xmlSecKeyDataUsageKeyValueNodeWrite             0x00008
+<indexterm zone="xmlSecKeyDataUsageKeyValueNodeWrite"><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 ">&lt;dsig:KeyValue /&gt;</ulink> child.</para>
-<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></refsect2>
 <refsect2 id="xmlSecKeyDataUsageRetrievalMethodNodeXml" role="macro">
 <title>xmlSecKeyDataUsageRetrievalMethodNodeXml</title>
-<indexterm zone="xmlSecKeyDataUsageRetrievalMethodNodeXml"><primary sortas="xmlSecKeyDataUsageRetrievalMethodNodeXml">xmlSecKeyDataUsageRetrievalMethodNodeXml</primary></indexterm><programlisting>#define xmlSecKeyDataUsageRetrievalMethodNodeXml        0x00010
+<indexterm zone="xmlSecKeyDataUsageRetrievalMethodNodeXml"><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 ">&lt;dsig:RetrievalMethod /&gt;</ulink> node
-in XML format.</para>
-<para>
+in XML format.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataUsageRetrievalMethodNodeBin" role="macro">
 <title>xmlSecKeyDataUsageRetrievalMethodNodeBin</title>
-<indexterm zone="xmlSecKeyDataUsageRetrievalMethodNodeBin"><primary sortas="xmlSecKeyDataUsageRetrievalMethodNodeBin">xmlSecKeyDataUsageRetrievalMethodNodeBin</primary></indexterm><programlisting>#define xmlSecKeyDataUsageRetrievalMethodNodeBin        0x00020
+<indexterm zone="xmlSecKeyDataUsageRetrievalMethodNodeBin"><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 ">&lt;dsig:RetrievalMethod /&gt;</ulink> node
-in binary format.</para>
-<para>
+in binary format.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataUsageAny" role="macro">
 <title>xmlSecKeyDataUsageAny</title>
-<indexterm zone="xmlSecKeyDataUsageAny"><primary sortas="xmlSecKeyDataUsageAny">xmlSecKeyDataUsageAny</primary></indexterm><programlisting>#define xmlSecKeyDataUsageAny                           0xFFFFF
+<indexterm zone="xmlSecKeyDataUsageAny"><primary>xmlSecKeyDataUsageAny</primary></indexterm>
+<programlisting>#define xmlSecKeyDataUsageAny                           0xFFFFF
 </programlisting>
 <para>
-Any key data usage.</para>
-<para>
+Any key data usage.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataUsageKeyInfoNode" role="macro">
 <title>xmlSecKeyDataUsageKeyInfoNode</title>
-<indexterm zone="xmlSecKeyDataUsageKeyInfoNode"><primary sortas="xmlSecKeyDataUsageKeyInfoNode">xmlSecKeyDataUsageKeyInfoNode</primary></indexterm><programlisting>#define             xmlSecKeyDataUsageKeyInfoNode</programlisting>
-<para>
-The key data could be read and written from/to a <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink> child.</para>
+<indexterm zone="xmlSecKeyDataUsageKeyInfoNode"><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 ">&lt;dsig:KeyInfo /&gt;</ulink> child.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataUsageKeyValueNode" role="macro">
 <title>xmlSecKeyDataUsageKeyValueNode</title>
-<indexterm zone="xmlSecKeyDataUsageKeyValueNode"><primary sortas="xmlSecKeyDataUsageKeyValueNode">xmlSecKeyDataUsageKeyValueNode</primary></indexterm><programlisting>#define             xmlSecKeyDataUsageKeyValueNode</programlisting>
-<para>
-The key data could be read and written from/to a <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue ">&lt;dsig:KeyValue /&gt;</ulink> child.</para>
+<indexterm zone="xmlSecKeyDataUsageKeyValueNode"><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 ">&lt;dsig:KeyValue /&gt;</ulink> child.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataUsageRetrievalMethodNode" role="macro">
 <title>xmlSecKeyDataUsageRetrievalMethodNode</title>
-<indexterm zone="xmlSecKeyDataUsageRetrievalMethodNode"><primary sortas="xmlSecKeyDataUsageRetrievalMethodNode">xmlSecKeyDataUsageRetrievalMethodNode</primary></indexterm><programlisting>#define             xmlSecKeyDataUsageRetrievalMethodNode</programlisting>
+<indexterm zone="xmlSecKeyDataUsageRetrievalMethodNode"><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 ">&lt;dsig:RetrievalMethod /&gt;</ulink> node
-in any format.</para>
-<para>
+in any format.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataType" role="typedef">
 <title>xmlSecKeyDataType</title>
-<indexterm zone="xmlSecKeyDataType"><primary sortas="xmlSecKeyDataType">xmlSecKeyDataType</primary></indexterm><programlisting>typedef unsigned int                            xmlSecKeyDataType;
+<indexterm zone="xmlSecKeyDataType"><primary>xmlSecKeyDataType</primary></indexterm>
+<programlisting>typedef unsigned int                            xmlSecKeyDataType;
 </programlisting>
 <para>
-The key data type (public/private, session/permanet, etc.).</para>
-<para>
+The key data type (public/private, session/permanet, etc.).
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataTypeUnknown" role="macro">
 <title>xmlSecKeyDataTypeUnknown</title>
-<indexterm zone="xmlSecKeyDataTypeUnknown"><primary sortas="xmlSecKeyDataTypeUnknown">xmlSecKeyDataTypeUnknown</primary></indexterm><programlisting>#define xmlSecKeyDataTypeUnknown                        0x0000
+<indexterm zone="xmlSecKeyDataTypeUnknown"><primary>xmlSecKeyDataTypeUnknown</primary></indexterm>
+<programlisting>#define xmlSecKeyDataTypeUnknown                        0x0000
 </programlisting>
 <para>
-The key data type is unknown (same as <link linkend="xmlSecKeyDataTypeNone"><type>xmlSecKeyDataTypeNone</type></link>).</para>
-<para>
+The key data type is unknown (same as <link linkend="xmlSecKeyDataTypeNone"><type>xmlSecKeyDataTypeNone</type></link>).
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataTypeNone" role="macro">
 <title>xmlSecKeyDataTypeNone</title>
-<indexterm zone="xmlSecKeyDataTypeNone"><primary sortas="xmlSecKeyDataTypeNone">xmlSecKeyDataTypeNone</primary></indexterm><programlisting>#define xmlSecKeyDataTypeNone                           xmlSecKeyDataTypeUnknown
+<indexterm zone="xmlSecKeyDataTypeNone"><primary>xmlSecKeyDataTypeNone</primary></indexterm>
+<programlisting>#define xmlSecKeyDataTypeNone                           xmlSecKeyDataTypeUnknown
 </programlisting>
 <para>
-The key data type is unknown (same as <link linkend="xmlSecKeyDataTypeUnknown"><type>xmlSecKeyDataTypeUnknown</type></link>).</para>
-<para>
+The key data type is unknown (same as <link linkend="xmlSecKeyDataTypeUnknown"><type>xmlSecKeyDataTypeUnknown</type></link>).
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataTypePublic" role="macro">
 <title>xmlSecKeyDataTypePublic</title>
-<indexterm zone="xmlSecKeyDataTypePublic"><primary sortas="xmlSecKeyDataTypePublic">xmlSecKeyDataTypePublic</primary></indexterm><programlisting>#define xmlSecKeyDataTypePublic                         0x0001
+<indexterm zone="xmlSecKeyDataTypePublic"><primary>xmlSecKeyDataTypePublic</primary></indexterm>
+<programlisting>#define xmlSecKeyDataTypePublic                         0x0001
 </programlisting>
 <para>
-The key data contain a public key.</para>
-<para>
+The key data contain a public key.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataTypePrivate" role="macro">
 <title>xmlSecKeyDataTypePrivate</title>
-<indexterm zone="xmlSecKeyDataTypePrivate"><primary sortas="xmlSecKeyDataTypePrivate">xmlSecKeyDataTypePrivate</primary></indexterm><programlisting>#define xmlSecKeyDataTypePrivate                        0x0002
+<indexterm zone="xmlSecKeyDataTypePrivate"><primary>xmlSecKeyDataTypePrivate</primary></indexterm>
+<programlisting>#define xmlSecKeyDataTypePrivate                        0x0002
 </programlisting>
 <para>
-The key data contain a private key.</para>
-<para>
+The key data contain a private key.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataTypeSymmetric" role="macro">
 <title>xmlSecKeyDataTypeSymmetric</title>
-<indexterm zone="xmlSecKeyDataTypeSymmetric"><primary sortas="xmlSecKeyDataTypeSymmetric">xmlSecKeyDataTypeSymmetric</primary></indexterm><programlisting>#define xmlSecKeyDataTypeSymmetric                      0x0004
+<indexterm zone="xmlSecKeyDataTypeSymmetric"><primary>xmlSecKeyDataTypeSymmetric</primary></indexterm>
+<programlisting>#define xmlSecKeyDataTypeSymmetric                      0x0004
 </programlisting>
 <para>
-The key data contain a symmetric key.</para>
-<para>
+The key data contain a symmetric key.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataTypeSession" role="macro">
 <title>xmlSecKeyDataTypeSession</title>
-<indexterm zone="xmlSecKeyDataTypeSession"><primary sortas="xmlSecKeyDataTypeSession">xmlSecKeyDataTypeSession</primary></indexterm><programlisting>#define xmlSecKeyDataTypeSession                        0x0008
+<indexterm zone="xmlSecKeyDataTypeSession"><primary>xmlSecKeyDataTypeSession</primary></indexterm>
+<programlisting>#define xmlSecKeyDataTypeSession                        0x0008
 </programlisting>
 <para>
-The key data contain session key (one time key, not stored in keys manager).</para>
-<para>
+The key data contain session key (one time key, not stored in keys manager).
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataTypePermanent" role="macro">
 <title>xmlSecKeyDataTypePermanent</title>
-<indexterm zone="xmlSecKeyDataTypePermanent"><primary sortas="xmlSecKeyDataTypePermanent">xmlSecKeyDataTypePermanent</primary></indexterm><programlisting>#define xmlSecKeyDataTypePermanent                      0x0010
+<indexterm zone="xmlSecKeyDataTypePermanent"><primary>xmlSecKeyDataTypePermanent</primary></indexterm>
+<programlisting>#define xmlSecKeyDataTypePermanent                      0x0010
 </programlisting>
 <para>
-The key data contain permanent key (stored in keys manager).</para>
-<para>
+The key data contain permanent key (stored in keys manager).
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataTypeTrusted" role="macro">
 <title>xmlSecKeyDataTypeTrusted</title>
-<indexterm zone="xmlSecKeyDataTypeTrusted"><primary sortas="xmlSecKeyDataTypeTrusted">xmlSecKeyDataTypeTrusted</primary></indexterm><programlisting>#define xmlSecKeyDataTypeTrusted                        0x0100
+<indexterm zone="xmlSecKeyDataTypeTrusted"><primary>xmlSecKeyDataTypeTrusted</primary></indexterm>
+<programlisting>#define xmlSecKeyDataTypeTrusted                        0x0100
 </programlisting>
 <para>
-The key data is trusted.</para>
-<para>
+The key data is trusted.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataTypeAny" role="macro">
 <title>xmlSecKeyDataTypeAny</title>
-<indexterm zone="xmlSecKeyDataTypeAny"><primary sortas="xmlSecKeyDataTypeAny">xmlSecKeyDataTypeAny</primary></indexterm><programlisting>#define xmlSecKeyDataTypeAny                            0xFFFF
+<indexterm zone="xmlSecKeyDataTypeAny"><primary>xmlSecKeyDataTypeAny</primary></indexterm>
+<programlisting>#define xmlSecKeyDataTypeAny                            0xFFFF
 </programlisting>
 <para>
-Any key data.</para>
-<para>
+Any key data.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataFormat" role="enum">
 <title>enum xmlSecKeyDataFormat</title>
-<indexterm zone="xmlSecKeyDataFormat"><primary sortas="xmlSecKeyDataFormat">xmlSecKeyDataFormat</primary></indexterm><programlisting>typedef enum {
+<indexterm zone="xmlSecKeyDataFormat"><primary>xmlSecKeyDataFormat</primary></indexterm>
+<programlisting>typedef enum {
     xmlSecKeyDataFormatUnknown = 0,
     xmlSecKeyDataFormatBinary,
     xmlSecKeyDataFormatPem,
@@ -391,148 +388,144 @@ Any key data.</para>
 } xmlSecKeyDataFormat;
 </programlisting>
 <para>
-The key data format (binary, der, pem, etc.).</para>
-<para>
+The key data format (binary, der, pem, etc.).
 </para><variablelist role="enum">
 <varlistentry id="xmlSecKeyDataFormatUnknown" role="constant">
 <term><literal>xmlSecKeyDataFormatUnknown</literal></term>
-<listitem><simpara>         the key data format is unknown.
+<listitem><simpara>the key data format is unknown.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecKeyDataFormatBinary" role="constant">
 <term><literal>xmlSecKeyDataFormatBinary</literal></term>
-<listitem><simpara>          the binary key data.
+<listitem><simpara>the binary key data.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecKeyDataFormatPem" role="constant">
 <term><literal>xmlSecKeyDataFormatPem</literal></term>
-<listitem><simpara>             the PEM key data (cert or public/private key).
+<listitem><simpara>the PEM key data (cert or public/private key).
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecKeyDataFormatDer" role="constant">
 <term><literal>xmlSecKeyDataFormatDer</literal></term>
-<listitem><simpara>             the DER key data (cert or public/private key).
+<listitem><simpara>the DER key data (cert or public/private key).
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecKeyDataFormatPkcs8Pem" role="constant">
 <term><literal>xmlSecKeyDataFormatPkcs8Pem</literal></term>
-<listitem><simpara>        the PKCS8 PEM private key.
+<listitem><simpara>the PKCS8 PEM private key.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecKeyDataFormatPkcs8Der" role="constant">
 <term><literal>xmlSecKeyDataFormatPkcs8Der</literal></term>
-<listitem><simpara>        the PKCS8 DER private key.
+<listitem><simpara>the PKCS8 DER private key.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecKeyDataFormatPkcs12" role="constant">
 <term><literal>xmlSecKeyDataFormatPkcs12</literal></term>
-<listitem><simpara>          the PKCS12 format (bag of keys and certs)
+<listitem><simpara>the PKCS12 format (bag of keys and certs)
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecKeyDataFormatCertPem" role="constant">
 <term><literal>xmlSecKeyDataFormatCertPem</literal></term>
-<listitem><simpara>         the PEM cert.
+<listitem><simpara>the PEM cert.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecKeyDataFormatCertDer" role="constant">
 <term><literal>xmlSecKeyDataFormatCertDer</literal></term>
-<listitem><simpara>         the DER cert.
+<listitem><simpara>the DER cert.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataIdsGet" role="function">
 <title>xmlSecKeyDataIdsGet ()</title>
-<indexterm zone="xmlSecKeyDataIdsGet"><primary sortas="xmlSecKeyDataIdsGet">xmlSecKeyDataIdsGet</primary></indexterm><programlisting><link linkend="xmlSecPtrList">xmlSecPtrListPtr</link>    xmlSecKeyDataIdsGet                 (void);</programlisting>
-<para>
-Gets global registered key data klasses list.</para>
+<indexterm zone="xmlSecKeyDataIdsGet"><primary>xmlSecKeyDataIdsGet</primary></indexterm>
+<programlisting><link linkend="xmlSecPtrList"><returnvalue>xmlSecPtrListPtr</returnvalue></link>    xmlSecKeyDataIdsGet                 (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets global registered key data klasses list.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to list of all registered key data klasses.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataIdsInit" role="function">
 <title>xmlSecKeyDataIdsInit ()</title>
-<indexterm zone="xmlSecKeyDataIdsInit"><primary sortas="xmlSecKeyDataIdsInit">xmlSecKeyDataIdsInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataIdsInit                (void);</programlisting>
+<indexterm zone="xmlSecKeyDataIdsInit"><primary>xmlSecKeyDataIdsInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyDataIdsInit                (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 Initializes the key data klasses. This function is called from the
-<link linkend="xmlSecInit"><type>xmlSecInit</type></link> function and the application should not call it directly.</para>
-<para>
+<link linkend="xmlSecInit"><type>xmlSecInit</type></link> function and the application should not call it directly.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataIdsShutdown" role="function">
 <title>xmlSecKeyDataIdsShutdown ()</title>
-<indexterm zone="xmlSecKeyDataIdsShutdown"><primary sortas="xmlSecKeyDataIdsShutdown">xmlSecKeyDataIdsShutdown</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDataIdsShutdown            (void);</programlisting>
+<indexterm zone="xmlSecKeyDataIdsShutdown"><primary>xmlSecKeyDataIdsShutdown</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyDataIdsShutdown            (<parameter><type>void</type></parameter>);</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>
+<link linkend="xmlSecShutdown"><type>xmlSecShutdown</type></link> function and the application should not call it directly.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataIdsRegisterDefault" role="function">
 <title>xmlSecKeyDataIdsRegisterDefault ()</title>
-<indexterm zone="xmlSecKeyDataIdsRegisterDefault"><primary sortas="xmlSecKeyDataIdsRegisterDefault">xmlSecKeyDataIdsRegisterDefault</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataIdsRegisterDefault     (void);</programlisting>
+<indexterm zone="xmlSecKeyDataIdsRegisterDefault"><primary>xmlSecKeyDataIdsRegisterDefault</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyDataIdsRegisterDefault     (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 Registers default (implemented by XML Security Library)
 key data klasses: <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";>&lt;dsig:KeyName/&gt;</ulink> element processing klass,
-<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";>&lt;dsig:KeyValue/&gt;</ulink> element processing klass, ...</para>
-<para>
+<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";>&lt;dsig:KeyValue/&gt;</ulink> element processing klass, ...
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataIdsRegister" role="function">
 <title>xmlSecKeyDataIdsRegister ()</title>
-<indexterm zone="xmlSecKeyDataIdsRegister"><primary sortas="xmlSecKeyDataIdsRegister">xmlSecKeyDataIdsRegister</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataIdsRegister            (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id);</programlisting>
-<para>
-Registers <parameter>id</parameter> in the global list of key data klasses.</para>
+<indexterm zone="xmlSecKeyDataIdsRegister"><primary>xmlSecKeyDataIdsRegister</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyDataIdsRegister            (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>);</programlisting>
 <para>
+Registers <parameter>id</parameter> in the global list of key data klasses.
 </para><variablelist role="params">
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the key data klass.
+<listitem><simpara>the key data klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyData" role="struct">
 <title>struct xmlSecKeyData</title>
-<indexterm zone="xmlSecKeyData"><primary sortas="xmlSecKeyData">xmlSecKeyData</primary></indexterm><programlisting>struct xmlSecKeyData {
+<indexterm zone="xmlSecKeyData"><primary>xmlSecKeyData</primary></indexterm>
+<programlisting>struct xmlSecKeyData {
     xmlSecKeyDataId                     id;
     void*                               reserved0;
     void*                               reserved1;
 };
 </programlisting>
 <para>
-The key data: key value (crypto material), x509 data, pgp data, etc.</para>
-<para>
+The key data: key value (crypto material), x509 data, pgp data, etc.
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>&#160;<structfield>id</structfield>;</term>
-<listitem><simpara>                 the data id (<link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link>).
+<varlistentry><term><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link>&#160;<structfield id="xmlSecKeyData.id">id</structfield>;</term>
+<listitem><simpara>the data id (<link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link>).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
-<listitem><simpara>          reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecKeyData.reserved0">reserved0</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
-<listitem><simpara>          reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecKeyData.reserved1">reserved1</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataCreate" role="function">
 <title>xmlSecKeyDataCreate ()</title>
-<indexterm zone="xmlSecKeyDataCreate"><primary sortas="xmlSecKeyDataCreate">xmlSecKeyDataCreate</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    xmlSecKeyDataCreate                 (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id);</programlisting>
+<indexterm zone="xmlSecKeyDataCreate"><primary>xmlSecKeyDataCreate</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyData"><returnvalue>xmlSecKeyDataPtr</returnvalue></link>    xmlSecKeyDataCreate                 (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>);</programlisting>
 <para>
 Allocates and initializes new key data of the specified type <parameter>id</parameter>.
 Caller is responsible for destroing returend object with
-<link linkend="xmlSecKeyDataDestroy"><type>xmlSecKeyDataDestroy</type></link> function.</para>
-<para>
+<link linkend="xmlSecKeyDataDestroy"><type>xmlSecKeyDataDestroy</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the data id.
+<listitem><simpara>the data id.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly allocated key data structure
 or NULL if an error occurs.
@@ -540,14 +533,14 @@ or NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataDuplicate" role="function">
 <title>xmlSecKeyDataDuplicate ()</title>
-<indexterm zone="xmlSecKeyDataDuplicate"><primary sortas="xmlSecKeyDataDuplicate">xmlSecKeyDataDuplicate</primary></indexterm><programlisting><link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link>    xmlSecKeyDataDuplicate              (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<indexterm zone="xmlSecKeyDataDuplicate"><primary>xmlSecKeyDataDuplicate</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataPtr"><returnvalue>xmlSecKeyDataPtr</returnvalue></link>    xmlSecKeyDataDuplicate              (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
 Creates a duplicate of the given <parameter>data</parameter>. Caller is responsible for
-destroing returend object with <link linkend="xmlSecKeyDataDestroy"><type>xmlSecKeyDataDestroy</type></link> function.</para>
-<para>
+destroing returend object with <link linkend="xmlSecKeyDataDestroy"><type>xmlSecKeyDataDestroy</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to the key data.
+<listitem><simpara>the pointer to the key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly allocated key data structure
 or NULL if an error occurs.
@@ -555,515 +548,516 @@ or NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataDestroy" role="function">
 <title>xmlSecKeyDataDestroy ()</title>
-<indexterm zone="xmlSecKeyDataDestroy"><primary sortas="xmlSecKeyDataDestroy">xmlSecKeyDataDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDataDestroy                (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Destroys the data and frees all allocated memory.</para>
+<indexterm zone="xmlSecKeyDataDestroy"><primary>xmlSecKeyDataDestroy</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyDataDestroy                (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Destroys the data and frees all allocated memory.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to the key data.
+<listitem><simpara>the pointer to the key data.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataGenerate" role="function">
 <title>xmlSecKeyDataGenerate ()</title>
-<indexterm zone="xmlSecKeyDataGenerate"><primary sortas="xmlSecKeyDataGenerate">xmlSecKeyDataGenerate</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataGenerate               (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
-<para>
-Generates new key data of given size and type.</para>
+<indexterm zone="xmlSecKeyDataGenerate"><primary>xmlSecKeyDataGenerate</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyDataGenerate               (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> sizeBits</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
+Generates new key data of given size and type.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to key data.
+<listitem><simpara>the pointer to key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>sizeBits</parameter>&#160;:</term>
-<listitem><simpara>           the desired key data size (in bits).
+<listitem><simpara>the desired key data size (in bits).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the desired key data type.
+<listitem><simpara>the desired key data type.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataGetType" role="function">
 <title>xmlSecKeyDataGetType ()</title>
-<indexterm zone="xmlSecKeyDataGetType"><primary sortas="xmlSecKeyDataGetType">xmlSecKeyDataGetType</primary></indexterm><programlisting><link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link>   xmlSecKeyDataGetType                (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets key data type.</para>
+<indexterm zone="xmlSecKeyDataGetType"><primary>xmlSecKeyDataGetType</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataType"><returnvalue>xmlSecKeyDataType</returnvalue></link>   xmlSecKeyDataGetType                (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets key data type.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to key data.
+<listitem><simpara>the pointer to key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> key data type.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataGetSize" role="function">
 <title>xmlSecKeyDataGetSize ()</title>
-<indexterm zone="xmlSecKeyDataGetSize"><primary sortas="xmlSecKeyDataGetSize">xmlSecKeyDataGetSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecKeyDataGetSize                (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets key data size.</para>
+<indexterm zone="xmlSecKeyDataGetSize"><primary>xmlSecKeyDataGetSize</primary></indexterm>
+<programlisting><link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          xmlSecKeyDataGetSize                (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets key data size.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to key data.
+<listitem><simpara>the pointer to key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> key data size (in bits).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataGetIdentifier" role="function">
 <title>xmlSecKeyDataGetIdentifier ()</title>
-<indexterm zone="xmlSecKeyDataGetIdentifier"><primary sortas="xmlSecKeyDataGetIdentifier">xmlSecKeyDataGetIdentifier</primary></indexterm><programlisting>const <link linkend="xmlChar">xmlChar</link>*      xmlSecKeyDataGetIdentifier          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets key data identifier string.</para>
+<indexterm zone="xmlSecKeyDataGetIdentifier"><primary>xmlSecKeyDataGetIdentifier</primary></indexterm>
+<programlisting>const <link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*      xmlSecKeyDataGetIdentifier          (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets key data identifier string.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to key data.
+<listitem><simpara>the pointer to key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> key data id string.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataDebugDump" role="function">
 <title>xmlSecKeyDataDebugDump ()</title>
-<indexterm zone="xmlSecKeyDataDebugDump"><primary sortas="xmlSecKeyDataDebugDump">xmlSecKeyDataDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDataDebugDump              (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints key data debug info.</para>
+<indexterm zone="xmlSecKeyDataDebugDump"><primary>xmlSecKeyDataDebugDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyDataDebugDump              (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints key data debug info.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to key data.
+<listitem><simpara>the pointer to key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataDebugXmlDump" role="function">
 <title>xmlSecKeyDataDebugXmlDump ()</title>
-<indexterm zone="xmlSecKeyDataDebugXmlDump"><primary sortas="xmlSecKeyDataDebugXmlDump">xmlSecKeyDataDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDataDebugXmlDump           (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints key data debug info in XML format.</para>
+<indexterm zone="xmlSecKeyDataDebugXmlDump"><primary>xmlSecKeyDataDebugXmlDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyDataDebugXmlDump           (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints key data debug info in XML format.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to key data.
+<listitem><simpara>the pointer to key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataXmlRead" role="function">
 <title>xmlSecKeyDataXmlRead ()</title>
-<indexterm zone="xmlSecKeyDataXmlRead"><primary sortas="xmlSecKeyDataXmlRead">xmlSecKeyDataXmlRead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataXmlRead                (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
-<para>
-Reads the key data of klass <parameter>id</parameter> from XML <parameter>node</parameter> and adds them to <parameter>key</parameter>.</para>
+<indexterm zone="xmlSecKeyDataXmlRead"><primary>xmlSecKeyDataXmlRead</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyDataXmlRead                (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
+Reads the key data of klass <parameter>id</parameter> from XML <parameter>node</parameter> and adds them to <parameter>key</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the data klass.
+<listitem><simpara>the data klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the destination key.
+<listitem><simpara>the destination key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to an XML node.
+<listitem><simpara>the pointer to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
+<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>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataXmlWrite" role="function">
 <title>xmlSecKeyDataXmlWrite ()</title>
-<indexterm zone="xmlSecKeyDataXmlWrite"><primary sortas="xmlSecKeyDataXmlWrite">xmlSecKeyDataXmlWrite</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataXmlWrite               (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
-<para>
-Writes the key data of klass <parameter>id</parameter> from <parameter>key</parameter> to an XML <parameter>node</parameter>.</para>
+<indexterm zone="xmlSecKeyDataXmlWrite"><primary>xmlSecKeyDataXmlWrite</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyDataXmlWrite               (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
+Writes the key data of klass <parameter>id</parameter> from <parameter>key</parameter> to an XML <parameter>node</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the data klass.
+<listitem><simpara>the data klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the source key.
+<listitem><simpara>the source key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to an XML node.
+<listitem><simpara>the pointer to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
+<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>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataBinRead" role="function">
 <title>xmlSecKeyDataBinRead ()</title>
-<indexterm zone="xmlSecKeyDataBinRead"><primary sortas="xmlSecKeyDataBinRead">xmlSecKeyDataBinRead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataBinRead                (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
-<para>
-Reads the key data of klass <parameter>id</parameter> from binary buffer <parameter>buf</parameter> to <parameter>key</parameter>.</para>
+<indexterm zone="xmlSecKeyDataBinRead"><primary>xmlSecKeyDataBinRead</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyDataBinRead                (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
+Reads the key data of klass <parameter>id</parameter> from binary buffer <parameter>buf</parameter> to <parameter>key</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the data klass.
+<listitem><simpara>the data klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the destination key.
+<listitem><simpara>the destination key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the input binary buffer.
+<listitem><simpara>the input binary buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the input buffer size.
+<listitem><simpara>the input buffer size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node processing context.
+<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>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataBinWrite" role="function">
 <title>xmlSecKeyDataBinWrite ()</title>
-<indexterm zone="xmlSecKeyDataBinWrite"><primary sortas="xmlSecKeyDataBinWrite">xmlSecKeyDataBinWrite</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataBinWrite               (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlSecByte">xmlSecByte</link> **buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> *bufSize,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
-<para>
-Writes the key data of klass <parameter>id</parameter> from the <parameter>key</parameter> to a binary buffer <parameter>buf</parameter>.</para>
+<indexterm zone="xmlSecKeyDataBinWrite"><primary>xmlSecKeyDataBinWrite</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyDataBinWrite               (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlSecByte"><type>xmlSecByte</type></link> **buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> *bufSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
+Writes the key data of klass <parameter>id</parameter> from the <parameter>key</parameter> to a binary buffer <parameter>buf</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the data klass.
+<listitem><simpara>the data klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the source key.
+<listitem><simpara>the source key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the output binary buffer.
+<listitem><simpara>the output binary buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the output buffer size.
+<listitem><simpara>the output buffer size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node processing context.
+<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>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataGetName" role="macro">
 <title>xmlSecKeyDataGetName()</title>
-<indexterm zone="xmlSecKeyDataGetName"><primary sortas="xmlSecKeyDataGetName">xmlSecKeyDataGetName</primary></indexterm><programlisting>#define             xmlSecKeyDataGetName(data)</programlisting>
-<para>
-Macro. Returns the key data name.</para>
+<indexterm zone="xmlSecKeyDataGetName"><primary>xmlSecKeyDataGetName</primary></indexterm>
+<programlisting>#define             xmlSecKeyDataGetName(data)</programlisting>
 <para>
+Macro. Returns the key data name.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to key data.
+<listitem><simpara>the pointer to key data.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataIsValid" role="macro">
 <title>xmlSecKeyDataIsValid()</title>
-<indexterm zone="xmlSecKeyDataIsValid"><primary sortas="xmlSecKeyDataIsValid">xmlSecKeyDataIsValid</primary></indexterm><programlisting>#define             xmlSecKeyDataIsValid(data)</programlisting>
+<indexterm zone="xmlSecKeyDataIsValid"><primary>xmlSecKeyDataIsValid</primary></indexterm>
+<programlisting>#define             xmlSecKeyDataIsValid(data)</programlisting>
 <para>
 Macro. Returns 1 if <parameter>data</parameter> is not NULL and <parameter>data</parameter>-&gt;id is not NULL
-or 0 otherwise.</para>
-<para>
+or 0 otherwise.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to data.
+<listitem><simpara>the pointer to data.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataCheckId" role="macro">
 <title>xmlSecKeyDataCheckId()</title>
-<indexterm zone="xmlSecKeyDataCheckId"><primary sortas="xmlSecKeyDataCheckId">xmlSecKeyDataCheckId</primary></indexterm><programlisting>#define             xmlSecKeyDataCheckId(data, dataId)</programlisting>
-<para>
-Macro. Returns 1 if <parameter>data</parameter> is valid and <parameter>data</parameter>'s id is equal to <parameter>dataId</parameter>.</para>
+<indexterm zone="xmlSecKeyDataCheckId"><primary>xmlSecKeyDataCheckId</primary></indexterm>
+<programlisting>#define             xmlSecKeyDataCheckId(data, dataId)</programlisting>
 <para>
+Macro. Returns 1 if <parameter>data</parameter> is valid and <parameter>data</parameter>'s id is equal to <parameter>dataId</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to data.
+<listitem><simpara>the pointer to data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataId</parameter>&#160;:</term>
-<listitem><simpara>             the data Id.
+<listitem><simpara>the data Id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataCheckUsage" role="macro">
 <title>xmlSecKeyDataCheckUsage()</title>
-<indexterm zone="xmlSecKeyDataCheckUsage"><primary sortas="xmlSecKeyDataCheckUsage">xmlSecKeyDataCheckUsage</primary></indexterm><programlisting>#define             xmlSecKeyDataCheckUsage(data, usg)</programlisting>
-<para>
-Macro. Returns 1 if <parameter>data</parameter> is valid and could be used for <parameter>usg</parameter>.</para>
+<indexterm zone="xmlSecKeyDataCheckUsage"><primary>xmlSecKeyDataCheckUsage</primary></indexterm>
+<programlisting>#define             xmlSecKeyDataCheckUsage(data, usg)</programlisting>
 <para>
+Macro. Returns 1 if <parameter>data</parameter> is valid and could be used for <parameter>usg</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to data.
+<listitem><simpara>the pointer to data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>usg</parameter>&#160;:</term>
-<listitem><simpara>                the data usage.
+<listitem><simpara>the data usage.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataCheckSize" role="macro">
 <title>xmlSecKeyDataCheckSize()</title>
-<indexterm zone="xmlSecKeyDataCheckSize"><primary sortas="xmlSecKeyDataCheckSize">xmlSecKeyDataCheckSize</primary></indexterm><programlisting>#define             xmlSecKeyDataCheckSize(data, size)</programlisting>
-<para>
-Macro. Returns 1 if <parameter>data</parameter> is valid and <parameter>data</parameter>'s object has at least <parameter>size</parameter> bytes.</para>
+<indexterm zone="xmlSecKeyDataCheckSize"><primary>xmlSecKeyDataCheckSize</primary></indexterm>
+<programlisting>#define             xmlSecKeyDataCheckSize(data, size)</programlisting>
 <para>
+Macro. Returns 1 if <parameter>data</parameter> is valid and <parameter>data</parameter>'s object has at least <parameter>size</parameter> bytes.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to data.
+<listitem><simpara>the pointer to data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the expected size.
+<listitem><simpara>the expected size.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataIdUnknown" role="macro">
 <title>xmlSecKeyDataIdUnknown</title>
-<indexterm zone="xmlSecKeyDataIdUnknown"><primary sortas="xmlSecKeyDataIdUnknown">xmlSecKeyDataIdUnknown</primary></indexterm><programlisting>#define xmlSecKeyDataIdUnknown                  ((xmlSecKeyDataId)NULL)
+<indexterm zone="xmlSecKeyDataIdUnknown"><primary>xmlSecKeyDataIdUnknown</primary></indexterm>
+<programlisting>#define xmlSecKeyDataIdUnknown                  ((xmlSecKeyDataId)NULL)
 </programlisting>
 <para>
-The "unknown" id.</para>
-<para>
+The "unknown" id.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataInitMethod" role="function">
 <title>xmlSecKeyDataInitMethod ()</title>
-<indexterm zone="xmlSecKeyDataInitMethod"><primary sortas="xmlSecKeyDataInitMethod">xmlSecKeyDataInitMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecKeyDataInitMethod)          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Key data specific initialization method.</para>
+<indexterm zone="xmlSecKeyDataInitMethod"><primary>xmlSecKeyDataInitMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecKeyDataInitMethod)          (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Key data specific initialization method.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to key data.
+<listitem><simpara>the pointer to key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataDuplicateMethod" role="function">
 <title>xmlSecKeyDataDuplicateMethod ()</title>
-<indexterm zone="xmlSecKeyDataDuplicateMethod"><primary sortas="xmlSecKeyDataDuplicateMethod">xmlSecKeyDataDuplicateMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecKeyDataDuplicateMethod)     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> dst,
-                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> src);</programlisting>
-<para>
-Key data specific duplication (copy) method.</para>
+<indexterm zone="xmlSecKeyDataDuplicateMethod"><primary>xmlSecKeyDataDuplicateMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecKeyDataDuplicateMethod)     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> dst</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> src</parameter>);</programlisting>
 <para>
+Key data specific duplication (copy) method.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dst</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to destination key data.
+<listitem><simpara>the pointer to destination key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>src</parameter>&#160;:</term>
-<listitem><simpara>                the poiniter to source key data.
+<listitem><simpara>the poiniter to source key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataFinalizeMethod" role="function">
 <title>xmlSecKeyDataFinalizeMethod ()</title>
-<indexterm zone="xmlSecKeyDataFinalizeMethod"><primary sortas="xmlSecKeyDataFinalizeMethod">xmlSecKeyDataFinalizeMethod</primary></indexterm><programlisting><link linkend="void">void</link>                (*xmlSecKeyDataFinalizeMethod)      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<indexterm zone="xmlSecKeyDataFinalizeMethod"><primary>xmlSecKeyDataFinalizeMethod</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*xmlSecKeyDataFinalizeMethod)      (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
 Key data specific finalization method. All the objects and resources allocated
-by the key data object must be freed inside this method.</para>
-<para>
+by the key data object must be freed inside this method.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the data.
+<listitem><simpara>the data.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataXmlReadMethod" role="function">
 <title>xmlSecKeyDataXmlReadMethod ()</title>
-<indexterm zone="xmlSecKeyDataXmlReadMethod"><primary sortas="xmlSecKeyDataXmlReadMethod">xmlSecKeyDataXmlReadMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecKeyDataXmlReadMethod)       (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
-<para>
-Key data specific method for reading XML node.</para>
+<indexterm zone="xmlSecKeyDataXmlReadMethod"><primary>xmlSecKeyDataXmlReadMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecKeyDataXmlReadMethod)       (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
+Key data specific method for reading XML node.
 </para><variablelist role="params">
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the data id.
+<listitem><simpara>the data id.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the key.
+<listitem><simpara>the key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to data's value XML node.
+<listitem><simpara>the pointer to data's value XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node processing context.
+<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>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataXmlWriteMethod" role="function">
 <title>xmlSecKeyDataXmlWriteMethod ()</title>
-<indexterm zone="xmlSecKeyDataXmlWriteMethod"><primary sortas="xmlSecKeyDataXmlWriteMethod">xmlSecKeyDataXmlWriteMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecKeyDataXmlWriteMethod)      (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
-<para>
-Key data specific method for writing XML node.</para>
+<indexterm zone="xmlSecKeyDataXmlWriteMethod"><primary>xmlSecKeyDataXmlWriteMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecKeyDataXmlWriteMethod)      (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
+Key data specific method for writing XML node.
 </para><variablelist role="params">
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the data id.
+<listitem><simpara>the data id.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the key.
+<listitem><simpara>the key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to data's value XML node.
+<listitem><simpara>the pointer to data's value XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the &lt;dsig:KeyInfo&gt; node processing context.
+<listitem><simpara>the &lt;dsig:KeyInfo&gt; node processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataBinReadMethod" role="function">
 <title>xmlSecKeyDataBinReadMethod ()</title>
-<indexterm zone="xmlSecKeyDataBinReadMethod"><primary sortas="xmlSecKeyDataBinReadMethod">xmlSecKeyDataBinReadMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecKeyDataBinReadMethod)       (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
-<para>
-Key data specific method for reading binary buffer.</para>
+<indexterm zone="xmlSecKeyDataBinReadMethod"><primary>xmlSecKeyDataBinReadMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecKeyDataBinReadMethod)       (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
+Key data specific method for reading binary buffer.
 </para><variablelist role="params">
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the data id.
+<listitem><simpara>the data id.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the key.
+<listitem><simpara>the key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the input buffer.
+<listitem><simpara>the input buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the buffer size.
+<listitem><simpara>the buffer size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node processing context.
+<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>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataBinWriteMethod" role="function">
 <title>xmlSecKeyDataBinWriteMethod ()</title>
-<indexterm zone="xmlSecKeyDataBinWriteMethod"><primary sortas="xmlSecKeyDataBinWriteMethod">xmlSecKeyDataBinWriteMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecKeyDataBinWriteMethod)      (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlSecByte">xmlSecByte</link> **buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> *bufSize,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
-<para>
-Key data specific method for reading binary buffer.</para>
+<indexterm zone="xmlSecKeyDataBinWriteMethod"><primary>xmlSecKeyDataBinWriteMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecKeyDataBinWriteMethod)      (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlSecByte"><type>xmlSecByte</type></link> **buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> *bufSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
+Key data specific method for reading binary buffer.
 </para><variablelist role="params">
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the data id.
+<listitem><simpara>the data id.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the key.
+<listitem><simpara>the key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the output buffer.
+<listitem><simpara>the output buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the buffer size.
+<listitem><simpara>the buffer size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node processing context.
+<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>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataGenerateMethod" role="function">
 <title>xmlSecKeyDataGenerateMethod ()</title>
-<indexterm zone="xmlSecKeyDataGenerateMethod"><primary sortas="xmlSecKeyDataGenerateMethod">xmlSecKeyDataGenerateMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecKeyDataGenerateMethod)      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
-<para>
-Key data specific method for generating new key data.</para>
+<indexterm zone="xmlSecKeyDataGenerateMethod"><primary>xmlSecKeyDataGenerateMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecKeyDataGenerateMethod)      (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> sizeBits</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
+Key data specific method for generating new key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to key data.
+<listitem><simpara>the pointer to key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>sizeBits</parameter>&#160;:</term>
-<listitem><simpara>           the key data specific size.
+<listitem><simpara>the key data specific size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the required key type (session/permanent, etc.)
+<listitem><simpara>the required key type (session/permanent, etc.)
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataGetTypeMethod" role="function">
 <title>xmlSecKeyDataGetTypeMethod ()</title>
-<indexterm zone="xmlSecKeyDataGetTypeMethod"><primary sortas="xmlSecKeyDataGetTypeMethod">xmlSecKeyDataGetTypeMethod</primary></indexterm><programlisting><link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link>   (*xmlSecKeyDataGetTypeMethod)       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Key data specific method to get the key type.</para>
+<indexterm zone="xmlSecKeyDataGetTypeMethod"><primary>xmlSecKeyDataGetTypeMethod</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataType"><returnvalue>xmlSecKeyDataType</returnvalue></link>   (*xmlSecKeyDataGetTypeMethod)       (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Key data specific method to get the key type.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>                the data.
+<listitem><simpara>the data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the key type.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataGetSizeMethod" role="function">
 <title>xmlSecKeyDataGetSizeMethod ()</title>
-<indexterm zone="xmlSecKeyDataGetSizeMethod"><primary sortas="xmlSecKeyDataGetSizeMethod">xmlSecKeyDataGetSizeMethod</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          (*xmlSecKeyDataGetSizeMethod)       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Key data specific method to get the key size.</para>
+<indexterm zone="xmlSecKeyDataGetSizeMethod"><primary>xmlSecKeyDataGetSizeMethod</primary></indexterm>
+<programlisting><link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          (*xmlSecKeyDataGetSizeMethod)       (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Key data specific method to get the key size.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to key data.
+<listitem><simpara>the pointer to key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the key size in bits.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataGetIdentifierMethod" role="function">
 <title>xmlSecKeyDataGetIdentifierMethod ()</title>
-<indexterm zone="xmlSecKeyDataGetIdentifierMethod"><primary sortas="xmlSecKeyDataGetIdentifierMethod">xmlSecKeyDataGetIdentifierMethod</primary></indexterm><programlisting>const <link linkend="xmlChar">xmlChar</link> *     (*xmlSecKeyDataGetIdentifierMethod) (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<indexterm zone="xmlSecKeyDataGetIdentifierMethod"><primary>xmlSecKeyDataGetIdentifierMethod</primary></indexterm>
+<programlisting>const <link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link> *     (*xmlSecKeyDataGetIdentifierMethod) (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
 Key data specific method to get the key data identifier string (for example,
-X509 data identifier is the subject of the verified cert).</para>
-<para>
+X509 data identifier is the subject of the verified cert).
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to key data.
+<listitem><simpara>the pointer to key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the identifier string or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataDebugDumpMethod" role="function">
 <title>xmlSecKeyDataDebugDumpMethod ()</title>
-<indexterm zone="xmlSecKeyDataDebugDumpMethod"><primary sortas="xmlSecKeyDataDebugDumpMethod">xmlSecKeyDataDebugDumpMethod</primary></indexterm><programlisting><link linkend="void">void</link>                (*xmlSecKeyDataDebugDumpMethod)     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Key data specific method for printing debug info.</para>
+<indexterm zone="xmlSecKeyDataDebugDumpMethod"><primary>xmlSecKeyDataDebugDumpMethod</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*xmlSecKeyDataDebugDumpMethod)     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Key data specific method for printing debug info.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the data.
+<listitem><simpara>the data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the FILE to print debug info (should be open for writing).
+<listitem><simpara>the FILE to print debug info (should be open for writing).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataKlass" role="struct">
 <title>struct xmlSecKeyDataKlass</title>
-<indexterm zone="xmlSecKeyDataKlass"><primary sortas="xmlSecKeyDataKlass">xmlSecKeyDataKlass</primary></indexterm><programlisting>struct xmlSecKeyDataKlass {
+<indexterm zone="xmlSecKeyDataKlass"><primary>xmlSecKeyDataKlass</primary></indexterm>
+<programlisting>struct xmlSecKeyDataKlass {
     xmlSecSize                          klassSize;
     xmlSecSize                          objSize;
 
@@ -1101,180 +1095,157 @@ Key data specific method for printing debug info.</para>
 };
 </programlisting>
 <para>
-The data id (klass).</para>
-<para>
+The data id (klass).
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>klassSize</structfield>;</term>
-<listitem><simpara>          the klass size.
+<varlistentry><term><link linkend="xmlSecSize"><type>xmlSecSize</type></link>&#160;<structfield id="xmlSecKeyDataKlass.klassSize">klassSize</structfield>;</term>
+<listitem><simpara>the klass size.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>objSize</structfield>;</term>
-<listitem><simpara>            the object size.
+<varlistentry><term><link linkend="xmlSecSize"><type>xmlSecSize</type></link>&#160;<structfield id="xmlSecKeyDataKlass.objSize">objSize</structfield>;</term>
+<listitem><simpara>the object size.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>name</structfield>;</term>
-<listitem><simpara>               the object name.
+<varlistentry><term>const&#160;<link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecKeyDataKlass.name">name</structfield>;</term>
+<listitem><simpara>the object name.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link>&#160;<structfield>usage</structfield>;</term>
-<listitem><simpara>              the allowed data usage.
+<varlistentry><term><link linkend="xmlSecKeyDataUsage"><type>xmlSecKeyDataUsage</type></link>&#160;<structfield id="xmlSecKeyDataKlass.usage">usage</structfield>;</term>
+<listitem><simpara>the allowed data usage.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>href</structfield>;</term>
-<listitem><simpara>               the identification string (href).
+<varlistentry><term>const&#160;<link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecKeyDataKlass.href">href</structfield>;</term>
+<listitem><simpara>the identification string (href).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>dataNodeName</structfield>;</term>
-<listitem><simpara>       the data's XML node name.
+<varlistentry><term>const&#160;<link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecKeyDataKlass.dataNodeName">dataNodeName</structfield>;</term>
+<listitem><simpara>the data's XML node name.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>dataNodeNs</structfield>;</term>
-<listitem><simpara>         the data's XML node namespace.
+<varlistentry><term>const&#160;<link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecKeyDataKlass.dataNodeNs">dataNodeNs</structfield>;</term>
+<listitem><simpara>the data's XML node namespace.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyDataInitMethod">xmlSecKeyDataInitMethod</link>&#160;<structfield>initialize</structfield>;</term>
-<listitem><simpara>         the initialization method.
+<varlistentry><term><link linkend="xmlSecKeyDataInitMethod"><type>xmlSecKeyDataInitMethod</type></link>&#160;<structfield id="xmlSecKeyDataKlass.initialize">initialize</structfield>;</term>
+<listitem><simpara>the initialization method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyDataDuplicateMethod">xmlSecKeyDataDuplicateMethod</link>&#160;<structfield>duplicate</structfield>;</term>
-<listitem><simpara>          the duplicate (copy) method.
+<varlistentry><term><link linkend="xmlSecKeyDataDuplicateMethod"><type>xmlSecKeyDataDuplicateMethod</type></link>&#160;<structfield id="xmlSecKeyDataKlass.duplicate">duplicate</structfield>;</term>
+<listitem><simpara>the duplicate (copy) method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyDataFinalizeMethod">xmlSecKeyDataFinalizeMethod</link>&#160;<structfield>finalize</structfield>;</term>
-<listitem><simpara>           the finalization (destroy) method.
+<varlistentry><term><link linkend="xmlSecKeyDataFinalizeMethod"><type>xmlSecKeyDataFinalizeMethod</type></link>&#160;<structfield id="xmlSecKeyDataKlass.finalize">finalize</structfield>;</term>
+<listitem><simpara>the finalization (destroy) method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyDataGenerateMethod">xmlSecKeyDataGenerateMethod</link>&#160;<structfield>generate</structfield>;</term>
-<listitem><simpara>           the new data generation method.
+<varlistentry><term><link linkend="xmlSecKeyDataGenerateMethod"><type>xmlSecKeyDataGenerateMethod</type></link>&#160;<structfield id="xmlSecKeyDataKlass.generate">generate</structfield>;</term>
+<listitem><simpara>the new data generation method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyDataGetTypeMethod">xmlSecKeyDataGetTypeMethod</link>&#160;<structfield>getType</structfield>;</term>
-<listitem><simpara>            the method to access data's type information.
+<varlistentry><term><link linkend="xmlSecKeyDataGetTypeMethod"><type>xmlSecKeyDataGetTypeMethod</type></link>&#160;<structfield id="xmlSecKeyDataKlass.getType">getType</structfield>;</term>
+<listitem><simpara>the method to access data's type information.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyDataGetSizeMethod">xmlSecKeyDataGetSizeMethod</link>&#160;<structfield>getSize</structfield>;</term>
-<listitem><simpara>            the method to access data's size.
+<varlistentry><term><link linkend="xmlSecKeyDataGetSizeMethod"><type>xmlSecKeyDataGetSizeMethod</type></link>&#160;<structfield id="xmlSecKeyDataKlass.getSize">getSize</structfield>;</term>
+<listitem><simpara>the method to access data's size.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyDataGetIdentifierMethod">xmlSecKeyDataGetIdentifierMethod</link>&#160;<structfield>getIdentifier</structfield>;</term>
-<listitem><simpara>      the method to access data's string identifier.
+<varlistentry><term><link linkend="xmlSecKeyDataGetIdentifierMethod"><type>xmlSecKeyDataGetIdentifierMethod</type></link>&#160;<structfield id="xmlSecKeyDataKlass.getIdentifier">getIdentifier</structfield>;</term>
+<listitem><simpara>the method to access data's string identifier.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyDataXmlReadMethod">xmlSecKeyDataXmlReadMethod</link>&#160;<structfield>xmlRead</structfield>;</term>
-<listitem><simpara>            the method for reading data from XML node.
+<varlistentry><term><link linkend="xmlSecKeyDataXmlReadMethod"><type>xmlSecKeyDataXmlReadMethod</type></link>&#160;<structfield id="xmlSecKeyDataKlass.xmlRead">xmlRead</structfield>;</term>
+<listitem><simpara>the method for reading data from XML node.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyDataXmlWriteMethod">xmlSecKeyDataXmlWriteMethod</link>&#160;<structfield>xmlWrite</structfield>;</term>
-<listitem><simpara>           the method for writing data to XML node.
+<varlistentry><term><link linkend="xmlSecKeyDataXmlWriteMethod"><type>xmlSecKeyDataXmlWriteMethod</type></link>&#160;<structfield id="xmlSecKeyDataKlass.xmlWrite">xmlWrite</structfield>;</term>
+<listitem><simpara>the method for writing data to XML node.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyDataBinReadMethod">xmlSecKeyDataBinReadMethod</link>&#160;<structfield>binRead</structfield>;</term>
-<listitem><simpara>            the method for reading data from a binary buffer.
+<varlistentry><term><link linkend="xmlSecKeyDataBinReadMethod"><type>xmlSecKeyDataBinReadMethod</type></link>&#160;<structfield id="xmlSecKeyDataKlass.binRead">binRead</structfield>;</term>
+<listitem><simpara>the method for reading data from a binary buffer.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyDataBinWriteMethod">xmlSecKeyDataBinWriteMethod</link>&#160;<structfield>binWrite</structfield>;</term>
-<listitem><simpara>           the method for writing data to binary buffer.
+<varlistentry><term><link linkend="xmlSecKeyDataBinWriteMethod"><type>xmlSecKeyDataBinWriteMethod</type></link>&#160;<structfield id="xmlSecKeyDataKlass.binWrite">binWrite</structfield>;</term>
+<listitem><simpara>the method for writing data to binary buffer.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyDataDebugDumpMethod">xmlSecKeyDataDebugDumpMethod</link>&#160;<structfield>debugDump</structfield>;</term>
-<listitem><simpara>          the method for printing debug data information.
+<varlistentry><term><link linkend="xmlSecKeyDataDebugDumpMethod"><type>xmlSecKeyDataDebugDumpMethod</type></link>&#160;<structfield id="xmlSecKeyDataKlass.debugDump">debugDump</structfield>;</term>
+<listitem><simpara>the method for printing debug data information.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyDataDebugDumpMethod">xmlSecKeyDataDebugDumpMethod</link>&#160;<structfield>debugXmlDump</structfield>;</term>
-<listitem><simpara>       the method for printing debug data information in XML format.
+<varlistentry><term><link linkend="xmlSecKeyDataDebugDumpMethod"><type>xmlSecKeyDataDebugDumpMethod</type></link>&#160;<structfield id="xmlSecKeyDataKlass.debugXmlDump">debugXmlDump</structfield>;</term>
+<listitem><simpara>the method for printing debug data information in XML format.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
-<listitem><simpara>          reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecKeyDataKlass.reserved0">reserved0</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
-<listitem><simpara>          reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecKeyDataKlass.reserved1">reserved1</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataKlassGetName" role="macro">
 <title>xmlSecKeyDataKlassGetName()</title>
-<indexterm zone="xmlSecKeyDataKlassGetName"><primary sortas="xmlSecKeyDataKlassGetName">xmlSecKeyDataKlassGetName</primary></indexterm><programlisting>#define             xmlSecKeyDataKlassGetName(klass)</programlisting>
-<para>
-Macro. Returns data klass name.</para>
+<indexterm zone="xmlSecKeyDataKlassGetName"><primary>xmlSecKeyDataKlassGetName</primary></indexterm>
+<programlisting>#define             xmlSecKeyDataKlassGetName(klass)</programlisting>
 <para>
+Macro. Returns data klass name.
 </para><variablelist role="params">
 <varlistentry><term><parameter>klass</parameter>&#160;:</term>
-<listitem><simpara>              the data klass.
+<listitem><simpara>the data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataListId" role="macro">
 <title>xmlSecKeyDataListId</title>
-<indexterm zone="xmlSecKeyDataListId"><primary sortas="xmlSecKeyDataListId">xmlSecKeyDataListId</primary></indexterm><programlisting>#define xmlSecKeyDataListId     xmlSecKeyDataListGetKlass()
+<indexterm zone="xmlSecKeyDataListId"><primary>xmlSecKeyDataListId</primary></indexterm>
+<programlisting>#define xmlSecKeyDataListId     xmlSecKeyDataListGetKlass()
 </programlisting>
 <para>
-The key data klasses list klass id.</para>
-<para>
+The key data klasses list klass id.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataListGetKlass" role="function">
 <title>xmlSecKeyDataListGetKlass ()</title>
-<indexterm zone="xmlSecKeyDataListGetKlass"><primary sortas="xmlSecKeyDataListGetKlass">xmlSecKeyDataListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     xmlSecKeyDataListGetKlass           (void);</programlisting>
-<para>
-The key data list klass.</para>
+<indexterm zone="xmlSecKeyDataListGetKlass"><primary>xmlSecKeyDataListGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecPtrListId"><returnvalue>xmlSecPtrListId</returnvalue></link>     xmlSecKeyDataListGetKlass           (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The key data list klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key data list klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataIdListId" role="macro">
 <title>xmlSecKeyDataIdListId</title>
-<indexterm zone="xmlSecKeyDataIdListId"><primary sortas="xmlSecKeyDataIdListId">xmlSecKeyDataIdListId</primary></indexterm><programlisting>#define xmlSecKeyDataIdListId   xmlSecKeyDataIdListGetKlass()
+<indexterm zone="xmlSecKeyDataIdListId"><primary>xmlSecKeyDataIdListId</primary></indexterm>
+<programlisting>#define xmlSecKeyDataIdListId   xmlSecKeyDataIdListGetKlass()
 </programlisting>
 <para>
-The key data list klass id.</para>
-<para>
+The key data list klass id.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataIdListGetKlass" role="function">
 <title>xmlSecKeyDataIdListGetKlass ()</title>
-<indexterm zone="xmlSecKeyDataIdListGetKlass"><primary sortas="xmlSecKeyDataIdListGetKlass">xmlSecKeyDataIdListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     xmlSecKeyDataIdListGetKlass         (void);</programlisting>
-<para>
-The key data id list klass.</para>
+<indexterm zone="xmlSecKeyDataIdListGetKlass"><primary>xmlSecKeyDataIdListGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecPtrListId"><returnvalue>xmlSecPtrListId</returnvalue></link>     xmlSecKeyDataIdListGetKlass         (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The key data id list klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key data id list klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataIdListFind" role="function">
 <title>xmlSecKeyDataIdListFind ()</title>
-<indexterm zone="xmlSecKeyDataIdListFind"><primary sortas="xmlSecKeyDataIdListFind">xmlSecKeyDataIdListFind</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataIdListFind             (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId);</programlisting>
-<para>
-Lookups <parameter>dataId</parameter> in <parameter>list</parameter>.</para>
+<indexterm zone="xmlSecKeyDataIdListFind"><primary>xmlSecKeyDataIdListFind</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyDataIdListFind             (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> dataId</parameter>);</programlisting>
 <para>
+Lookups <parameter>dataId</parameter> in <parameter>list</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to key data ids list.
+<listitem><simpara>the pointer to key data ids list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataId</parameter>&#160;:</term>
-<listitem><simpara>             the key data klass.
+<listitem><simpara>the key data klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if <parameter>dataId</parameter> is found in the <parameter>list</parameter>, 0 if not and a negative
 value if an error occurs.
@@ -1282,340 +1253,341 @@ value if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataIdListFindByNode" role="function">
 <title>xmlSecKeyDataIdListFindByNode ()</title>
-<indexterm zone="xmlSecKeyDataIdListFindByNode"><primary sortas="xmlSecKeyDataIdListFindByNode">xmlSecKeyDataIdListFindByNode</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataIdListFindByNode       (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         const <link linkend="xmlChar">xmlChar</link> *nodeName,
-                                                         const <link linkend="xmlChar">xmlChar</link> *nodeNs,
-                                                         <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link> usage);</programlisting>
+<indexterm zone="xmlSecKeyDataIdListFindByNode"><primary>xmlSecKeyDataIdListFindByNode</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecKeyDataIdListFindByNode       (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *nodeName</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *nodeNs</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataUsage"><type>xmlSecKeyDataUsage</type></link> usage</parameter>);</programlisting>
 <para>
 Lookups data klass in the list with given <parameter>nodeName</parameter>, <parameter>nodeNs</parameter> and
-<parameter>usage</parameter> in the <parameter>list</parameter>.</para>
-<para>
+<parameter>usage</parameter> in the <parameter>list</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to key data ids list.
+<listitem><simpara>the pointer to key data ids list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nodeName</parameter>&#160;:</term>
-<listitem><simpara>           the desired key data klass XML node name.
+<listitem><simpara>the desired key data klass XML node name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nodeNs</parameter>&#160;:</term>
-<listitem><simpara>             the desired key data klass XML node namespace.
+<listitem><simpara>the desired key data klass XML node namespace.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>usage</parameter>&#160;:</term>
-<listitem><simpara>              the desired key data usage.
+<listitem><simpara>the desired key data usage.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> key data klass is found and NULL otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataIdListFindByHref" role="function">
 <title>xmlSecKeyDataIdListFindByHref ()</title>
-<indexterm zone="xmlSecKeyDataIdListFindByHref"><primary sortas="xmlSecKeyDataIdListFindByHref">xmlSecKeyDataIdListFindByHref</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataIdListFindByHref       (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         const <link linkend="xmlChar">xmlChar</link> *href,
-                                                         <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link> usage);</programlisting>
-<para>
-Lookups data klass in the list with given <parameter>href</parameter> and <parameter>usage</parameter> in <parameter>list</parameter>.</para>
+<indexterm zone="xmlSecKeyDataIdListFindByHref"><primary>xmlSecKeyDataIdListFindByHref</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecKeyDataIdListFindByHref       (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *href</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataUsage"><type>xmlSecKeyDataUsage</type></link> usage</parameter>);</programlisting>
 <para>
+Lookups data klass in the list with given <parameter>href</parameter> and <parameter>usage</parameter> in <parameter>list</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to key data ids list.
+<listitem><simpara>the pointer to key data ids list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>href</parameter>&#160;:</term>
-<listitem><simpara>               the desired key data klass href.
+<listitem><simpara>the desired key data klass href.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>usage</parameter>&#160;:</term>
-<listitem><simpara>              the desired key data usage.
+<listitem><simpara>the desired key data usage.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> key data klass is found and NULL otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataIdListFindByName" role="function">
 <title>xmlSecKeyDataIdListFindByName ()</title>
-<indexterm zone="xmlSecKeyDataIdListFindByName"><primary sortas="xmlSecKeyDataIdListFindByName">xmlSecKeyDataIdListFindByName</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataIdListFindByName       (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link> usage);</programlisting>
-<para>
-Lookups data klass in the list with given <parameter>name</parameter> and <parameter>usage</parameter> in <parameter>list</parameter>.</para>
+<indexterm zone="xmlSecKeyDataIdListFindByName"><primary>xmlSecKeyDataIdListFindByName</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecKeyDataIdListFindByName       (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataUsage"><type>xmlSecKeyDataUsage</type></link> usage</parameter>);</programlisting>
 <para>
+Lookups data klass in the list with given <parameter>name</parameter> and <parameter>usage</parameter> in <parameter>list</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to key data ids list.
+<listitem><simpara>the pointer to key data ids list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>name</parameter>&#160;:</term>
-<listitem><simpara>               the desired key data klass name.
+<listitem><simpara>the desired key data klass name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>usage</parameter>&#160;:</term>
-<listitem><simpara>              the desired key data usage.
+<listitem><simpara>the desired key data usage.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> key data klass is found and NULL otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataIdListDebugDump" role="function">
 <title>xmlSecKeyDataIdListDebugDump ()</title>
-<indexterm zone="xmlSecKeyDataIdListDebugDump"><primary sortas="xmlSecKeyDataIdListDebugDump">xmlSecKeyDataIdListDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDataIdListDebugDump        (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints binary key data debug information to <parameter>output</parameter>.</para>
+<indexterm zone="xmlSecKeyDataIdListDebugDump"><primary>xmlSecKeyDataIdListDebugDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyDataIdListDebugDump        (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints binary key data debug information to <parameter>output</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to key data ids list.
+<listitem><simpara>the pointer to key data ids list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataIdListDebugXmlDump" role="function">
 <title>xmlSecKeyDataIdListDebugXmlDump ()</title>
-<indexterm zone="xmlSecKeyDataIdListDebugXmlDump"><primary sortas="xmlSecKeyDataIdListDebugXmlDump">xmlSecKeyDataIdListDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDataIdListDebugXmlDump     (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints binary key data debug information to <parameter>output</parameter> in XML format.</para>
+<indexterm zone="xmlSecKeyDataIdListDebugXmlDump"><primary>xmlSecKeyDataIdListDebugXmlDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyDataIdListDebugXmlDump     (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints binary key data debug information to <parameter>output</parameter> in XML format.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to key data ids list.
+<listitem><simpara>the pointer to key data ids list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataBinarySize" role="macro">
 <title>xmlSecKeyDataBinarySize</title>
-<indexterm zone="xmlSecKeyDataBinarySize"><primary sortas="xmlSecKeyDataBinarySize">xmlSecKeyDataBinarySize</primary></indexterm><programlisting>#define             xmlSecKeyDataBinarySize</programlisting>
-<para>
-The binary key data object size.</para>
+<indexterm zone="xmlSecKeyDataBinarySize"><primary>xmlSecKeyDataBinarySize</primary></indexterm>
+<programlisting>#define             xmlSecKeyDataBinarySize</programlisting>
 <para>
+The binary key data object size.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataBinaryValueInitialize" role="function">
 <title>xmlSecKeyDataBinaryValueInitialize ()</title>
-<indexterm zone="xmlSecKeyDataBinaryValueInitialize"><primary sortas="xmlSecKeyDataBinaryValueInitialize">xmlSecKeyDataBinaryValueInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataBinaryValueInitialize  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Initializes key data.</para>
+<indexterm zone="xmlSecKeyDataBinaryValueInitialize"><primary>xmlSecKeyDataBinaryValueInitialize</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyDataBinaryValueInitialize  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Initializes key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to binary key data.
+<listitem><simpara>the pointer to binary key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataBinaryValueDuplicate" role="function">
 <title>xmlSecKeyDataBinaryValueDuplicate ()</title>
-<indexterm zone="xmlSecKeyDataBinaryValueDuplicate"><primary sortas="xmlSecKeyDataBinaryValueDuplicate">xmlSecKeyDataBinaryValueDuplicate</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataBinaryValueDuplicate   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> dst,
-                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> src);</programlisting>
-<para>
-Copies binary key data from <parameter>src</parameter> to <parameter>dst</parameter>.</para>
+<indexterm zone="xmlSecKeyDataBinaryValueDuplicate"><primary>xmlSecKeyDataBinaryValueDuplicate</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyDataBinaryValueDuplicate   (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> dst</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> src</parameter>);</programlisting>
 <para>
+Copies binary key data from <parameter>src</parameter> to <parameter>dst</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dst</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to destination binary key data.
+<listitem><simpara>the pointer to destination binary key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>src</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to source binary key data.
+<listitem><simpara>the pointer to source binary key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataBinaryValueFinalize" role="function">
 <title>xmlSecKeyDataBinaryValueFinalize ()</title>
-<indexterm zone="xmlSecKeyDataBinaryValueFinalize"><primary sortas="xmlSecKeyDataBinaryValueFinalize">xmlSecKeyDataBinaryValueFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDataBinaryValueFinalize    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Cleans up binary key data.</para>
+<indexterm zone="xmlSecKeyDataBinaryValueFinalize"><primary>xmlSecKeyDataBinaryValueFinalize</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyDataBinaryValueFinalize    (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Cleans up binary key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to binary key data.
+<listitem><simpara>the pointer to binary key data.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataBinaryValueXmlRead" role="function">
 <title>xmlSecKeyDataBinaryValueXmlRead ()</title>
-<indexterm zone="xmlSecKeyDataBinaryValueXmlRead"><primary sortas="xmlSecKeyDataBinaryValueXmlRead">xmlSecKeyDataBinaryValueXmlRead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataBinaryValueXmlRead     (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
-<para>
-Reads binary key data from <parameter>node</parameter> to the key by base64 decoding the <parameter>node</parameter> content.</para>
+<indexterm zone="xmlSecKeyDataBinaryValueXmlRead"><primary>xmlSecKeyDataBinaryValueXmlRead</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyDataBinaryValueXmlRead     (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
+Reads binary key data from <parameter>node</parameter> to the key by base64 decoding the <parameter>node</parameter> content.
 </para><variablelist role="params">
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the data klass.
+<listitem><simpara>the data klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to destination key.
+<listitem><simpara>the pointer to destination key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to an XML node.
+<listitem><simpara>the pointer to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
+<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>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataBinaryValueXmlWrite" role="function">
 <title>xmlSecKeyDataBinaryValueXmlWrite ()</title>
-<indexterm zone="xmlSecKeyDataBinaryValueXmlWrite"><primary sortas="xmlSecKeyDataBinaryValueXmlWrite">xmlSecKeyDataBinaryValueXmlWrite</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataBinaryValueXmlWrite    (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<indexterm zone="xmlSecKeyDataBinaryValueXmlWrite"><primary>xmlSecKeyDataBinaryValueXmlWrite</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyDataBinaryValueXmlWrite    (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
 Base64 encodes binary key data of klass <parameter>id</parameter> from the <parameter>key</parameter> and
-sets to the <parameter>node</parameter> content.</para>
-<para>
+sets to the <parameter>node</parameter> content.
 </para><variablelist role="params">
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the data klass.
+<listitem><simpara>the data klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to source key.
+<listitem><simpara>the pointer to source key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to an XML node.
+<listitem><simpara>the pointer to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
+<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>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataBinaryValueBinRead" role="function">
 <title>xmlSecKeyDataBinaryValueBinRead ()</title>
-<indexterm zone="xmlSecKeyDataBinaryValueBinRead"><primary sortas="xmlSecKeyDataBinaryValueBinRead">xmlSecKeyDataBinaryValueBinRead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataBinaryValueBinRead     (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
-<para>
-Reads binary key data of the klass <parameter>id</parameter> from <parameter>buf</parameter> to the <parameter>key</parameter>.</para>
+<indexterm zone="xmlSecKeyDataBinaryValueBinRead"><primary>xmlSecKeyDataBinaryValueBinRead</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyDataBinaryValueBinRead     (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
+Reads binary key data of the klass <parameter>id</parameter> from <parameter>buf</parameter> to the <parameter>key</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the data klass.
+<listitem><simpara>the data klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to destination key.
+<listitem><simpara>the pointer to destination key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the source binary buffer.
+<listitem><simpara>the source binary buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the source binary buffer size.
+<listitem><simpara>the source binary buffer size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
+<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>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataBinaryValueBinWrite" role="function">
 <title>xmlSecKeyDataBinaryValueBinWrite ()</title>
-<indexterm zone="xmlSecKeyDataBinaryValueBinWrite"><primary sortas="xmlSecKeyDataBinaryValueBinWrite">xmlSecKeyDataBinaryValueBinWrite</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataBinaryValueBinWrite    (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="xmlSecByte">xmlSecByte</link> **buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> *bufSize,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
-<para>
-Writes binary key data of klass <parameter>id</parameter> from the <parameter>key</parameter> to <parameter>buf</parameter>.</para>
+<indexterm zone="xmlSecKeyDataBinaryValueBinWrite"><primary>xmlSecKeyDataBinaryValueBinWrite</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyDataBinaryValueBinWrite    (<parameter><link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link> id</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="xmlSecByte"><type>xmlSecByte</type></link> **buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> *bufSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
+Writes binary key data of klass <parameter>id</parameter> from the <parameter>key</parameter> to <parameter>buf</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the data klass.
+<listitem><simpara>the data klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to source key.
+<listitem><simpara>the pointer to source key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the destination binary buffer.
+<listitem><simpara>the destination binary buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the destination binary buffer size.
+<listitem><simpara>the destination binary buffer size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
+<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>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataBinaryValueDebugDump" role="function">
 <title>xmlSecKeyDataBinaryValueDebugDump ()</title>
-<indexterm zone="xmlSecKeyDataBinaryValueDebugDump"><primary sortas="xmlSecKeyDataBinaryValueDebugDump">xmlSecKeyDataBinaryValueDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDataBinaryValueDebugDump   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints binary key data debug information to <parameter>output</parameter>.</para>
+<indexterm zone="xmlSecKeyDataBinaryValueDebugDump"><primary>xmlSecKeyDataBinaryValueDebugDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyDataBinaryValueDebugDump   (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints binary key data debug information to <parameter>output</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to binary key data.
+<listitem><simpara>the pointer to binary key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataBinaryValueDebugXmlDump" role="function">
 <title>xmlSecKeyDataBinaryValueDebugXmlDump ()</title>
-<indexterm zone="xmlSecKeyDataBinaryValueDebugXmlDump"><primary sortas="xmlSecKeyDataBinaryValueDebugXmlDump">xmlSecKeyDataBinaryValueDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDataBinaryValueDebugXmlDump
-                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints binary key data debug information to <parameter>output</parameter> in XML format.</para>
+<indexterm zone="xmlSecKeyDataBinaryValueDebugXmlDump"><primary>xmlSecKeyDataBinaryValueDebugXmlDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyDataBinaryValueDebugXmlDump
+                                                        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints binary key data debug information to <parameter>output</parameter> in XML format.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to binary key data.
+<listitem><simpara>the pointer to binary key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataBinaryValueGetSize" role="function">
 <title>xmlSecKeyDataBinaryValueGetSize ()</title>
-<indexterm zone="xmlSecKeyDataBinaryValueGetSize"><primary sortas="xmlSecKeyDataBinaryValueGetSize">xmlSecKeyDataBinaryValueGetSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecKeyDataBinaryValueGetSize     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets the binary key data size.</para>
+<indexterm zone="xmlSecKeyDataBinaryValueGetSize"><primary>xmlSecKeyDataBinaryValueGetSize</primary></indexterm>
+<programlisting><link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          xmlSecKeyDataBinaryValueGetSize     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets the binary key data size.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to binary key data.
+<listitem><simpara>the pointer to binary key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> binary key data size in bits.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataBinaryValueGetBuffer" role="function">
 <title>xmlSecKeyDataBinaryValueGetBuffer ()</title>
-<indexterm zone="xmlSecKeyDataBinaryValueGetBuffer"><primary sortas="xmlSecKeyDataBinaryValueGetBuffer">xmlSecKeyDataBinaryValueGetBuffer</primary></indexterm><programlisting><link linkend="xmlSecBufferPtr">xmlSecBufferPtr</link>     xmlSecKeyDataBinaryValueGetBuffer   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets the binary key data buffer.</para>
+<indexterm zone="xmlSecKeyDataBinaryValueGetBuffer"><primary>xmlSecKeyDataBinaryValueGetBuffer</primary></indexterm>
+<programlisting><link linkend="xmlSecBufferPtr"><returnvalue>xmlSecBufferPtr</returnvalue></link>     xmlSecKeyDataBinaryValueGetBuffer   (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets the binary key data buffer.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to binary key data.
+<listitem><simpara>the pointer to binary key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to binary key data buffer.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataBinaryValueSetBuffer" role="function">
 <title>xmlSecKeyDataBinaryValueSetBuffer ()</title>
-<indexterm zone="xmlSecKeyDataBinaryValueSetBuffer"><primary sortas="xmlSecKeyDataBinaryValueSetBuffer">xmlSecKeyDataBinaryValueSetBuffer</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataBinaryValueSetBuffer   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
-<para>
-Sets the value of <parameter>data</parameter> to <parameter>buf</parameter>.</para>
+<indexterm zone="xmlSecKeyDataBinaryValueSetBuffer"><primary>xmlSecKeyDataBinaryValueSetBuffer</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeyDataBinaryValueSetBuffer   (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);</programlisting>
 <para>
+Sets the value of <parameter>data</parameter> to <parameter>buf</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to binary key data.
+<listitem><simpara>the pointer to binary key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to binary buffer.
+<listitem><simpara>the pointer to binary buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the binary buffer size.
+<listitem><simpara>the binary buffer size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataStore" role="struct">
 <title>struct xmlSecKeyDataStore</title>
-<indexterm zone="xmlSecKeyDataStore"><primary sortas="xmlSecKeyDataStore">xmlSecKeyDataStore</primary></indexterm><programlisting>struct xmlSecKeyDataStore {
+<indexterm zone="xmlSecKeyDataStore"><primary>xmlSecKeyDataStore</primary></indexterm>
+<programlisting>struct xmlSecKeyDataStore {
     xmlSecKeyDataStoreId                id;
 
     /* for the future */
@@ -1626,35 +1598,31 @@ Sets the value of <parameter>data</parameter> to <parameter>buf</parameter>.</pa
 <para>
 The key data store. Key data store holds common key data specific information
 required for key data processing. For example, X509 data store may hold
-information about trusted (root) certificates.</para>
-<para>
+information about trusted (root) certificates.
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>&#160;<structfield>id</structfield>;</term>
-<listitem><simpara>                 the store id (<link linkend="xmlSecKeyDataStoreId"><type>xmlSecKeyDataStoreId</type></link>).
+<varlistentry><term><link linkend="xmlSecKeyDataStoreId"><type>xmlSecKeyDataStoreId</type></link>&#160;<structfield id="xmlSecKeyDataStore.id">id</structfield>;</term>
+<listitem><simpara>the store id (<link linkend="xmlSecKeyDataStoreId"><type>xmlSecKeyDataStoreId</type></link>).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
-<listitem><simpara>          reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecKeyDataStore.reserved0">reserved0</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
-<listitem><simpara>          reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecKeyDataStore.reserved1">reserved1</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataStoreCreate" role="function">
 <title>xmlSecKeyDataStoreCreate ()</title>
-<indexterm zone="xmlSecKeyDataStoreCreate"><primary sortas="xmlSecKeyDataStoreCreate">xmlSecKeyDataStoreCreate</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link>  xmlSecKeyDataStoreCreate         (<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> id);</programlisting>
+<indexterm zone="xmlSecKeyDataStoreCreate"><primary>xmlSecKeyDataStoreCreate</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataStore"><returnvalue>xmlSecKeyDataStorePtr</returnvalue></link>  xmlSecKeyDataStoreCreate         (<parameter><link linkend="xmlSecKeyDataStoreId"><type>xmlSecKeyDataStoreId</type></link> id</parameter>);</programlisting>
 <para>
 Creates new key data store of the specified klass <parameter>id</parameter>. Caller is responsible
-for freeng returned object with <link linkend="xmlSecKeyDataStoreDestroy"><type>xmlSecKeyDataStoreDestroy</type></link> function.</para>
-<para>
+for freeng returned object with <link linkend="xmlSecKeyDataStoreDestroy"><type>xmlSecKeyDataStoreDestroy</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the store id.
+<listitem><simpara>the store id.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly allocated key data store structure
 or NULL if an error occurs.
@@ -1662,103 +1630,104 @@ or NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataStoreDestroy" role="function">
 <title>xmlSecKeyDataStoreDestroy ()</title>
-<indexterm zone="xmlSecKeyDataStoreDestroy"><primary sortas="xmlSecKeyDataStoreDestroy">xmlSecKeyDataStoreDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDataStoreDestroy           (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);</programlisting>
+<indexterm zone="xmlSecKeyDataStoreDestroy"><primary>xmlSecKeyDataStoreDestroy</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyDataStoreDestroy           (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>);</programlisting>
 <para>
 Destroys the key data store created with <link linkend="xmlSecKeyDataStoreCreate"><type>xmlSecKeyDataStoreCreate</type></link>
-function.</para>
-<para>
+function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to the key data store..
+<listitem><simpara>the pointer to the key data store..
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataStoreGetName" role="macro">
 <title>xmlSecKeyDataStoreGetName()</title>
-<indexterm zone="xmlSecKeyDataStoreGetName"><primary sortas="xmlSecKeyDataStoreGetName">xmlSecKeyDataStoreGetName</primary></indexterm><programlisting>#define             xmlSecKeyDataStoreGetName(store)</programlisting>
-<para>
-Macro. Returns key data store name.</para>
+<indexterm zone="xmlSecKeyDataStoreGetName"><primary>xmlSecKeyDataStoreGetName</primary></indexterm>
+<programlisting>#define             xmlSecKeyDataStoreGetName(store)</programlisting>
 <para>
+Macro. Returns key data store name.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to store.
+<listitem><simpara>the pointer to store.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataStoreIsValid" role="macro">
 <title>xmlSecKeyDataStoreIsValid()</title>
-<indexterm zone="xmlSecKeyDataStoreIsValid"><primary sortas="xmlSecKeyDataStoreIsValid">xmlSecKeyDataStoreIsValid</primary></indexterm><programlisting>#define             xmlSecKeyDataStoreIsValid(store)</programlisting>
+<indexterm zone="xmlSecKeyDataStoreIsValid"><primary>xmlSecKeyDataStoreIsValid</primary></indexterm>
+<programlisting>#define             xmlSecKeyDataStoreIsValid(store)</programlisting>
 <para>
 Macro. Returns 1 if <parameter>store</parameter> is not NULL and <parameter>store</parameter>-&gt;id is not NULL
-or 0 otherwise.</para>
-<para>
+or 0 otherwise.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to store.
+<listitem><simpara>the pointer to store.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataStoreCheckId" role="macro">
 <title>xmlSecKeyDataStoreCheckId()</title>
-<indexterm zone="xmlSecKeyDataStoreCheckId"><primary sortas="xmlSecKeyDataStoreCheckId">xmlSecKeyDataStoreCheckId</primary></indexterm><programlisting>#define             xmlSecKeyDataStoreCheckId(store, storeId)</programlisting>
-<para>
-Macro. Returns 1 if <parameter>store</parameter> is valid and <parameter>store</parameter>'s id is equal to <parameter>storeId</parameter>.</para>
+<indexterm zone="xmlSecKeyDataStoreCheckId"><primary>xmlSecKeyDataStoreCheckId</primary></indexterm>
+<programlisting>#define             xmlSecKeyDataStoreCheckId(store, storeId)</programlisting>
 <para>
+Macro. Returns 1 if <parameter>store</parameter> is valid and <parameter>store</parameter>'s id is equal to <parameter>storeId</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to store.
+<listitem><simpara>the pointer to store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>storeId</parameter>&#160;:</term>
-<listitem><simpara>            the store Id.
+<listitem><simpara>the store Id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataStoreCheckSize" role="macro">
 <title>xmlSecKeyDataStoreCheckSize()</title>
-<indexterm zone="xmlSecKeyDataStoreCheckSize"><primary sortas="xmlSecKeyDataStoreCheckSize">xmlSecKeyDataStoreCheckSize</primary></indexterm><programlisting>#define             xmlSecKeyDataStoreCheckSize(store, size)</programlisting>
-<para>
-Macro. Returns 1 if <parameter>data</parameter> is valid and <parameter>stores</parameter>'s object has at least <parameter>size</parameter> bytes.</para>
+<indexterm zone="xmlSecKeyDataStoreCheckSize"><primary>xmlSecKeyDataStoreCheckSize</primary></indexterm>
+<programlisting>#define             xmlSecKeyDataStoreCheckSize(store, size)</programlisting>
 <para>
+Macro. Returns 1 if <parameter>data</parameter> is valid and <parameter>stores</parameter>'s object has at least <parameter>size</parameter> bytes.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to store.
+<listitem><simpara>the pointer to store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the expected size.
+<listitem><simpara>the expected size.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataStoreIdUnknown" role="macro">
 <title>xmlSecKeyDataStoreIdUnknown</title>
-<indexterm zone="xmlSecKeyDataStoreIdUnknown"><primary sortas="xmlSecKeyDataStoreIdUnknown">xmlSecKeyDataStoreIdUnknown</primary></indexterm><programlisting>#define xmlSecKeyDataStoreIdUnknown                     NULL
+<indexterm zone="xmlSecKeyDataStoreIdUnknown"><primary>xmlSecKeyDataStoreIdUnknown</primary></indexterm>
+<programlisting>#define xmlSecKeyDataStoreIdUnknown                     NULL
 </programlisting>
 <para>
-The "unknown" id.</para>
-<para>
+The "unknown" id.
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataStoreInitializeMethod" role="function">
 <title>xmlSecKeyDataStoreInitializeMethod ()</title>
-<indexterm zone="xmlSecKeyDataStoreInitializeMethod"><primary sortas="xmlSecKeyDataStoreInitializeMethod">xmlSecKeyDataStoreInitializeMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecKeyDataStoreInitializeMethod)
-                                                        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);</programlisting>
-<para>
-Key data store specific initialization method.</para>
+<indexterm zone="xmlSecKeyDataStoreInitializeMethod"><primary>xmlSecKeyDataStoreInitializeMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecKeyDataStoreInitializeMethod)
+                                                        (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>);</programlisting>
 <para>
+Key data store specific initialization method.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the data store.
+<listitem><simpara>the data store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataStoreFinalizeMethod" role="function">
 <title>xmlSecKeyDataStoreFinalizeMethod ()</title>
-<indexterm zone="xmlSecKeyDataStoreFinalizeMethod"><primary sortas="xmlSecKeyDataStoreFinalizeMethod">xmlSecKeyDataStoreFinalizeMethod</primary></indexterm><programlisting><link linkend="void">void</link>                (*xmlSecKeyDataStoreFinalizeMethod) (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);</programlisting>
-<para>
-Key data store specific finalization (destroy) method.</para>
+<indexterm zone="xmlSecKeyDataStoreFinalizeMethod"><primary>xmlSecKeyDataStoreFinalizeMethod</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*xmlSecKeyDataStoreFinalizeMethod) (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>);</programlisting>
 <para>
+Key data store specific finalization (destroy) method.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the data store.
+<listitem><simpara>the data store.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataStoreKlass" role="struct">
 <title>struct xmlSecKeyDataStoreKlass</title>
-<indexterm zone="xmlSecKeyDataStoreKlass"><primary sortas="xmlSecKeyDataStoreKlass">xmlSecKeyDataStoreKlass</primary></indexterm><programlisting>struct xmlSecKeyDataStoreKlass {
+<indexterm zone="xmlSecKeyDataStoreKlass"><primary>xmlSecKeyDataStoreKlass</primary></indexterm>
+<programlisting>struct xmlSecKeyDataStoreKlass {
     xmlSecSize                          klassSize;
     xmlSecSize                          objSize;
 
@@ -1775,70 +1744,62 @@ Key data store specific finalization (destroy) method.</para>
 };
 </programlisting>
 <para>
-The data store id (klass).</para>
-<para>
+The data store id (klass).
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>klassSize</structfield>;</term>
-<listitem><simpara>          the data store klass size.
+<varlistentry><term><link linkend="xmlSecSize"><type>xmlSecSize</type></link>&#160;<structfield id="xmlSecKeyDataStoreKlass.klassSize">klassSize</structfield>;</term>
+<listitem><simpara>the data store klass size.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>objSize</structfield>;</term>
-<listitem><simpara>            the data store obj size.
+<varlistentry><term><link linkend="xmlSecSize"><type>xmlSecSize</type></link>&#160;<structfield id="xmlSecKeyDataStoreKlass.objSize">objSize</structfield>;</term>
+<listitem><simpara>the data store obj size.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>name</structfield>;</term>
-<listitem><simpara>               the store's name.
+<varlistentry><term>const&#160;<link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecKeyDataStoreKlass.name">name</structfield>;</term>
+<listitem><simpara>the store's name.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyDataStoreInitializeMethod">xmlSecKeyDataStoreInitializeMethod</link>&#160;<structfield>initialize</structfield>;</term>
-<listitem><simpara>         the store's initialization method.
+<varlistentry><term><link linkend="xmlSecKeyDataStoreInitializeMethod"><type>xmlSecKeyDataStoreInitializeMethod</type></link>&#160;<structfield id="xmlSecKeyDataStoreKlass.initialize">initialize</structfield>;</term>
+<listitem><simpara>the store's initialization method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyDataStoreFinalizeMethod">xmlSecKeyDataStoreFinalizeMethod</link>&#160;<structfield>finalize</structfield>;</term>
-<listitem><simpara>           the store's finalization (destroy) method.
+<varlistentry><term><link linkend="xmlSecKeyDataStoreFinalizeMethod"><type>xmlSecKeyDataStoreFinalizeMethod</type></link>&#160;<structfield id="xmlSecKeyDataStoreKlass.finalize">finalize</structfield>;</term>
+<listitem><simpara>the store's finalization (destroy) method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
-<listitem><simpara>          reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecKeyDataStoreKlass.reserved0">reserved0</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
-<listitem><simpara>          reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecKeyDataStoreKlass.reserved1">reserved1</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataStoreKlassGetName" role="macro">
 <title>xmlSecKeyDataStoreKlassGetName()</title>
-<indexterm zone="xmlSecKeyDataStoreKlassGetName"><primary sortas="xmlSecKeyDataStoreKlassGetName">xmlSecKeyDataStoreKlassGetName</primary></indexterm><programlisting>#define             xmlSecKeyDataStoreKlassGetName(klass)</programlisting>
-<para>
-Macro. Returns store klass name.</para>
+<indexterm zone="xmlSecKeyDataStoreKlassGetName"><primary>xmlSecKeyDataStoreKlassGetName</primary></indexterm>
+<programlisting>#define             xmlSecKeyDataStoreKlassGetName(klass)</programlisting>
 <para>
+Macro. Returns store klass name.
 </para><variablelist role="params">
 <varlistentry><term><parameter>klass</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to store klass.
+<listitem><simpara>the pointer to store klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyDataStorePtrListId" role="macro">
 <title>xmlSecKeyDataStorePtrListId</title>
-<indexterm zone="xmlSecKeyDataStorePtrListId"><primary sortas="xmlSecKeyDataStorePtrListId">xmlSecKeyDataStorePtrListId</primary></indexterm><programlisting>#define xmlSecKeyDataStorePtrListId     xmlSecKeyDataStorePtrListGetKlass()
+<indexterm zone="xmlSecKeyDataStorePtrListId"><primary>xmlSecKeyDataStorePtrListId</primary></indexterm>
+<programlisting>#define xmlSecKeyDataStorePtrListId     xmlSecKeyDataStorePtrListGetKlass()
 </programlisting>
 <para>
-The data store list id (klass).</para>
-<para>
+The data store list id (klass).
 </para></refsect2>
 <refsect2 id="xmlSecKeyDataStorePtrListGetKlass" role="function">
 <title>xmlSecKeyDataStorePtrListGetKlass ()</title>
-<indexterm zone="xmlSecKeyDataStorePtrListGetKlass"><primary sortas="xmlSecKeyDataStorePtrListGetKlass">xmlSecKeyDataStorePtrListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     xmlSecKeyDataStorePtrListGetKlass   (void);</programlisting>
-<para>
-Key data stores list.</para>
+<indexterm zone="xmlSecKeyDataStorePtrListGetKlass"><primary>xmlSecKeyDataStorePtrListGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecPtrListId"><returnvalue>xmlSecPtrListId</returnvalue></link>     xmlSecKeyDataStorePtrListGetKlass   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Key data stores list.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> key data stores list klass.
 </simpara></listitem></varlistentry>
@@ -1846,7 +1807,4 @@ Key data stores list.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/keysmngr.sgml b/docs/api/sgml/keysmngr.sgml
index ff0a22b..4e34bf3 100644
--- a/docs/api/sgml/keysmngr.sgml
+++ b/docs/api/sgml/keysmngr.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-keysmngr.top_of_page">keysmngr</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>keysmngr</refname>
 <refpurpose>Keys manager object support.</refpurpose>
@@ -13,80 +14,72 @@
 <refsynopsisdiv id="xmlsec-keysmngr.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link>   <link linkend="xmlSecKeysMngrCreate">xmlSecKeysMngrCreate</link>                (void);
-<link linkend="void">void</link>                <link linkend="xmlSecKeysMngrDestroy">xmlSecKeysMngrDestroy</link>               (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        <link linkend="xmlSecKeysMngrFindKey">xmlSecKeysMngrFindKey</link>               (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeysMngrAdoptKeysStore">xmlSecKeysMngrAdoptKeysStore</link>        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);
-<link linkend="xmlSecKeyStorePtr">xmlSecKeyStorePtr</link>   <link linkend="xmlSecKeysMngrGetKeysStore">xmlSecKeysMngrGetKeysStore</link>          (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>                 <link linkend="xmlSecKeysMngrAdoptDataStore">xmlSecKeysMngrAdoptDataStore</link>        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);
-<link linkend="xmlSecKeyDataStorePtr">xmlSecKeyDataStorePtr</link>  <link linkend="xmlSecKeysMngrGetDataStore">xmlSecKeysMngrGetDataStore</link>       (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> id);
-<link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        (<link linkend="xmlSecGetKeyCallback">*xmlSecGetKeyCallback</link>)             (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<synopsis><link linkend="xmlSecKeysMngr"><returnvalue>xmlSecKeysMngrPtr</returnvalue></link>   <link linkend="xmlSecKeysMngrCreate">xmlSecKeysMngrCreate</link>                (<parameter><type>void</type></parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeysMngrDestroy">xmlSecKeysMngrDestroy</link>               (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);
+<link linkend="xmlSecKeyPtr"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecKeysMngrFindKey">xmlSecKeysMngrFindKey</link>               (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeysMngrAdoptKeysStore">xmlSecKeysMngrAdoptKeysStore</link>        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>);
+<link linkend="xmlSecKeyStorePtr"><returnvalue>xmlSecKeyStorePtr</returnvalue></link>   <link linkend="xmlSecKeysMngrGetKeysStore">xmlSecKeysMngrGetKeysStore</link>          (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecKeysMngrAdoptDataStore">xmlSecKeysMngrAdoptDataStore</link>        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>);
+<link linkend="xmlSecKeyDataStorePtr"><returnvalue>xmlSecKeyDataStorePtr</returnvalue></link>  <link linkend="xmlSecKeysMngrGetDataStore">xmlSecKeysMngrGetDataStore</link>       (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataStoreId"><type>xmlSecKeyDataStoreId</type></link> id</parameter>);
+<link linkend="xmlSecKeyPtr"><returnvalue>xmlSecKeyPtr</returnvalue></link>        (<link linkend="xmlSecGetKeyCallback">*xmlSecGetKeyCallback</link>)             (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> keyInfoNode</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
 struct              <link linkend="xmlSecKeysMngr">xmlSecKeysMngr</link>;
-<link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        <link linkend="xmlSecKeysMngrGetKey">xmlSecKeysMngrGetKey</link>                (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="xmlSecKeyPtr"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecKeysMngrGetKey">xmlSecKeysMngrGetKey</link>                (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> keyInfoNode</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
 struct              <link linkend="xmlSecKeyStore">xmlSecKeyStore</link>;
-<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link>   <link linkend="xmlSecKeyStoreCreate">xmlSecKeyStoreCreate</link>                (<link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link> id);
-<link linkend="void">void</link>                <link linkend="xmlSecKeyStoreDestroy">xmlSecKeyStoreDestroy</link>               (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);
-<link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        <link linkend="xmlSecKeyStoreFindKey">xmlSecKeyStoreFindKey</link>               (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="xmlSecKeyStore"><returnvalue>xmlSecKeyStorePtr</returnvalue></link>   <link linkend="xmlSecKeyStoreCreate">xmlSecKeyStoreCreate</link>                (<parameter><link linkend="xmlSecKeyStoreId"><type>xmlSecKeyStoreId</type></link> id</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecKeyStoreDestroy">xmlSecKeyStoreDestroy</link>               (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>);
+<link linkend="xmlSecKeyPtr"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecKeyStoreFindKey">xmlSecKeyStoreFindKey</link>               (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
 #define             <link linkend="xmlSecKeyStoreGetName">xmlSecKeyStoreGetName</link>               (store)
 #define             <link linkend="xmlSecKeyStoreIsValid">xmlSecKeyStoreIsValid</link>               (store)
-#define             <link linkend="xmlSecKeyStoreCheckId">xmlSecKeyStoreCheckId</link>               (store, storeId)
-#define             <link linkend="xmlSecKeyStoreCheckSize">xmlSecKeyStoreCheckSize</link>             (store, size)
+#define             <link linkend="xmlSecKeyStoreCheckId">xmlSecKeyStoreCheckId</link>               (store,
+                                                         storeId)
+#define             <link linkend="xmlSecKeyStoreCheckSize">xmlSecKeyStoreCheckSize</link>             (store,
+                                                         size)
 #define             <link linkend="xmlSecKeyStoreIdUnknown">xmlSecKeyStoreIdUnknown</link>
-<link linkend="int">int</link>                 (<link linkend="xmlSecKeyStoreInitializeMethod">*xmlSecKeyStoreInitializeMethod</link>)   (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);
-<link linkend="void">void</link>                (<link linkend="xmlSecKeyStoreFinalizeMethod">*xmlSecKeyStoreFinalizeMethod</link>)     (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);
-<link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        (<link linkend="xmlSecKeyStoreFindKeyMethod">*xmlSecKeyStoreFindKeyMethod</link>)      (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecKeyStoreInitializeMethod">*xmlSecKeyStoreInitializeMethod</link>)   (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="xmlSecKeyStoreFinalizeMethod">*xmlSecKeyStoreFinalizeMethod</link>)     (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>);
+<link linkend="xmlSecKeyPtr"><returnvalue>xmlSecKeyPtr</returnvalue></link>        (<link linkend="xmlSecKeyStoreFindKeyMethod">*xmlSecKeyStoreFindKeyMethod</link>)      (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
 struct              <link linkend="xmlSecKeyStoreKlass">xmlSecKeyStoreKlass</link>;
 #define             <link linkend="xmlSecKeyStoreKlassGetName">xmlSecKeyStoreKlassGetName</link>          (klass)
 #define             <link linkend="xmlSecSimpleKeysStoreId">xmlSecSimpleKeysStoreId</link>
-<link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link>    <link linkend="xmlSecSimpleKeysStoreGetKlass">xmlSecSimpleKeysStoreGetKlass</link>       (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecSimpleKeysStoreAdoptKey">xmlSecSimpleKeysStoreAdoptKey</link>       (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>                 <link linkend="xmlSecSimpleKeysStoreLoad">xmlSecSimpleKeysStoreLoad</link>           (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         const <link linkend="char">char</link> *uri,
-                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
-<link linkend="int">int</link>                 <link linkend="xmlSecSimpleKeysStoreSave">xmlSecSimpleKeysStoreSave</link>           (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="xmlSecPtrListPtr">xmlSecPtrListPtr</link>    <link linkend="xmlSecSimpleKeysStoreGetKeys">xmlSecSimpleKeysStoreGetKeys</link>        (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);
+<link linkend="xmlSecKeyStoreId"><returnvalue>xmlSecKeyStoreId</returnvalue></link>    <link linkend="xmlSecSimpleKeysStoreGetKlass">xmlSecSimpleKeysStoreGetKlass</link>       (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecSimpleKeysStoreAdoptKey">xmlSecSimpleKeysStoreAdoptKey</link>       (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecSimpleKeysStoreLoad">xmlSecSimpleKeysStoreLoad</link>           (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *uri</parameter>,
+                                                         <parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> keysMngr</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecSimpleKeysStoreSave">xmlSecSimpleKeysStoreSave</link>           (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="xmlSecPtrListPtr"><returnvalue>xmlSecPtrListPtr</returnvalue></link>    <link linkend="xmlSecSimpleKeysStoreGetKeys">xmlSecSimpleKeysStoreGetKeys</link>        (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-keysmngr.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Keys manager object support.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-keysmngr.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecKeysMngrCreate" role="function">
 <title>xmlSecKeysMngrCreate ()</title>
-<indexterm zone="xmlSecKeysMngrCreate"><primary sortas="xmlSecKeysMngrCreate">xmlSecKeysMngrCreate</primary></indexterm><programlisting><link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link>   xmlSecKeysMngrCreate                (void);</programlisting>
+<indexterm zone="xmlSecKeysMngrCreate"><primary>xmlSecKeysMngrCreate</primary></indexterm>
+<programlisting><link linkend="xmlSecKeysMngr"><returnvalue>xmlSecKeysMngrPtr</returnvalue></link>   xmlSecKeysMngrCreate                (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 Creates new keys manager. Caller is responsible for freeing it with
-<link linkend="xmlSecKeysMngrDestroy"><type>xmlSecKeysMngrDestroy</type></link> function.</para>
-<para>
+<link linkend="xmlSecKeysMngrDestroy"><type>xmlSecKeysMngrDestroy</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly allocated keys manager or NULL if
 an error occurs.
@@ -94,63 +87,63 @@ an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeysMngrDestroy" role="function">
 <title>xmlSecKeysMngrDestroy ()</title>
-<indexterm zone="xmlSecKeysMngrDestroy"><primary sortas="xmlSecKeysMngrDestroy">xmlSecKeysMngrDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeysMngrDestroy               (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
-<para>
-Destroys keys manager created with <link linkend="xmlSecKeysMngrCreate"><type>xmlSecKeysMngrCreate</type></link> function.</para>
+<indexterm zone="xmlSecKeysMngrDestroy"><primary>xmlSecKeysMngrDestroy</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeysMngrDestroy               (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);</programlisting>
 <para>
+Destroys keys manager created with <link linkend="xmlSecKeysMngrCreate"><type>xmlSecKeysMngrCreate</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeysMngrFindKey" role="function">
 <title>xmlSecKeysMngrFindKey ()</title>
-<indexterm zone="xmlSecKeysMngrFindKey"><primary sortas="xmlSecKeysMngrFindKey">xmlSecKeysMngrFindKey</primary></indexterm><programlisting><link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        xmlSecKeysMngrFindKey               (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<indexterm zone="xmlSecKeysMngrFindKey"><primary>xmlSecKeysMngrFindKey</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyPtr"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecKeysMngrFindKey               (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
 Lookups key in the keys manager keys store. The caller is responsible
-for destroying the returned key using <link linkend="xmlSecKeyDestroy"><type>xmlSecKeyDestroy</type></link> method.</para>
-<para>
+for destroying the returned key using <link linkend="xmlSecKeyDestroy"><type>xmlSecKeyDestroy</type></link> method.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>name</parameter>&#160;:</term>
-<listitem><simpara>               the desired key name.
+<listitem><simpara>the desired key name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node processing context.
+<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>&#160;:</term><listitem><simpara> the pointer to a key or NULL if key is not found or an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeysMngrAdoptKeysStore" role="function">
 <title>xmlSecKeysMngrAdoptKeysStore ()</title>
-<indexterm zone="xmlSecKeysMngrAdoptKeysStore"><primary sortas="xmlSecKeysMngrAdoptKeysStore">xmlSecKeysMngrAdoptKeysStore</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeysMngrAdoptKeysStore        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);</programlisting>
-<para>
-Adopts keys store in the keys manager <parameter>mngr</parameter>.</para>
+<indexterm zone="xmlSecKeysMngrAdoptKeysStore"><primary>xmlSecKeysMngrAdoptKeysStore</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeysMngrAdoptKeysStore        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>);</programlisting>
 <para>
+Adopts keys store in the keys manager <parameter>mngr</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to keys store.
+<listitem><simpara>the pointer to keys store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeysMngrGetKeysStore" role="function">
 <title>xmlSecKeysMngrGetKeysStore ()</title>
-<indexterm zone="xmlSecKeysMngrGetKeysStore"><primary sortas="xmlSecKeysMngrGetKeysStore">xmlSecKeysMngrGetKeysStore</primary></indexterm><programlisting><link linkend="xmlSecKeyStorePtr">xmlSecKeyStorePtr</link>   xmlSecKeysMngrGetKeysStore          (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
-<para>
-Gets the keys store.</para>
+<indexterm zone="xmlSecKeysMngrGetKeysStore"><primary>xmlSecKeysMngrGetKeysStore</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyStorePtr"><returnvalue>xmlSecKeyStorePtr</returnvalue></link>   xmlSecKeysMngrGetKeysStore          (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);</programlisting>
 <para>
+Gets the keys store.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the keys store in the keys manager <parameter>mngr</parameter> or NULL if
 there is no store or an error occurs.
@@ -158,34 +151,34 @@ there is no store or an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeysMngrAdoptDataStore" role="function">
 <title>xmlSecKeysMngrAdoptDataStore ()</title>
-<indexterm zone="xmlSecKeysMngrAdoptDataStore"><primary sortas="xmlSecKeysMngrAdoptDataStore">xmlSecKeysMngrAdoptDataStore</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeysMngrAdoptDataStore        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);</programlisting>
-<para>
-Adopts data store in the keys manager.</para>
+<indexterm zone="xmlSecKeysMngrAdoptDataStore"><primary>xmlSecKeysMngrAdoptDataStore</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecKeysMngrAdoptDataStore        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>);</programlisting>
 <para>
+Adopts data store in the keys manager.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to data store.
+<listitem><simpara>the pointer to data store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeysMngrGetDataStore" role="function">
 <title>xmlSecKeysMngrGetDataStore ()</title>
-<indexterm zone="xmlSecKeysMngrGetDataStore"><primary sortas="xmlSecKeysMngrGetDataStore">xmlSecKeysMngrGetDataStore</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStorePtr">xmlSecKeyDataStorePtr</link>  xmlSecKeysMngrGetDataStore       (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> id);</programlisting>
-<para>
-Lookups the data store of given klass <parameter>id</parameter> in the keys manager.</para>
+<indexterm zone="xmlSecKeysMngrGetDataStore"><primary>xmlSecKeysMngrGetDataStore</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataStorePtr"><returnvalue>xmlSecKeyDataStorePtr</returnvalue></link>  xmlSecKeysMngrGetDataStore       (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataStoreId"><type>xmlSecKeyDataStoreId</type></link> id</parameter>);</programlisting>
 <para>
+Lookups the data store of given klass <parameter>id</parameter> in the keys manager.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the desired data store klass.
+<listitem><simpara>the desired data store klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to data store or NULL if it is not found or an error
 occurs.
@@ -193,17 +186,17 @@ occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecGetKeyCallback" role="function">
 <title>xmlSecGetKeyCallback ()</title>
-<indexterm zone="xmlSecGetKeyCallback"><primary sortas="xmlSecGetKeyCallback">xmlSecGetKeyCallback</primary></indexterm><programlisting><link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        (*xmlSecGetKeyCallback)             (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
-<para>
-Reads the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter> and extracts the key.</para>
+<indexterm zone="xmlSecGetKeyCallback"><primary>xmlSecGetKeyCallback</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyPtr"><returnvalue>xmlSecKeyPtr</returnvalue></link>        (*xmlSecGetKeyCallback)             (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> keyInfoNode</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
+Reads the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter> and extracts the key.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoNode</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>                 the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node processing context.
+<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>&#160;:</term><listitem><simpara> the pointer to key or NULL if the key is not found or
 an error occurs.
@@ -211,45 +204,42 @@ an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeysMngr" role="struct">
 <title>struct xmlSecKeysMngr</title>
-<indexterm zone="xmlSecKeysMngr"><primary sortas="xmlSecKeysMngr">xmlSecKeysMngr</primary></indexterm><programlisting>struct xmlSecKeysMngr {
+<indexterm zone="xmlSecKeysMngr"><primary>xmlSecKeysMngr</primary></indexterm>
+<programlisting>struct xmlSecKeysMngr {
     xmlSecKeyStorePtr           keysStore;
     xmlSecPtrList               storesList;
     xmlSecGetKeyCallback        getKey;
 };
 </programlisting>
 <para>
-The keys manager structure.</para>
-<para>
+The keys manager structure.
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link>&#160;<structfield>keysStore</structfield>;</term>
-<listitem><simpara>                  the key store (list of keys known to keys manager).
+<varlistentry><term><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link>&#160;<structfield id="xmlSecKeysMngr.keysStore">keysStore</structfield>;</term>
+<listitem><simpara>the key store (list of keys known to keys manager).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrList</link>&#160;<structfield>storesList</structfield>;</term>
-<listitem><simpara>                 the list of key data stores known to keys manager.
+<varlistentry><term><link linkend="xmlSecPtrList"><type>xmlSecPtrList</type></link>&#160;<structfield id="xmlSecKeysMngr.storesList">storesList</structfield>;</term>
+<listitem><simpara>the list of key data stores known to keys manager.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecGetKeyCallback">xmlSecGetKeyCallback</link>&#160;<structfield>getKey</structfield>;</term>
-<listitem><simpara>                     the callback used to read <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
+<varlistentry><term><link linkend="xmlSecGetKeyCallback"><type>xmlSecGetKeyCallback</type></link>&#160;<structfield id="xmlSecKeysMngr.getKey">getKey</structfield>;</term>
+<listitem><simpara>the callback used to read <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeysMngrGetKey" role="function">
 <title>xmlSecKeysMngrGetKey ()</title>
-<indexterm zone="xmlSecKeysMngrGetKey"><primary sortas="xmlSecKeysMngrGetKey">xmlSecKeysMngrGetKey</primary></indexterm><programlisting><link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        xmlSecKeysMngrGetKey                (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
-<para>
-Reads the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter> and extracts the key.</para>
+<indexterm zone="xmlSecKeysMngrGetKey"><primary>xmlSecKeysMngrGetKey</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyPtr"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecKeysMngrGetKey                (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> keyInfoNode</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
+Reads the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter> and extracts the key.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoNode</parameter>&#160;:</term>
-<listitem><simpara>        the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node processing context.
+<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>&#160;:</term><listitem><simpara> the pointer to key or NULL if the key is not found or
 an error occurs.
@@ -257,7 +247,8 @@ an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyStore" role="struct">
 <title>struct xmlSecKeyStore</title>
-<indexterm zone="xmlSecKeyStore"><primary sortas="xmlSecKeyStore">xmlSecKeyStore</primary></indexterm><programlisting>struct xmlSecKeyStore {
+<indexterm zone="xmlSecKeyStore"><primary>xmlSecKeyStore</primary></indexterm>
+<programlisting>struct xmlSecKeyStore {
     xmlSecKeyStoreId                    id;
 
     /* for the future */
@@ -266,180 +257,177 @@ an error occurs.
 };
 </programlisting>
 <para>
-The keys store.</para>
-<para>
+The keys store.
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link>&#160;<structfield>id</structfield>;</term>
-<listitem><simpara>                 the store id (<link linkend="xmlSecKeyStoreId"><type>xmlSecKeyStoreId</type></link>).
+<varlistentry><term><link linkend="xmlSecKeyStoreId"><type>xmlSecKeyStoreId</type></link>&#160;<structfield id="xmlSecKeyStore.id">id</structfield>;</term>
+<listitem><simpara>the store id (<link linkend="xmlSecKeyStoreId"><type>xmlSecKeyStoreId</type></link>).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
-<listitem><simpara>          reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecKeyStore.reserved0">reserved0</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
-<listitem><simpara>          reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecKeyStore.reserved1">reserved1</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyStoreCreate" role="function">
 <title>xmlSecKeyStoreCreate ()</title>
-<indexterm zone="xmlSecKeyStoreCreate"><primary sortas="xmlSecKeyStoreCreate">xmlSecKeyStoreCreate</primary></indexterm><programlisting><link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link>   xmlSecKeyStoreCreate                (<link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link> id);</programlisting>
+<indexterm zone="xmlSecKeyStoreCreate"><primary>xmlSecKeyStoreCreate</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyStore"><returnvalue>xmlSecKeyStorePtr</returnvalue></link>   xmlSecKeyStoreCreate                (<parameter><link linkend="xmlSecKeyStoreId"><type>xmlSecKeyStoreId</type></link> id</parameter>);</programlisting>
 <para>
 Creates new store of the specified klass <parameter>klass</parameter>. Caller is responsible
-for freeing the returned store by calling <link linkend="xmlSecKeyStoreDestroy"><type>xmlSecKeyStoreDestroy</type></link> function.</para>
-<para>
+for freeing the returned store by calling <link linkend="xmlSecKeyStoreDestroy"><type>xmlSecKeyStoreDestroy</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the key store klass.
+<listitem><simpara>the key store klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly allocated keys store or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyStoreDestroy" role="function">
 <title>xmlSecKeyStoreDestroy ()</title>
-<indexterm zone="xmlSecKeyStoreDestroy"><primary sortas="xmlSecKeyStoreDestroy">xmlSecKeyStoreDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyStoreDestroy               (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);</programlisting>
-<para>
-Destroys the store created with <link linkend="xmlSecKeyStoreCreate"><type>xmlSecKeyStoreCreate</type></link> function.</para>
+<indexterm zone="xmlSecKeyStoreDestroy"><primary>xmlSecKeyStoreDestroy</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecKeyStoreDestroy               (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>);</programlisting>
 <para>
+Destroys the store created with <link linkend="xmlSecKeyStoreCreate"><type>xmlSecKeyStoreCreate</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to keys store.
+<listitem><simpara>the pointer to keys store.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyStoreFindKey" role="function">
 <title>xmlSecKeyStoreFindKey ()</title>
-<indexterm zone="xmlSecKeyStoreFindKey"><primary sortas="xmlSecKeyStoreFindKey">xmlSecKeyStoreFindKey</primary></indexterm><programlisting><link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        xmlSecKeyStoreFindKey               (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<indexterm zone="xmlSecKeyStoreFindKey"><primary>xmlSecKeyStoreFindKey</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyPtr"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecKeyStoreFindKey               (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
 Lookups key in the store. The caller is responsible for destroying
-the returned key using <link linkend="xmlSecKeyDestroy"><type>xmlSecKeyDestroy</type></link> method.</para>
-<para>
+the returned key using <link linkend="xmlSecKeyDestroy"><type>xmlSecKeyDestroy</type></link> method.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to keys store.
+<listitem><simpara>the pointer to keys store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>name</parameter>&#160;:</term>
-<listitem><simpara>               the desired key name.
+<listitem><simpara>the desired key name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node processing context.
+<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>&#160;:</term><listitem><simpara> the pointer to a key or NULL if key is not found or an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyStoreGetName" role="macro">
 <title>xmlSecKeyStoreGetName()</title>
-<indexterm zone="xmlSecKeyStoreGetName"><primary sortas="xmlSecKeyStoreGetName">xmlSecKeyStoreGetName</primary></indexterm><programlisting>#define             xmlSecKeyStoreGetName(store)</programlisting>
-<para>
-Macro. Returns key store name.</para>
+<indexterm zone="xmlSecKeyStoreGetName"><primary>xmlSecKeyStoreGetName</primary></indexterm>
+<programlisting>#define             xmlSecKeyStoreGetName(store)</programlisting>
 <para>
+Macro. Returns key store name.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to store.
+<listitem><simpara>the pointer to store.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyStoreIsValid" role="macro">
 <title>xmlSecKeyStoreIsValid()</title>
-<indexterm zone="xmlSecKeyStoreIsValid"><primary sortas="xmlSecKeyStoreIsValid">xmlSecKeyStoreIsValid</primary></indexterm><programlisting>#define             xmlSecKeyStoreIsValid(store)</programlisting>
+<indexterm zone="xmlSecKeyStoreIsValid"><primary>xmlSecKeyStoreIsValid</primary></indexterm>
+<programlisting>#define             xmlSecKeyStoreIsValid(store)</programlisting>
 <para>
 Macro. Returns 1 if <parameter>store</parameter> is not NULL and <parameter>store</parameter>-&gt;id is not NULL
-or 0 otherwise.</para>
-<para>
+or 0 otherwise.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to store.
+<listitem><simpara>the pointer to store.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyStoreCheckId" role="macro">
 <title>xmlSecKeyStoreCheckId()</title>
-<indexterm zone="xmlSecKeyStoreCheckId"><primary sortas="xmlSecKeyStoreCheckId">xmlSecKeyStoreCheckId</primary></indexterm><programlisting>#define             xmlSecKeyStoreCheckId(store, storeId)</programlisting>
-<para>
-Macro. Returns 1 if <parameter>store</parameter> is valid and <parameter>store</parameter>'s id is equal to <parameter>storeId</parameter>.</para>
+<indexterm zone="xmlSecKeyStoreCheckId"><primary>xmlSecKeyStoreCheckId</primary></indexterm>
+<programlisting>#define             xmlSecKeyStoreCheckId(store, storeId)</programlisting>
 <para>
+Macro. Returns 1 if <parameter>store</parameter> is valid and <parameter>store</parameter>'s id is equal to <parameter>storeId</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to store.
+<listitem><simpara>the pointer to store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>storeId</parameter>&#160;:</term>
-<listitem><simpara>            the store Id.
+<listitem><simpara>the store Id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyStoreCheckSize" role="macro">
 <title>xmlSecKeyStoreCheckSize()</title>
-<indexterm zone="xmlSecKeyStoreCheckSize"><primary sortas="xmlSecKeyStoreCheckSize">xmlSecKeyStoreCheckSize</primary></indexterm><programlisting>#define             xmlSecKeyStoreCheckSize(store, size)</programlisting>
-<para>
-Macro. Returns 1 if <parameter>store</parameter> is valid and <parameter>stores</parameter>'s object has at least <parameter>size</parameter> bytes.</para>
+<indexterm zone="xmlSecKeyStoreCheckSize"><primary>xmlSecKeyStoreCheckSize</primary></indexterm>
+<programlisting>#define             xmlSecKeyStoreCheckSize(store, size)</programlisting>
 <para>
+Macro. Returns 1 if <parameter>store</parameter> is valid and <parameter>stores</parameter>'s object has at least <parameter>size</parameter> bytes.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to store.
+<listitem><simpara>the pointer to store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the expected size.
+<listitem><simpara>the expected size.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyStoreIdUnknown" role="macro">
 <title>xmlSecKeyStoreIdUnknown</title>
-<indexterm zone="xmlSecKeyStoreIdUnknown"><primary sortas="xmlSecKeyStoreIdUnknown">xmlSecKeyStoreIdUnknown</primary></indexterm><programlisting>#define xmlSecKeyStoreIdUnknown                         ((xmlSecKeyDataStoreId)NULL)
+<indexterm zone="xmlSecKeyStoreIdUnknown"><primary>xmlSecKeyStoreIdUnknown</primary></indexterm>
+<programlisting>#define xmlSecKeyStoreIdUnknown                         ((xmlSecKeyDataStoreId)NULL)
 </programlisting>
 <para>
-The "unknown" id.</para>
-<para>
+The "unknown" id.
 </para></refsect2>
 <refsect2 id="xmlSecKeyStoreInitializeMethod" role="function">
 <title>xmlSecKeyStoreInitializeMethod ()</title>
-<indexterm zone="xmlSecKeyStoreInitializeMethod"><primary sortas="xmlSecKeyStoreInitializeMethod">xmlSecKeyStoreInitializeMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecKeyStoreInitializeMethod)   (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);</programlisting>
-<para>
-Keys store specific initialization method.</para>
+<indexterm zone="xmlSecKeyStoreInitializeMethod"><primary>xmlSecKeyStoreInitializeMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecKeyStoreInitializeMethod)   (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>);</programlisting>
 <para>
+Keys store specific initialization method.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the store.
+<listitem><simpara>the store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyStoreFinalizeMethod" role="function">
 <title>xmlSecKeyStoreFinalizeMethod ()</title>
-<indexterm zone="xmlSecKeyStoreFinalizeMethod"><primary sortas="xmlSecKeyStoreFinalizeMethod">xmlSecKeyStoreFinalizeMethod</primary></indexterm><programlisting><link linkend="void">void</link>                (*xmlSecKeyStoreFinalizeMethod)     (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);</programlisting>
-<para>
-Keys store specific finalization (destroy) method.</para>
+<indexterm zone="xmlSecKeyStoreFinalizeMethod"><primary>xmlSecKeyStoreFinalizeMethod</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*xmlSecKeyStoreFinalizeMethod)     (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>);</programlisting>
 <para>
+Keys store specific finalization (destroy) method.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the store.
+<listitem><simpara>the store.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyStoreFindKeyMethod" role="function">
 <title>xmlSecKeyStoreFindKeyMethod ()</title>
-<indexterm zone="xmlSecKeyStoreFindKeyMethod"><primary sortas="xmlSecKeyStoreFindKeyMethod">xmlSecKeyStoreFindKeyMethod</primary></indexterm><programlisting><link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        (*xmlSecKeyStoreFindKeyMethod)      (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<indexterm zone="xmlSecKeyStoreFindKeyMethod"><primary>xmlSecKeyStoreFindKeyMethod</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyPtr"><returnvalue>xmlSecKeyPtr</returnvalue></link>        (*xmlSecKeyStoreFindKeyMethod)      (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
 Keys store specific find method. The caller is responsible for destroying
-the returned key using <link linkend="xmlSecKeyDestroy"><type>xmlSecKeyDestroy</type></link> method.</para>
-<para>
+the returned key using <link linkend="xmlSecKeyDestroy"><type>xmlSecKeyDestroy</type></link> method.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the store.
+<listitem><simpara>the store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>name</parameter>&#160;:</term>
-<listitem><simpara>               the desired key name.
+<listitem><simpara>the desired key name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to key info context.
+<listitem><simpara>the pointer to key info context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to a key or NULL if key is not found or an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyStoreKlass" role="struct">
 <title>struct xmlSecKeyStoreKlass</title>
-<indexterm zone="xmlSecKeyStoreKlass"><primary sortas="xmlSecKeyStoreKlass">xmlSecKeyStoreKlass</primary></indexterm><programlisting>struct xmlSecKeyStoreKlass {
+<indexterm zone="xmlSecKeyStoreKlass"><primary>xmlSecKeyStoreKlass</primary></indexterm>
+<programlisting>struct xmlSecKeyStoreKlass {
     xmlSecSize                          klassSize;
     xmlSecSize                          objSize;
 
@@ -457,147 +445,138 @@ the returned key using <link linkend="xmlSecKeyDestroy"><type>xmlSecKeyDestroy</
 };
 </programlisting>
 <para>
-The keys store id (klass).</para>
-<para>
+The keys store id (klass).
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>klassSize</structfield>;</term>
-<listitem><simpara>          the store klass size.
+<varlistentry><term><link linkend="xmlSecSize"><type>xmlSecSize</type></link>&#160;<structfield id="xmlSecKeyStoreKlass.klassSize">klassSize</structfield>;</term>
+<listitem><simpara>the store klass size.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>objSize</structfield>;</term>
-<listitem><simpara>            the store obj size.
+<varlistentry><term><link linkend="xmlSecSize"><type>xmlSecSize</type></link>&#160;<structfield id="xmlSecKeyStoreKlass.objSize">objSize</structfield>;</term>
+<listitem><simpara>the store obj size.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>name</structfield>;</term>
-<listitem><simpara>               the store's name.
+<varlistentry><term>const&#160;<link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecKeyStoreKlass.name">name</structfield>;</term>
+<listitem><simpara>the store's name.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyStoreInitializeMethod">xmlSecKeyStoreInitializeMethod</link>&#160;<structfield>initialize</structfield>;</term>
-<listitem><simpara>         the store's initialization method.
+<varlistentry><term><link linkend="xmlSecKeyStoreInitializeMethod"><type>xmlSecKeyStoreInitializeMethod</type></link>&#160;<structfield id="xmlSecKeyStoreKlass.initialize">initialize</structfield>;</term>
+<listitem><simpara>the store's initialization method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyStoreFinalizeMethod">xmlSecKeyStoreFinalizeMethod</link>&#160;<structfield>finalize</structfield>;</term>
-<listitem><simpara>           the store's finalization (destroy) method.
+<varlistentry><term><link linkend="xmlSecKeyStoreFinalizeMethod"><type>xmlSecKeyStoreFinalizeMethod</type></link>&#160;<structfield id="xmlSecKeyStoreKlass.finalize">finalize</structfield>;</term>
+<listitem><simpara>the store's finalization (destroy) method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyStoreFindKeyMethod">xmlSecKeyStoreFindKeyMethod</link>&#160;<structfield>findKey</structfield>;</term>
-<listitem><simpara>            the store's find method.
+<varlistentry><term><link linkend="xmlSecKeyStoreFindKeyMethod"><type>xmlSecKeyStoreFindKeyMethod</type></link>&#160;<structfield id="xmlSecKeyStoreKlass.findKey">findKey</structfield>;</term>
+<listitem><simpara>the store's find method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
-<listitem><simpara>          reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecKeyStoreKlass.reserved0">reserved0</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
-<listitem><simpara>          reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecKeyStoreKlass.reserved1">reserved1</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecKeyStoreKlassGetName" role="macro">
 <title>xmlSecKeyStoreKlassGetName()</title>
-<indexterm zone="xmlSecKeyStoreKlassGetName"><primary sortas="xmlSecKeyStoreKlassGetName">xmlSecKeyStoreKlassGetName</primary></indexterm><programlisting>#define             xmlSecKeyStoreKlassGetName(klass)</programlisting>
-<para>
-Macro. Returns store klass name.</para>
+<indexterm zone="xmlSecKeyStoreKlassGetName"><primary>xmlSecKeyStoreKlassGetName</primary></indexterm>
+<programlisting>#define             xmlSecKeyStoreKlassGetName(klass)</programlisting>
 <para>
+Macro. Returns store klass name.
 </para><variablelist role="params">
 <varlistentry><term><parameter>klass</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to store klass.
+<listitem><simpara>the pointer to store klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecSimpleKeysStoreId" role="macro">
 <title>xmlSecSimpleKeysStoreId</title>
-<indexterm zone="xmlSecSimpleKeysStoreId"><primary sortas="xmlSecSimpleKeysStoreId">xmlSecSimpleKeysStoreId</primary></indexterm><programlisting>#define xmlSecSimpleKeysStoreId         xmlSecSimpleKeysStoreGetKlass()
+<indexterm zone="xmlSecSimpleKeysStoreId"><primary>xmlSecSimpleKeysStoreId</primary></indexterm>
+<programlisting>#define xmlSecSimpleKeysStoreId         xmlSecSimpleKeysStoreGetKlass()
 </programlisting>
 <para>
-A simple keys store klass id.</para>
-<para>
+A simple keys store klass id.
 </para></refsect2>
 <refsect2 id="xmlSecSimpleKeysStoreGetKlass" role="function">
 <title>xmlSecSimpleKeysStoreGetKlass ()</title>
-<indexterm zone="xmlSecSimpleKeysStoreGetKlass"><primary sortas="xmlSecSimpleKeysStoreGetKlass">xmlSecSimpleKeysStoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link>    xmlSecSimpleKeysStoreGetKlass       (void);</programlisting>
-<para>
-The simple list based keys store klass.</para>
+<indexterm zone="xmlSecSimpleKeysStoreGetKlass"><primary>xmlSecSimpleKeysStoreGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyStoreId"><returnvalue>xmlSecKeyStoreId</returnvalue></link>    xmlSecSimpleKeysStoreGetKlass       (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The simple list based keys store klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> simple list based keys store klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecSimpleKeysStoreAdoptKey" role="function">
 <title>xmlSecSimpleKeysStoreAdoptKey ()</title>
-<indexterm zone="xmlSecSimpleKeysStoreAdoptKey"><primary sortas="xmlSecSimpleKeysStoreAdoptKey">xmlSecSimpleKeysStoreAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecSimpleKeysStoreAdoptKey       (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
-<para>
-Adds <parameter>key</parameter> to the <parameter>store</parameter>.</para>
+<indexterm zone="xmlSecSimpleKeysStoreAdoptKey"><primary>xmlSecSimpleKeysStoreAdoptKey</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecSimpleKeysStoreAdoptKey       (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);</programlisting>
 <para>
+Adds <parameter>key</parameter> to the <parameter>store</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to simple keys store.
+<listitem><simpara>the pointer to simple keys store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecSimpleKeysStoreLoad" role="function">
 <title>xmlSecSimpleKeysStoreLoad ()</title>
-<indexterm zone="xmlSecSimpleKeysStoreLoad"><primary sortas="xmlSecSimpleKeysStoreLoad">xmlSecSimpleKeysStoreLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecSimpleKeysStoreLoad           (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         const <link linkend="char">char</link> *uri,
-                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
-<para>
-Reads keys from an XML file.</para>
+<indexterm zone="xmlSecSimpleKeysStoreLoad"><primary>xmlSecSimpleKeysStoreLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecSimpleKeysStoreLoad           (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *uri</parameter>,
+                                                         <parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> keysMngr</parameter>);</programlisting>
 <para>
+Reads keys from an XML file.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to simple keys store.
+<listitem><simpara>the pointer to simple keys store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>uri</parameter>&#160;:</term>
-<listitem><simpara>                the filename.
+<listitem><simpara>the filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keysMngr</parameter>&#160;:</term>
-<listitem><simpara>           the pointer to associated keys manager.
+<listitem><simpara>the pointer to associated keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecSimpleKeysStoreSave" role="function">
 <title>xmlSecSimpleKeysStoreSave ()</title>
-<indexterm zone="xmlSecSimpleKeysStoreSave"><primary sortas="xmlSecSimpleKeysStoreSave">xmlSecSimpleKeysStoreSave</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecSimpleKeysStoreSave           (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
-<para>
-Writes keys from <parameter>store</parameter> to an XML file.</para>
+<indexterm zone="xmlSecSimpleKeysStoreSave"><primary>xmlSecSimpleKeysStoreSave</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecSimpleKeysStoreSave           (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
+Writes keys from <parameter>store</parameter> to an XML file.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to simple keys store.
+<listitem><simpara>the pointer to simple keys store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the filename.
+<listitem><simpara>the filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the saved keys type (public, private, ...).
+<listitem><simpara>the saved keys type (public, private, ...).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecSimpleKeysStoreGetKeys" role="function">
 <title>xmlSecSimpleKeysStoreGetKeys ()</title>
-<indexterm zone="xmlSecSimpleKeysStoreGetKeys"><primary sortas="xmlSecSimpleKeysStoreGetKeys">xmlSecSimpleKeysStoreGetKeys</primary></indexterm><programlisting><link linkend="xmlSecPtrListPtr">xmlSecPtrListPtr</link>    xmlSecSimpleKeysStoreGetKeys        (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);</programlisting>
-<para>
-Gets list of keys from simple keys store.</para>
+<indexterm zone="xmlSecSimpleKeysStoreGetKeys"><primary>xmlSecSimpleKeysStoreGetKeys</primary></indexterm>
+<programlisting><link linkend="xmlSecPtrListPtr"><returnvalue>xmlSecPtrListPtr</returnvalue></link>    xmlSecSimpleKeysStoreGetKeys        (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>);</programlisting>
 <para>
+Gets list of keys from simple keys store.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to simple keys store.
+<listitem><simpara>the pointer to simple keys store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the list of keys stored in the keys store or NULL
 if an error occurs.
@@ -606,7 +585,4 @@ if an error occurs.
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/list.sgml b/docs/api/sgml/list.sgml
index ad8290a..cdf1f4f 100644
--- a/docs/api/sgml/list.sgml
+++ b/docs/api/sgml/list.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-list.top_of_page">list</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>list</refname>
 <refpurpose>Generic list structure implementation.</refpurpose>
@@ -13,68 +14,60 @@
 <refsynopsisdiv id="xmlsec-list.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-struct              <link linkend="xmlSecPtrList">xmlSecPtrList</link>;
-<link linkend="void">void</link>                <link linkend="xmlSecPtrListSetDefaultAllocMode">xmlSecPtrListSetDefaultAllocMode</link>    (<link linkend="xmlSecAllocMode">xmlSecAllocMode</link> defAllocMode,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> defInitialSize);
-<link linkend="int">int</link>                 <link linkend="xmlSecPtrListInitialize">xmlSecPtrListInitialize</link>             (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="xmlSecPtrListId">xmlSecPtrListId</link> id);
-<link linkend="void">void</link>                <link linkend="xmlSecPtrListFinalize">xmlSecPtrListFinalize</link>               (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);
-<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link>    <link linkend="xmlSecPtrListCreate">xmlSecPtrListCreate</link>                 (<link linkend="xmlSecPtrListId">xmlSecPtrListId</link> id);
-<link linkend="void">void</link>                <link linkend="xmlSecPtrListDestroy">xmlSecPtrListDestroy</link>                (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);
-<link linkend="void">void</link>                <link linkend="xmlSecPtrListEmpty">xmlSecPtrListEmpty</link>                  (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);
-<link linkend="int">int</link>                 <link linkend="xmlSecPtrListCopy">xmlSecPtrListCopy</link>                   (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> dst,
-                                                         <link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> src);
-<link linkend="xmlSecPtrListPtr">xmlSecPtrListPtr</link>    <link linkend="xmlSecPtrListDuplicate">xmlSecPtrListDuplicate</link>              (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);
-<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecPtrListGetSize">xmlSecPtrListGetSize</link>                (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);
-<link linkend="xmlSecPtr">xmlSecPtr</link>           <link linkend="xmlSecPtrListGetItem">xmlSecPtrListGetItem</link>                (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="int">int</link>                 <link linkend="xmlSecPtrListAdd">xmlSecPtrListAdd</link>                    (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="xmlSec">xmlSecPtr</link> item);
-<link linkend="int">int</link>                 <link linkend="xmlSecPtrListSet">xmlSecPtrListSet</link>                    (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="xmlSec">xmlSecPtr</link> item,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="int">int</link>                 <link linkend="xmlSecPtrListRemove">xmlSecPtrListRemove</link>                 (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="void">void</link>                <link linkend="xmlSecPtrListDebugDump">xmlSecPtrListDebugDump</link>              (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
-<link linkend="void">void</link>                <link linkend="xmlSecPtrListDebugXmlDump">xmlSecPtrListDebugXmlDump</link>           (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<synopsis>struct              <link linkend="xmlSecPtrList">xmlSecPtrList</link>;
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecPtrListSetDefaultAllocMode">xmlSecPtrListSetDefaultAllocMode</link>    (<parameter><link linkend="xmlSecAllocMode"><type>xmlSecAllocMode</type></link> defAllocMode</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> defInitialSize</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecPtrListInitialize">xmlSecPtrListInitialize</link>             (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="xmlSecPtrListId"><type>xmlSecPtrListId</type></link> id</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecPtrListFinalize">xmlSecPtrListFinalize</link>               (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>);
+<link linkend="xmlSecPtrList"><returnvalue>xmlSecPtrListPtr</returnvalue></link>    <link linkend="xmlSecPtrListCreate">xmlSecPtrListCreate</link>                 (<parameter><link linkend="xmlSecPtrListId"><type>xmlSecPtrListId</type></link> id</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecPtrListDestroy">xmlSecPtrListDestroy</link>                (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecPtrListEmpty">xmlSecPtrListEmpty</link>                  (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecPtrListCopy">xmlSecPtrListCopy</link>                   (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> dst</parameter>,
+                                                         <parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> src</parameter>);
+<link linkend="xmlSecPtrListPtr"><returnvalue>xmlSecPtrListPtr</returnvalue></link>    <link linkend="xmlSecPtrListDuplicate">xmlSecPtrListDuplicate</link>              (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>);
+<link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          <link linkend="xmlSecPtrListGetSize">xmlSecPtrListGetSize</link>                (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>);
+<link linkend="xmlSecPtr"><returnvalue>xmlSecPtr</returnvalue></link>           <link linkend="xmlSecPtrListGetItem">xmlSecPtrListGetItem</link>                (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecPtrListAdd">xmlSecPtrListAdd</link>                    (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="xmlSec"><type>xmlSecPtr</type></link> item</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecPtrListSet">xmlSecPtrListSet</link>                    (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="xmlSec"><type>xmlSecPtr</type></link> item</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecPtrListRemove">xmlSecPtrListRemove</link>                 (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecPtrListDebugDump">xmlSecPtrListDebugDump</link>              (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecPtrListDebugXmlDump">xmlSecPtrListDebugXmlDump</link>           (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
 #define             <link linkend="xmlSecPtrListGetName">xmlSecPtrListGetName</link>                (list)
 #define             <link linkend="xmlSecPtrListIsValid">xmlSecPtrListIsValid</link>                (list)
-#define             <link linkend="xmlSecPtrListCheckId">xmlSecPtrListCheckId</link>                (list, dataId)
+#define             <link linkend="xmlSecPtrListCheckId">xmlSecPtrListCheckId</link>                (list,
+                                                         dataId)
 #define             <link linkend="xmlSecPtrListIdUnknown">xmlSecPtrListIdUnknown</link>
-<link linkend="xmlSecPtr">xmlSecPtr</link>           (<link linkend="xmlSecPtrDuplicateItemMethod">*xmlSecPtrDuplicateItemMethod</link>)     (<link linkend="xmlSec">xmlSecPtr</link> ptr);
-<link linkend="void">void</link>                (<link linkend="xmlSecPtrDestroyItemMethod">*xmlSecPtrDestroyItemMethod</link>)       (<link linkend="xmlSec">xmlSecPtr</link> ptr);
-<link linkend="void">void</link>                (<link linkend="xmlSecPtrDebugDumpItemMethod">*xmlSecPtrDebugDumpItemMethod</link>)     (<link linkend="xmlSec">xmlSecPtr</link> ptr,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="xmlSecPtr"><returnvalue>xmlSecPtr</returnvalue></link>           (<link linkend="xmlSecPtrDuplicateItemMethod">*xmlSecPtrDuplicateItemMethod</link>)     (<parameter><link linkend="xmlSec"><type>xmlSecPtr</type></link> ptr</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="xmlSecPtrDestroyItemMethod">*xmlSecPtrDestroyItemMethod</link>)       (<parameter><link linkend="xmlSec"><type>xmlSecPtr</type></link> ptr</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="xmlSecPtrDebugDumpItemMethod">*xmlSecPtrDebugDumpItemMethod</link>)     (<parameter><link linkend="xmlSec"><type>xmlSecPtr</type></link> ptr</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
 struct              <link linkend="xmlSecPtrListKlass">xmlSecPtrListKlass</link>;
 #define             <link linkend="xmlSecPtrListKlassGetName">xmlSecPtrListKlassGetName</link>           (klass)
 #define             <link linkend="xmlSecStringListId">xmlSecStringListId</link>
-<link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     <link linkend="xmlSecStringListGetKlass">xmlSecStringListGetKlass</link>            (void);
+<link linkend="xmlSecPtrListId"><returnvalue>xmlSecPtrListId</returnvalue></link>     <link linkend="xmlSecStringListGetKlass">xmlSecStringListGetKlass</link>            (<parameter><type>void</type></parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-list.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Generic list structure implementation.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-list.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecPtrList" role="struct">
 <title>struct xmlSecPtrList</title>
-<indexterm zone="xmlSecPtrList"><primary sortas="xmlSecPtrList">xmlSecPtrList</primary></indexterm><programlisting>struct xmlSecPtrList {
+<indexterm zone="xmlSecPtrList"><primary>xmlSecPtrList</primary></indexterm>
+<programlisting>struct xmlSecPtrList {
     xmlSecPtrListId             id;
 
     xmlSecPtr*                  data;
@@ -84,174 +77,168 @@ Generic list structure implementation.
 };
 </programlisting>
 <para>
-The pointers list.</para>
-<para>
+The pointers list.
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="xmlSecPtrListId">xmlSecPtrListId</link>&#160;<structfield>id</structfield>;</term>
-<listitem><simpara>                         the list items description.
+<varlistentry><term><link linkend="xmlSecPtrListId"><type>xmlSecPtrListId</type></link>&#160;<structfield id="xmlSecPtrList.id">id</structfield>;</term>
+<listitem><simpara>the list items description.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSec">xmlSecPtr</link>&#160;*<structfield>data</structfield>;</term>
-<listitem><simpara>                       the list data.
+<varlistentry><term><link linkend="xmlSec"><type>xmlSecPtr</type></link>&#160;*<structfield id="xmlSecPtrList.data">data</structfield>;</term>
+<listitem><simpara>the list data.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>use</structfield>;</term>
-<listitem><simpara>                        the current list size.
+<varlistentry><term><link linkend="xmlSecSize"><type>xmlSecSize</type></link>&#160;<structfield id="xmlSecPtrList.use">use</structfield>;</term>
+<listitem><simpara>the current list size.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>max</structfield>;</term>
-<listitem><simpara>                        the max (allocated) list size.
+<varlistentry><term><link linkend="xmlSecSize"><type>xmlSecSize</type></link>&#160;<structfield id="xmlSecPtrList.max">max</structfield>;</term>
+<listitem><simpara>the max (allocated) list size.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecAllocMode">xmlSecAllocMode</link>&#160;<structfield>allocMode</structfield>;</term>
-<listitem><simpara>                  the memory allocation mode.
+<varlistentry><term><link linkend="xmlSecAllocMode"><type>xmlSecAllocMode</type></link>&#160;<structfield id="xmlSecPtrList.allocMode">allocMode</structfield>;</term>
+<listitem><simpara>the memory allocation mode.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListSetDefaultAllocMode" role="function">
 <title>xmlSecPtrListSetDefaultAllocMode ()</title>
-<indexterm zone="xmlSecPtrListSetDefaultAllocMode"><primary sortas="xmlSecPtrListSetDefaultAllocMode">xmlSecPtrListSetDefaultAllocMode</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecPtrListSetDefaultAllocMode    (<link linkend="xmlSecAllocMode">xmlSecAllocMode</link> defAllocMode,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> defInitialSize);</programlisting>
-<para>
-Sets new default allocation mode and minimal initial list size.</para>
+<indexterm zone="xmlSecPtrListSetDefaultAllocMode"><primary>xmlSecPtrListSetDefaultAllocMode</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecPtrListSetDefaultAllocMode    (<parameter><link linkend="xmlSecAllocMode"><type>xmlSecAllocMode</type></link> defAllocMode</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> defInitialSize</parameter>);</programlisting>
 <para>
+Sets new default allocation mode and minimal initial list size.
 </para><variablelist role="params">
 <varlistentry><term><parameter>defAllocMode</parameter>&#160;:</term>
-<listitem><simpara>       the new default memory allocation mode.
+<listitem><simpara>the new default memory allocation mode.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>defInitialSize</parameter>&#160;:</term>
-<listitem><simpara>     the new default minimal initial size.
+<listitem><simpara>the new default minimal initial size.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListInitialize" role="function">
 <title>xmlSecPtrListInitialize ()</title>
-<indexterm zone="xmlSecPtrListInitialize"><primary sortas="xmlSecPtrListInitialize">xmlSecPtrListInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecPtrListInitialize             (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="xmlSecPtrListId">xmlSecPtrListId</link> id);</programlisting>
+<indexterm zone="xmlSecPtrListInitialize"><primary>xmlSecPtrListInitialize</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecPtrListInitialize             (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="xmlSecPtrListId"><type>xmlSecPtrListId</type></link> id</parameter>);</programlisting>
 <para>
 Initializes the list of given klass. Caller is responsible
-for cleaning up by calling <link linkend="xmlSecPtrListFinalize"><type>xmlSecPtrListFinalize</type></link> function.</para>
-<para>
+for cleaning up by calling <link linkend="xmlSecPtrListFinalize"><type>xmlSecPtrListFinalize</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to list.
+<listitem><simpara>the pointer to list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the list klass.
+<listitem><simpara>the list klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListFinalize" role="function">
 <title>xmlSecPtrListFinalize ()</title>
-<indexterm zone="xmlSecPtrListFinalize"><primary sortas="xmlSecPtrListFinalize">xmlSecPtrListFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecPtrListFinalize               (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);</programlisting>
+<indexterm zone="xmlSecPtrListFinalize"><primary>xmlSecPtrListFinalize</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecPtrListFinalize               (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>);</programlisting>
 <para>
 Cleans up the list initialized with <link linkend="xmlSecPtrListInitialize"><type>xmlSecPtrListInitialize</type></link>
-function.</para>
-<para>
+function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to list.
+<listitem><simpara>the pointer to list.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListCreate" role="function">
 <title>xmlSecPtrListCreate ()</title>
-<indexterm zone="xmlSecPtrListCreate"><primary sortas="xmlSecPtrListCreate">xmlSecPtrListCreate</primary></indexterm><programlisting><link linkend="xmlSecPtrList">xmlSecPtrListPtr</link>    xmlSecPtrListCreate                 (<link linkend="xmlSecPtrListId">xmlSecPtrListId</link> id);</programlisting>
+<indexterm zone="xmlSecPtrListCreate"><primary>xmlSecPtrListCreate</primary></indexterm>
+<programlisting><link linkend="xmlSecPtrList"><returnvalue>xmlSecPtrListPtr</returnvalue></link>    xmlSecPtrListCreate                 (<parameter><link linkend="xmlSecPtrListId"><type>xmlSecPtrListId</type></link> id</parameter>);</programlisting>
 <para>
 Creates new list object. Caller is responsible for freeing returned list
-by calling <link linkend="xmlSecPtrListDestroy"><type>xmlSecPtrListDestroy</type></link> function.</para>
-<para>
+by calling <link linkend="xmlSecPtrListDestroy"><type>xmlSecPtrListDestroy</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the list klass.
+<listitem><simpara>the list klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated list or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListDestroy" role="function">
 <title>xmlSecPtrListDestroy ()</title>
-<indexterm zone="xmlSecPtrListDestroy"><primary sortas="xmlSecPtrListDestroy">xmlSecPtrListDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecPtrListDestroy                (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);</programlisting>
-<para>
-Destroys <parameter>list</parameter> created with <link linkend="xmlSecPtrListCreate"><type>xmlSecPtrListCreate</type></link> function.</para>
+<indexterm zone="xmlSecPtrListDestroy"><primary>xmlSecPtrListDestroy</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecPtrListDestroy                (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>);</programlisting>
 <para>
+Destroys <parameter>list</parameter> created with <link linkend="xmlSecPtrListCreate"><type>xmlSecPtrListCreate</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to list.
+<listitem><simpara>the pointer to list.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListEmpty" role="function">
 <title>xmlSecPtrListEmpty ()</title>
-<indexterm zone="xmlSecPtrListEmpty"><primary sortas="xmlSecPtrListEmpty">xmlSecPtrListEmpty</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecPtrListEmpty                  (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);</programlisting>
-<para>
-Remove all items from <parameter>list</parameter> (if any).</para>
+<indexterm zone="xmlSecPtrListEmpty"><primary>xmlSecPtrListEmpty</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecPtrListEmpty                  (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>);</programlisting>
 <para>
+Remove all items from <parameter>list</parameter> (if any).
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to list.
+<listitem><simpara>the pointer to list.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListCopy" role="function">
 <title>xmlSecPtrListCopy ()</title>
-<indexterm zone="xmlSecPtrListCopy"><primary sortas="xmlSecPtrListCopy">xmlSecPtrListCopy</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecPtrListCopy                   (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> dst,
-                                                         <link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> src);</programlisting>
+<indexterm zone="xmlSecPtrListCopy"><primary>xmlSecPtrListCopy</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecPtrListCopy                   (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> dst</parameter>,
+                                                         <parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> src</parameter>);</programlisting>
 <para>
 Copies <parameter>src</parameter> list items to <parameter>dst</parameter> list using <link linkend="duplicateItem"><type>duplicateItem</type></link> method
 of the list klass. If <link linkend="duplicateItem"><type>duplicateItem</type></link> method is NULL then
-we jsut copy pointers to items.</para>
-<para>
+we jsut copy pointers to items.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dst</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to destination list.
+<listitem><simpara>the pointer to destination list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>src</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to source list.
+<listitem><simpara>the pointer to source list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListDuplicate" role="function">
 <title>xmlSecPtrListDuplicate ()</title>
-<indexterm zone="xmlSecPtrListDuplicate"><primary sortas="xmlSecPtrListDuplicate">xmlSecPtrListDuplicate</primary></indexterm><programlisting><link linkend="xmlSecPtrListPtr">xmlSecPtrListPtr</link>    xmlSecPtrListDuplicate              (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);</programlisting>
-<para>
-Creates a new copy of <parameter>list</parameter> and all its items.</para>
+<indexterm zone="xmlSecPtrListDuplicate"><primary>xmlSecPtrListDuplicate</primary></indexterm>
+<programlisting><link linkend="xmlSecPtrListPtr"><returnvalue>xmlSecPtrListPtr</returnvalue></link>    xmlSecPtrListDuplicate              (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>);</programlisting>
 <para>
+Creates a new copy of <parameter>list</parameter> and all its items.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to list.
+<listitem><simpara>the pointer to list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated list or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListGetSize" role="function">
 <title>xmlSecPtrListGetSize ()</title>
-<indexterm zone="xmlSecPtrListGetSize"><primary sortas="xmlSecPtrListGetSize">xmlSecPtrListGetSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecPtrListGetSize                (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);</programlisting>
-<para>
-Gets list size.</para>
+<indexterm zone="xmlSecPtrListGetSize"><primary>xmlSecPtrListGetSize</primary></indexterm>
+<programlisting><link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          xmlSecPtrListGetSize                (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>);</programlisting>
 <para>
+Gets list size.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to list.
+<listitem><simpara>the pointer to list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the number of itmes in <parameter>list</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListGetItem" role="function">
 <title>xmlSecPtrListGetItem ()</title>
-<indexterm zone="xmlSecPtrListGetItem"><primary sortas="xmlSecPtrListGetItem">xmlSecPtrListGetItem</primary></indexterm><programlisting><link linkend="xmlSecPtr">xmlSecPtr</link>           xmlSecPtrListGetItem                (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
-<para>
-Gets item from the list.</para>
+<indexterm zone="xmlSecPtrListGetItem"><primary>xmlSecPtrListGetItem</primary></indexterm>
+<programlisting><link linkend="xmlSecPtr"><returnvalue>xmlSecPtr</returnvalue></link>           xmlSecPtrListGetItem                (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);</programlisting>
 <para>
+Gets item from the list.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to list.
+<listitem><simpara>the pointer to list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pos</parameter>&#160;:</term>
-<listitem><simpara>                the item position.
+<listitem><simpara>the item position.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the list item at position <parameter>pos</parameter> or NULL if <parameter>pos</parameter> is greater
 than the number of items in the list or an error occurs.
@@ -259,177 +246,178 @@ than the number of items in the list or an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListAdd" role="function">
 <title>xmlSecPtrListAdd ()</title>
-<indexterm zone="xmlSecPtrListAdd"><primary sortas="xmlSecPtrListAdd">xmlSecPtrListAdd</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecPtrListAdd                    (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="xmlSec">xmlSecPtr</link> item);</programlisting>
-<para>
-Adds <parameter>item</parameter> to the end of the <parameter>list</parameter>.</para>
+<indexterm zone="xmlSecPtrListAdd"><primary>xmlSecPtrListAdd</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecPtrListAdd                    (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="xmlSec"><type>xmlSecPtr</type></link> item</parameter>);</programlisting>
 <para>
+Adds <parameter>item</parameter> to the end of the <parameter>list</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to list.
+<listitem><simpara>the pointer to list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>item</parameter>&#160;:</term>
-<listitem><simpara>               the item.
+<listitem><simpara>the item.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListSet" role="function">
 <title>xmlSecPtrListSet ()</title>
-<indexterm zone="xmlSecPtrListSet"><primary sortas="xmlSecPtrListSet">xmlSecPtrListSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecPtrListSet                    (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="xmlSec">xmlSecPtr</link> item,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
+<indexterm zone="xmlSecPtrListSet"><primary>xmlSecPtrListSet</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecPtrListSet                    (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="xmlSec"><type>xmlSecPtr</type></link> item</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);</programlisting>
 <para>
 Sets the value of list item at position <parameter>pos</parameter>. The old value
-is destroyed.</para>
-<para>
+is destroyed.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to list.
+<listitem><simpara>the pointer to list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>item</parameter>&#160;:</term>
-<listitem><simpara>               the item.
+<listitem><simpara>the item.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pos</parameter>&#160;:</term>
-<listitem><simpara>                the pos.
+<listitem><simpara>the pos.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListRemove" role="function">
 <title>xmlSecPtrListRemove ()</title>
-<indexterm zone="xmlSecPtrListRemove"><primary sortas="xmlSecPtrListRemove">xmlSecPtrListRemove</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecPtrListRemove                 (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
-<para>
-Destroys list item at the position <parameter>pos</parameter> and sets it value to NULL.</para>
+<indexterm zone="xmlSecPtrListRemove"><primary>xmlSecPtrListRemove</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecPtrListRemove                 (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);</programlisting>
 <para>
+Destroys list item at the position <parameter>pos</parameter> and sets it value to NULL.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to list.
+<listitem><simpara>the pointer to list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pos</parameter>&#160;:</term>
-<listitem><simpara>                the position.
+<listitem><simpara>the position.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListDebugDump" role="function">
 <title>xmlSecPtrListDebugDump ()</title>
-<indexterm zone="xmlSecPtrListDebugDump"><primary sortas="xmlSecPtrListDebugDump">xmlSecPtrListDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecPtrListDebugDump              (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints debug information about <parameter>list</parameter> to the <parameter>output</parameter>.</para>
+<indexterm zone="xmlSecPtrListDebugDump"><primary>xmlSecPtrListDebugDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecPtrListDebugDump              (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints debug information about <parameter>list</parameter> to the <parameter>output</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to list.
+<listitem><simpara>the pointer to list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListDebugXmlDump" role="function">
 <title>xmlSecPtrListDebugXmlDump ()</title>
-<indexterm zone="xmlSecPtrListDebugXmlDump"><primary sortas="xmlSecPtrListDebugXmlDump">xmlSecPtrListDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecPtrListDebugXmlDump           (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints debug information about <parameter>list</parameter> to the <parameter>output</parameter> in XML format.</para>
+<indexterm zone="xmlSecPtrListDebugXmlDump"><primary>xmlSecPtrListDebugXmlDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecPtrListDebugXmlDump           (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints debug information about <parameter>list</parameter> to the <parameter>output</parameter> in XML format.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to list.
+<listitem><simpara>the pointer to list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListGetName" role="macro">
 <title>xmlSecPtrListGetName()</title>
-<indexterm zone="xmlSecPtrListGetName"><primary sortas="xmlSecPtrListGetName">xmlSecPtrListGetName</primary></indexterm><programlisting>#define             xmlSecPtrListGetName(list)</programlisting>
-<para>
-Macro. Returns lists's name.</para>
+<indexterm zone="xmlSecPtrListGetName"><primary>xmlSecPtrListGetName</primary></indexterm>
+<programlisting>#define             xmlSecPtrListGetName(list)</programlisting>
 <para>
+Macro. Returns lists's name.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the ponter to list.
+<listitem><simpara>the ponter to list.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListIsValid" role="macro">
 <title>xmlSecPtrListIsValid()</title>
-<indexterm zone="xmlSecPtrListIsValid"><primary sortas="xmlSecPtrListIsValid">xmlSecPtrListIsValid</primary></indexterm><programlisting>#define             xmlSecPtrListIsValid(list)</programlisting>
+<indexterm zone="xmlSecPtrListIsValid"><primary>xmlSecPtrListIsValid</primary></indexterm>
+<programlisting>#define             xmlSecPtrListIsValid(list)</programlisting>
 <para>
 Macro. Returns 1 if <parameter>list</parameter> is not NULL and <parameter>list</parameter>-&gt;id is not NULL
-or 0 otherwise.</para>
-<para>
+or 0 otherwise.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to list.
+<listitem><simpara>the pointer to list.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListCheckId" role="macro">
 <title>xmlSecPtrListCheckId()</title>
-<indexterm zone="xmlSecPtrListCheckId"><primary sortas="xmlSecPtrListCheckId">xmlSecPtrListCheckId</primary></indexterm><programlisting>#define             xmlSecPtrListCheckId(list, dataId)</programlisting>
-<para>
-Macro. Returns 1 if <parameter>list</parameter> is valid and <parameter>list</parameter>'s id is equal to <parameter>dataId</parameter>.</para>
+<indexterm zone="xmlSecPtrListCheckId"><primary>xmlSecPtrListCheckId</primary></indexterm>
+<programlisting>#define             xmlSecPtrListCheckId(list, dataId)</programlisting>
 <para>
+Macro. Returns 1 if <parameter>list</parameter> is valid and <parameter>list</parameter>'s id is equal to <parameter>dataId</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to list.
+<listitem><simpara>the pointer to list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataId</parameter>&#160;:</term>
-<listitem><simpara>             the list Id.
+<listitem><simpara>the list Id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListIdUnknown" role="macro">
 <title>xmlSecPtrListIdUnknown</title>
-<indexterm zone="xmlSecPtrListIdUnknown"><primary sortas="xmlSecPtrListIdUnknown">xmlSecPtrListIdUnknown</primary></indexterm><programlisting>#define xmlSecPtrListIdUnknown                  NULL
+<indexterm zone="xmlSecPtrListIdUnknown"><primary>xmlSecPtrListIdUnknown</primary></indexterm>
+<programlisting>#define xmlSecPtrListIdUnknown                  NULL
 </programlisting>
 <para>
-The "unknown" id.</para>
-<para>
+The "unknown" id.
 </para></refsect2>
 <refsect2 id="xmlSecPtrDuplicateItemMethod" role="function">
 <title>xmlSecPtrDuplicateItemMethod ()</title>
-<indexterm zone="xmlSecPtrDuplicateItemMethod"><primary sortas="xmlSecPtrDuplicateItemMethod">xmlSecPtrDuplicateItemMethod</primary></indexterm><programlisting><link linkend="xmlSecPtr">xmlSecPtr</link>           (*xmlSecPtrDuplicateItemMethod)     (<link linkend="xmlSec">xmlSecPtr</link> ptr);</programlisting>
-<para>
-Duplicates item <parameter>ptr</parameter>.</para>
+<indexterm zone="xmlSecPtrDuplicateItemMethod"><primary>xmlSecPtrDuplicateItemMethod</primary></indexterm>
+<programlisting><link linkend="xmlSecPtr"><returnvalue>xmlSecPtr</returnvalue></link>           (*xmlSecPtrDuplicateItemMethod)     (<parameter><link linkend="xmlSec"><type>xmlSecPtr</type></link> ptr</parameter>);</programlisting>
 <para>
+Duplicates item <parameter>ptr</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ptr</parameter>&#160;:</term>
-<listitem><simpara>                the poinetr to list item.
+<listitem><simpara>the poinetr to list item.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to new item copy or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrDestroyItemMethod" role="function">
 <title>xmlSecPtrDestroyItemMethod ()</title>
-<indexterm zone="xmlSecPtrDestroyItemMethod"><primary sortas="xmlSecPtrDestroyItemMethod">xmlSecPtrDestroyItemMethod</primary></indexterm><programlisting><link linkend="void">void</link>                (*xmlSecPtrDestroyItemMethod)       (<link linkend="xmlSec">xmlSecPtr</link> ptr);</programlisting>
-<para>
-Destroys list item <parameter>ptr</parameter>.</para>
+<indexterm zone="xmlSecPtrDestroyItemMethod"><primary>xmlSecPtrDestroyItemMethod</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*xmlSecPtrDestroyItemMethod)       (<parameter><link linkend="xmlSec"><type>xmlSecPtr</type></link> ptr</parameter>);</programlisting>
 <para>
+Destroys list item <parameter>ptr</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ptr</parameter>&#160;:</term>
-<listitem><simpara>                the poinetr to list item.
+<listitem><simpara>the poinetr to list item.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrDebugDumpItemMethod" role="function">
 <title>xmlSecPtrDebugDumpItemMethod ()</title>
-<indexterm zone="xmlSecPtrDebugDumpItemMethod"><primary sortas="xmlSecPtrDebugDumpItemMethod">xmlSecPtrDebugDumpItemMethod</primary></indexterm><programlisting><link linkend="void">void</link>                (*xmlSecPtrDebugDumpItemMethod)     (<link linkend="xmlSec">xmlSecPtr</link> ptr,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints debug information about <parameter>item</parameter> to <parameter>output</parameter>.</para>
+<indexterm zone="xmlSecPtrDebugDumpItemMethod"><primary>xmlSecPtrDebugDumpItemMethod</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*xmlSecPtrDebugDumpItemMethod)     (<parameter><link linkend="xmlSec"><type>xmlSecPtr</type></link> ptr</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints debug information about <parameter>item</parameter> to <parameter>output</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ptr</parameter>&#160;:</term>
-<listitem><simpara>                the poinetr to list item.
+<listitem><simpara>the poinetr to list item.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the output FILE.
+<listitem><simpara>the output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListKlass" role="struct">
 <title>struct xmlSecPtrListKlass</title>
-<indexterm zone="xmlSecPtrListKlass"><primary sortas="xmlSecPtrListKlass">xmlSecPtrListKlass</primary></indexterm><programlisting>struct xmlSecPtrListKlass {
+<indexterm zone="xmlSecPtrListKlass"><primary>xmlSecPtrListKlass</primary></indexterm>
+<programlisting>struct xmlSecPtrListKlass {
     const xmlChar*                      name;
     xmlSecPtrDuplicateItemMethod        duplicateItem;
     xmlSecPtrDestroyItemMethod          destroyItem;
@@ -438,60 +426,54 @@ Prints debug information about <parameter>item</parameter> to <parameter>output<
 };
 </programlisting>
 <para>
-List klass.</para>
-<para>
+List klass.
 </para><variablelist role="struct">
-<varlistentry>
-<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>name</structfield>;</term>
-<listitem><simpara>               the list klass name.
+<varlistentry><term>const&#160;<link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecPtrListKlass.name">name</structfield>;</term>
+<listitem><simpara>the list klass name.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecPtrDuplicateItemMethod">xmlSecPtrDuplicateItemMethod</link>&#160;<structfield>duplicateItem</structfield>;</term>
-<listitem><simpara>      the duplciate item method.
+<varlistentry><term><link linkend="xmlSecPtrDuplicateItemMethod"><type>xmlSecPtrDuplicateItemMethod</type></link>&#160;<structfield id="xmlSecPtrListKlass.duplicateItem">duplicateItem</structfield>;</term>
+<listitem><simpara>the duplciate item method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecPtrDestroyItemMethod">xmlSecPtrDestroyItemMethod</link>&#160;<structfield>destroyItem</structfield>;</term>
-<listitem><simpara>        the destroy item method.
+<varlistentry><term><link linkend="xmlSecPtrDestroyItemMethod"><type>xmlSecPtrDestroyItemMethod</type></link>&#160;<structfield id="xmlSecPtrListKlass.destroyItem">destroyItem</structfield>;</term>
+<listitem><simpara>the destroy item method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecPtrDebugDumpItemMethod">xmlSecPtrDebugDumpItemMethod</link>&#160;<structfield>debugDumpItem</structfield>;</term>
-<listitem><simpara>      the debug dump item method.
+<varlistentry><term><link linkend="xmlSecPtrDebugDumpItemMethod"><type>xmlSecPtrDebugDumpItemMethod</type></link>&#160;<structfield id="xmlSecPtrListKlass.debugDumpItem">debugDumpItem</structfield>;</term>
+<listitem><simpara>the debug dump item method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecPtrDebugDumpItemMethod">xmlSecPtrDebugDumpItemMethod</link>&#160;<structfield>debugXmlDumpItem</structfield>;</term>
-<listitem><simpara>   the debug dump item in xml format method.
+<varlistentry><term><link linkend="xmlSecPtrDebugDumpItemMethod"><type>xmlSecPtrDebugDumpItemMethod</type></link>&#160;<structfield id="xmlSecPtrListKlass.debugXmlDumpItem">debugXmlDumpItem</structfield>;</term>
+<listitem><simpara>the debug dump item in xml format method.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPtrListKlassGetName" role="macro">
 <title>xmlSecPtrListKlassGetName()</title>
-<indexterm zone="xmlSecPtrListKlassGetName"><primary sortas="xmlSecPtrListKlassGetName">xmlSecPtrListKlassGetName</primary></indexterm><programlisting>#define             xmlSecPtrListKlassGetName(klass)</programlisting>
-<para>
-Macro. Returns the list klass name.</para>
+<indexterm zone="xmlSecPtrListKlassGetName"><primary>xmlSecPtrListKlassGetName</primary></indexterm>
+<programlisting>#define             xmlSecPtrListKlassGetName(klass)</programlisting>
 <para>
+Macro. Returns the list klass name.
 </para><variablelist role="params">
 <varlistentry><term><parameter>klass</parameter>&#160;:</term>
-<listitem><simpara>              the list klass.
+<listitem><simpara>the list klass.
 2
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecStringListId" role="macro">
 <title>xmlSecStringListId</title>
-<indexterm zone="xmlSecStringListId"><primary sortas="xmlSecStringListId">xmlSecStringListId</primary></indexterm><programlisting>#define             xmlSecStringListId</programlisting>
-<para>
-Strings list klass.</para>
+<indexterm zone="xmlSecStringListId"><primary>xmlSecStringListId</primary></indexterm>
+<programlisting>#define             xmlSecStringListId</programlisting>
 <para>
+Strings list klass.
 </para></refsect2>
 <refsect2 id="xmlSecStringListGetKlass" role="function">
 <title>xmlSecStringListGetKlass ()</title>
-<indexterm zone="xmlSecStringListGetKlass"><primary sortas="xmlSecStringListGetKlass">xmlSecStringListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     xmlSecStringListGetKlass            (void);</programlisting>
-<para>
-The strins list class.</para>
+<indexterm zone="xmlSecStringListGetKlass"><primary>xmlSecStringListGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecPtrListId"><returnvalue>xmlSecPtrListId</returnvalue></link>     xmlSecStringListGetKlass            (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The strins list class.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> strings list klass.
 </simpara></listitem></varlistentry>
@@ -499,7 +481,4 @@ The strins list class.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/membuf.sgml b/docs/api/sgml/membuf.sgml
index 5aa2f1d..9610ce5 100644
--- a/docs/api/sgml/membuf.sgml
+++ b/docs/api/sgml/membuf.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-membuf.top_of_page">membuf</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>membuf</refname>
 <refpurpose>Memory buffer transform implementation.</refpurpose>
@@ -13,56 +14,46 @@
 <refsynopsisdiv id="xmlsec-membuf.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-#define             <link linkend="xmlSecTransformMemBufId">xmlSecTransformMemBufId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformMemBufGetKlass">xmlSecTransformMemBufGetKlass</link>       (void);
-<link linkend="xmlSecBufferPtr">xmlSecBufferPtr</link>     <link linkend="xmlSecTransformMemBufGetBuffer">xmlSecTransformMemBufGetBuffer</link>      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
+<synopsis>#define             <link linkend="xmlSecTransformMemBufId">xmlSecTransformMemBufId</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformMemBufGetKlass">xmlSecTransformMemBufGetKlass</link>       (<parameter><type>void</type></parameter>);
+<link linkend="xmlSecBufferPtr"><returnvalue>xmlSecBufferPtr</returnvalue></link>     <link linkend="xmlSecTransformMemBufGetBuffer">xmlSecTransformMemBufGetBuffer</link>      (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-membuf.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Memory buffer transform implementation.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-membuf.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecTransformMemBufId" role="macro">
 <title>xmlSecTransformMemBufId</title>
-<indexterm zone="xmlSecTransformMemBufId"><primary sortas="xmlSecTransformMemBufId">xmlSecTransformMemBufId</primary></indexterm><programlisting>#define             xmlSecTransformMemBufId</programlisting>
-<para>
-The Memory Buffer transform klass.</para>
+<indexterm zone="xmlSecTransformMemBufId"><primary>xmlSecTransformMemBufId</primary></indexterm>
+<programlisting>#define             xmlSecTransformMemBufId</programlisting>
 <para>
+The Memory Buffer transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformMemBufGetKlass" role="function">
 <title>xmlSecTransformMemBufGetKlass ()</title>
-<indexterm zone="xmlSecTransformMemBufGetKlass"><primary sortas="xmlSecTransformMemBufGetKlass">xmlSecTransformMemBufGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformMemBufGetKlass       (void);</programlisting>
-<para>
-The memory buffer transorm (used to store the data that go through it).</para>
+<indexterm zone="xmlSecTransformMemBufGetKlass"><primary>xmlSecTransformMemBufGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformMemBufGetKlass       (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The memory buffer transorm (used to store the data that go through it).
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> memory buffer transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformMemBufGetBuffer" role="function">
 <title>xmlSecTransformMemBufGetBuffer ()</title>
-<indexterm zone="xmlSecTransformMemBufGetBuffer"><primary sortas="xmlSecTransformMemBufGetBuffer">xmlSecTransformMemBufGetBuffer</primary></indexterm><programlisting><link linkend="xmlSecBufferPtr">xmlSecBufferPtr</link>     xmlSecTransformMemBufGetBuffer      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
-<para>
-Gets the pointer to memory buffer transform buffer.</para>
+<indexterm zone="xmlSecTransformMemBufGetBuffer"><primary>xmlSecTransformMemBufGetBuffer</primary></indexterm>
+<programlisting><link linkend="xmlSecBufferPtr"><returnvalue>xmlSecBufferPtr</returnvalue></link>     xmlSecTransformMemBufGetBuffer      (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>);</programlisting>
 <para>
+Gets the pointer to memory buffer transform buffer.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to memory buffer transform.
+<listitem><simpara>the pointer to memory buffer transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the transform's <link linkend="xmlSecBuffer"><type>xmlSecBuffer</type></link>.
 </simpara></listitem></varlistentry>
@@ -70,7 +61,4 @@ Gets the pointer to memory buffer transform buffer.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/mscrypto/app.sgml b/docs/api/sgml/mscrypto/app.sgml
index a899ac4..a1ea9a9 100644
--- a/docs/api/sgml/mscrypto/app.sgml
+++ b/docs/api/sgml/mscrypto/app.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-mscrypto-app.top_of_page">app</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC-MSCRYPTO Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC-MSCRYPTO Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>app</refname>
 <refpurpose>Application functions implementation for MS Crypto.</refpurpose>
@@ -13,341 +14,331 @@
 <refsynopsisdiv id="xmlsec-mscrypto-app.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppInit">xmlSecMSCryptoAppInit</link>               (const <link linkend="char">char</link> *config);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppShutdown">xmlSecMSCryptoAppShutdown</link>           (void);
-<link linkend="LPCTSTR--CAPS">LPCTSTR</link>             <link linkend="xmlSecMSCryptoAppGetCertStoreName">xmlSecMSCryptoAppGetCertStoreName</link>   (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrInit">xmlSecMSCryptoAppDefaultKeysMngrInit</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrAdoptKey">xmlSecMSCryptoAppDefaultKeysMngrAdoptKey</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrLoad">xmlSecMSCryptoAppDefaultKeysMngrLoad</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *uri);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrSave">xmlSecMSCryptoAppDefaultKeysMngrSave</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="HCRYPTKEY--CAPS">HCRYPTKEY</link> hKey);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="HCRYPTKEY--CAPS">HCRYPTKEY</link> hKey);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="HCRYPTKEY--CAPS">HCRYPTKEY</link> hKey);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> keyStore);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> trustedStore);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> untrustedStore);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppKeysMngrCertLoad">xmlSecMSCryptoAppKeysMngrCertLoad</link>   (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppKeysMngrCertLoadMemory">xmlSecMSCryptoAppKeysMngrCertLoadMemory</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecMSCryptoAppKeyLoad">xmlSecMSCryptoAppKeyLoad</link>            (const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecMSCryptoAppKeyLoadMemory">xmlSecMSCryptoAppKeyLoadMemory</link>      (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecMSCryptoAppPkcs12Load">xmlSecMSCryptoAppPkcs12Load</link>         (const <link linkend="char">char</link> *filename,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecMSCryptoAppPkcs12LoadMemory">xmlSecMSCryptoAppPkcs12LoadMemory</link>   (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppKeyCertLoad">xmlSecMSCryptoAppKeyCertLoad</link>        (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppKeyCertLoadMemory">xmlSecMSCryptoAppKeyCertLoadMemory</link>  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="void">void</link>*               <link linkend="xmlSecMSCryptoAppGetDefaultPwdCallback">xmlSecMSCryptoAppGetDefaultPwdCallback</link>
-                                                        (void);
+<synopsis><link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoAppInit">xmlSecMSCryptoAppInit</link>               (<parameter>const <link linkend="char"><type>char</type></link> *config</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoAppShutdown">xmlSecMSCryptoAppShutdown</link>           (<parameter><type>void</type></parameter>);
+<link linkend="LPCTSTR:CAPS"><returnvalue>LPCTSTR</returnvalue></link>             <link linkend="xmlSecMSCryptoAppGetCertStoreName">xmlSecMSCryptoAppGetCertStoreName</link>   (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrInit">xmlSecMSCryptoAppDefaultKeysMngrInit</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrAdoptKey">xmlSecMSCryptoAppDefaultKeysMngrAdoptKey</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrLoad">xmlSecMSCryptoAppDefaultKeysMngrLoad</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *uri</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrSave">xmlSecMSCryptoAppDefaultKeysMngrSave</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="HCRYPTKEY:CAPS"><type>HCRYPTKEY</type></link> hKey</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="HCRYPTKEY:CAPS"><type>HCRYPTKEY</type></link> hKey</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="HCRYPTKEY:CAPS"><type>HCRYPTKEY</type></link> hKey</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="HCERTSTORE:CAPS"><type>HCERTSTORE</type></link> keyStore</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="HCERTSTORE:CAPS"><type>HCERTSTORE</type></link> trustedStore</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="HCERTSTORE:CAPS"><type>HCERTSTORE</type></link> untrustedStore</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoAppKeysMngrCertLoad">xmlSecMSCryptoAppKeysMngrCertLoad</link>   (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoAppKeysMngrCertLoadMemory">xmlSecMSCryptoAppKeysMngrCertLoadMemory</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecMSCryptoAppKeyLoad">xmlSecMSCryptoAppKeyLoad</link>            (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecMSCryptoAppKeyLoadMemory">xmlSecMSCryptoAppKeyLoadMemory</link>      (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecMSCryptoAppPkcs12Load">xmlSecMSCryptoAppPkcs12Load</link>         (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecMSCryptoAppPkcs12LoadMemory">xmlSecMSCryptoAppPkcs12LoadMemory</link>   (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoAppKeyCertLoad">xmlSecMSCryptoAppKeyCertLoad</link>        (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoAppKeyCertLoadMemory">xmlSecMSCryptoAppKeyCertLoadMemory</link>  (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>*               <link linkend="xmlSecMSCryptoAppGetDefaultPwdCallback">xmlSecMSCryptoAppGetDefaultPwdCallback</link>
+                                                        (<parameter><type>void</type></parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-mscrypto-app.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Application functions implementation for MS Crypto.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-mscrypto-app.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecMSCryptoAppInit" role="function">
 <title>xmlSecMSCryptoAppInit ()</title>
-<indexterm zone="xmlSecMSCryptoAppInit"><primary sortas="xmlSecMSCryptoAppInit">xmlSecMSCryptoAppInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppInit               (const <link linkend="char">char</link> *config);</programlisting>
+<indexterm zone="xmlSecMSCryptoAppInit"><primary>xmlSecMSCryptoAppInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoAppInit               (<parameter>const <link linkend="char"><type>char</type></link> *config</parameter>);</programlisting>
 <para>
 General crypto engine initialization. This function is used
 by XMLSec command line utility and called before
-<parameter>xmlSecInit</parameter> function.</para>
-<para>
+<parameter>xmlSecInit</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>config</parameter>&#160;:</term>
-<listitem><simpara>             the name of another then the default ms certificate store.
+<listitem><simpara>the name of another then the default ms certificate store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppShutdown" role="function">
 <title>xmlSecMSCryptoAppShutdown ()</title>
-<indexterm zone="xmlSecMSCryptoAppShutdown"><primary sortas="xmlSecMSCryptoAppShutdown">xmlSecMSCryptoAppShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppShutdown           (void);</programlisting>
+<indexterm zone="xmlSecMSCryptoAppShutdown"><primary>xmlSecMSCryptoAppShutdown</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoAppShutdown           (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after
-<parameter>xmlSecShutdown</parameter> function.</para>
-<para>
+<parameter>xmlSecShutdown</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppGetCertStoreName" role="function">
 <title>xmlSecMSCryptoAppGetCertStoreName ()</title>
-<indexterm zone="xmlSecMSCryptoAppGetCertStoreName"><primary sortas="xmlSecMSCryptoAppGetCertStoreName">xmlSecMSCryptoAppGetCertStoreName</primary></indexterm><programlisting><link linkend="LPCTSTR--CAPS">LPCTSTR</link>             xmlSecMSCryptoAppGetCertStoreName   (void);</programlisting>
-<para>
-Gets the MS Crypto certs store name set by <parameter>xmlSecMSCryptoAppInit</parameter> function.</para>
+<indexterm zone="xmlSecMSCryptoAppGetCertStoreName"><primary>xmlSecMSCryptoAppGetCertStoreName</primary></indexterm>
+<programlisting><link linkend="LPCTSTR:CAPS"><returnvalue>LPCTSTR</returnvalue></link>             xmlSecMSCryptoAppGetCertStoreName   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets the MS Crypto certs store name set by <parameter>xmlSecMSCryptoAppInit</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the MS Crypto certs name used by xmlsec-mscrypto.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppDefaultKeysMngrInit" role="function">
 <title>xmlSecMSCryptoAppDefaultKeysMngrInit ()</title>
-<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrInit"><primary sortas="xmlSecMSCryptoAppDefaultKeysMngrInit">xmlSecMSCryptoAppDefaultKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppDefaultKeysMngrInit
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
+<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrInit"><primary>xmlSecMSCryptoAppDefaultKeysMngrInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoAppDefaultKeysMngrInit
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);</programlisting>
 <para>
 Initializes <parameter>mngr</parameter> with simple keys store <link linkend="xmlSecSimpleKeysStoreId"><type>xmlSecSimpleKeysStoreId</type></link>
-and a default MSCrypto crypto key data stores.</para>
-<para>
+and a default MSCrypto crypto key data stores.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppDefaultKeysMngrAdoptKey" role="function">
 <title>xmlSecMSCryptoAppDefaultKeysMngrAdoptKey ()</title>
-<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrAdoptKey"><primary sortas="xmlSecMSCryptoAppDefaultKeysMngrAdoptKey">xmlSecMSCryptoAppDefaultKeysMngrAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptKey
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrAdoptKey"><primary>xmlSecMSCryptoAppDefaultKeysMngrAdoptKey</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptKey
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);</programlisting>
 <para>
 Adds <parameter>key</parameter> to the keys manager <parameter>mngr</parameter> created with <link linkend="xmlSecMSCryptoAppDefaultKeysMngrInit"><type>xmlSecMSCryptoAppDefaultKeysMngrInit</type></link>
-function.</para>
-<para>
+function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppDefaultKeysMngrLoad" role="function">
 <title>xmlSecMSCryptoAppDefaultKeysMngrLoad ()</title>
-<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrLoad"><primary sortas="xmlSecMSCryptoAppDefaultKeysMngrLoad">xmlSecMSCryptoAppDefaultKeysMngrLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppDefaultKeysMngrLoad
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *uri);</programlisting>
+<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrLoad"><primary>xmlSecMSCryptoAppDefaultKeysMngrLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoAppDefaultKeysMngrLoad
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *uri</parameter>);</programlisting>
 <para>
 Loads XML keys file from <parameter>uri</parameter> to the keys manager <parameter>mngr</parameter> created
-with <link linkend="xmlSecMSCryptoAppDefaultKeysMngrInit"><type>xmlSecMSCryptoAppDefaultKeysMngrInit</type></link> function.</para>
-<para>
+with <link linkend="xmlSecMSCryptoAppDefaultKeysMngrInit"><type>xmlSecMSCryptoAppDefaultKeysMngrInit</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>uri</parameter>&#160;:</term>
-<listitem><simpara>                the uri.
+<listitem><simpara>the uri.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppDefaultKeysMngrSave" role="function">
 <title>xmlSecMSCryptoAppDefaultKeysMngrSave ()</title>
-<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrSave"><primary sortas="xmlSecMSCryptoAppDefaultKeysMngrSave">xmlSecMSCryptoAppDefaultKeysMngrSave</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppDefaultKeysMngrSave
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
-<para>
-Saves keys from <parameter>mngr</parameter> to  XML keys file.</para>
+<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrSave"><primary>xmlSecMSCryptoAppDefaultKeysMngrSave</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoAppDefaultKeysMngrSave
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
+Saves keys from <parameter>mngr</parameter> to  XML keys file.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>   the destination filename.
+<listitem><simpara>the destination filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the type of keys to save (public/private/symmetric).
+<listitem><simpara>the type of keys to save (public/private/symmetric).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad" role="function">
 <title>xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad ()</title>
-<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad"><primary sortas="xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="HCRYPTKEY--CAPS">HCRYPTKEY</link> hKey);</programlisting>
-<para>
-Adds private key <parameter>hKey</parameter> to the keys manager <parameter>mngr</parameter>.</para>
+<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad"><primary>xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="HCRYPTKEY:CAPS"><type>HCRYPTKEY</type></link> hKey</parameter>);</programlisting>
 <para>
+Adds private key <parameter>hKey</parameter> to the keys manager <parameter>mngr</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>hKey</parameter>&#160;:</term>
-<listitem><simpara>       the key handle.
+<listitem><simpara>the key handle.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad" role="function">
 <title>xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad ()</title>
-<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad"><primary sortas="xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="HCRYPTKEY--CAPS">HCRYPTKEY</link> hKey);</programlisting>
-<para>
-Adds public key <parameter>hKey</parameter> to the keys manager <parameter>mngr</parameter>.</para>
+<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad"><primary>xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="HCRYPTKEY:CAPS"><type>HCRYPTKEY</type></link> hKey</parameter>);</programlisting>
 <para>
+Adds public key <parameter>hKey</parameter> to the keys manager <parameter>mngr</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>hKey</parameter>&#160;:</term>
-<listitem><simpara>       the key handle.
+<listitem><simpara>the key handle.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad" role="function">
 <title>xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad ()</title>
-<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad"><primary sortas="xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="HCRYPTKEY--CAPS">HCRYPTKEY</link> hKey);</programlisting>
-<para>
-Adds symmetric key <parameter>hKey</parameter> to the keys manager <parameter>mngr</parameter>.</para>
+<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad"><primary>xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="HCRYPTKEY:CAPS"><type>HCRYPTKEY</type></link> hKey</parameter>);</programlisting>
 <para>
+Adds symmetric key <parameter>hKey</parameter> to the keys manager <parameter>mngr</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>hKey</parameter>&#160;:</term>
-<listitem><simpara>       the key handle.
+<listitem><simpara>the key handle.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore" role="function">
 <title>xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore ()</title>
-<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore"><primary sortas="xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> keyStore);</programlisting>
-<para>
-Adds <parameter>keyStore</parameter> to the list of key stores in the keys manager <parameter>mngr</parameter>.</para>
+<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore"><primary>xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="HCERTSTORE:CAPS"><type>HCERTSTORE</type></link> keyStore</parameter>);</programlisting>
 <para>
+Adds <parameter>keyStore</parameter> to the list of key stores in the keys manager <parameter>mngr</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>                       the keys manager.
+<listitem><simpara>the keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyStore</parameter>&#160;:</term>
-<listitem><simpara>           the pointer to keys store.
+<listitem><simpara>the pointer to keys store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore" role="function">
 <title>xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore ()</title>
-<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore"><primary sortas="xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> trustedStore);</programlisting>
-<para>
-Adds <parameter>trustedStore</parameter> to the list of trusted cert stores in the keys manager <parameter>mngr</parameter>.</para>
+<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore"><primary>xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="HCERTSTORE:CAPS"><type>HCERTSTORE</type></link> trustedStore</parameter>);</programlisting>
 <para>
+Adds <parameter>trustedStore</parameter> to the list of trusted cert stores in the keys manager <parameter>mngr</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>                       the keys manager.
+<listitem><simpara>the keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>trustedStore</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to certs store.
+<listitem><simpara>the pointer to certs store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore" role="function">
 <title>xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore ()</title>
-<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore"><primary sortas="xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> untrustedStore);</programlisting>
-<para>
-Adds <parameter>trustedStore</parameter> to the list of un-trusted cert stores in the keys manager <parameter>mngr</parameter>.</para>
+<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore"><primary>xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="HCERTSTORE:CAPS"><type>HCERTSTORE</type></link> untrustedStore</parameter>);</programlisting>
 <para>
+Adds <parameter>trustedStore</parameter> to the list of un-trusted cert stores in the keys manager <parameter>mngr</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>                       the keys manager.
+<listitem><simpara>the keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>untrustedStore</parameter>&#160;:</term>
-<listitem><simpara>     the pointer to certs store.
+<listitem><simpara>the pointer to certs store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppKeysMngrCertLoad" role="function">
 <title>xmlSecMSCryptoAppKeysMngrCertLoad ()</title>
-<indexterm zone="xmlSecMSCryptoAppKeysMngrCertLoad"><primary sortas="xmlSecMSCryptoAppKeysMngrCertLoad">xmlSecMSCryptoAppKeysMngrCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppKeysMngrCertLoad   (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<indexterm zone="xmlSecMSCryptoAppKeysMngrCertLoad"><primary>xmlSecMSCryptoAppKeysMngrCertLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoAppKeysMngrCertLoad   (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
 Reads cert from <parameter>filename</parameter> and adds to the list of trusted or known
-untrusted certs in <parameter>store</parameter> (not implemented yet).</para>
-<para>
+untrusted certs in <parameter>store</parameter> (not implemented yet).
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the keys manager.
+<listitem><simpara>the keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the certificate file.
+<listitem><simpara>the certificate file.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the flag that indicates is the certificate in <parameter>filename</parameter>
+<listitem><simpara>the flag that indicates is the certificate in <parameter>filename</parameter>
                      trusted or not.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
@@ -355,31 +346,31 @@ untrusted certs in <parameter>store</parameter> (not implemented yet).</para>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppKeysMngrCertLoadMemory" role="function">
 <title>xmlSecMSCryptoAppKeysMngrCertLoadMemory ()</title>
-<indexterm zone="xmlSecMSCryptoAppKeysMngrCertLoadMemory"><primary sortas="xmlSecMSCryptoAppKeysMngrCertLoadMemory">xmlSecMSCryptoAppKeysMngrCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppKeysMngrCertLoadMemory
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<indexterm zone="xmlSecMSCryptoAppKeysMngrCertLoadMemory"><primary>xmlSecMSCryptoAppKeysMngrCertLoadMemory</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoAppKeysMngrCertLoadMemory
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
 Reads cert from <parameter>data</parameter> and adds to the list of trusted or known
-untrusted certs in <parameter>store</parameter>.</para>
-<para>
+untrusted certs in <parameter>store</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the keys manager.
+<listitem><simpara>the keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the binary certificate.
+<listitem><simpara>the binary certificate.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           size of binary certificate (data)
+<listitem><simpara>size of binary certificate (data)
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the flag that indicates is the certificate in <parameter>filename</parameter>
+<listitem><simpara>the flag that indicates is the certificate in <parameter>filename</parameter>
                      trusted or not.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
@@ -387,173 +378,173 @@ untrusted certs in <parameter>store</parameter>.</para>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppKeyLoad" role="function">
 <title>xmlSecMSCryptoAppKeyLoad ()</title>
-<indexterm zone="xmlSecMSCryptoAppKeyLoad"><primary sortas="xmlSecMSCryptoAppKeyLoad">xmlSecMSCryptoAppKeyLoad</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecMSCryptoAppKeyLoad            (const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
-<para>
-Reads key from the a file.</para>
-<para>
+<indexterm zone="xmlSecMSCryptoAppKeyLoad"><primary>xmlSecMSCryptoAppKeyLoad</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecMSCryptoAppKeyLoad            (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
+<para>
+Reads key from the a file.
 </para><variablelist role="params">
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the key filename.
+<listitem><simpara>the key filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the key file format.
+<listitem><simpara>the key file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the key file password.
+<listitem><simpara>the key file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the key password callback.
+<listitem><simpara>the key password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppKeyLoadMemory" role="function">
 <title>xmlSecMSCryptoAppKeyLoadMemory ()</title>
-<indexterm zone="xmlSecMSCryptoAppKeyLoadMemory"><primary sortas="xmlSecMSCryptoAppKeyLoadMemory">xmlSecMSCryptoAppKeyLoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecMSCryptoAppKeyLoadMemory      (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
-<para>
-Reads key from the a file.</para>
-<para>
+<indexterm zone="xmlSecMSCryptoAppKeyLoadMemory"><primary>xmlSecMSCryptoAppKeyLoadMemory</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecMSCryptoAppKeyLoadMemory      (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
+<para>
+Reads key from the a file.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the key binary data.
+<listitem><simpara>the key binary data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the key data size.
+<listitem><simpara>the key data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the key format.
+<listitem><simpara>the key format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the key password.
+<listitem><simpara>the key password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the key password callback.
+<listitem><simpara>the key password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppPkcs12Load" role="function">
 <title>xmlSecMSCryptoAppPkcs12Load ()</title>
-<indexterm zone="xmlSecMSCryptoAppPkcs12Load"><primary sortas="xmlSecMSCryptoAppPkcs12Load">xmlSecMSCryptoAppPkcs12Load</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecMSCryptoAppPkcs12Load         (const <link linkend="char">char</link> *filename,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
-<para>
-Reads key and all associated certificates from the PKCS12 file</para>
+<indexterm zone="xmlSecMSCryptoAppPkcs12Load"><primary>xmlSecMSCryptoAppPkcs12Load</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecMSCryptoAppPkcs12Load         (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
 <para>
+Reads key and all associated certificates from the PKCS12 file
 </para><variablelist role="params">
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the PKCS12 key filename.
+<listitem><simpara>the PKCS12 key filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the PKCS12 file password.
+<listitem><simpara>the PKCS12 file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the password callback.
+<listitem><simpara>the password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppPkcs12LoadMemory" role="function">
 <title>xmlSecMSCryptoAppPkcs12LoadMemory ()</title>
-<indexterm zone="xmlSecMSCryptoAppPkcs12LoadMemory"><primary sortas="xmlSecMSCryptoAppPkcs12LoadMemory">xmlSecMSCryptoAppPkcs12LoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecMSCryptoAppPkcs12LoadMemory   (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
-<para>
-Reads key and all associated certificates from the PKCS12 binary</para>
-<para>
+<indexterm zone="xmlSecMSCryptoAppPkcs12LoadMemory"><primary>xmlSecMSCryptoAppPkcs12LoadMemory</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecMSCryptoAppPkcs12LoadMemory   (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
+<para>
+Reads key and all associated certificates from the PKCS12 binary
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the binary PKCS12 key in data.
+<listitem><simpara>the binary PKCS12 key in data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           size of binary pkcs12 data
+<listitem><simpara>size of binary pkcs12 data
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the PKCS12 file password.
+<listitem><simpara>the PKCS12 file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the password callback.
+<listitem><simpara>the password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppKeyCertLoad" role="function">
 <title>xmlSecMSCryptoAppKeyCertLoad ()</title>
-<indexterm zone="xmlSecMSCryptoAppKeyCertLoad"><primary sortas="xmlSecMSCryptoAppKeyCertLoad">xmlSecMSCryptoAppKeyCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppKeyCertLoad        (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
-<para>
-Reads the certificate from $<parameter>filename</parameter> and adds it to key.</para>
+<indexterm zone="xmlSecMSCryptoAppKeyCertLoad"><primary>xmlSecMSCryptoAppKeyCertLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoAppKeyCertLoad        (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);</programlisting>
 <para>
+Reads the certificate from $<parameter>filename</parameter> and adds it to key.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the certificate filename.
+<listitem><simpara>the certificate filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppKeyCertLoadMemory" role="function">
 <title>xmlSecMSCryptoAppKeyCertLoadMemory ()</title>
-<indexterm zone="xmlSecMSCryptoAppKeyCertLoadMemory"><primary sortas="xmlSecMSCryptoAppKeyCertLoadMemory">xmlSecMSCryptoAppKeyCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppKeyCertLoadMemory  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
-<para>
-Reads the certificate from $<parameter>data</parameter> and adds it to key.</para>
+<indexterm zone="xmlSecMSCryptoAppKeyCertLoadMemory"><primary>xmlSecMSCryptoAppKeyCertLoadMemory</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoAppKeyCertLoadMemory  (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);</programlisting>
 <para>
+Reads the certificate from $<parameter>data</parameter> and adds it to key.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the binary certificate.
+<listitem><simpara>the binary certificate.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           size of certificate binary (data)
+<listitem><simpara>size of certificate binary (data)
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoAppGetDefaultPwdCallback" role="function">
 <title>xmlSecMSCryptoAppGetDefaultPwdCallback ()</title>
-<indexterm zone="xmlSecMSCryptoAppGetDefaultPwdCallback"><primary sortas="xmlSecMSCryptoAppGetDefaultPwdCallback">xmlSecMSCryptoAppGetDefaultPwdCallback</primary></indexterm><programlisting><link linkend="void">void</link>*               xmlSecMSCryptoAppGetDefaultPwdCallback
-                                                        (void);</programlisting>
-<para>
-Gets default password callback.</para>
+<indexterm zone="xmlSecMSCryptoAppGetDefaultPwdCallback"><primary>xmlSecMSCryptoAppGetDefaultPwdCallback</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>*               xmlSecMSCryptoAppGetDefaultPwdCallback
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets default password callback.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> default password callback.
 </simpara></listitem></varlistentry>
@@ -561,7 +552,4 @@ Gets default password callback.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/mscrypto/certkeys.sgml b/docs/api/sgml/mscrypto/certkeys.sgml
index f368732..07cacf9 100644
--- a/docs/api/sgml/mscrypto/certkeys.sgml
+++ b/docs/api/sgml/mscrypto/certkeys.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-mscrypto-certkeys.top_of_page">certkeys</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC-MSCRYPTO Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC-MSCRYPTO Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>certkeys</refname>
 <refpurpose>MS Crypto certificates helper functions.</refpurpose>
@@ -13,93 +14,83 @@
 <refsynopsisdiv id="xmlsec-mscrypto-certkeys.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link>      <link linkend="xmlSecMSCryptoKeyDataGetCert">xmlSecMSCryptoKeyDataGetCert</link>        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="HCRYPTKEY--CAPS">HCRYPTKEY</link>           <link linkend="xmlSecMSCryptoKeyDataGetKey">xmlSecMSCryptoKeyDataGetKey</link>         (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="HCRYPTKEY--CAPS">HCRYPTKEY</link>           <link linkend="xmlSecMSCryptoKeyDataGetDecryptKey">xmlSecMSCryptoKeyDataGetDecryptKey</link>  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link>      <link linkend="xmlSecMSCryptoCertDup">xmlSecMSCryptoCertDup</link>               (<link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link> pCert);
-<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    <link linkend="xmlSecMSCryptoCertAdopt">xmlSecMSCryptoCertAdopt</link>             (<link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link> pCert,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="HCRYPTPROV--CAPS">HCRYPTPROV</link>          <link linkend="xmlSecMSCryptoKeyDataGetMSCryptoProvider">xmlSecMSCryptoKeyDataGetMSCryptoProvider</link>
-                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="DWORD--CAPS">DWORD</link>               <link linkend="xmlSecMSCryptoKeyDataGetMSCryptoKeySpec">xmlSecMSCryptoKeyDataGetMSCryptoKeySpec</link>
-                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<synopsis><link linkend="PCCERT-CONTEXT:CAPS"><returnvalue>PCCERT_CONTEXT</returnvalue></link>      <link linkend="xmlSecMSCryptoKeyDataGetCert">xmlSecMSCryptoKeyDataGetCert</link>        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="HCRYPTKEY:CAPS"><returnvalue>HCRYPTKEY</returnvalue></link>           <link linkend="xmlSecMSCryptoKeyDataGetKey">xmlSecMSCryptoKeyDataGetKey</link>         (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="HCRYPTKEY:CAPS"><returnvalue>HCRYPTKEY</returnvalue></link>           <link linkend="xmlSecMSCryptoKeyDataGetDecryptKey">xmlSecMSCryptoKeyDataGetDecryptKey</link>  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="PCCERT-CONTEXT:CAPS"><returnvalue>PCCERT_CONTEXT</returnvalue></link>      <link linkend="xmlSecMSCryptoCertDup">xmlSecMSCryptoCertDup</link>               (<parameter><link linkend="PCCERT-CONTEXT:CAPS"><type>PCCERT_CONTEXT</type></link> pCert</parameter>);
+<link linkend="xmlSecKeyData"><returnvalue>xmlSecKeyDataPtr</returnvalue></link>    <link linkend="xmlSecMSCryptoCertAdopt">xmlSecMSCryptoCertAdopt</link>             (<parameter><link linkend="PCCERT-CONTEXT:CAPS"><type>PCCERT_CONTEXT</type></link> pCert</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="HCRYPTPROV:CAPS"><returnvalue>HCRYPTPROV</returnvalue></link>          <link linkend="xmlSecMSCryptoKeyDataGetMSCryptoProvider">xmlSecMSCryptoKeyDataGetMSCryptoProvider</link>
+                                                        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="DWORD:CAPS"><returnvalue>DWORD</returnvalue></link>               <link linkend="xmlSecMSCryptoKeyDataGetMSCryptoKeySpec">xmlSecMSCryptoKeyDataGetMSCryptoKeySpec</link>
+                                                        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-mscrypto-certkeys.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 MS Crypto certificates helper functions.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-mscrypto-certkeys.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecMSCryptoKeyDataGetCert" role="function">
 <title>xmlSecMSCryptoKeyDataGetCert ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataGetCert"><primary sortas="xmlSecMSCryptoKeyDataGetCert">xmlSecMSCryptoKeyDataGetCert</primary></indexterm><programlisting><link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link>      xmlSecMSCryptoKeyDataGetCert        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<indexterm zone="xmlSecMSCryptoKeyDataGetCert"><primary>xmlSecMSCryptoKeyDataGetCert</primary></indexterm>
+<programlisting><link linkend="PCCERT-CONTEXT:CAPS"><returnvalue>PCCERT_CONTEXT</returnvalue></link>      xmlSecMSCryptoKeyDataGetCert        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
 Native MSCrypto certificate retrieval from xmlsec keydata. The
-returned PCCERT_CONTEXT must not be released by the caller.</para>
-<para>
+returned PCCERT_CONTEXT must not be released by the caller.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the key data to retrieve certificate from.
+<listitem><simpara>the key data to retrieve certificate from.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> PCCERT_CONTEXT on success or NULL otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataGetKey" role="function">
 <title>xmlSecMSCryptoKeyDataGetKey ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataGetKey"><primary sortas="xmlSecMSCryptoKeyDataGetKey">xmlSecMSCryptoKeyDataGetKey</primary></indexterm><programlisting><link linkend="HCRYPTKEY--CAPS">HCRYPTKEY</link>           xmlSecMSCryptoKeyDataGetKey         (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<indexterm zone="xmlSecMSCryptoKeyDataGetKey"><primary>xmlSecMSCryptoKeyDataGetKey</primary></indexterm>
+<programlisting><link linkend="HCRYPTKEY:CAPS"><returnvalue>HCRYPTKEY</returnvalue></link>           xmlSecMSCryptoKeyDataGetKey         (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
 Native MSCrypto key retrieval from xmlsec keydata. The
-returned HKEY must not be destroyed by the caller.</para>
-<para>
+returned HKEY must not be destroyed by the caller.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the key data to retrieve certificate from.
+<listitem><simpara>the key data to retrieve certificate from.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>              type of key requested (public/private)
+<listitem><simpara>type of key requested (public/private)
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> HKEY on success or NULL otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataGetDecryptKey" role="function">
 <title>xmlSecMSCryptoKeyDataGetDecryptKey ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataGetDecryptKey"><primary sortas="xmlSecMSCryptoKeyDataGetDecryptKey">xmlSecMSCryptoKeyDataGetDecryptKey</primary></indexterm><programlisting><link linkend="HCRYPTKEY--CAPS">HCRYPTKEY</link>           xmlSecMSCryptoKeyDataGetDecryptKey  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<indexterm zone="xmlSecMSCryptoKeyDataGetDecryptKey"><primary>xmlSecMSCryptoKeyDataGetDecryptKey</primary></indexterm>
+<programlisting><link linkend="HCRYPTKEY:CAPS"><returnvalue>HCRYPTKEY</returnvalue></link>           xmlSecMSCryptoKeyDataGetDecryptKey  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
 Native MSCrypto decrypt key retrieval from xmlsec keydata. The
-returned HKEY must not be destroyed by the caller.</para>
-<para>
+returned HKEY must not be destroyed by the caller.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>       the key data pointer
+<listitem><simpara>the key data pointer
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> HKEY on success or NULL otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoCertDup" role="function">
 <title>xmlSecMSCryptoCertDup ()</title>
-<indexterm zone="xmlSecMSCryptoCertDup"><primary sortas="xmlSecMSCryptoCertDup">xmlSecMSCryptoCertDup</primary></indexterm><programlisting><link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link>      xmlSecMSCryptoCertDup               (<link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link> pCert);</programlisting>
-<para>
-Duplicates the <parameter>pCert</parameter>.</para>
+<indexterm zone="xmlSecMSCryptoCertDup"><primary>xmlSecMSCryptoCertDup</primary></indexterm>
+<programlisting><link linkend="PCCERT-CONTEXT:CAPS"><returnvalue>PCCERT_CONTEXT</returnvalue></link>      xmlSecMSCryptoCertDup               (<parameter><link linkend="PCCERT-CONTEXT:CAPS"><type>PCCERT_CONTEXT</type></link> pCert</parameter>);</programlisting>
 <para>
+Duplicates the <parameter>pCert</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>pCert</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to cert.
+<listitem><simpara>the pointer to cert.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created PCCERT_CONTEXT object or
 NULL if an error occurs.
@@ -107,45 +98,45 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoCertAdopt" role="function">
 <title>xmlSecMSCryptoCertAdopt ()</title>
-<indexterm zone="xmlSecMSCryptoCertAdopt"><primary sortas="xmlSecMSCryptoCertAdopt">xmlSecMSCryptoCertAdopt</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    xmlSecMSCryptoCertAdopt             (<link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link> pCert,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
-<para>
-Creates key data value from the cert.</para>
+<indexterm zone="xmlSecMSCryptoCertAdopt"><primary>xmlSecMSCryptoCertAdopt</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyData"><returnvalue>xmlSecKeyDataPtr</returnvalue></link>    xmlSecMSCryptoCertAdopt             (<parameter><link linkend="PCCERT-CONTEXT:CAPS"><type>PCCERT_CONTEXT</type></link> pCert</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
+Creates key data value from the cert.
 </para><variablelist role="params">
 <varlistentry><term><parameter>pCert</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to cert.
+<listitem><simpara>the pointer to cert.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the expected key type.
+<listitem><simpara>the expected key type.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created xmlsec key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataGetMSCryptoProvider" role="function">
 <title>xmlSecMSCryptoKeyDataGetMSCryptoProvider ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataGetMSCryptoProvider"><primary sortas="xmlSecMSCryptoKeyDataGetMSCryptoProvider">xmlSecMSCryptoKeyDataGetMSCryptoProvider</primary></indexterm><programlisting><link linkend="HCRYPTPROV--CAPS">HCRYPTPROV</link>          xmlSecMSCryptoKeyDataGetMSCryptoProvider
-                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets crypto provider handle</para>
+<indexterm zone="xmlSecMSCryptoKeyDataGetMSCryptoProvider"><primary>xmlSecMSCryptoKeyDataGetMSCryptoProvider</primary></indexterm>
+<programlisting><link linkend="HCRYPTPROV:CAPS"><returnvalue>HCRYPTPROV</returnvalue></link>          xmlSecMSCryptoKeyDataGetMSCryptoProvider
+                                                        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets crypto provider handle
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>              the key data
+<listitem><simpara>the key data
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the crypto provider handler or 0 if there is an error.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataGetMSCryptoKeySpec" role="function">
 <title>xmlSecMSCryptoKeyDataGetMSCryptoKeySpec ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataGetMSCryptoKeySpec"><primary sortas="xmlSecMSCryptoKeyDataGetMSCryptoKeySpec">xmlSecMSCryptoKeyDataGetMSCryptoKeySpec</primary></indexterm><programlisting><link linkend="DWORD--CAPS">DWORD</link>               xmlSecMSCryptoKeyDataGetMSCryptoKeySpec
-                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets key spec info.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataGetMSCryptoKeySpec"><primary>xmlSecMSCryptoKeyDataGetMSCryptoKeySpec</primary></indexterm>
+<programlisting><link linkend="DWORD:CAPS"><returnvalue>DWORD</returnvalue></link>               xmlSecMSCryptoKeyDataGetMSCryptoKeySpec
+                                                        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets key spec info.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>              the key data
+<listitem><simpara>the key data
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the key spec info from key data
 </simpara></listitem></varlistentry>
@@ -153,7 +144,4 @@ Gets key spec info.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/mscrypto/crypto.sgml b/docs/api/sgml/mscrypto/crypto.sgml
index 5dbe162..f2e5b77 100644
--- a/docs/api/sgml/mscrypto/crypto.sgml
+++ b/docs/api/sgml/mscrypto/crypto.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-mscrypto-crypto.top_of_page">crypto</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC-MSCRYPTO Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC-MSCRYPTO Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>crypto</refname>
 <refpurpose>Crypto transforms implementation for MS Crypto.</refpurpose>
@@ -13,904 +14,999 @@
 <refsynopsisdiv id="xmlsec-mscrypto-crypto.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  <link linkend="xmlSecCryptoGetFunctions-mscrypto">xmlSecCryptoGetFunctions_mscrypto</link>
-                                                        (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoInit">xmlSecMSCryptoInit</link>                  (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoShutdown">xmlSecMSCryptoShutdown</link>              (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoKeysMngrInit">xmlSecMSCryptoKeysMngrInit</link>          (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoGenerateRandom">xmlSecMSCryptoGenerateRandom</link>        (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
-                                                         <link linkend="size-t">size_t</link> size);
-<link linkend="void">void</link>                <link linkend="xmlSecMSCryptoErrorsDefaultCallback">xmlSecMSCryptoErrorsDefaultCallback</link> (const <link linkend="char">char</link> *file,
-                                                         <link linkend="int">int</link> line,
-                                                         const <link linkend="char">char</link> *func,
-                                                         const <link linkend="char">char</link> *errorObject,
-                                                         const <link linkend="char">char</link> *errorSubject,
-                                                         <link linkend="int">int</link> reason,
-                                                         const <link linkend="char">char</link> *msg);
-<link linkend="LPWSTR--CAPS">LPWSTR</link>              <link linkend="xmlSecMSCryptoConvertLocaleToUnicode">xmlSecMSCryptoConvertLocaleToUnicode</link>
-                                                        (const <link linkend="char">char</link> *str);
-<link linkend="LPWSTR--CAPS">LPWSTR</link>              <link linkend="xmlSecMSCryptoConvertUtf8ToUnicode">xmlSecMSCryptoConvertUtf8ToUnicode</link>  (const <link linkend="xmlChar">xmlChar</link> *str);
-<link linkend="xmlChar">xmlChar</link>*            <link linkend="xmlSecMSCryptoConvertUnicodeToUtf8">xmlSecMSCryptoConvertUnicodeToUtf8</link>  (<link linkend="LPCWSTR--CAPS">LPCWSTR</link> str);
-<link linkend="xmlChar">xmlChar</link>*            <link linkend="xmlSecMSCryptoConvertLocaleToUtf8">xmlSecMSCryptoConvertLocaleToUtf8</link>   (const <link linkend="char">char</link> *str);
-<link linkend="char">char</link>*               <link linkend="xmlSecMSCryptoConvertUtf8ToLocale">xmlSecMSCryptoConvertUtf8ToLocale</link>   (const <link linkend="xmlChar">xmlChar</link> *str);
-<link linkend="xmlChar">xmlChar</link>*            <link linkend="xmlSecMSCryptoConvertTstrToUtf8">xmlSecMSCryptoConvertTstrToUtf8</link>     (<link linkend="LPCTSTR--CAPS">LPCTSTR</link> str);
-<link linkend="LPTSTR--CAPS">LPTSTR</link>              <link linkend="xmlSecMSCryptoConvertUtf8ToTstr">xmlSecMSCryptoConvertUtf8ToTstr</link>     (const <link linkend="xmlChar">xmlChar</link> *str);
+<synopsis><link linkend="xmlSecCryptoDLFunctions"><returnvalue>xmlSecCryptoDLFunctionsPtr</returnvalue></link>  <link linkend="xmlSecCryptoGetFunctions-mscrypto">xmlSecCryptoGetFunctions_mscrypto</link>
+                                                        (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoInit">xmlSecMSCryptoInit</link>                  (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoShutdown">xmlSecMSCryptoShutdown</link>              (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoKeysMngrInit">xmlSecMSCryptoKeysMngrInit</link>          (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoGenerateRandom">xmlSecMSCryptoGenerateRandom</link>        (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buffer</parameter>,
+                                                         <parameter><link linkend="size-t"><type>size_t</type></link> size</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecMSCryptoErrorsDefaultCallback">xmlSecMSCryptoErrorsDefaultCallback</link> (<parameter>const <link linkend="char"><type>char</type></link> *file</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> line</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *func</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorObject</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorSubject</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> reason</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *msg</parameter>);
+<link linkend="LPWSTR:CAPS"><returnvalue>LPWSTR</returnvalue></link>              <link linkend="xmlSecMSCryptoConvertLocaleToUnicode">xmlSecMSCryptoConvertLocaleToUnicode</link>
+                                                        (<parameter>const <link linkend="char"><type>char</type></link> *str</parameter>);
+<link linkend="LPWSTR:CAPS"><returnvalue>LPWSTR</returnvalue></link>              <link linkend="xmlSecMSCryptoConvertUtf8ToUnicode">xmlSecMSCryptoConvertUtf8ToUnicode</link>  (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *str</parameter>);
+<link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*            <link linkend="xmlSecMSCryptoConvertUnicodeToUtf8">xmlSecMSCryptoConvertUnicodeToUtf8</link>  (<parameter><link linkend="LPCWSTR:CAPS"><type>LPCWSTR</type></link> str</parameter>);
+<link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*            <link linkend="xmlSecMSCryptoConvertLocaleToUtf8">xmlSecMSCryptoConvertLocaleToUtf8</link>   (<parameter>const <link linkend="char"><type>char</type></link> *str</parameter>);
+<link linkend="char"><returnvalue>char</returnvalue></link>*               <link linkend="xmlSecMSCryptoConvertUtf8ToLocale">xmlSecMSCryptoConvertUtf8ToLocale</link>   (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *str</parameter>);
+<link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*            <link linkend="xmlSecMSCryptoConvertTstrToUtf8">xmlSecMSCryptoConvertTstrToUtf8</link>     (<parameter><link linkend="LPCTSTR:CAPS"><type>LPCTSTR</type></link> str</parameter>);
+<link linkend="LPTSTR:CAPS"><returnvalue>LPTSTR</returnvalue></link>              <link linkend="xmlSecMSCryptoConvertUtf8ToTstr">xmlSecMSCryptoConvertUtf8ToTstr</link>     (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *str</parameter>);
 #define             <link linkend="xmlSecMSCryptoKeyDataDsaId">xmlSecMSCryptoKeyDataDsaId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecMSCryptoKeyDataDsaGetKlass">xmlSecMSCryptoKeyDataDsaGetKlass</link>    (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecMSCryptoKeyDataDsaGetKlass">xmlSecMSCryptoKeyDataDsaGetKlass</link>    (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformDsaSha1Id">xmlSecMSCryptoTransformDsaSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformDsaSha1GetKlass">xmlSecMSCryptoTransformDsaSha1GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformDsaSha1GetKlass">xmlSecMSCryptoTransformDsaSha1GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoKeyDataGost2001Id">xmlSecMSCryptoKeyDataGost2001Id</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecMSCryptoKeyDataGost2001GetKlass">xmlSecMSCryptoKeyDataGost2001GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecMSCryptoKeyDataGost2001GetKlass">xmlSecMSCryptoKeyDataGost2001GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformGost2001GostR3411-94Id">xmlSecMSCryptoTransformGost2001GostR3411_94Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformGost2001GostR3411-94GetKlass">xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformGost2001GostR3411-94GetKlass">xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoKeyDataRsaId">xmlSecMSCryptoKeyDataRsaId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecMSCryptoKeyDataRsaGetKlass">xmlSecMSCryptoKeyDataRsaGetKlass</link>    (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecMSCryptoKeyDataRsaGetKlass">xmlSecMSCryptoKeyDataRsaGetKlass</link>    (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformRsaMd5Id">xmlSecMSCryptoTransformRsaMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformRsaMd5GetKlass">xmlSecMSCryptoTransformRsaMd5GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformRsaMd5GetKlass">xmlSecMSCryptoTransformRsaMd5GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformRsaSha1Id">xmlSecMSCryptoTransformRsaSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformRsaSha1GetKlass">xmlSecMSCryptoTransformRsaSha1GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformRsaSha1GetKlass">xmlSecMSCryptoTransformRsaSha1GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformRsaSha256Id">xmlSecMSCryptoTransformRsaSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformRsaSha256GetKlass">xmlSecMSCryptoTransformRsaSha256GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformRsaSha256GetKlass">xmlSecMSCryptoTransformRsaSha256GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformRsaSha384Id">xmlSecMSCryptoTransformRsaSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformRsaSha384GetKlass">xmlSecMSCryptoTransformRsaSha384GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformRsaSha384GetKlass">xmlSecMSCryptoTransformRsaSha384GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformRsaSha512Id">xmlSecMSCryptoTransformRsaSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformRsaSha512GetKlass">xmlSecMSCryptoTransformRsaSha512GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformRsaSha512GetKlass">xmlSecMSCryptoTransformRsaSha512GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformRsaPkcs1Id">xmlSecMSCryptoTransformRsaPkcs1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformRsaPkcs1GetKlass">xmlSecMSCryptoTransformRsaPkcs1GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformRsaPkcs1GetKlass">xmlSecMSCryptoTransformRsaPkcs1GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecMSCryptoTransformRsaOaepId">xmlSecMSCryptoTransformRsaOaepId</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformRsaOaepGetKlass">xmlSecMSCryptoTransformRsaOaepGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformMd5Id">xmlSecMSCryptoTransformMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformMd5GetKlass">xmlSecMSCryptoTransformMd5GetKlass</link>  (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformMd5GetKlass">xmlSecMSCryptoTransformMd5GetKlass</link>  (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformSha1Id">xmlSecMSCryptoTransformSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformSha1GetKlass">xmlSecMSCryptoTransformSha1GetKlass</link> (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformSha1GetKlass">xmlSecMSCryptoTransformSha1GetKlass</link> (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformSha256Id">xmlSecMSCryptoTransformSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformSha256GetKlass">xmlSecMSCryptoTransformSha256GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformSha256GetKlass">xmlSecMSCryptoTransformSha256GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformSha384Id">xmlSecMSCryptoTransformSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformSha384GetKlass">xmlSecMSCryptoTransformSha384GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformSha384GetKlass">xmlSecMSCryptoTransformSha384GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformSha512Id">xmlSecMSCryptoTransformSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformSha512GetKlass">xmlSecMSCryptoTransformSha512GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformSha512GetKlass">xmlSecMSCryptoTransformSha512GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformGostR3411-94Id">xmlSecMSCryptoTransformGostR3411_94Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformGostR3411-94GetKlass">xmlSecMSCryptoTransformGostR3411_94GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformGostR3411-94GetKlass">xmlSecMSCryptoTransformGostR3411_94GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoKeyDataAesId">xmlSecMSCryptoKeyDataAesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecMSCryptoKeyDataAesGetKlass">xmlSecMSCryptoKeyDataAesGetKlass</link>    (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoKeyDataAesSet">xmlSecMSCryptoKeyDataAesSet</link>         (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecMSCryptoKeyDataAesGetKlass">xmlSecMSCryptoKeyDataAesGetKlass</link>    (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoKeyDataAesSet">xmlSecMSCryptoKeyDataAesSet</link>         (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformAes128CbcId">xmlSecMSCryptoTransformAes128CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformAes128CbcGetKlass">xmlSecMSCryptoTransformAes128CbcGetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformAes128CbcGetKlass">xmlSecMSCryptoTransformAes128CbcGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformAes192CbcId">xmlSecMSCryptoTransformAes192CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformAes192CbcGetKlass">xmlSecMSCryptoTransformAes192CbcGetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformAes192CbcGetKlass">xmlSecMSCryptoTransformAes192CbcGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformAes256CbcId">xmlSecMSCryptoTransformAes256CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformAes256CbcGetKlass">xmlSecMSCryptoTransformAes256CbcGetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformAes256CbcGetKlass">xmlSecMSCryptoTransformAes256CbcGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecMSCryptoTransformKWAes128Id">xmlSecMSCryptoTransformKWAes128Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformKWAes128GetKlass">xmlSecMSCryptoTransformKWAes128GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecMSCryptoTransformKWAes192Id">xmlSecMSCryptoTransformKWAes192Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformKWAes192GetKlass">xmlSecMSCryptoTransformKWAes192GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecMSCryptoTransformKWAes256Id">xmlSecMSCryptoTransformKWAes256Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformKWAes256GetKlass">xmlSecMSCryptoTransformKWAes256GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoKeyDataDesId">xmlSecMSCryptoKeyDataDesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecMSCryptoKeyDataDesGetKlass">xmlSecMSCryptoKeyDataDesGetKlass</link>    (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecMSCryptoKeyDataDesGetKlass">xmlSecMSCryptoKeyDataDesGetKlass</link>    (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformDes3CbcId">xmlSecMSCryptoTransformDes3CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformDes3CbcGetKlass">xmlSecMSCryptoTransformDes3CbcGetKlass</link>
-                                                        (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoHmacGetMinOutputLength">xmlSecMSCryptoHmacGetMinOutputLength</link>
-                                                        (void);
-<link linkend="void">void</link>                <link linkend="xmlSecMSCryptoHmacSetMinOutputLength">xmlSecMSCryptoHmacSetMinOutputLength</link>
-                                                        (<link linkend="int">int</link> min_length);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformDes3CbcGetKlass">xmlSecMSCryptoTransformDes3CbcGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecMSCryptoTransformKWDes3Id">xmlSecMSCryptoTransformKWDes3Id</link>
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformKWDes3GetKlass">xmlSecMSCryptoTransformKWDes3GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoHmacGetMinOutputLength">xmlSecMSCryptoHmacGetMinOutputLength</link>
+                                                        (<parameter><type>void</type></parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecMSCryptoHmacSetMinOutputLength">xmlSecMSCryptoHmacSetMinOutputLength</link>
+                                                        (<parameter><link linkend="int"><type>int</type></link> min_length</parameter>);
 #define             <link linkend="xmlSecMSCryptoKeyDataHmacId">xmlSecMSCryptoKeyDataHmacId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecMSCryptoKeyDataHmacGetKlass">xmlSecMSCryptoKeyDataHmacGetKlass</link>   (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoKeyDataHmacSet">xmlSecMSCryptoKeyDataHmacSet</link>        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecMSCryptoKeyDataHmacGetKlass">xmlSecMSCryptoKeyDataHmacGetKlass</link>   (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoKeyDataHmacSet">xmlSecMSCryptoKeyDataHmacSet</link>        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformHmacMd5Id">xmlSecMSCryptoTransformHmacMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformHmacMd5GetKlass">xmlSecMSCryptoTransformHmacMd5GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformHmacMd5GetKlass">xmlSecMSCryptoTransformHmacMd5GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformHmacSha1Id">xmlSecMSCryptoTransformHmacSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformHmacSha1GetKlass">xmlSecMSCryptoTransformHmacSha1GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformHmacSha1GetKlass">xmlSecMSCryptoTransformHmacSha1GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformHmacSha256Id">xmlSecMSCryptoTransformHmacSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformHmacSha256GetKlass">xmlSecMSCryptoTransformHmacSha256GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformHmacSha256GetKlass">xmlSecMSCryptoTransformHmacSha256GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformHmacSha384Id">xmlSecMSCryptoTransformHmacSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformHmacSha384GetKlass">xmlSecMSCryptoTransformHmacSha384GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformHmacSha384GetKlass">xmlSecMSCryptoTransformHmacSha384GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoTransformHmacSha512Id">xmlSecMSCryptoTransformHmacSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformHmacSha512GetKlass">xmlSecMSCryptoTransformHmacSha512GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecMSCryptoTransformHmacSha512GetKlass">xmlSecMSCryptoTransformHmacSha512GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-mscrypto-crypto.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Crypto transforms implementation for MS Crypto.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-mscrypto-crypto.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecCryptoGetFunctions-mscrypto" role="function">
 <title>xmlSecCryptoGetFunctions_mscrypto ()</title>
-<indexterm zone="xmlSecCryptoGetFunctions-mscrypto"><primary sortas="xmlSecCryptoGetFunctions_mscrypto">xmlSecCryptoGetFunctions_mscrypto</primary></indexterm><programlisting><link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  xmlSecCryptoGetFunctions_mscrypto
-                                                        (void);</programlisting>
-<para>
-Gets MSCrypto specific functions table.</para>
+<indexterm zone="xmlSecCryptoGetFunctions-mscrypto"><primary>xmlSecCryptoGetFunctions_mscrypto</primary></indexterm>
+<programlisting><link linkend="xmlSecCryptoDLFunctions"><returnvalue>xmlSecCryptoDLFunctionsPtr</returnvalue></link>  xmlSecCryptoGetFunctions_mscrypto
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets MSCrypto specific functions table.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> xmlsec-mscrypto functions table.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoInit" role="function">
 <title>xmlSecMSCryptoInit ()</title>
-<indexterm zone="xmlSecMSCryptoInit"><primary sortas="xmlSecMSCryptoInit">xmlSecMSCryptoInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoInit                  (void);</programlisting>
-<para>
-XMLSec library specific crypto engine initialization.</para>
+<indexterm zone="xmlSecMSCryptoInit"><primary>xmlSecMSCryptoInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoInit                  (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+XMLSec library specific crypto engine initialization.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoShutdown" role="function">
 <title>xmlSecMSCryptoShutdown ()</title>
-<indexterm zone="xmlSecMSCryptoShutdown"><primary sortas="xmlSecMSCryptoShutdown">xmlSecMSCryptoShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoShutdown              (void);</programlisting>
-<para>
-XMLSec library specific crypto engine shutdown.</para>
+<indexterm zone="xmlSecMSCryptoShutdown"><primary>xmlSecMSCryptoShutdown</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoShutdown              (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+XMLSec library specific crypto engine shutdown.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeysMngrInit" role="function">
 <title>xmlSecMSCryptoKeysMngrInit ()</title>
-<indexterm zone="xmlSecMSCryptoKeysMngrInit"><primary sortas="xmlSecMSCryptoKeysMngrInit">xmlSecMSCryptoKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoKeysMngrInit          (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
-<para>
-Adds MSCrypto specific key data stores in keys manager.</para>
+<indexterm zone="xmlSecMSCryptoKeysMngrInit"><primary>xmlSecMSCryptoKeysMngrInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoKeysMngrInit          (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);</programlisting>
 <para>
+Adds MSCrypto specific key data stores in keys manager.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoGenerateRandom" role="function">
 <title>xmlSecMSCryptoGenerateRandom ()</title>
-<indexterm zone="xmlSecMSCryptoGenerateRandom"><primary sortas="xmlSecMSCryptoGenerateRandom">xmlSecMSCryptoGenerateRandom</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoGenerateRandom        (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
-                                                         <link linkend="size-t">size_t</link> size);</programlisting>
+<indexterm zone="xmlSecMSCryptoGenerateRandom"><primary>xmlSecMSCryptoGenerateRandom</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoGenerateRandom        (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buffer</parameter>,
+                                                         <parameter><link linkend="size-t"><type>size_t</type></link> size</parameter>);</programlisting>
 <para>
 Generates <parameter>size</parameter> random bytes and puts result in <parameter>buffer</parameter>
-(not implemented yet).</para>
-<para>
+(not implemented yet).
 </para><variablelist role="params">
 <varlistentry><term><parameter>buffer</parameter>&#160;:</term>
-<listitem><simpara>             the destination buffer.
+<listitem><simpara>the destination buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the numer of bytes to generate.
+<listitem><simpara>the numer of bytes to generate.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoErrorsDefaultCallback" role="function">
 <title>xmlSecMSCryptoErrorsDefaultCallback ()</title>
-<indexterm zone="xmlSecMSCryptoErrorsDefaultCallback"><primary sortas="xmlSecMSCryptoErrorsDefaultCallback">xmlSecMSCryptoErrorsDefaultCallback</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecMSCryptoErrorsDefaultCallback (const <link linkend="char">char</link> *file,
-                                                         <link linkend="int">int</link> line,
-                                                         const <link linkend="char">char</link> *func,
-                                                         const <link linkend="char">char</link> *errorObject,
-                                                         const <link linkend="char">char</link> *errorSubject,
-                                                         <link linkend="int">int</link> reason,
-                                                         const <link linkend="char">char</link> *msg);</programlisting>
-<para>
-The default errors reporting callback function.</para>
+<indexterm zone="xmlSecMSCryptoErrorsDefaultCallback"><primary>xmlSecMSCryptoErrorsDefaultCallback</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecMSCryptoErrorsDefaultCallback (<parameter>const <link linkend="char"><type>char</type></link> *file</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> line</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *func</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorObject</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorSubject</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> reason</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *msg</parameter>);</programlisting>
 <para>
+The default errors reporting callback function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>file</parameter>&#160;:</term>
-<listitem><simpara>               the error location file name (__FILE__ macro).
+<listitem><simpara>the error location file name (__FILE__ macro).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>line</parameter>&#160;:</term>
-<listitem><simpara>               the error location line number (__LINE__ macro).
+<listitem><simpara>the error location line number (__LINE__ macro).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>func</parameter>&#160;:</term>
-<listitem><simpara>               the error location function name (__FUNCTION__ macro).
+<listitem><simpara>the error location function name (__FUNCTION__ macro).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>errorObject</parameter>&#160;:</term>
-<listitem><simpara>        the error specific error object
+<listitem><simpara>the error specific error object
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>errorSubject</parameter>&#160;:</term>
-<listitem><simpara>       the error specific error subject.
+<listitem><simpara>the error specific error subject.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>reason</parameter>&#160;:</term>
-<listitem><simpara>             the error code.
+<listitem><simpara>the error code.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>msg</parameter>&#160;:</term>
-<listitem><simpara>                the additional error message.
+<listitem><simpara>the additional error message.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoConvertLocaleToUnicode" role="function">
 <title>xmlSecMSCryptoConvertLocaleToUnicode ()</title>
-<indexterm zone="xmlSecMSCryptoConvertLocaleToUnicode"><primary sortas="xmlSecMSCryptoConvertLocaleToUnicode">xmlSecMSCryptoConvertLocaleToUnicode</primary></indexterm><programlisting><link linkend="LPWSTR--CAPS">LPWSTR</link>              xmlSecMSCryptoConvertLocaleToUnicode
-                                                        (const <link linkend="char">char</link> *str);</programlisting>
-<para>
-Converts input string from current system locale to Unicode.</para>
+<indexterm zone="xmlSecMSCryptoConvertLocaleToUnicode"><primary>xmlSecMSCryptoConvertLocaleToUnicode</primary></indexterm>
+<programlisting><link linkend="LPWSTR:CAPS"><returnvalue>LPWSTR</returnvalue></link>              xmlSecMSCryptoConvertLocaleToUnicode
+                                                        (<parameter>const <link linkend="char"><type>char</type></link> *str</parameter>);</programlisting>
 <para>
+Converts input string from current system locale to Unicode.
 </para><variablelist role="params">
 <varlistentry><term><parameter>str</parameter>&#160;:</term>
-<listitem><simpara>         the string to convert.
+<listitem><simpara>the string to convert.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a pointer to newly allocated string (must be freed with xmlFree) or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoConvertUtf8ToUnicode" role="function">
 <title>xmlSecMSCryptoConvertUtf8ToUnicode ()</title>
-<indexterm zone="xmlSecMSCryptoConvertUtf8ToUnicode"><primary sortas="xmlSecMSCryptoConvertUtf8ToUnicode">xmlSecMSCryptoConvertUtf8ToUnicode</primary></indexterm><programlisting><link linkend="LPWSTR--CAPS">LPWSTR</link>              xmlSecMSCryptoConvertUtf8ToUnicode  (const <link linkend="xmlChar">xmlChar</link> *str);</programlisting>
-<para>
-Converts input string from UTF8 to Unicode.</para>
+<indexterm zone="xmlSecMSCryptoConvertUtf8ToUnicode"><primary>xmlSecMSCryptoConvertUtf8ToUnicode</primary></indexterm>
+<programlisting><link linkend="LPWSTR:CAPS"><returnvalue>LPWSTR</returnvalue></link>              xmlSecMSCryptoConvertUtf8ToUnicode  (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *str</parameter>);</programlisting>
 <para>
+Converts input string from UTF8 to Unicode.
 </para><variablelist role="params">
 <varlistentry><term><parameter>str</parameter>&#160;:</term>
-<listitem><simpara>         the string to convert.
+<listitem><simpara>the string to convert.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a pointer to newly allocated string (must be freed with xmlFree) or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoConvertUnicodeToUtf8" role="function">
 <title>xmlSecMSCryptoConvertUnicodeToUtf8 ()</title>
-<indexterm zone="xmlSecMSCryptoConvertUnicodeToUtf8"><primary sortas="xmlSecMSCryptoConvertUnicodeToUtf8">xmlSecMSCryptoConvertUnicodeToUtf8</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*            xmlSecMSCryptoConvertUnicodeToUtf8  (<link linkend="LPCWSTR--CAPS">LPCWSTR</link> str);</programlisting>
-<para>
-Converts input string from Unicode to UTF8.</para>
+<indexterm zone="xmlSecMSCryptoConvertUnicodeToUtf8"><primary>xmlSecMSCryptoConvertUnicodeToUtf8</primary></indexterm>
+<programlisting><link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*            xmlSecMSCryptoConvertUnicodeToUtf8  (<parameter><link linkend="LPCWSTR:CAPS"><type>LPCWSTR</type></link> str</parameter>);</programlisting>
 <para>
+Converts input string from Unicode to UTF8.
 </para><variablelist role="params">
 <varlistentry><term><parameter>str</parameter>&#160;:</term>
-<listitem><simpara>         the string to convert.
+<listitem><simpara>the string to convert.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a pointer to newly allocated string (must be freed with xmlFree) or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoConvertLocaleToUtf8" role="function">
 <title>xmlSecMSCryptoConvertLocaleToUtf8 ()</title>
-<indexterm zone="xmlSecMSCryptoConvertLocaleToUtf8"><primary sortas="xmlSecMSCryptoConvertLocaleToUtf8">xmlSecMSCryptoConvertLocaleToUtf8</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*            xmlSecMSCryptoConvertLocaleToUtf8   (const <link linkend="char">char</link> *str);</programlisting>
-<para>
-Converts input string from locale to UTF8.</para>
+<indexterm zone="xmlSecMSCryptoConvertLocaleToUtf8"><primary>xmlSecMSCryptoConvertLocaleToUtf8</primary></indexterm>
+<programlisting><link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*            xmlSecMSCryptoConvertLocaleToUtf8   (<parameter>const <link linkend="char"><type>char</type></link> *str</parameter>);</programlisting>
 <para>
+Converts input string from locale to UTF8.
 </para><variablelist role="params">
 <varlistentry><term><parameter>str</parameter>&#160;:</term>
-<listitem><simpara>         the string to convert.
+<listitem><simpara>the string to convert.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a pointer to newly allocated string (must be freed with xmlFree) or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoConvertUtf8ToLocale" role="function">
 <title>xmlSecMSCryptoConvertUtf8ToLocale ()</title>
-<indexterm zone="xmlSecMSCryptoConvertUtf8ToLocale"><primary sortas="xmlSecMSCryptoConvertUtf8ToLocale">xmlSecMSCryptoConvertUtf8ToLocale</primary></indexterm><programlisting><link linkend="char">char</link>*               xmlSecMSCryptoConvertUtf8ToLocale   (const <link linkend="xmlChar">xmlChar</link> *str);</programlisting>
-<para>
-Converts input string from UTF8 to locale.</para>
+<indexterm zone="xmlSecMSCryptoConvertUtf8ToLocale"><primary>xmlSecMSCryptoConvertUtf8ToLocale</primary></indexterm>
+<programlisting><link linkend="char"><returnvalue>char</returnvalue></link>*               xmlSecMSCryptoConvertUtf8ToLocale   (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *str</parameter>);</programlisting>
 <para>
+Converts input string from UTF8 to locale.
 </para><variablelist role="params">
 <varlistentry><term><parameter>str</parameter>&#160;:</term>
-<listitem><simpara>         the string to convert.
+<listitem><simpara>the string to convert.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a pointer to newly allocated string (must be freed with xmlFree) or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoConvertTstrToUtf8" role="function">
 <title>xmlSecMSCryptoConvertTstrToUtf8 ()</title>
-<indexterm zone="xmlSecMSCryptoConvertTstrToUtf8"><primary sortas="xmlSecMSCryptoConvertTstrToUtf8">xmlSecMSCryptoConvertTstrToUtf8</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*            xmlSecMSCryptoConvertTstrToUtf8     (<link linkend="LPCTSTR--CAPS">LPCTSTR</link> str);</programlisting>
-<para>
-Converts input string from TSTR (locale or Unicode) to UTF8.</para>
+<indexterm zone="xmlSecMSCryptoConvertTstrToUtf8"><primary>xmlSecMSCryptoConvertTstrToUtf8</primary></indexterm>
+<programlisting><link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*            xmlSecMSCryptoConvertTstrToUtf8     (<parameter><link linkend="LPCTSTR:CAPS"><type>LPCTSTR</type></link> str</parameter>);</programlisting>
 <para>
+Converts input string from TSTR (locale or Unicode) to UTF8.
 </para><variablelist role="params">
 <varlistentry><term><parameter>str</parameter>&#160;:</term>
-<listitem><simpara>         the string to convert.
+<listitem><simpara>the string to convert.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a pointer to newly allocated string (must be freed with xmlFree) or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoConvertUtf8ToTstr" role="function">
 <title>xmlSecMSCryptoConvertUtf8ToTstr ()</title>
-<indexterm zone="xmlSecMSCryptoConvertUtf8ToTstr"><primary sortas="xmlSecMSCryptoConvertUtf8ToTstr">xmlSecMSCryptoConvertUtf8ToTstr</primary></indexterm><programlisting><link linkend="LPTSTR--CAPS">LPTSTR</link>              xmlSecMSCryptoConvertUtf8ToTstr     (const <link linkend="xmlChar">xmlChar</link> *str);</programlisting>
-<para>
-Converts input string from UTF8 to TSTR (locale or Unicode).</para>
+<indexterm zone="xmlSecMSCryptoConvertUtf8ToTstr"><primary>xmlSecMSCryptoConvertUtf8ToTstr</primary></indexterm>
+<programlisting><link linkend="LPTSTR:CAPS"><returnvalue>LPTSTR</returnvalue></link>              xmlSecMSCryptoConvertUtf8ToTstr     (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *str</parameter>);</programlisting>
 <para>
+Converts input string from UTF8 to TSTR (locale or Unicode).
 </para><variablelist role="params">
 <varlistentry><term><parameter>str</parameter>&#160;:</term>
-<listitem><simpara>         the string to convert.
+<listitem><simpara>the string to convert.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a pointer to newly allocated string (must be freed with xmlFree) or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataDsaId" role="macro">
 <title>xmlSecMSCryptoKeyDataDsaId</title>
-<indexterm zone="xmlSecMSCryptoKeyDataDsaId"><primary sortas="xmlSecMSCryptoKeyDataDsaId">xmlSecMSCryptoKeyDataDsaId</primary></indexterm><programlisting>#define             xmlSecMSCryptoKeyDataDsaId</programlisting>
-<para>
-The DSA key klass.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataDsaId"><primary>xmlSecMSCryptoKeyDataDsaId</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoKeyDataDsaId</programlisting>
 <para>
+The DSA key klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataDsaGetKlass" role="function">
 <title>xmlSecMSCryptoKeyDataDsaGetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataDsaGetKlass"><primary sortas="xmlSecMSCryptoKeyDataDsaGetKlass">xmlSecMSCryptoKeyDataDsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecMSCryptoKeyDataDsaGetKlass    (void);</programlisting>
-<para>
-The DSA key data klass.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataDsaGetKlass"><primary>xmlSecMSCryptoKeyDataDsaGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecMSCryptoKeyDataDsaGetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The DSA key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to DSA key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformDsaSha1Id" role="macro">
 <title>xmlSecMSCryptoTransformDsaSha1Id</title>
-<indexterm zone="xmlSecMSCryptoTransformDsaSha1Id"><primary sortas="xmlSecMSCryptoTransformDsaSha1Id">xmlSecMSCryptoTransformDsaSha1Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformDsaSha1Id</programlisting>
-<para>
-The DSA SHA1 signature transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformDsaSha1Id"><primary>xmlSecMSCryptoTransformDsaSha1Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformDsaSha1Id</programlisting>
 <para>
+The DSA SHA1 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformDsaSha1GetKlass" role="function">
 <title>xmlSecMSCryptoTransformDsaSha1GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformDsaSha1GetKlass"><primary sortas="xmlSecMSCryptoTransformDsaSha1GetKlass">xmlSecMSCryptoTransformDsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformDsaSha1GetKlass
-                                                        (void);</programlisting>
-<para>
-The DSA-SHA1 signature transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformDsaSha1GetKlass"><primary>xmlSecMSCryptoTransformDsaSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformDsaSha1GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The DSA-SHA1 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DSA-SHA1 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataGost2001Id" role="macro">
 <title>xmlSecMSCryptoKeyDataGost2001Id</title>
-<indexterm zone="xmlSecMSCryptoKeyDataGost2001Id"><primary sortas="xmlSecMSCryptoKeyDataGost2001Id">xmlSecMSCryptoKeyDataGost2001Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoKeyDataGost2001Id</programlisting>
-<para>
-The GOST2001 key klass.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataGost2001Id"><primary>xmlSecMSCryptoKeyDataGost2001Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoKeyDataGost2001Id</programlisting>
 <para>
+The GOST2001 key klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataGost2001GetKlass" role="function">
 <title>xmlSecMSCryptoKeyDataGost2001GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataGost2001GetKlass"><primary sortas="xmlSecMSCryptoKeyDataGost2001GetKlass">xmlSecMSCryptoKeyDataGost2001GetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecMSCryptoKeyDataGost2001GetKlass
-                                                        (void);</programlisting>
-<para>
-The GOST2001 key data klass.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataGost2001GetKlass"><primary>xmlSecMSCryptoKeyDataGost2001GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecMSCryptoKeyDataGost2001GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The GOST2001 key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to GOST2001 key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformGost2001GostR3411-94Id" role="macro">
 <title>xmlSecMSCryptoTransformGost2001GostR3411_94Id</title>
-<indexterm zone="xmlSecMSCryptoTransformGost2001GostR3411-94Id"><primary sortas="xmlSecMSCryptoTransformGost2001GostR3411_94Id">xmlSecMSCryptoTransformGost2001GostR3411_94Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformGost2001GostR3411_94Id</programlisting>
-<para>
-The GOST2001 GOSTR3411_94 signature transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformGost2001GostR3411-94Id"><primary>xmlSecMSCryptoTransformGost2001GostR3411_94Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformGost2001GostR3411_94Id</programlisting>
 <para>
+The GOST2001 GOSTR3411_94 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformGost2001GostR3411-94GetKlass" role="function">
 <title>xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformGost2001GostR3411-94GetKlass"><primary sortas="xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass">xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass
-                                                        (void);</programlisting>
-<para>
-The GOST2001-GOSTR3411_94 signature transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformGost2001GostR3411-94GetKlass"><primary>xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The GOST2001-GOSTR3411_94 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> GOST2001-GOSTR3411_94 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataRsaId" role="macro">
 <title>xmlSecMSCryptoKeyDataRsaId</title>
-<indexterm zone="xmlSecMSCryptoKeyDataRsaId"><primary sortas="xmlSecMSCryptoKeyDataRsaId">xmlSecMSCryptoKeyDataRsaId</primary></indexterm><programlisting>#define             xmlSecMSCryptoKeyDataRsaId</programlisting>
-<para>
-The RSA key klass.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataRsaId"><primary>xmlSecMSCryptoKeyDataRsaId</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoKeyDataRsaId</programlisting>
 <para>
+The RSA key klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataRsaGetKlass" role="function">
 <title>xmlSecMSCryptoKeyDataRsaGetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataRsaGetKlass"><primary sortas="xmlSecMSCryptoKeyDataRsaGetKlass">xmlSecMSCryptoKeyDataRsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecMSCryptoKeyDataRsaGetKlass    (void);</programlisting>
-<para>
-The MSCrypto RSA CertKey data klass.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataRsaGetKlass"><primary>xmlSecMSCryptoKeyDataRsaGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecMSCryptoKeyDataRsaGetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The MSCrypto RSA CertKey data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to MSCrypto RSA key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformRsaMd5Id" role="macro">
 <title>xmlSecMSCryptoTransformRsaMd5Id</title>
-<indexterm zone="xmlSecMSCryptoTransformRsaMd5Id"><primary sortas="xmlSecMSCryptoTransformRsaMd5Id">xmlSecMSCryptoTransformRsaMd5Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformRsaMd5Id</programlisting>
-<para>
-The RSA-MD5 signature transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformRsaMd5Id"><primary>xmlSecMSCryptoTransformRsaMd5Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformRsaMd5Id</programlisting>
 <para>
+The RSA-MD5 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformRsaMd5GetKlass" role="function">
 <title>xmlSecMSCryptoTransformRsaMd5GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformRsaMd5GetKlass"><primary sortas="xmlSecMSCryptoTransformRsaMd5GetKlass">xmlSecMSCryptoTransformRsaMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformRsaMd5GetKlass
-                                                        (void);</programlisting>
-<para>
-The RSA-MD5 signature transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformRsaMd5GetKlass"><primary>xmlSecMSCryptoTransformRsaMd5GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformRsaMd5GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-MD5 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-MD5 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformRsaSha1Id" role="macro">
 <title>xmlSecMSCryptoTransformRsaSha1Id</title>
-<indexterm zone="xmlSecMSCryptoTransformRsaSha1Id"><primary sortas="xmlSecMSCryptoTransformRsaSha1Id">xmlSecMSCryptoTransformRsaSha1Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformRsaSha1Id</programlisting>
-<para>
-The RSA-SHA1 signature transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformRsaSha1Id"><primary>xmlSecMSCryptoTransformRsaSha1Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformRsaSha1Id</programlisting>
 <para>
+The RSA-SHA1 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformRsaSha1GetKlass" role="function">
 <title>xmlSecMSCryptoTransformRsaSha1GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformRsaSha1GetKlass"><primary sortas="xmlSecMSCryptoTransformRsaSha1GetKlass">xmlSecMSCryptoTransformRsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformRsaSha1GetKlass
-                                                        (void);</programlisting>
-<para>
-The RSA-SHA1 signature transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformRsaSha1GetKlass"><primary>xmlSecMSCryptoTransformRsaSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformRsaSha1GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-SHA1 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA1 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformRsaSha256Id" role="macro">
 <title>xmlSecMSCryptoTransformRsaSha256Id</title>
-<indexterm zone="xmlSecMSCryptoTransformRsaSha256Id"><primary sortas="xmlSecMSCryptoTransformRsaSha256Id">xmlSecMSCryptoTransformRsaSha256Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformRsaSha256Id</programlisting>
-<para>
-The RSA-SHA256 signature transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformRsaSha256Id"><primary>xmlSecMSCryptoTransformRsaSha256Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformRsaSha256Id</programlisting>
 <para>
+The RSA-SHA256 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformRsaSha256GetKlass" role="function">
 <title>xmlSecMSCryptoTransformRsaSha256GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformRsaSha256GetKlass"><primary sortas="xmlSecMSCryptoTransformRsaSha256GetKlass">xmlSecMSCryptoTransformRsaSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformRsaSha256GetKlass
-                                                        (void);</programlisting>
-<para>
-The RSA-SHA256 signature transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformRsaSha256GetKlass"><primary>xmlSecMSCryptoTransformRsaSha256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformRsaSha256GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-SHA256 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA256 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformRsaSha384Id" role="macro">
 <title>xmlSecMSCryptoTransformRsaSha384Id</title>
-<indexterm zone="xmlSecMSCryptoTransformRsaSha384Id"><primary sortas="xmlSecMSCryptoTransformRsaSha384Id">xmlSecMSCryptoTransformRsaSha384Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformRsaSha384Id</programlisting>
-<para>
-The RSA-SHA384 signature transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformRsaSha384Id"><primary>xmlSecMSCryptoTransformRsaSha384Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformRsaSha384Id</programlisting>
 <para>
+The RSA-SHA384 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformRsaSha384GetKlass" role="function">
 <title>xmlSecMSCryptoTransformRsaSha384GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformRsaSha384GetKlass"><primary sortas="xmlSecMSCryptoTransformRsaSha384GetKlass">xmlSecMSCryptoTransformRsaSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformRsaSha384GetKlass
-                                                        (void);</programlisting>
-<para>
-The RSA-SHA384 signature transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformRsaSha384GetKlass"><primary>xmlSecMSCryptoTransformRsaSha384GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformRsaSha384GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-SHA384 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA384 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformRsaSha512Id" role="macro">
 <title>xmlSecMSCryptoTransformRsaSha512Id</title>
-<indexterm zone="xmlSecMSCryptoTransformRsaSha512Id"><primary sortas="xmlSecMSCryptoTransformRsaSha512Id">xmlSecMSCryptoTransformRsaSha512Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformRsaSha512Id</programlisting>
-<para>
-The RSA-SHA512 signature transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformRsaSha512Id"><primary>xmlSecMSCryptoTransformRsaSha512Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformRsaSha512Id</programlisting>
 <para>
+The RSA-SHA512 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformRsaSha512GetKlass" role="function">
 <title>xmlSecMSCryptoTransformRsaSha512GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformRsaSha512GetKlass"><primary sortas="xmlSecMSCryptoTransformRsaSha512GetKlass">xmlSecMSCryptoTransformRsaSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformRsaSha512GetKlass
-                                                        (void);</programlisting>
-<para>
-The RSA-SHA512 signature transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformRsaSha512GetKlass"><primary>xmlSecMSCryptoTransformRsaSha512GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformRsaSha512GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-SHA512 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA512 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformRsaPkcs1Id" role="macro">
 <title>xmlSecMSCryptoTransformRsaPkcs1Id</title>
-<indexterm zone="xmlSecMSCryptoTransformRsaPkcs1Id"><primary sortas="xmlSecMSCryptoTransformRsaPkcs1Id">xmlSecMSCryptoTransformRsaPkcs1Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformRsaPkcs1Id</programlisting>
-<para>
-The RSA PKCS1 key transport transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformRsaPkcs1Id"><primary>xmlSecMSCryptoTransformRsaPkcs1Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformRsaPkcs1Id</programlisting>
 <para>
+The RSA PKCS1 key transport transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformRsaPkcs1GetKlass" role="function">
 <title>xmlSecMSCryptoTransformRsaPkcs1GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformRsaPkcs1GetKlass"><primary sortas="xmlSecMSCryptoTransformRsaPkcs1GetKlass">xmlSecMSCryptoTransformRsaPkcs1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformRsaPkcs1GetKlass
-                                                        (void);</programlisting>
-<para>
-The RSA-PKCS1 key transport transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformRsaPkcs1GetKlass"><primary>xmlSecMSCryptoTransformRsaPkcs1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformRsaPkcs1GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-PKCS1 key transport transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-PKCS1 key transport transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
+<refsect2 id="xmlSecMSCryptoTransformRsaOaepId" role="macro">
+<title>xmlSecMSCryptoTransformRsaOaepId</title>
+<indexterm zone="xmlSecMSCryptoTransformRsaOaepId"><primary>xmlSecMSCryptoTransformRsaOaepId</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformRsaOaepId</programlisting>
+<para>
+The RSA PKCS1 key transport transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecMSCryptoTransformRsaOaepGetKlass" role="function">
+<title>xmlSecMSCryptoTransformRsaOaepGetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoTransformRsaOaepGetKlass"><primary>xmlSecMSCryptoTransformRsaOaepGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformRsaOaepGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+The RSA-OAEP key transport transform klass.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-OAEP key transport transform klass.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformMd5Id" role="macro">
 <title>xmlSecMSCryptoTransformMd5Id</title>
-<indexterm zone="xmlSecMSCryptoTransformMd5Id"><primary sortas="xmlSecMSCryptoTransformMd5Id">xmlSecMSCryptoTransformMd5Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformMd5Id</programlisting>
-<para>
-The MD5 digest transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformMd5Id"><primary>xmlSecMSCryptoTransformMd5Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformMd5Id</programlisting>
 <para>
+The MD5 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformMd5GetKlass" role="function">
 <title>xmlSecMSCryptoTransformMd5GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformMd5GetKlass"><primary sortas="xmlSecMSCryptoTransformMd5GetKlass">xmlSecMSCryptoTransformMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformMd5GetKlass  (void);</programlisting>
-<para>
-SHA-1 digest transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformMd5GetKlass"><primary>xmlSecMSCryptoTransformMd5GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformMd5GetKlass  (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA-1 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-1 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformSha1Id" role="macro">
 <title>xmlSecMSCryptoTransformSha1Id</title>
-<indexterm zone="xmlSecMSCryptoTransformSha1Id"><primary sortas="xmlSecMSCryptoTransformSha1Id">xmlSecMSCryptoTransformSha1Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformSha1Id</programlisting>
-<para>
-The SHA1 digest transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformSha1Id"><primary>xmlSecMSCryptoTransformSha1Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformSha1Id</programlisting>
 <para>
+The SHA1 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformSha1GetKlass" role="function">
 <title>xmlSecMSCryptoTransformSha1GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformSha1GetKlass"><primary sortas="xmlSecMSCryptoTransformSha1GetKlass">xmlSecMSCryptoTransformSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformSha1GetKlass (void);</programlisting>
-<para>
-SHA-1 digest transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformSha1GetKlass"><primary>xmlSecMSCryptoTransformSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformSha1GetKlass (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA-1 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-1 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformSha256Id" role="macro">
 <title>xmlSecMSCryptoTransformSha256Id</title>
-<indexterm zone="xmlSecMSCryptoTransformSha256Id"><primary sortas="xmlSecMSCryptoTransformSha256Id">xmlSecMSCryptoTransformSha256Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformSha256Id</programlisting>
-<para>
-The SHA256 digest transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformSha256Id"><primary>xmlSecMSCryptoTransformSha256Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformSha256Id</programlisting>
 <para>
+The SHA256 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformSha256GetKlass" role="function">
 <title>xmlSecMSCryptoTransformSha256GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformSha256GetKlass"><primary sortas="xmlSecMSCryptoTransformSha256GetKlass">xmlSecMSCryptoTransformSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformSha256GetKlass
-                                                        (void);</programlisting>
-<para>
-SHA-256 digest transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformSha256GetKlass"><primary>xmlSecMSCryptoTransformSha256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformSha256GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA-256 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-256 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformSha384Id" role="macro">
 <title>xmlSecMSCryptoTransformSha384Id</title>
-<indexterm zone="xmlSecMSCryptoTransformSha384Id"><primary sortas="xmlSecMSCryptoTransformSha384Id">xmlSecMSCryptoTransformSha384Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformSha384Id</programlisting>
-<para>
-The SHA384 digest transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformSha384Id"><primary>xmlSecMSCryptoTransformSha384Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformSha384Id</programlisting>
 <para>
+The SHA384 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformSha384GetKlass" role="function">
 <title>xmlSecMSCryptoTransformSha384GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformSha384GetKlass"><primary sortas="xmlSecMSCryptoTransformSha384GetKlass">xmlSecMSCryptoTransformSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformSha384GetKlass
-                                                        (void);</programlisting>
-<para>
-SHA-384 digest transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformSha384GetKlass"><primary>xmlSecMSCryptoTransformSha384GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformSha384GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA-384 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-384 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformSha512Id" role="macro">
 <title>xmlSecMSCryptoTransformSha512Id</title>
-<indexterm zone="xmlSecMSCryptoTransformSha512Id"><primary sortas="xmlSecMSCryptoTransformSha512Id">xmlSecMSCryptoTransformSha512Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformSha512Id</programlisting>
-<para>
-The SHA512 digest transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformSha512Id"><primary>xmlSecMSCryptoTransformSha512Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformSha512Id</programlisting>
 <para>
+The SHA512 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformSha512GetKlass" role="function">
 <title>xmlSecMSCryptoTransformSha512GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformSha512GetKlass"><primary sortas="xmlSecMSCryptoTransformSha512GetKlass">xmlSecMSCryptoTransformSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformSha512GetKlass
-                                                        (void);</programlisting>
-<para>
-SHA-512 digest transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformSha512GetKlass"><primary>xmlSecMSCryptoTransformSha512GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformSha512GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA-512 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-512 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformGostR3411-94Id" role="macro">
 <title>xmlSecMSCryptoTransformGostR3411_94Id</title>
-<indexterm zone="xmlSecMSCryptoTransformGostR3411-94Id"><primary sortas="xmlSecMSCryptoTransformGostR3411_94Id">xmlSecMSCryptoTransformGostR3411_94Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformGostR3411_94Id</programlisting>
-<para>
-The GOSTR3411_94 digest transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformGostR3411-94Id"><primary>xmlSecMSCryptoTransformGostR3411_94Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformGostR3411_94Id</programlisting>
 <para>
+The GOSTR3411_94 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformGostR3411-94GetKlass" role="function">
 <title>xmlSecMSCryptoTransformGostR3411_94GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformGostR3411-94GetKlass"><primary sortas="xmlSecMSCryptoTransformGostR3411_94GetKlass">xmlSecMSCryptoTransformGostR3411_94GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformGostR3411_94GetKlass
-                                                        (void);</programlisting>
-<para>
-GOSTR3411_94 digest transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformGostR3411-94GetKlass"><primary>xmlSecMSCryptoTransformGostR3411_94GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformGostR3411_94GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+GOSTR3411_94 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to GOSTR3411_94 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataAesId" role="macro">
 <title>xmlSecMSCryptoKeyDataAesId</title>
-<indexterm zone="xmlSecMSCryptoKeyDataAesId"><primary sortas="xmlSecMSCryptoKeyDataAesId">xmlSecMSCryptoKeyDataAesId</primary></indexterm><programlisting>#define             xmlSecMSCryptoKeyDataAesId</programlisting>
-<para>
-The AES key data klass.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataAesId"><primary>xmlSecMSCryptoKeyDataAesId</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoKeyDataAesId</programlisting>
 <para>
+The AES key data klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataAesGetKlass" role="function">
 <title>xmlSecMSCryptoKeyDataAesGetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataAesGetKlass"><primary sortas="xmlSecMSCryptoKeyDataAesGetKlass">xmlSecMSCryptoKeyDataAesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecMSCryptoKeyDataAesGetKlass    (void);</programlisting>
-<para>
-The AES key data klass.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataAesGetKlass"><primary>xmlSecMSCryptoKeyDataAesGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecMSCryptoKeyDataAesGetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The AES key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataAesSet" role="function">
 <title>xmlSecMSCryptoKeyDataAesSet ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataAesSet"><primary sortas="xmlSecMSCryptoKeyDataAesSet">xmlSecMSCryptoKeyDataAesSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoKeyDataAesSet         (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
-<para>
-Sets the value of AES key data.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataAesSet"><primary>xmlSecMSCryptoKeyDataAesSet</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoKeyDataAesSet         (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);</programlisting>
 <para>
+Sets the value of AES key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to AES key data.
+<listitem><simpara>the pointer to AES key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key value.
+<listitem><simpara>the pointer to key value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the key value size (in bytes).
+<listitem><simpara>the key value size (in bytes).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformAes128CbcId" role="macro">
 <title>xmlSecMSCryptoTransformAes128CbcId</title>
-<indexterm zone="xmlSecMSCryptoTransformAes128CbcId"><primary sortas="xmlSecMSCryptoTransformAes128CbcId">xmlSecMSCryptoTransformAes128CbcId</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformAes128CbcId</programlisting>
-<para>
-The AES128 CBC cipher transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformAes128CbcId"><primary>xmlSecMSCryptoTransformAes128CbcId</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformAes128CbcId</programlisting>
 <para>
+The AES128 CBC cipher transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformAes128CbcGetKlass" role="function">
 <title>xmlSecMSCryptoTransformAes128CbcGetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformAes128CbcGetKlass"><primary sortas="xmlSecMSCryptoTransformAes128CbcGetKlass">xmlSecMSCryptoTransformAes128CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformAes128CbcGetKlass
-                                                        (void);</programlisting>
-<para>
-AES 128 CBC encryption transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformAes128CbcGetKlass"><primary>xmlSecMSCryptoTransformAes128CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformAes128CbcGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+AES 128 CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 128 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformAes192CbcId" role="macro">
 <title>xmlSecMSCryptoTransformAes192CbcId</title>
-<indexterm zone="xmlSecMSCryptoTransformAes192CbcId"><primary sortas="xmlSecMSCryptoTransformAes192CbcId">xmlSecMSCryptoTransformAes192CbcId</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformAes192CbcId</programlisting>
-<para>
-The AES192 CBC cipher transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformAes192CbcId"><primary>xmlSecMSCryptoTransformAes192CbcId</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformAes192CbcId</programlisting>
 <para>
+The AES192 CBC cipher transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformAes192CbcGetKlass" role="function">
 <title>xmlSecMSCryptoTransformAes192CbcGetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformAes192CbcGetKlass"><primary sortas="xmlSecMSCryptoTransformAes192CbcGetKlass">xmlSecMSCryptoTransformAes192CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformAes192CbcGetKlass
-                                                        (void);</programlisting>
-<para>
-AES 192 CBC encryption transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformAes192CbcGetKlass"><primary>xmlSecMSCryptoTransformAes192CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformAes192CbcGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+AES 192 CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 192 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformAes256CbcId" role="macro">
 <title>xmlSecMSCryptoTransformAes256CbcId</title>
-<indexterm zone="xmlSecMSCryptoTransformAes256CbcId"><primary sortas="xmlSecMSCryptoTransformAes256CbcId">xmlSecMSCryptoTransformAes256CbcId</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformAes256CbcId</programlisting>
-<para>
-The AES256 CBC cipher transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformAes256CbcId"><primary>xmlSecMSCryptoTransformAes256CbcId</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformAes256CbcId</programlisting>
 <para>
+The AES256 CBC cipher transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformAes256CbcGetKlass" role="function">
 <title>xmlSecMSCryptoTransformAes256CbcGetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformAes256CbcGetKlass"><primary sortas="xmlSecMSCryptoTransformAes256CbcGetKlass">xmlSecMSCryptoTransformAes256CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformAes256CbcGetKlass
-                                                        (void);</programlisting>
-<para>
-AES 256 CBC encryption transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformAes256CbcGetKlass"><primary>xmlSecMSCryptoTransformAes256CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformAes256CbcGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+AES 256 CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 256 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
+<refsect2 id="xmlSecMSCryptoTransformKWAes128Id" role="macro">
+<title>xmlSecMSCryptoTransformKWAes128Id</title>
+<indexterm zone="xmlSecMSCryptoTransformKWAes128Id"><primary>xmlSecMSCryptoTransformKWAes128Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformKWAes128Id</programlisting>
+<para>
+The AES 128 key wrap transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecMSCryptoTransformKWAes128GetKlass" role="function">
+<title>xmlSecMSCryptoTransformKWAes128GetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoTransformKWAes128GetKlass"><primary>xmlSecMSCryptoTransformKWAes128GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformKWAes128GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+The AES-128 kew wrapper transform klass.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-128 kew wrapper transform klass.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecMSCryptoTransformKWAes192Id" role="macro">
+<title>xmlSecMSCryptoTransformKWAes192Id</title>
+<indexterm zone="xmlSecMSCryptoTransformKWAes192Id"><primary>xmlSecMSCryptoTransformKWAes192Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformKWAes192Id</programlisting>
+<para>
+The AES 192 key wrap transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecMSCryptoTransformKWAes192GetKlass" role="function">
+<title>xmlSecMSCryptoTransformKWAes192GetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoTransformKWAes192GetKlass"><primary>xmlSecMSCryptoTransformKWAes192GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformKWAes192GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+The AES-192 kew wrapper transform klass.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-192 kew wrapper transform klass.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecMSCryptoTransformKWAes256Id" role="macro">
+<title>xmlSecMSCryptoTransformKWAes256Id</title>
+<indexterm zone="xmlSecMSCryptoTransformKWAes256Id"><primary>xmlSecMSCryptoTransformKWAes256Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformKWAes256Id</programlisting>
+<para>
+The AES 256 key wrap transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecMSCryptoTransformKWAes256GetKlass" role="function">
+<title>xmlSecMSCryptoTransformKWAes256GetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoTransformKWAes256GetKlass"><primary>xmlSecMSCryptoTransformKWAes256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformKWAes256GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+The AES-256 kew wrapper transform klass.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-256 kew wrapper transform klass.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataDesId" role="macro">
 <title>xmlSecMSCryptoKeyDataDesId</title>
-<indexterm zone="xmlSecMSCryptoKeyDataDesId"><primary sortas="xmlSecMSCryptoKeyDataDesId">xmlSecMSCryptoKeyDataDesId</primary></indexterm><programlisting>#define             xmlSecMSCryptoKeyDataDesId</programlisting>
-<para>
-The DES key data klass.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataDesId"><primary>xmlSecMSCryptoKeyDataDesId</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoKeyDataDesId</programlisting>
 <para>
+The DES key data klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataDesGetKlass" role="function">
 <title>xmlSecMSCryptoKeyDataDesGetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataDesGetKlass"><primary sortas="xmlSecMSCryptoKeyDataDesGetKlass">xmlSecMSCryptoKeyDataDesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecMSCryptoKeyDataDesGetKlass    (void);</programlisting>
-<para>
-The DES key data klass.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataDesGetKlass"><primary>xmlSecMSCryptoKeyDataDesGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecMSCryptoKeyDataDesGetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The DES key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DES key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformDes3CbcId" role="macro">
 <title>xmlSecMSCryptoTransformDes3CbcId</title>
-<indexterm zone="xmlSecMSCryptoTransformDes3CbcId"><primary sortas="xmlSecMSCryptoTransformDes3CbcId">xmlSecMSCryptoTransformDes3CbcId</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformDes3CbcId</programlisting>
-<para>
-The DES3 CBC cipher transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformDes3CbcId"><primary>xmlSecMSCryptoTransformDes3CbcId</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformDes3CbcId</programlisting>
 <para>
+The DES3 CBC cipher transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformDes3CbcGetKlass" role="function">
 <title>xmlSecMSCryptoTransformDes3CbcGetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformDes3CbcGetKlass"><primary sortas="xmlSecMSCryptoTransformDes3CbcGetKlass">xmlSecMSCryptoTransformDes3CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformDes3CbcGetKlass
-                                                        (void);</programlisting>
-<para>
-Triple DES CBC encryption transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformDes3CbcGetKlass"><primary>xmlSecMSCryptoTransformDes3CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformDes3CbcGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Triple DES CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to Triple DES encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
+<refsect2 id="xmlSecMSCryptoTransformKWDes3Id" role="macro">
+<title>xmlSecMSCryptoTransformKWDes3Id</title>
+<indexterm zone="xmlSecMSCryptoTransformKWDes3Id"><primary>xmlSecMSCryptoTransformKWDes3Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformKWDes3Id</programlisting>
+<para>
+The DES3 KW transform klass.
+</para></refsect2>
+<refsect2 id="xmlSecMSCryptoTransformKWDes3GetKlass" role="function">
+<title>xmlSecMSCryptoTransformKWDes3GetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoTransformKWDes3GetKlass"><primary>xmlSecMSCryptoTransformKWDes3GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformKWDes3GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
+<para>
+The Triple DES key wrapper transform klass.
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Triple DES key wrapper transform klass.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoHmacGetMinOutputLength" role="function">
 <title>xmlSecMSCryptoHmacGetMinOutputLength ()</title>
-<indexterm zone="xmlSecMSCryptoHmacGetMinOutputLength"><primary sortas="xmlSecMSCryptoHmacGetMinOutputLength">xmlSecMSCryptoHmacGetMinOutputLength</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoHmacGetMinOutputLength
-                                                        (void);</programlisting>
-<para>
-Gets the value of min HMAC length.</para>
+<indexterm zone="xmlSecMSCryptoHmacGetMinOutputLength"><primary>xmlSecMSCryptoHmacGetMinOutputLength</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoHmacGetMinOutputLength
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets the value of min HMAC length.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the min HMAC output length
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoHmacSetMinOutputLength" role="function">
 <title>xmlSecMSCryptoHmacSetMinOutputLength ()</title>
-<indexterm zone="xmlSecMSCryptoHmacSetMinOutputLength"><primary sortas="xmlSecMSCryptoHmacSetMinOutputLength">xmlSecMSCryptoHmacSetMinOutputLength</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecMSCryptoHmacSetMinOutputLength
-                                                        (<link linkend="int">int</link> min_length);</programlisting>
-<para>
-Sets the min HMAC output length</para>
+<indexterm zone="xmlSecMSCryptoHmacSetMinOutputLength"><primary>xmlSecMSCryptoHmacSetMinOutputLength</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecMSCryptoHmacSetMinOutputLength
+                                                        (<parameter><link linkend="int"><type>int</type></link> min_length</parameter>);</programlisting>
 <para>
+Sets the min HMAC output length
 </para><variablelist role="params">
 <varlistentry><term><parameter>min_length</parameter>&#160;:</term>
-<listitem><simpara> the new min length
+<listitem><simpara>the new min length
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataHmacId" role="macro">
 <title>xmlSecMSCryptoKeyDataHmacId</title>
-<indexterm zone="xmlSecMSCryptoKeyDataHmacId"><primary sortas="xmlSecMSCryptoKeyDataHmacId">xmlSecMSCryptoKeyDataHmacId</primary></indexterm><programlisting>#define             xmlSecMSCryptoKeyDataHmacId</programlisting>
-<para>
-The DHMAC key klass.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataHmacId"><primary>xmlSecMSCryptoKeyDataHmacId</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoKeyDataHmacId</programlisting>
 <para>
+The DHMAC key klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataHmacGetKlass" role="function">
 <title>xmlSecMSCryptoKeyDataHmacGetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataHmacGetKlass"><primary sortas="xmlSecMSCryptoKeyDataHmacGetKlass">xmlSecMSCryptoKeyDataHmacGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecMSCryptoKeyDataHmacGetKlass   (void);</programlisting>
-<para>
-The HMAC key data klass.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataHmacGetKlass"><primary>xmlSecMSCryptoKeyDataHmacGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecMSCryptoKeyDataHmacGetKlass   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> HMAC key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataHmacSet" role="function">
 <title>xmlSecMSCryptoKeyDataHmacSet ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataHmacSet"><primary sortas="xmlSecMSCryptoKeyDataHmacSet">xmlSecMSCryptoKeyDataHmacSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoKeyDataHmacSet        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
-<para>
-Sets the value of HMAC key data.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataHmacSet"><primary>xmlSecMSCryptoKeyDataHmacSet</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoKeyDataHmacSet        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);</programlisting>
 <para>
+Sets the value of HMAC key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to HMAC key data.
+<listitem><simpara>the pointer to HMAC key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key value.
+<listitem><simpara>the pointer to key value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the key value size (in bytes).
+<listitem><simpara>the key value size (in bytes).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformHmacMd5Id" role="macro">
 <title>xmlSecMSCryptoTransformHmacMd5Id</title>
-<indexterm zone="xmlSecMSCryptoTransformHmacMd5Id"><primary sortas="xmlSecMSCryptoTransformHmacMd5Id">xmlSecMSCryptoTransformHmacMd5Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformHmacMd5Id</programlisting>
-<para>
-The HMAC with MD5 signature transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformHmacMd5Id"><primary>xmlSecMSCryptoTransformHmacMd5Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformHmacMd5Id</programlisting>
 <para>
+The HMAC with MD5 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformHmacMd5GetKlass" role="function">
 <title>xmlSecMSCryptoTransformHmacMd5GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformHmacMd5GetKlass"><primary sortas="xmlSecMSCryptoTransformHmacMd5GetKlass">xmlSecMSCryptoTransformHmacMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformHmacMd5GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-MD5 transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformHmacMd5GetKlass"><primary>xmlSecMSCryptoTransformHmacMd5GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformHmacMd5GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-MD5 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-MD5 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformHmacSha1Id" role="macro">
 <title>xmlSecMSCryptoTransformHmacSha1Id</title>
-<indexterm zone="xmlSecMSCryptoTransformHmacSha1Id"><primary sortas="xmlSecMSCryptoTransformHmacSha1Id">xmlSecMSCryptoTransformHmacSha1Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformHmacSha1Id</programlisting>
-<para>
-The HMAC with SHA1 signature transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformHmacSha1Id"><primary>xmlSecMSCryptoTransformHmacSha1Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformHmacSha1Id</programlisting>
 <para>
+The HMAC with SHA1 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformHmacSha1GetKlass" role="function">
 <title>xmlSecMSCryptoTransformHmacSha1GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformHmacSha1GetKlass"><primary sortas="xmlSecMSCryptoTransformHmacSha1GetKlass">xmlSecMSCryptoTransformHmacSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformHmacSha1GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-SHA1 transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformHmacSha1GetKlass"><primary>xmlSecMSCryptoTransformHmacSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformHmacSha1GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA1 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA1 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformHmacSha256Id" role="macro">
 <title>xmlSecMSCryptoTransformHmacSha256Id</title>
-<indexterm zone="xmlSecMSCryptoTransformHmacSha256Id"><primary sortas="xmlSecMSCryptoTransformHmacSha256Id">xmlSecMSCryptoTransformHmacSha256Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformHmacSha256Id</programlisting>
-<para>
-The HMAC with SHA256 signature transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformHmacSha256Id"><primary>xmlSecMSCryptoTransformHmacSha256Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformHmacSha256Id</programlisting>
 <para>
+The HMAC with SHA256 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformHmacSha256GetKlass" role="function">
 <title>xmlSecMSCryptoTransformHmacSha256GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformHmacSha256GetKlass"><primary sortas="xmlSecMSCryptoTransformHmacSha256GetKlass">xmlSecMSCryptoTransformHmacSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformHmacSha256GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-SHA256 transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformHmacSha256GetKlass"><primary>xmlSecMSCryptoTransformHmacSha256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformHmacSha256GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA256 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA256 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformHmacSha384Id" role="macro">
 <title>xmlSecMSCryptoTransformHmacSha384Id</title>
-<indexterm zone="xmlSecMSCryptoTransformHmacSha384Id"><primary sortas="xmlSecMSCryptoTransformHmacSha384Id">xmlSecMSCryptoTransformHmacSha384Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformHmacSha384Id</programlisting>
-<para>
-The HMAC with SHA384 signature transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformHmacSha384Id"><primary>xmlSecMSCryptoTransformHmacSha384Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformHmacSha384Id</programlisting>
 <para>
+The HMAC with SHA384 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformHmacSha384GetKlass" role="function">
 <title>xmlSecMSCryptoTransformHmacSha384GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformHmacSha384GetKlass"><primary sortas="xmlSecMSCryptoTransformHmacSha384GetKlass">xmlSecMSCryptoTransformHmacSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformHmacSha384GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-SHA384 transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformHmacSha384GetKlass"><primary>xmlSecMSCryptoTransformHmacSha384GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformHmacSha384GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA384 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA384 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformHmacSha512Id" role="macro">
 <title>xmlSecMSCryptoTransformHmacSha512Id</title>
-<indexterm zone="xmlSecMSCryptoTransformHmacSha512Id"><primary sortas="xmlSecMSCryptoTransformHmacSha512Id">xmlSecMSCryptoTransformHmacSha512Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformHmacSha512Id</programlisting>
-<para>
-The HMAC with SHA512 signature transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformHmacSha512Id"><primary>xmlSecMSCryptoTransformHmacSha512Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoTransformHmacSha512Id</programlisting>
 <para>
+The HMAC with SHA512 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoTransformHmacSha512GetKlass" role="function">
 <title>xmlSecMSCryptoTransformHmacSha512GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoTransformHmacSha512GetKlass"><primary sortas="xmlSecMSCryptoTransformHmacSha512GetKlass">xmlSecMSCryptoTransformHmacSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformHmacSha512GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-SHA512 transform klass.</para>
+<indexterm zone="xmlSecMSCryptoTransformHmacSha512GetKlass"><primary>xmlSecMSCryptoTransformHmacSha512GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecMSCryptoTransformHmacSha512GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA512 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA512 transform klass.
 </simpara></listitem></varlistentry>
@@ -918,7 +1014,4 @@ The HMAC-SHA512 transform klass.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/mscrypto/keysstore.sgml b/docs/api/sgml/mscrypto/keysstore.sgml
index d8c8ce4..f80d8ae 100644
--- a/docs/api/sgml/mscrypto/keysstore.sgml
+++ b/docs/api/sgml/mscrypto/keysstore.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-mscrypto-keysstore.top_of_page">keysstore</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC-MSCRYPTO Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC-MSCRYPTO Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>keysstore</refname>
 <refpurpose>Keys store implementation for MS Crypto.</refpurpose>
@@ -13,110 +14,100 @@
 <refsynopsisdiv id="xmlsec-mscrypto-keysstore.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-#define             <link linkend="xmlSecMSCryptoKeysStoreId">xmlSecMSCryptoKeysStoreId</link>
-<link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link>    <link linkend="xmlSecMSCryptoKeysStoreGetKlass">xmlSecMSCryptoKeysStoreGetKlass</link>     (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoKeysStoreAdoptKey">xmlSecMSCryptoKeysStoreAdoptKey</link>     (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoKeysStoreLoad">xmlSecMSCryptoKeysStoreLoad</link>         (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         const <link linkend="char">char</link> *uri,
-                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoKeysStoreSave">xmlSecMSCryptoKeysStoreSave</link>         (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<synopsis>#define             <link linkend="xmlSecMSCryptoKeysStoreId">xmlSecMSCryptoKeysStoreId</link>
+<link linkend="xmlSecKeyStoreId"><returnvalue>xmlSecKeyStoreId</returnvalue></link>    <link linkend="xmlSecMSCryptoKeysStoreGetKlass">xmlSecMSCryptoKeysStoreGetKlass</link>     (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoKeysStoreAdoptKey">xmlSecMSCryptoKeysStoreAdoptKey</link>     (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoKeysStoreLoad">xmlSecMSCryptoKeysStoreLoad</link>         (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *uri</parameter>,
+                                                         <parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> keysMngr</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoKeysStoreSave">xmlSecMSCryptoKeysStoreSave</link>         (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-mscrypto-keysstore.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Keys store implementation for MS Crypto.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-mscrypto-keysstore.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecMSCryptoKeysStoreId" role="macro">
 <title>xmlSecMSCryptoKeysStoreId</title>
-<indexterm zone="xmlSecMSCryptoKeysStoreId"><primary sortas="xmlSecMSCryptoKeysStoreId">xmlSecMSCryptoKeysStoreId</primary></indexterm><programlisting>#define xmlSecMSCryptoKeysStoreId       xmlSecMSCryptoKeysStoreGetKlass()
+<indexterm zone="xmlSecMSCryptoKeysStoreId"><primary>xmlSecMSCryptoKeysStoreId</primary></indexterm>
+<programlisting>#define xmlSecMSCryptoKeysStoreId       xmlSecMSCryptoKeysStoreGetKlass()
 </programlisting>
 <para>
-A MSCrypto keys store klass id.</para>
-<para>
+A MSCrypto keys store klass id.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoKeysStoreGetKlass" role="function">
 <title>xmlSecMSCryptoKeysStoreGetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoKeysStoreGetKlass"><primary sortas="xmlSecMSCryptoKeysStoreGetKlass">xmlSecMSCryptoKeysStoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link>    xmlSecMSCryptoKeysStoreGetKlass     (void);</programlisting>
-<para>
-The MSCrypto list based keys store klass.</para>
+<indexterm zone="xmlSecMSCryptoKeysStoreGetKlass"><primary>xmlSecMSCryptoKeysStoreGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyStoreId"><returnvalue>xmlSecKeyStoreId</returnvalue></link>    xmlSecMSCryptoKeysStoreGetKlass     (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The MSCrypto list based keys store klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> MSCrypto list based keys store klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeysStoreAdoptKey" role="function">
 <title>xmlSecMSCryptoKeysStoreAdoptKey ()</title>
-<indexterm zone="xmlSecMSCryptoKeysStoreAdoptKey"><primary sortas="xmlSecMSCryptoKeysStoreAdoptKey">xmlSecMSCryptoKeysStoreAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoKeysStoreAdoptKey     (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
-<para>
-Adds <parameter>key</parameter> to the <parameter>store</parameter>.</para>
+<indexterm zone="xmlSecMSCryptoKeysStoreAdoptKey"><primary>xmlSecMSCryptoKeysStoreAdoptKey</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoKeysStoreAdoptKey     (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);</programlisting>
 <para>
+Adds <parameter>key</parameter> to the <parameter>store</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to MSCrypto keys store.
+<listitem><simpara>the pointer to MSCrypto keys store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeysStoreLoad" role="function">
 <title>xmlSecMSCryptoKeysStoreLoad ()</title>
-<indexterm zone="xmlSecMSCryptoKeysStoreLoad"><primary sortas="xmlSecMSCryptoKeysStoreLoad">xmlSecMSCryptoKeysStoreLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoKeysStoreLoad         (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         const <link linkend="char">char</link> *uri,
-                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
-<para>
-Reads keys from an XML file.</para>
+<indexterm zone="xmlSecMSCryptoKeysStoreLoad"><primary>xmlSecMSCryptoKeysStoreLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoKeysStoreLoad         (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *uri</parameter>,
+                                                         <parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> keysMngr</parameter>);</programlisting>
 <para>
+Reads keys from an XML file.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to MSCrypto keys store.
+<listitem><simpara>the pointer to MSCrypto keys store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>uri</parameter>&#160;:</term>
-<listitem><simpara>                the filename.
+<listitem><simpara>the filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keysMngr</parameter>&#160;:</term>
-<listitem><simpara>           the pointer to associated keys manager.
+<listitem><simpara>the pointer to associated keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeysStoreSave" role="function">
 <title>xmlSecMSCryptoKeysStoreSave ()</title>
-<indexterm zone="xmlSecMSCryptoKeysStoreSave"><primary sortas="xmlSecMSCryptoKeysStoreSave">xmlSecMSCryptoKeysStoreSave</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoKeysStoreSave         (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
-<para>
-Writes keys from <parameter>store</parameter> to an XML file.</para>
+<indexterm zone="xmlSecMSCryptoKeysStoreSave"><primary>xmlSecMSCryptoKeysStoreSave</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoKeysStoreSave         (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
+Writes keys from <parameter>store</parameter> to an XML file.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to MSCrypto keys store.
+<listitem><simpara>the pointer to MSCrypto keys store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the filename.
+<listitem><simpara>the filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the saved keys type (public, private, ...).
+<listitem><simpara>the saved keys type (public, private, ...).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
@@ -124,7 +115,4 @@ Writes keys from <parameter>store</parameter> to an XML file.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/mscrypto/x509.sgml b/docs/api/sgml/mscrypto/x509.sgml
index 1a29bd5..e6bb123 100644
--- a/docs/api/sgml/mscrypto/x509.sgml
+++ b/docs/api/sgml/mscrypto/x509.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-mscrypto-x509.top_of_page">x509</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC-MSCRYPTO Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC-MSCRYPTO Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>x509</refname>
 <refpurpose>X509 certificates support implementation for MS Crypto.</refpurpose>
@@ -13,91 +14,81 @@
 <refsynopsisdiv id="xmlsec-mscrypto-x509.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-#define             <link linkend="xmlSecMSCryptoKeyDataX509Id">xmlSecMSCryptoKeyDataX509Id</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecMSCryptoKeyDataX509GetKlass">xmlSecMSCryptoKeyDataX509GetKlass</link>   (void);
-<link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link>      <link linkend="xmlSecMSCryptoKeyDataX509GetKeyCert">xmlSecMSCryptoKeyDataX509GetKeyCert</link> (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoKeyDataX509AdoptKeyCert">xmlSecMSCryptoKeyDataX509AdoptKeyCert</link>
-                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link> cert);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoKeyDataX509AdoptCert">xmlSecMSCryptoKeyDataX509AdoptCert</link>  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link> cert);
-<link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link>      <link linkend="xmlSecMSCryptoKeyDataX509GetCert">xmlSecMSCryptoKeyDataX509GetCert</link>    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecMSCryptoKeyDataX509GetCertsSize">xmlSecMSCryptoKeyDataX509GetCertsSize</link>
-                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoKeyDataX509AdoptCrl">xmlSecMSCryptoKeyDataX509AdoptCrl</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="PCCRL-CONTEXT--CAPS">PCCRL_CONTEXT</link> crl);
-<link linkend="PCCRL-CONTEXT--CAPS">PCCRL_CONTEXT</link>       <link linkend="xmlSecMSCryptoKeyDataX509GetCrl">xmlSecMSCryptoKeyDataX509GetCrl</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecMSCryptoKeyDataX509GetCrlsSize">xmlSecMSCryptoKeyDataX509GetCrlsSize</link>
-                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<synopsis>#define             <link linkend="xmlSecMSCryptoKeyDataX509Id">xmlSecMSCryptoKeyDataX509Id</link>
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecMSCryptoKeyDataX509GetKlass">xmlSecMSCryptoKeyDataX509GetKlass</link>   (<parameter><type>void</type></parameter>);
+<link linkend="PCCERT-CONTEXT:CAPS"><returnvalue>PCCERT_CONTEXT</returnvalue></link>      <link linkend="xmlSecMSCryptoKeyDataX509GetKeyCert">xmlSecMSCryptoKeyDataX509GetKeyCert</link> (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoKeyDataX509AdoptKeyCert">xmlSecMSCryptoKeyDataX509AdoptKeyCert</link>
+                                                        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="PCCERT-CONTEXT:CAPS"><type>PCCERT_CONTEXT</type></link> cert</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoKeyDataX509AdoptCert">xmlSecMSCryptoKeyDataX509AdoptCert</link>  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="PCCERT-CONTEXT:CAPS"><type>PCCERT_CONTEXT</type></link> cert</parameter>);
+<link linkend="PCCERT-CONTEXT:CAPS"><returnvalue>PCCERT_CONTEXT</returnvalue></link>      <link linkend="xmlSecMSCryptoKeyDataX509GetCert">xmlSecMSCryptoKeyDataX509GetCert</link>    (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);
+<link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          <link linkend="xmlSecMSCryptoKeyDataX509GetCertsSize">xmlSecMSCryptoKeyDataX509GetCertsSize</link>
+                                                        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoKeyDataX509AdoptCrl">xmlSecMSCryptoKeyDataX509AdoptCrl</link>   (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="PCCRL-CONTEXT:CAPS"><type>PCCRL_CONTEXT</type></link> crl</parameter>);
+<link linkend="PCCRL-CONTEXT:CAPS"><returnvalue>PCCRL_CONTEXT</returnvalue></link>       <link linkend="xmlSecMSCryptoKeyDataX509GetCrl">xmlSecMSCryptoKeyDataX509GetCrl</link>     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);
+<link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          <link linkend="xmlSecMSCryptoKeyDataX509GetCrlsSize">xmlSecMSCryptoKeyDataX509GetCrlsSize</link>
+                                                        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
 #define             <link linkend="xmlSecMSCryptoKeyDataRawX509CertId">xmlSecMSCryptoKeyDataRawX509CertId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecMSCryptoKeyDataRawX509CertGetKlass">xmlSecMSCryptoKeyDataRawX509CertGetKlass</link>
-                                                        (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecMSCryptoKeyDataRawX509CertGetKlass">xmlSecMSCryptoKeyDataRawX509CertGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecMSCryptoX509StoreId">xmlSecMSCryptoX509StoreId</link>
-<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>  <link linkend="xmlSecMSCryptoX509StoreGetKlass">xmlSecMSCryptoX509StoreGetKlass</link>   (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoX509StoreAdoptCert">xmlSecMSCryptoX509StoreAdoptCert</link>    (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link> cert,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoX509StoreAdoptKeyStore">xmlSecMSCryptoX509StoreAdoptKeyStore</link>
-                                                        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> keyStore);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoX509StoreAdoptTrustedStore">xmlSecMSCryptoX509StoreAdoptTrustedStore</link>
-                                                        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> trustedStore);
-<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoX509StoreAdoptUntrustedStore">xmlSecMSCryptoX509StoreAdoptUntrustedStore</link>
-                                                        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> untrustedStore);
-<link linkend="void">void</link>                <link linkend="xmlSecMSCryptoX509StoreEnableSystemTrustedCerts">xmlSecMSCryptoX509StoreEnableSystemTrustedCerts</link>
-                                                        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="int">int</link> val);
+<link linkend="xmlSecKeyDataStoreId"><returnvalue>xmlSecKeyDataStoreId</returnvalue></link>  <link linkend="xmlSecMSCryptoX509StoreGetKlass">xmlSecMSCryptoX509StoreGetKlass</link>   (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoX509StoreAdoptCert">xmlSecMSCryptoX509StoreAdoptCert</link>    (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="PCCERT-CONTEXT:CAPS"><type>PCCERT_CONTEXT</type></link> cert</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoX509StoreAdoptKeyStore">xmlSecMSCryptoX509StoreAdoptKeyStore</link>
+                                                        (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="HCERTSTORE:CAPS"><type>HCERTSTORE</type></link> keyStore</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoX509StoreAdoptTrustedStore">xmlSecMSCryptoX509StoreAdoptTrustedStore</link>
+                                                        (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="HCERTSTORE:CAPS"><type>HCERTSTORE</type></link> trustedStore</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecMSCryptoX509StoreAdoptUntrustedStore">xmlSecMSCryptoX509StoreAdoptUntrustedStore</link>
+                                                        (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="HCERTSTORE:CAPS"><type>HCERTSTORE</type></link> untrustedStore</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecMSCryptoX509StoreEnableSystemTrustedCerts">xmlSecMSCryptoX509StoreEnableSystemTrustedCerts</link>
+                                                        (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> val</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-mscrypto-x509.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 X509 certificates support implementation for MS Crypto.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-mscrypto-x509.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecMSCryptoKeyDataX509Id" role="macro">
 <title>xmlSecMSCryptoKeyDataX509Id</title>
-<indexterm zone="xmlSecMSCryptoKeyDataX509Id"><primary sortas="xmlSecMSCryptoKeyDataX509Id">xmlSecMSCryptoKeyDataX509Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoKeyDataX509Id</programlisting>
-<para>
-The MSCrypto X509 data klass.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataX509Id"><primary>xmlSecMSCryptoKeyDataX509Id</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoKeyDataX509Id</programlisting>
 <para>
+The MSCrypto X509 data klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataX509GetKlass" role="function">
 <title>xmlSecMSCryptoKeyDataX509GetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataX509GetKlass"><primary sortas="xmlSecMSCryptoKeyDataX509GetKlass">xmlSecMSCryptoKeyDataX509GetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecMSCryptoKeyDataX509GetKlass   (void);</programlisting>
-<para>
-The MSCrypto X509 key data klass (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-X509Data"><type>sec-X509Data</type></link>).</para>
+<indexterm zone="xmlSecMSCryptoKeyDataX509GetKlass"><primary>xmlSecMSCryptoKeyDataX509GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecMSCryptoKeyDataX509GetKlass   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The MSCrypto X509 key data klass (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-X509Data"><type>sec-X509Data</type></link>).
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the X509 data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataX509GetKeyCert" role="function">
 <title>xmlSecMSCryptoKeyDataX509GetKeyCert ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataX509GetKeyCert"><primary sortas="xmlSecMSCryptoKeyDataX509GetKeyCert">xmlSecMSCryptoKeyDataX509GetKeyCert</primary></indexterm><programlisting><link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link>      xmlSecMSCryptoKeyDataX509GetKeyCert (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets the certificate from which the key was extracted.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataX509GetKeyCert"><primary>xmlSecMSCryptoKeyDataX509GetKeyCert</primary></indexterm>
+<programlisting><link linkend="PCCERT-CONTEXT:CAPS"><returnvalue>PCCERT_CONTEXT</returnvalue></link>      xmlSecMSCryptoKeyDataX509GetKeyCert (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets the certificate from which the key was extracted.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the key's certificate or NULL if key data was not used for key
 extraction or an error occurs.
@@ -105,52 +96,52 @@ extraction or an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataX509AdoptKeyCert" role="function">
 <title>xmlSecMSCryptoKeyDataX509AdoptKeyCert ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataX509AdoptKeyCert"><primary sortas="xmlSecMSCryptoKeyDataX509AdoptKeyCert">xmlSecMSCryptoKeyDataX509AdoptKeyCert</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoKeyDataX509AdoptKeyCert
-                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link> cert);</programlisting>
-<para>
-Sets the key's certificate in <parameter>data</parameter>.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataX509AdoptKeyCert"><primary>xmlSecMSCryptoKeyDataX509AdoptKeyCert</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoKeyDataX509AdoptKeyCert
+                                                        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="PCCERT-CONTEXT:CAPS"><type>PCCERT_CONTEXT</type></link> cert</parameter>);</programlisting>
 <para>
+Sets the key's certificate in <parameter>data</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>cert</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to MSCRYPTO X509 certificate.
+<listitem><simpara>the pointer to MSCRYPTO X509 certificate.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataX509AdoptCert" role="function">
 <title>xmlSecMSCryptoKeyDataX509AdoptCert ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataX509AdoptCert"><primary sortas="xmlSecMSCryptoKeyDataX509AdoptCert">xmlSecMSCryptoKeyDataX509AdoptCert</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoKeyDataX509AdoptCert  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link> cert);</programlisting>
-<para>
-Adds certificate to the X509 key data.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataX509AdoptCert"><primary>xmlSecMSCryptoKeyDataX509AdoptCert</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoKeyDataX509AdoptCert  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="PCCERT-CONTEXT:CAPS"><type>PCCERT_CONTEXT</type></link> cert</parameter>);</programlisting>
 <para>
+Adds certificate to the X509 key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>cert</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to MSCRYPTO X509 certificate.
+<listitem><simpara>the pointer to MSCRYPTO X509 certificate.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataX509GetCert" role="function">
 <title>xmlSecMSCryptoKeyDataX509GetCert ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataX509GetCert"><primary sortas="xmlSecMSCryptoKeyDataX509GetCert">xmlSecMSCryptoKeyDataX509GetCert</primary></indexterm><programlisting><link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link>      xmlSecMSCryptoKeyDataX509GetCert    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
-<para>
-Gets a certificate from X509 key data.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataX509GetCert"><primary>xmlSecMSCryptoKeyDataX509GetCert</primary></indexterm>
+<programlisting><link linkend="PCCERT-CONTEXT:CAPS"><returnvalue>PCCERT_CONTEXT</returnvalue></link>      xmlSecMSCryptoKeyDataX509GetCert    (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);</programlisting>
 <para>
+Gets a certificate from X509 key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pos</parameter>&#160;:</term>
-<listitem><simpara>                the desired certificate position.
+<listitem><simpara>the desired certificate position.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to certificate or NULL if <parameter>pos</parameter> is larger than the
 number of certificates in <parameter>data</parameter> or an error occurs.
@@ -158,48 +149,48 @@ number of certificates in <parameter>data</parameter> or an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataX509GetCertsSize" role="function">
 <title>xmlSecMSCryptoKeyDataX509GetCertsSize ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataX509GetCertsSize"><primary sortas="xmlSecMSCryptoKeyDataX509GetCertsSize">xmlSecMSCryptoKeyDataX509GetCertsSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecMSCryptoKeyDataX509GetCertsSize
-                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets the number of certificates in <parameter>data</parameter>.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataX509GetCertsSize"><primary>xmlSecMSCryptoKeyDataX509GetCertsSize</primary></indexterm>
+<programlisting><link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          xmlSecMSCryptoKeyDataX509GetCertsSize
+                                                        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets the number of certificates in <parameter>data</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> te number of certificates in <parameter>data</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataX509AdoptCrl" role="function">
 <title>xmlSecMSCryptoKeyDataX509AdoptCrl ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataX509AdoptCrl"><primary sortas="xmlSecMSCryptoKeyDataX509AdoptCrl">xmlSecMSCryptoKeyDataX509AdoptCrl</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoKeyDataX509AdoptCrl   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="PCCRL-CONTEXT--CAPS">PCCRL_CONTEXT</link> crl);</programlisting>
-<para>
-Adds CRL to the X509 key data.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataX509AdoptCrl"><primary>xmlSecMSCryptoKeyDataX509AdoptCrl</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoKeyDataX509AdoptCrl   (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="PCCRL-CONTEXT:CAPS"><type>PCCRL_CONTEXT</type></link> crl</parameter>);</programlisting>
 <para>
+Adds CRL to the X509 key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>crl</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to MSCrypto X509 CRL.
+<listitem><simpara>the pointer to MSCrypto X509 CRL.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataX509GetCrl" role="function">
 <title>xmlSecMSCryptoKeyDataX509GetCrl ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataX509GetCrl"><primary sortas="xmlSecMSCryptoKeyDataX509GetCrl">xmlSecMSCryptoKeyDataX509GetCrl</primary></indexterm><programlisting><link linkend="PCCRL-CONTEXT--CAPS">PCCRL_CONTEXT</link>       xmlSecMSCryptoKeyDataX509GetCrl     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
-<para>
-Gets a CRL from X509 key data.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataX509GetCrl"><primary>xmlSecMSCryptoKeyDataX509GetCrl</primary></indexterm>
+<programlisting><link linkend="PCCRL-CONTEXT:CAPS"><returnvalue>PCCRL_CONTEXT</returnvalue></link>       xmlSecMSCryptoKeyDataX509GetCrl     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);</programlisting>
 <para>
+Gets a CRL from X509 key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pos</parameter>&#160;:</term>
-<listitem><simpara>                the desired CRL position.
+<listitem><simpara>the desired CRL position.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to CRL or NULL if <parameter>pos</parameter> is larger than the
 number of CRLs in <parameter>data</parameter> or an error occurs.
@@ -207,148 +198,145 @@ number of CRLs in <parameter>data</parameter> or an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataX509GetCrlsSize" role="function">
 <title>xmlSecMSCryptoKeyDataX509GetCrlsSize ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataX509GetCrlsSize"><primary sortas="xmlSecMSCryptoKeyDataX509GetCrlsSize">xmlSecMSCryptoKeyDataX509GetCrlsSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecMSCryptoKeyDataX509GetCrlsSize
-                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets the number of CRLs in <parameter>data</parameter>.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataX509GetCrlsSize"><primary>xmlSecMSCryptoKeyDataX509GetCrlsSize</primary></indexterm>
+<programlisting><link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          xmlSecMSCryptoKeyDataX509GetCrlsSize
+                                                        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets the number of CRLs in <parameter>data</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> te number of CRLs in <parameter>data</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataRawX509CertId" role="macro">
 <title>xmlSecMSCryptoKeyDataRawX509CertId</title>
-<indexterm zone="xmlSecMSCryptoKeyDataRawX509CertId"><primary sortas="xmlSecMSCryptoKeyDataRawX509CertId">xmlSecMSCryptoKeyDataRawX509CertId</primary></indexterm><programlisting>#define             xmlSecMSCryptoKeyDataRawX509CertId</programlisting>
-<para>
-The MSCrypto raw X509 certificate klass.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataRawX509CertId"><primary>xmlSecMSCryptoKeyDataRawX509CertId</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoKeyDataRawX509CertId</programlisting>
 <para>
+The MSCrypto raw X509 certificate klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoKeyDataRawX509CertGetKlass" role="function">
 <title>xmlSecMSCryptoKeyDataRawX509CertGetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoKeyDataRawX509CertGetKlass"><primary sortas="xmlSecMSCryptoKeyDataRawX509CertGetKlass">xmlSecMSCryptoKeyDataRawX509CertGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecMSCryptoKeyDataRawX509CertGetKlass
-                                                        (void);</programlisting>
-<para>
-The raw X509 certificates key data klass.</para>
+<indexterm zone="xmlSecMSCryptoKeyDataRawX509CertGetKlass"><primary>xmlSecMSCryptoKeyDataRawX509CertGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecMSCryptoKeyDataRawX509CertGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The raw X509 certificates key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> raw X509 certificates key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoX509StoreId" role="macro">
 <title>xmlSecMSCryptoX509StoreId</title>
-<indexterm zone="xmlSecMSCryptoX509StoreId"><primary sortas="xmlSecMSCryptoX509StoreId">xmlSecMSCryptoX509StoreId</primary></indexterm><programlisting>#define             xmlSecMSCryptoX509StoreId</programlisting>
-<para>
-The MSCrypto X509 store klass.</para>
+<indexterm zone="xmlSecMSCryptoX509StoreId"><primary>xmlSecMSCryptoX509StoreId</primary></indexterm>
+<programlisting>#define             xmlSecMSCryptoX509StoreId</programlisting>
 <para>
+The MSCrypto X509 store klass.
 </para></refsect2>
 <refsect2 id="xmlSecMSCryptoX509StoreGetKlass" role="function">
 <title>xmlSecMSCryptoX509StoreGetKlass ()</title>
-<indexterm zone="xmlSecMSCryptoX509StoreGetKlass"><primary sortas="xmlSecMSCryptoX509StoreGetKlass">xmlSecMSCryptoX509StoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>  xmlSecMSCryptoX509StoreGetKlass   (void);</programlisting>
-<para>
-The MSCrypto X509 certificates key data store klass.</para>
+<indexterm zone="xmlSecMSCryptoX509StoreGetKlass"><primary>xmlSecMSCryptoX509StoreGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataStoreId"><returnvalue>xmlSecKeyDataStoreId</returnvalue></link>  xmlSecMSCryptoX509StoreGetKlass   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The MSCrypto X509 certificates key data store klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to MSCrypto X509 certificates key data store klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoX509StoreAdoptCert" role="function">
 <title>xmlSecMSCryptoX509StoreAdoptCert ()</title>
-<indexterm zone="xmlSecMSCryptoX509StoreAdoptCert"><primary sortas="xmlSecMSCryptoX509StoreAdoptCert">xmlSecMSCryptoX509StoreAdoptCert</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoX509StoreAdoptCert    (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link> cert,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
-<para>
-Adds trusted (root) or untrusted certificate to the store.</para>
+<indexterm zone="xmlSecMSCryptoX509StoreAdoptCert"><primary>xmlSecMSCryptoX509StoreAdoptCert</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoX509StoreAdoptCert    (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="PCCERT-CONTEXT:CAPS"><type>PCCERT_CONTEXT</type></link> cert</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
+Adds trusted (root) or untrusted certificate to the store.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</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>cert</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to PCCERT_CONTEXT X509 certificate.
+<listitem><simpara>the pointer to PCCERT_CONTEXT X509 certificate.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the certificate type (trusted/untrusted).
+<listitem><simpara>the certificate type (trusted/untrusted).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoX509StoreAdoptKeyStore" role="function">
 <title>xmlSecMSCryptoX509StoreAdoptKeyStore ()</title>
-<indexterm zone="xmlSecMSCryptoX509StoreAdoptKeyStore"><primary sortas="xmlSecMSCryptoX509StoreAdoptKeyStore">xmlSecMSCryptoX509StoreAdoptKeyStore</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoX509StoreAdoptKeyStore
-                                                        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> keyStore);</programlisting>
-<para>
-Adds <parameter>keyStore</parameter> to the list of key stores.</para>
+<indexterm zone="xmlSecMSCryptoX509StoreAdoptKeyStore"><primary>xmlSecMSCryptoX509StoreAdoptKeyStore</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoX509StoreAdoptKeyStore
+                                                        (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="HCERTSTORE:CAPS"><type>HCERTSTORE</type></link> keyStore</parameter>);</programlisting>
 <para>
+Adds <parameter>keyStore</parameter> to the list of key stores.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</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>keyStore</parameter>&#160;:</term>
-<listitem><simpara>           the pointer to keys store.
+<listitem><simpara>the pointer to keys store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoX509StoreAdoptTrustedStore" role="function">
 <title>xmlSecMSCryptoX509StoreAdoptTrustedStore ()</title>
-<indexterm zone="xmlSecMSCryptoX509StoreAdoptTrustedStore"><primary sortas="xmlSecMSCryptoX509StoreAdoptTrustedStore">xmlSecMSCryptoX509StoreAdoptTrustedStore</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoX509StoreAdoptTrustedStore
-                                                        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> trustedStore);</programlisting>
-<para>
-Adds <parameter>trustedStore</parameter> to the list of trusted certs stores.</para>
+<indexterm zone="xmlSecMSCryptoX509StoreAdoptTrustedStore"><primary>xmlSecMSCryptoX509StoreAdoptTrustedStore</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoX509StoreAdoptTrustedStore
+                                                        (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="HCERTSTORE:CAPS"><type>HCERTSTORE</type></link> trustedStore</parameter>);</programlisting>
 <para>
+Adds <parameter>trustedStore</parameter> to the list of trusted certs stores.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</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>trustedStore</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to certs store.
+<listitem><simpara>the pointer to certs store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoX509StoreAdoptUntrustedStore" role="function">
 <title>xmlSecMSCryptoX509StoreAdoptUntrustedStore ()</title>
-<indexterm zone="xmlSecMSCryptoX509StoreAdoptUntrustedStore"><primary sortas="xmlSecMSCryptoX509StoreAdoptUntrustedStore">xmlSecMSCryptoX509StoreAdoptUntrustedStore</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoX509StoreAdoptUntrustedStore
-                                                        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> untrustedStore);</programlisting>
-<para>
-Adds <parameter>trustedStore</parameter> to the list of un-trusted certs stores.</para>
+<indexterm zone="xmlSecMSCryptoX509StoreAdoptUntrustedStore"><primary>xmlSecMSCryptoX509StoreAdoptUntrustedStore</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecMSCryptoX509StoreAdoptUntrustedStore
+                                                        (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="HCERTSTORE:CAPS"><type>HCERTSTORE</type></link> untrustedStore</parameter>);</programlisting>
 <para>
+Adds <parameter>trustedStore</parameter> to the list of un-trusted certs stores.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</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>untrustedStore</parameter>&#160;:</term>
-<listitem><simpara>     the pointer to certs store.
+<listitem><simpara>the pointer to certs store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecMSCryptoX509StoreEnableSystemTrustedCerts" role="function">
 <title>xmlSecMSCryptoX509StoreEnableSystemTrustedCerts ()</title>
-<indexterm zone="xmlSecMSCryptoX509StoreEnableSystemTrustedCerts"><primary sortas="xmlSecMSCryptoX509StoreEnableSystemTrustedCerts">xmlSecMSCryptoX509StoreEnableSystemTrustedCerts</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecMSCryptoX509StoreEnableSystemTrustedCerts
-                                                        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="int">int</link> val);</programlisting>
-<para>
-Enables/disables the system trusted certs.</para>
+<indexterm zone="xmlSecMSCryptoX509StoreEnableSystemTrustedCerts"><primary>xmlSecMSCryptoX509StoreEnableSystemTrustedCerts</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecMSCryptoX509StoreEnableSystemTrustedCerts
+                                                        (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> val</parameter>);</programlisting>
 <para>
+Enables/disables the system trusted certs.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</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>val</parameter>&#160;:</term>
-<listitem><simpara>                the enable/disable flag
+<listitem><simpara>the enable/disable flag
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/nodeset.sgml b/docs/api/sgml/nodeset.sgml
index d217077..fb2cc0a 100644
--- a/docs/api/sgml/nodeset.sgml
+++ b/docs/api/sgml/nodeset.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-nodeset.top_of_page">nodeset</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>nodeset</refname>
 <refpurpose>Nodeset object implementation.</refpurpose>
@@ -13,62 +14,53 @@
 <refsynopsisdiv id="xmlsec-nodeset.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-enum                <link linkend="xmlSecNodeSetType">xmlSecNodeSetType</link>;
+<synopsis>enum                <link linkend="xmlSecNodeSetType">xmlSecNodeSetType</link>;
 enum                <link linkend="xmlSecNodeSetOp">xmlSecNodeSetOp</link>;
 struct              <link linkend="xmlSecNodeSet">xmlSecNodeSet</link>;
-<link linkend="int">int</link>                 (<link linkend="xmlSecNodeSetWalkCallback">*xmlSecNodeSetWalkCallback</link>)        (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> parent,
-                                                         <link linkend="void">void</link> *data);
-<link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link>    <link linkend="xmlSecNodeSetCreate">xmlSecNodeSetCreate</link>                 (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                                         <link linkend="xmlNodeSet">xmlNodeSetPtr</link> nodes,
-                                                         <link linkend="xmlSecNodeSetType">xmlSecNodeSetType</link> type);
-<link linkend="void">void</link>                <link linkend="xmlSecNodeSetDestroy">xmlSecNodeSetDestroy</link>                (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset);
-<link linkend="void">void</link>                <link linkend="xmlSecNodeSetDocDestroy">xmlSecNodeSetDocDestroy</link>             (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset);
-<link linkend="int">int</link>                 <link linkend="xmlSecNodeSetContains">xmlSecNodeSetContains</link>               (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> parent);
-<link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link>    <link linkend="xmlSecNodeSetAdd">xmlSecNodeSetAdd</link>                    (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> newNSet,
-                                                         <link linkend="xmlSecNodeSetOp">xmlSecNodeSetOp</link> op);
-<link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link>    <link linkend="xmlSecNodeSetAddList">xmlSecNodeSetAddList</link>                (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> newNSet,
-                                                         <link linkend="xmlSecNodeSetOp">xmlSecNodeSetOp</link> op);
-<link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link>    <link linkend="xmlSecNodeSetGetChildren">xmlSecNodeSetGetChildren</link>            (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                                         const <link linkend="xmlNode">xmlNodePtr</link> parent,
-                                                         <link linkend="int">int</link> withComments,
-                                                         <link linkend="int">int</link> invert);
-<link linkend="int">int</link>                 <link linkend="xmlSecNodeSetWalk">xmlSecNodeSetWalk</link>                   (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                                         <link linkend="xmlSecNodeSetWalkCallback">xmlSecNodeSetWalkCallback</link> walkFunc,
-                                                         <link linkend="void">void</link> *data);
-<link linkend="int">int</link>                 <link linkend="xmlSecNodeSetDumpTextNodes">xmlSecNodeSetDumpTextNodes</link>          (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                                         <link linkend="xmlOutputBuffer">xmlOutputBufferPtr</link> out);
-<link linkend="void">void</link>                <link linkend="xmlSecNodeSetDebugDump">xmlSecNodeSetDebugDump</link>              (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecNodeSetWalkCallback">*xmlSecNodeSetWalkCallback</link>)        (<parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nset</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> parent</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *data</parameter>);
+<link linkend="xmlSecNodeSetPtr"><returnvalue>xmlSecNodeSetPtr</returnvalue></link>    <link linkend="xmlSecNodeSetCreate">xmlSecNodeSetCreate</link>                 (<parameter><link linkend="xmlDoc"><type>xmlDocPtr</type></link> doc</parameter>,
+                                                         <parameter><link linkend="xmlNodeSet"><type>xmlNodeSetPtr</type></link> nodes</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSetType"><type>xmlSecNodeSetType</type></link> type</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecNodeSetDestroy">xmlSecNodeSetDestroy</link>                (<parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nset</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecNodeSetDocDestroy">xmlSecNodeSetDocDestroy</link>             (<parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nset</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNodeSetContains">xmlSecNodeSetContains</link>               (<parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nset</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> parent</parameter>);
+<link linkend="xmlSecNodeSetPtr"><returnvalue>xmlSecNodeSetPtr</returnvalue></link>    <link linkend="xmlSecNodeSetAdd">xmlSecNodeSetAdd</link>                    (<parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nset</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> newNSet</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSetOp"><type>xmlSecNodeSetOp</type></link> op</parameter>);
+<link linkend="xmlSecNodeSetPtr"><returnvalue>xmlSecNodeSetPtr</returnvalue></link>    <link linkend="xmlSecNodeSetAddList">xmlSecNodeSetAddList</link>                (<parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nset</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> newNSet</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSetOp"><type>xmlSecNodeSetOp</type></link> op</parameter>);
+<link linkend="xmlSecNodeSetPtr"><returnvalue>xmlSecNodeSetPtr</returnvalue></link>    <link linkend="xmlSecNodeSetGetChildren">xmlSecNodeSetGetChildren</link>            (<parameter><link linkend="xmlDoc"><type>xmlDocPtr</type></link> doc</parameter>,
+                                                         <parameter>const <link linkend="xmlNode"><type>xmlNodePtr</type></link> parent</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> withComments</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> invert</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNodeSetWalk">xmlSecNodeSetWalk</link>                   (<parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nset</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSetWalkCallback"><type>xmlSecNodeSetWalkCallback</type></link> walkFunc</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *data</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNodeSetDumpTextNodes">xmlSecNodeSetDumpTextNodes</link>          (<parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nset</parameter>,
+                                                         <parameter><link linkend="xmlOutputBuffer"><type>xmlOutputBufferPtr</type></link> out</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecNodeSetDebugDump">xmlSecNodeSetDebugDump</link>              (<parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nset</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-nodeset.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Nodeset object implementation.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-nodeset.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecNodeSetType" role="enum">
 <title>enum xmlSecNodeSetType</title>
-<indexterm zone="xmlSecNodeSetType"><primary sortas="xmlSecNodeSetType">xmlSecNodeSetType</primary></indexterm><programlisting>typedef enum {
+<indexterm zone="xmlSecNodeSetType"><primary>xmlSecNodeSetType</primary></indexterm>
+<programlisting>typedef enum {
     xmlSecNodeSetNormal = 0,
     xmlSecNodeSetInvert,
     xmlSecNodeSetTree,
@@ -79,80 +71,80 @@ Nodeset object implementation.
 } xmlSecNodeSetType;
 </programlisting>
 <para>
-The basic nodes sets types.</para>
-<para>
+The basic nodes sets types.
 </para><variablelist role="enum">
 <varlistentry id="xmlSecNodeSetNormal" role="constant">
 <term><literal>xmlSecNodeSetNormal</literal></term>
-<listitem><simpara>        nodes set = nodes in the list.
+<listitem><simpara>nodes set = nodes in the list.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecNodeSetInvert" role="constant">
 <term><literal>xmlSecNodeSetInvert</literal></term>
-<listitem><simpara>        nodes set = all document nodes minus nodes in the list.
+<listitem><simpara>nodes set = all document nodes minus nodes in the list.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecNodeSetTree" role="constant">
 <term><literal>xmlSecNodeSetTree</literal></term>
-<listitem><simpara>          nodes set = nodes in the list and all their subtress.
+<listitem><simpara>nodes set = nodes in the list and all their subtress.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecNodeSetTreeWithoutComments" role="constant">
 <term><literal>xmlSecNodeSetTreeWithoutComments</literal></term>
-<listitem><simpara>           nodes set = nodes in the list and
+<listitem><simpara>nodes set = nodes in the list and
                              all their subtress but no comment nodes.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecNodeSetTreeInvert" role="constant">
 <term><literal>xmlSecNodeSetTreeInvert</literal></term>
-<listitem><simpara>    nodes set = all document nodes minus nodes in the
+<listitem><simpara>nodes set = all document nodes minus nodes in the
                              list and all their subtress.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecNodeSetTreeWithoutCommentsInvert" role="constant">
 <term><literal>xmlSecNodeSetTreeWithoutCommentsInvert</literal></term>
-<listitem><simpara>     nodes set = all document nodes
+<listitem><simpara>nodes set = all document nodes
                              minus (nodes in the list and all their subtress
                              plus all comment nodes).
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecNodeSetList" role="constant">
 <term><literal>xmlSecNodeSetList</literal></term>
-<listitem><simpara>          nodes set = all nodes in the chidren list of nodes sets.
+<listitem><simpara>nodes set = all nodes in the chidren list of nodes sets.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNodeSetOp" role="enum">
 <title>enum xmlSecNodeSetOp</title>
-<indexterm zone="xmlSecNodeSetOp"><primary sortas="xmlSecNodeSetOp">xmlSecNodeSetOp</primary></indexterm><programlisting>typedef enum {
+<indexterm zone="xmlSecNodeSetOp"><primary>xmlSecNodeSetOp</primary></indexterm>
+<programlisting>typedef enum {
     xmlSecNodeSetIntersection = 0,
     xmlSecNodeSetSubtraction,
     xmlSecNodeSetUnion
 } xmlSecNodeSetOp;
 </programlisting>
 <para>
-The simple nodes sets operations.</para>
-<para>
+The simple nodes sets operations.
 </para><variablelist role="enum">
 <varlistentry id="xmlSecNodeSetIntersection" role="constant">
 <term><literal>xmlSecNodeSetIntersection</literal></term>
-<listitem><simpara>  intersection.
+<listitem><simpara>intersection.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecNodeSetSubtraction" role="constant">
 <term><literal>xmlSecNodeSetSubtraction</literal></term>
-<listitem><simpara>   subtraction.
+<listitem><simpara>subtraction.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecNodeSetUnion" role="constant">
 <term><literal>xmlSecNodeSetUnion</literal></term>
-<listitem><simpara>         union.
+<listitem><simpara>union.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNodeSet" role="struct">
 <title>struct xmlSecNodeSet</title>
-<indexterm zone="xmlSecNodeSet"><primary sortas="xmlSecNodeSet">xmlSecNodeSet</primary></indexterm><programlisting>struct xmlSecNodeSet {
+<indexterm zone="xmlSecNodeSet"><primary>xmlSecNodeSet</primary></indexterm>
+<programlisting>struct xmlSecNodeSet {
     xmlNodeSetPtr       nodes;
     xmlDocPtr           doc;
     int                 destroyDoc;
@@ -164,73 +156,64 @@ The simple nodes sets operations.</para>
 };
 </programlisting>
 <para>
-The enchanced nodes set.</para>
-<para>
+The enchanced nodes set.
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="xmlNodeSet">xmlNodeSetPtr</link>&#160;<structfield>nodes</structfield>;</term>
-<listitem><simpara>                      the nodes list.
+<varlistentry><term><link linkend="xmlNodeSet"><type>xmlNodeSetPtr</type></link>&#160;<structfield id="xmlSecNodeSet.nodes">nodes</structfield>;</term>
+<listitem><simpara>the nodes list.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlDoc">xmlDocPtr</link>&#160;<structfield>doc</structfield>;</term>
-<listitem><simpara>                        the parent XML document.
+<varlistentry><term><link linkend="xmlDoc"><type>xmlDocPtr</type></link>&#160;<structfield id="xmlSecNodeSet.doc">doc</structfield>;</term>
+<listitem><simpara>the parent XML document.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="int">int</link>&#160;<structfield>destroyDoc</structfield>;</term>
-<listitem><simpara>                 the flag: if set to 1 then <parameter>doc</parameter> will
+<varlistentry><term><link linkend="int"><type>int</type></link>&#160;<structfield id="xmlSecNodeSet.destroyDoc">destroyDoc</structfield>;</term>
+<listitem><simpara>the flag: if set to 1 then <parameter>doc</parameter> will
                              be destroyed when node set is destroyed.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecNodeSetType">xmlSecNodeSetType</link>&#160;<structfield>type</structfield>;</term>
-<listitem><simpara>                       the nodes set type.
+<varlistentry><term><link linkend="xmlSecNodeSetType"><type>xmlSecNodeSetType</type></link>&#160;<structfield id="xmlSecNodeSet.type">type</structfield>;</term>
+<listitem><simpara>the nodes set type.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecNodeSetOp">xmlSecNodeSetOp</link>&#160;<structfield>op</structfield>;</term>
-<listitem><simpara>                         the operation type.
+<varlistentry><term><link linkend="xmlSecNodeSetOp"><type>xmlSecNodeSetOp</type></link>&#160;<structfield id="xmlSecNodeSet.op">op</structfield>;</term>
+<listitem><simpara>the operation type.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link>&#160;<structfield>next</structfield>;</term>
-<listitem><simpara>                       the next nodes set.
+<varlistentry><term><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link>&#160;<structfield id="xmlSecNodeSet.next">next</structfield>;</term>
+<listitem><simpara>the next nodes set.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link>&#160;<structfield>prev</structfield>;</term>
-<listitem><simpara>                       the previous nodes set.
+<varlistentry><term><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link>&#160;<structfield id="xmlSecNodeSet.prev">prev</structfield>;</term>
+<listitem><simpara>the previous nodes set.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link>&#160;<structfield>children</structfield>;</term>
-<listitem><simpara>                   the children list (valid only if type
+<varlistentry><term><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link>&#160;<structfield id="xmlSecNodeSet.children">children</structfield>;</term>
+<listitem><simpara>the children list (valid only if type
                              equal to <link linkend="xmlSecNodeSetList"><type>xmlSecNodeSetList</type></link>).
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNodeSetWalkCallback" role="function">
 <title>xmlSecNodeSetWalkCallback ()</title>
-<indexterm zone="xmlSecNodeSetWalkCallback"><primary sortas="xmlSecNodeSetWalkCallback">xmlSecNodeSetWalkCallback</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecNodeSetWalkCallback)        (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> parent,
-                                                         <link linkend="void">void</link> *data);</programlisting>
-<para>
-The callback function called once per each node in the nodes set.</para>
+<indexterm zone="xmlSecNodeSetWalkCallback"><primary>xmlSecNodeSetWalkCallback</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecNodeSetWalkCallback)        (<parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nset</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> parent</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *data</parameter>);</programlisting>
 <para>
+The callback function called once per each node in the nodes set.
 </para><variablelist role="params">
 <varlistentry><term><parameter>nset</parameter>&#160;:</term>
-<listitem><simpara>                       the pointer to <link linkend="xmlSecNodeSet"><type>xmlSecNodeSet</type></link> structure.
+<listitem><simpara>the pointer to <link linkend="xmlSecNodeSet"><type>xmlSecNodeSet</type></link> structure.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>cur</parameter>&#160;:</term>
-<listitem><simpara>                        the pointer current XML node.
+<listitem><simpara>the pointer current XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>parent</parameter>&#160;:</term>
-<listitem><simpara>                     the pointer to the <parameter>cur</parameter> parent node.
+<listitem><simpara>the pointer to the <parameter>cur</parameter> parent node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>                       the pointer to application specific data.
+<listitem><simpara>the pointer to application specific data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs
 an walk procedure should be interrupted.
@@ -238,65 +221,65 @@ an walk procedure should be interrupted.
 </variablelist></refsect2>
 <refsect2 id="xmlSecNodeSetCreate" role="function">
 <title>xmlSecNodeSetCreate ()</title>
-<indexterm zone="xmlSecNodeSetCreate"><primary sortas="xmlSecNodeSetCreate">xmlSecNodeSetCreate</primary></indexterm><programlisting><link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link>    xmlSecNodeSetCreate                 (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                                         <link linkend="xmlNodeSet">xmlNodeSetPtr</link> nodes,
-                                                         <link linkend="xmlSecNodeSetType">xmlSecNodeSetType</link> type);</programlisting>
+<indexterm zone="xmlSecNodeSetCreate"><primary>xmlSecNodeSetCreate</primary></indexterm>
+<programlisting><link linkend="xmlSecNodeSetPtr"><returnvalue>xmlSecNodeSetPtr</returnvalue></link>    xmlSecNodeSetCreate                 (<parameter><link linkend="xmlDoc"><type>xmlDocPtr</type></link> doc</parameter>,
+                                                         <parameter><link linkend="xmlNodeSet"><type>xmlNodeSetPtr</type></link> nodes</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSetType"><type>xmlSecNodeSetType</type></link> type</parameter>);</programlisting>
 <para>
 Creates new nodes set. Caller is responsible for freeng returend object
-by calling <link linkend="xmlSecNodeSetDestroy"><type>xmlSecNodeSetDestroy</type></link> function.</para>
-<para>
+by calling <link linkend="xmlSecNodeSetDestroy"><type>xmlSecNodeSetDestroy</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>doc</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to parent XML document.
+<listitem><simpara>the pointer to parent XML document.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nodes</parameter>&#160;:</term>
-<listitem><simpara>              the list of nodes.
+<listitem><simpara>the list of nodes.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the nodes set type.
+<listitem><simpara>the nodes set type.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated node set or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNodeSetDestroy" role="function">
 <title>xmlSecNodeSetDestroy ()</title>
-<indexterm zone="xmlSecNodeSetDestroy"><primary sortas="xmlSecNodeSetDestroy">xmlSecNodeSetDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecNodeSetDestroy                (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset);</programlisting>
-<para>
-Destroys the nodes set created with <link linkend="xmlSecNodeSetCreate"><type>xmlSecNodeSetCreate</type></link> function.</para>
+<indexterm zone="xmlSecNodeSetDestroy"><primary>xmlSecNodeSetDestroy</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecNodeSetDestroy                (<parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nset</parameter>);</programlisting>
 <para>
+Destroys the nodes set created with <link linkend="xmlSecNodeSetCreate"><type>xmlSecNodeSetCreate</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>nset</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to node set.
+<listitem><simpara>the pointer to node set.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNodeSetDocDestroy" role="function">
 <title>xmlSecNodeSetDocDestroy ()</title>
-<indexterm zone="xmlSecNodeSetDocDestroy"><primary sortas="xmlSecNodeSetDocDestroy">xmlSecNodeSetDocDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecNodeSetDocDestroy             (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset);</programlisting>
-<para>
-Instructs node set to destroy nodes parent doc when node set is destroyed.</para>
+<indexterm zone="xmlSecNodeSetDocDestroy"><primary>xmlSecNodeSetDocDestroy</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecNodeSetDocDestroy             (<parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nset</parameter>);</programlisting>
 <para>
+Instructs node set to destroy nodes parent doc when node set is destroyed.
 </para><variablelist role="params">
 <varlistentry><term><parameter>nset</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to node set.
+<listitem><simpara>the pointer to node set.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNodeSetContains" role="function">
 <title>xmlSecNodeSetContains ()</title>
-<indexterm zone="xmlSecNodeSetContains"><primary sortas="xmlSecNodeSetContains">xmlSecNodeSetContains</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNodeSetContains               (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> parent);</programlisting>
-<para>
-Checks whether the <parameter>node</parameter> is in the nodes set or not.</para>
+<indexterm zone="xmlSecNodeSetContains"><primary>xmlSecNodeSetContains</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNodeSetContains               (<parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nset</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> parent</parameter>);</programlisting>
 <para>
+Checks whether the <parameter>node</parameter> is in the nodes set or not.
 </para><variablelist role="params">
 <varlistentry><term><parameter>nset</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to node set.
+<listitem><simpara>the pointer to node set.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to XML node to check.
+<listitem><simpara>the pointer to XML node to check.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>parent</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to <parameter>node</parameter> parent node.
+<listitem><simpara>the pointer to <parameter>node</parameter> parent node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if the <parameter>node</parameter> is in the nodes set <parameter>nset</parameter>, 0 if it is not
 and a negative value if an error occurs.
@@ -304,21 +287,21 @@ and a negative value if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecNodeSetAdd" role="function">
 <title>xmlSecNodeSetAdd ()</title>
-<indexterm zone="xmlSecNodeSetAdd"><primary sortas="xmlSecNodeSetAdd">xmlSecNodeSetAdd</primary></indexterm><programlisting><link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link>    xmlSecNodeSetAdd                    (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> newNSet,
-                                                         <link linkend="xmlSecNodeSetOp">xmlSecNodeSetOp</link> op);</programlisting>
-<para>
-Adds <parameter>newNSet</parameter> to the <parameter>nset</parameter> using operation <parameter>op</parameter>.</para>
+<indexterm zone="xmlSecNodeSetAdd"><primary>xmlSecNodeSetAdd</primary></indexterm>
+<programlisting><link linkend="xmlSecNodeSetPtr"><returnvalue>xmlSecNodeSetPtr</returnvalue></link>    xmlSecNodeSetAdd                    (<parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nset</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> newNSet</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSetOp"><type>xmlSecNodeSetOp</type></link> op</parameter>);</programlisting>
 <para>
+Adds <parameter>newNSet</parameter> to the <parameter>nset</parameter> using operation <parameter>op</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>nset</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to currrent nodes set (or NULL).
+<listitem><simpara>the pointer to currrent nodes set (or NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>newNSet</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to new nodes set.
+<listitem><simpara>the pointer to new nodes set.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>op</parameter>&#160;:</term>
-<listitem><simpara>                 the operation type.
+<listitem><simpara>the operation type.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to combined nodes set or NULL if an error
 occurs.
@@ -326,21 +309,21 @@ occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecNodeSetAddList" role="function">
 <title>xmlSecNodeSetAddList ()</title>
-<indexterm zone="xmlSecNodeSetAddList"><primary sortas="xmlSecNodeSetAddList">xmlSecNodeSetAddList</primary></indexterm><programlisting><link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link>    xmlSecNodeSetAddList                (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> newNSet,
-                                                         <link linkend="xmlSecNodeSetOp">xmlSecNodeSetOp</link> op);</programlisting>
-<para>
-Adds <parameter>newNSet</parameter> to the <parameter>nset</parameter> as child using operation <parameter>op</parameter>.</para>
+<indexterm zone="xmlSecNodeSetAddList"><primary>xmlSecNodeSetAddList</primary></indexterm>
+<programlisting><link linkend="xmlSecNodeSetPtr"><returnvalue>xmlSecNodeSetPtr</returnvalue></link>    xmlSecNodeSetAddList                (<parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nset</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> newNSet</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSetOp"><type>xmlSecNodeSetOp</type></link> op</parameter>);</programlisting>
 <para>
+Adds <parameter>newNSet</parameter> to the <parameter>nset</parameter> as child using operation <parameter>op</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>nset</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to currrent nodes set (or NULL).
+<listitem><simpara>the pointer to currrent nodes set (or NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>newNSet</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to new nodes set.
+<listitem><simpara>the pointer to new nodes set.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>op</parameter>&#160;:</term>
-<listitem><simpara>                 the operation type.
+<listitem><simpara>the operation type.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to combined nodes set or NULL if an error
 occurs.
@@ -348,10 +331,11 @@ occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecNodeSetGetChildren" role="function">
 <title>xmlSecNodeSetGetChildren ()</title>
-<indexterm zone="xmlSecNodeSetGetChildren"><primary sortas="xmlSecNodeSetGetChildren">xmlSecNodeSetGetChildren</primary></indexterm><programlisting><link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link>    xmlSecNodeSetGetChildren            (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                                         const <link linkend="xmlNode">xmlNodePtr</link> parent,
-                                                         <link linkend="int">int</link> withComments,
-                                                         <link linkend="int">int</link> invert);</programlisting>
+<indexterm zone="xmlSecNodeSetGetChildren"><primary>xmlSecNodeSetGetChildren</primary></indexterm>
+<programlisting><link linkend="xmlSecNodeSetPtr"><returnvalue>xmlSecNodeSetPtr</returnvalue></link>    xmlSecNodeSetGetChildren            (<parameter><link linkend="xmlDoc"><type>xmlDocPtr</type></link> doc</parameter>,
+                                                         <parameter>const <link linkend="xmlNode"><type>xmlNodePtr</type></link> parent</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> withComments</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> invert</parameter>);</programlisting>
 <para>
 Creates a new nodes set that contains:
  - if <parameter>withComments</parameter> is not 0 and <parameter>invert</parameter> is 0:
@@ -362,20 +346,19 @@ Creates a new nodes set that contains:
    all nodes in the <parameter>doc</parameter> except nodes in the <parameter>parent</parameter> subtree;
  - if <parameter>withComments</parameter> is 0 and <parameter>invert</parameter> is 0:
    all nodes in the <parameter>doc</parameter> except nodes in the <parameter>parent</parameter> subtree
-   and comment nodes.</para>
-<para>
+   and comment nodes.
 </para><variablelist role="params">
 <varlistentry><term><parameter>doc</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to an XML document.
+<listitem><simpara>the pointer to an XML document.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>parent</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to parent XML node or NULL if we want to include all document nodes.
+<listitem><simpara>the pointer to parent XML node or NULL if we want to include all document nodes.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>withComments</parameter>&#160;:</term>
-<listitem><simpara>       the flag include  comments or not.
+<listitem><simpara>the flag include  comments or not.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>invert</parameter>&#160;:</term>
-<listitem><simpara>             the "invert" flag.
+<listitem><simpara>the "invert" flag.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the newly created <link linkend="xmlSecNodeSet"><type>xmlSecNodeSet</type></link> structure
 or NULL if an error occurs.
@@ -383,63 +366,60 @@ or NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecNodeSetWalk" role="function">
 <title>xmlSecNodeSetWalk ()</title>
-<indexterm zone="xmlSecNodeSetWalk"><primary sortas="xmlSecNodeSetWalk">xmlSecNodeSetWalk</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNodeSetWalk                   (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                                         <link linkend="xmlSecNodeSetWalkCallback">xmlSecNodeSetWalkCallback</link> walkFunc,
-                                                         <link linkend="void">void</link> *data);</programlisting>
+<indexterm zone="xmlSecNodeSetWalk"><primary>xmlSecNodeSetWalk</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNodeSetWalk                   (<parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nset</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSetWalkCallback"><type>xmlSecNodeSetWalkCallback</type></link> walkFunc</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *data</parameter>);</programlisting>
 <para>
 Calls the function <parameter>walkFunc</parameter> once per each node in the nodes set <parameter>nset</parameter>.
 If the <parameter>walkFunc</parameter> returns a negative value, then the walk procedure
-is interrupted.</para>
-<para>
+is interrupted.
 </para><variablelist role="params">
 <varlistentry><term><parameter>nset</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to node set.
+<listitem><simpara>the pointer to node set.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>walkFunc</parameter>&#160;:</term>
-<listitem><simpara>           the callback functions.
+<listitem><simpara>the callback functions.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the application specific data passed to the <parameter>walkFunc</parameter>.
+<listitem><simpara>the application specific data passed to the <parameter>walkFunc</parameter>.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNodeSetDumpTextNodes" role="function">
 <title>xmlSecNodeSetDumpTextNodes ()</title>
-<indexterm zone="xmlSecNodeSetDumpTextNodes"><primary sortas="xmlSecNodeSetDumpTextNodes">xmlSecNodeSetDumpTextNodes</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNodeSetDumpTextNodes          (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                                         <link linkend="xmlOutputBuffer">xmlOutputBufferPtr</link> out);</programlisting>
-<para>
-Dumps content of all the text nodes from <parameter>nset</parameter> to <parameter>out</parameter>.</para>
+<indexterm zone="xmlSecNodeSetDumpTextNodes"><primary>xmlSecNodeSetDumpTextNodes</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNodeSetDumpTextNodes          (<parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nset</parameter>,
+                                                         <parameter><link linkend="xmlOutputBuffer"><type>xmlOutputBufferPtr</type></link> out</parameter>);</programlisting>
 <para>
+Dumps content of all the text nodes from <parameter>nset</parameter> to <parameter>out</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>nset</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to node set.
+<listitem><simpara>the pointer to node set.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>out</parameter>&#160;:</term>
-<listitem><simpara>                the output buffer.
+<listitem><simpara>the output buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNodeSetDebugDump" role="function">
 <title>xmlSecNodeSetDebugDump ()</title>
-<indexterm zone="xmlSecNodeSetDebugDump"><primary sortas="xmlSecNodeSetDebugDump">xmlSecNodeSetDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecNodeSetDebugDump              (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints information about <parameter>nset</parameter> to the <parameter>output</parameter>.</para>
+<indexterm zone="xmlSecNodeSetDebugDump"><primary>xmlSecNodeSetDebugDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecNodeSetDebugDump              (<parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nset</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints information about <parameter>nset</parameter> to the <parameter>output</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>nset</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to node set.
+<listitem><simpara>the pointer to node set.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/nss/app.sgml b/docs/api/sgml/nss/app.sgml
index 13789dc..4617572 100644
--- a/docs/api/sgml/nss/app.sgml
+++ b/docs/api/sgml/nss/app.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-nss-app.top_of_page">app</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC-NSS Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC-NSS Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>app</refname>
 <refpurpose>Application functions implementation for NSS.</refpurpose>
@@ -13,538 +14,528 @@
 <refsynopsisdiv id="xmlsec-nss-app.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="int">int</link>                 <link linkend="xmlSecNssAppInit">xmlSecNssAppInit</link>                    (const <link linkend="char">char</link> *config);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssAppShutdown">xmlSecNssAppShutdown</link>                (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssAppDefaultKeysMngrInit">xmlSecNssAppDefaultKeysMngrInit</link>     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssAppDefaultKeysMngrAdoptKey">xmlSecNssAppDefaultKeysMngrAdoptKey</link> (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssAppDefaultKeysMngrLoad">xmlSecNssAppDefaultKeysMngrLoad</link>     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *uri);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssAppDefaultKeysMngrSave">xmlSecNssAppDefaultKeysMngrSave</link>     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssAppKeysMngrCertLoad">xmlSecNssAppKeysMngrCertLoad</link>        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssAppKeysMngrCertLoadMemory">xmlSecNssAppKeysMngrCertLoadMemory</link>  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssAppKeysMngrCertLoadSECItem">xmlSecNssAppKeysMngrCertLoadSECItem</link> (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="SECItem">SECItem</link> *secItem,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecNssAppKeyLoad">xmlSecNssAppKeyLoad</link>                 (const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecNssAppKeyLoadMemory">xmlSecNssAppKeyLoadMemory</link>           (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecNssAppKeyLoadSECItem">xmlSecNssAppKeyLoadSECItem</link>          (<link linkend="SECItem">SECItem</link> *secItem,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecNssAppPkcs12Load">xmlSecNssAppPkcs12Load</link>              (const <link linkend="char">char</link> *filename,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecNssAppPkcs12LoadMemory">xmlSecNssAppPkcs12LoadMemory</link>        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecNssAppPkcs12LoadSECItem">xmlSecNssAppPkcs12LoadSECItem</link>       (<link linkend="SECItem">SECItem</link> *secItem,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssAppKeyCertLoad">xmlSecNssAppKeyCertLoad</link>             (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssAppKeyCertLoadMemory">xmlSecNssAppKeyCertLoadMemory</link>       (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssAppKeyCertLoadSECItem">xmlSecNssAppKeyCertLoadSECItem</link>      (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="SECItem">SECItem</link> *secItem,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecNssAppKeyFromCertLoadSECItem">xmlSecNssAppKeyFromCertLoadSECItem</link>  (<link linkend="SECItem">SECItem</link> *secItem,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="void">void</link>*               <link linkend="xmlSecNssAppGetDefaultPwdCallback">xmlSecNssAppGetDefaultPwdCallback</link>   (void);
+<synopsis><link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssAppInit">xmlSecNssAppInit</link>                    (<parameter>const <link linkend="char"><type>char</type></link> *config</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssAppShutdown">xmlSecNssAppShutdown</link>                (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssAppDefaultKeysMngrInit">xmlSecNssAppDefaultKeysMngrInit</link>     (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssAppDefaultKeysMngrAdoptKey">xmlSecNssAppDefaultKeysMngrAdoptKey</link> (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssAppDefaultKeysMngrLoad">xmlSecNssAppDefaultKeysMngrLoad</link>     (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *uri</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssAppDefaultKeysMngrSave">xmlSecNssAppDefaultKeysMngrSave</link>     (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssAppKeysMngrCertLoad">xmlSecNssAppKeysMngrCertLoad</link>        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssAppKeysMngrCertLoadMemory">xmlSecNssAppKeysMngrCertLoadMemory</link>  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssAppKeysMngrCertLoadSECItem">xmlSecNssAppKeysMngrCertLoadSECItem</link> (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="SECItem"><type>SECItem</type></link> *secItem</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecNssAppKeyLoad">xmlSecNssAppKeyLoad</link>                 (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecNssAppKeyLoadMemory">xmlSecNssAppKeyLoadMemory</link>           (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecNssAppKeyLoadSECItem">xmlSecNssAppKeyLoadSECItem</link>          (<parameter><link linkend="SECItem"><type>SECItem</type></link> *secItem</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecNssAppPkcs12Load">xmlSecNssAppPkcs12Load</link>              (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecNssAppPkcs12LoadMemory">xmlSecNssAppPkcs12LoadMemory</link>        (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecNssAppPkcs12LoadSECItem">xmlSecNssAppPkcs12LoadSECItem</link>       (<parameter><link linkend="SECItem"><type>SECItem</type></link> *secItem</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssAppKeyCertLoad">xmlSecNssAppKeyCertLoad</link>             (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssAppKeyCertLoadMemory">xmlSecNssAppKeyCertLoadMemory</link>       (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssAppKeyCertLoadSECItem">xmlSecNssAppKeyCertLoadSECItem</link>      (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="SECItem"><type>SECItem</type></link> *secItem</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecNssAppKeyFromCertLoadSECItem">xmlSecNssAppKeyFromCertLoadSECItem</link>  (<parameter><link linkend="SECItem"><type>SECItem</type></link> *secItem</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>*               <link linkend="xmlSecNssAppGetDefaultPwdCallback">xmlSecNssAppGetDefaultPwdCallback</link>   (<parameter><type>void</type></parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-nss-app.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Application functions implementation for NSS.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-nss-app.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecNssAppInit" role="function">
 <title>xmlSecNssAppInit ()</title>
-<indexterm zone="xmlSecNssAppInit"><primary sortas="xmlSecNssAppInit">xmlSecNssAppInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppInit                    (const <link linkend="char">char</link> *config);</programlisting>
+<indexterm zone="xmlSecNssAppInit"><primary>xmlSecNssAppInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssAppInit                    (<parameter>const <link linkend="char"><type>char</type></link> *config</parameter>);</programlisting>
 <para>
 General crypto engine initialization. This function is used
 by XMLSec command line utility and called before
-<parameter>xmlSecInit</parameter> function.</para>
-<para>
+<parameter>xmlSecInit</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>config</parameter>&#160;:</term>
-<listitem><simpara>             the path to NSS database files.
+<listitem><simpara>the path to NSS database files.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssAppShutdown" role="function">
 <title>xmlSecNssAppShutdown ()</title>
-<indexterm zone="xmlSecNssAppShutdown"><primary sortas="xmlSecNssAppShutdown">xmlSecNssAppShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppShutdown                (void);</programlisting>
+<indexterm zone="xmlSecNssAppShutdown"><primary>xmlSecNssAppShutdown</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssAppShutdown                (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after
-<parameter>xmlSecShutdown</parameter> function.</para>
-<para>
+<parameter>xmlSecShutdown</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssAppDefaultKeysMngrInit" role="function">
 <title>xmlSecNssAppDefaultKeysMngrInit ()</title>
-<indexterm zone="xmlSecNssAppDefaultKeysMngrInit"><primary sortas="xmlSecNssAppDefaultKeysMngrInit">xmlSecNssAppDefaultKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppDefaultKeysMngrInit     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
+<indexterm zone="xmlSecNssAppDefaultKeysMngrInit"><primary>xmlSecNssAppDefaultKeysMngrInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssAppDefaultKeysMngrInit     (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);</programlisting>
 <para>
 Initializes <parameter>mngr</parameter> with NSS keys store <link linkend="xmlSecNssKeysStoreId"><type>xmlSecNssKeysStoreId</type></link>
-and a default NSS crypto key data stores.</para>
-<para>
+and a default NSS crypto key data stores.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssAppDefaultKeysMngrAdoptKey" role="function">
 <title>xmlSecNssAppDefaultKeysMngrAdoptKey ()</title>
-<indexterm zone="xmlSecNssAppDefaultKeysMngrAdoptKey"><primary sortas="xmlSecNssAppDefaultKeysMngrAdoptKey">xmlSecNssAppDefaultKeysMngrAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppDefaultKeysMngrAdoptKey (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<indexterm zone="xmlSecNssAppDefaultKeysMngrAdoptKey"><primary>xmlSecNssAppDefaultKeysMngrAdoptKey</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssAppDefaultKeysMngrAdoptKey (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);</programlisting>
 <para>
 Adds <parameter>key</parameter> to the keys manager <parameter>mngr</parameter> created with <link linkend="xmlSecNssAppDefaultKeysMngrInit"><type>xmlSecNssAppDefaultKeysMngrInit</type></link>
-function.</para>
-<para>
+function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssAppDefaultKeysMngrLoad" role="function">
 <title>xmlSecNssAppDefaultKeysMngrLoad ()</title>
-<indexterm zone="xmlSecNssAppDefaultKeysMngrLoad"><primary sortas="xmlSecNssAppDefaultKeysMngrLoad">xmlSecNssAppDefaultKeysMngrLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppDefaultKeysMngrLoad     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *uri);</programlisting>
+<indexterm zone="xmlSecNssAppDefaultKeysMngrLoad"><primary>xmlSecNssAppDefaultKeysMngrLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssAppDefaultKeysMngrLoad     (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *uri</parameter>);</programlisting>
 <para>
 Loads XML keys file from <parameter>uri</parameter> to the keys manager <parameter>mngr</parameter> created
-with <link linkend="xmlSecNssAppDefaultKeysMngrInit"><type>xmlSecNssAppDefaultKeysMngrInit</type></link> function.</para>
-<para>
+with <link linkend="xmlSecNssAppDefaultKeysMngrInit"><type>xmlSecNssAppDefaultKeysMngrInit</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>uri</parameter>&#160;:</term>
-<listitem><simpara>                the uri.
+<listitem><simpara>the uri.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssAppDefaultKeysMngrSave" role="function">
 <title>xmlSecNssAppDefaultKeysMngrSave ()</title>
-<indexterm zone="xmlSecNssAppDefaultKeysMngrSave"><primary sortas="xmlSecNssAppDefaultKeysMngrSave">xmlSecNssAppDefaultKeysMngrSave</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppDefaultKeysMngrSave     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
-<para>
-Saves keys from <parameter>mngr</parameter> to  XML keys file.</para>
+<indexterm zone="xmlSecNssAppDefaultKeysMngrSave"><primary>xmlSecNssAppDefaultKeysMngrSave</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssAppDefaultKeysMngrSave     (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
+Saves keys from <parameter>mngr</parameter> to  XML keys file.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the destination filename.
+<listitem><simpara>the destination filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the type of keys to save (public/private/symmetric).
+<listitem><simpara>the type of keys to save (public/private/symmetric).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssAppKeysMngrCertLoad" role="function">
 <title>xmlSecNssAppKeysMngrCertLoad ()</title>
-<indexterm zone="xmlSecNssAppKeysMngrCertLoad"><primary sortas="xmlSecNssAppKeysMngrCertLoad">xmlSecNssAppKeysMngrCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppKeysMngrCertLoad        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<indexterm zone="xmlSecNssAppKeysMngrCertLoad"><primary>xmlSecNssAppKeysMngrCertLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssAppKeysMngrCertLoad        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
 Reads cert from <parameter>filename</parameter> and adds to the list of trusted or known
-untrusted certs in <parameter>store</parameter></para>
-<para>
+untrusted certs in <parameter>store</parameter>
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the certificate file.
+<listitem><simpara>the certificate file.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format (PEM or DER).
+<listitem><simpara>the certificate file format (PEM or DER).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the certificate type (trusted/untrusted).
+<listitem><simpara>the certificate type (trusted/untrusted).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssAppKeysMngrCertLoadMemory" role="function">
 <title>xmlSecNssAppKeysMngrCertLoadMemory ()</title>
-<indexterm zone="xmlSecNssAppKeysMngrCertLoadMemory"><primary sortas="xmlSecNssAppKeysMngrCertLoadMemory">xmlSecNssAppKeysMngrCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppKeysMngrCertLoadMemory  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<indexterm zone="xmlSecNssAppKeysMngrCertLoadMemory"><primary>xmlSecNssAppKeysMngrCertLoadMemory</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssAppKeysMngrCertLoadMemory  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
 Reads cert from <parameter>data</parameter> and adds to the list of trusted or known
-untrusted certs in <parameter>store</parameter></para>
-<para>
+untrusted certs in <parameter>store</parameter>
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the key binary data.
+<listitem><simpara>the key binary data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the key binary data size.
+<listitem><simpara>the key binary data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate format (PEM or DER).
+<listitem><simpara>the certificate format (PEM or DER).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the certificate type (trusted/untrusted).
+<listitem><simpara>the certificate type (trusted/untrusted).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssAppKeysMngrCertLoadSECItem" role="function">
 <title>xmlSecNssAppKeysMngrCertLoadSECItem ()</title>
-<indexterm zone="xmlSecNssAppKeysMngrCertLoadSECItem"><primary sortas="xmlSecNssAppKeysMngrCertLoadSECItem">xmlSecNssAppKeysMngrCertLoadSECItem</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppKeysMngrCertLoadSECItem (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="SECItem">SECItem</link> *secItem,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<indexterm zone="xmlSecNssAppKeysMngrCertLoadSECItem"><primary>xmlSecNssAppKeysMngrCertLoadSECItem</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssAppKeysMngrCertLoadSECItem (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="SECItem"><type>SECItem</type></link> *secItem</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
 Reads cert from <parameter>secItem</parameter> and adds to the list of trusted or known
-untrusted certs in <parameter>store</parameter></para>
-<para>
+untrusted certs in <parameter>store</parameter>
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>secItem</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to SECItem.
+<listitem><simpara>the pointer to SECItem.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate format (PEM or DER).
+<listitem><simpara>the certificate format (PEM or DER).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the certificate type (trusted/untrusted).
+<listitem><simpara>the certificate type (trusted/untrusted).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssAppKeyLoad" role="function">
 <title>xmlSecNssAppKeyLoad ()</title>
-<indexterm zone="xmlSecNssAppKeyLoad"><primary sortas="xmlSecNssAppKeyLoad">xmlSecNssAppKeyLoad</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecNssAppKeyLoad                 (const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
-<para>
-Reads key from a file</para>
-<para>
+<indexterm zone="xmlSecNssAppKeyLoad"><primary>xmlSecNssAppKeyLoad</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecNssAppKeyLoad                 (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
+<para>
+Reads key from a file
 </para><variablelist role="params">
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the key filename.
+<listitem><simpara>the key filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the key file format.
+<listitem><simpara>the key file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the key file password.
+<listitem><simpara>the key file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the key password callback.
+<listitem><simpara>the key password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssAppKeyLoadMemory" role="function">
 <title>xmlSecNssAppKeyLoadMemory ()</title>
-<indexterm zone="xmlSecNssAppKeyLoadMemory"><primary sortas="xmlSecNssAppKeyLoadMemory">xmlSecNssAppKeyLoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecNssAppKeyLoadMemory           (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
-<para>
-Reads key from a binary <parameter>data</parameter>.</para>
-<para>
+<indexterm zone="xmlSecNssAppKeyLoadMemory"><primary>xmlSecNssAppKeyLoadMemory</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecNssAppKeyLoadMemory           (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
+<para>
+Reads key from a binary <parameter>data</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the key binary data.
+<listitem><simpara>the key binary data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the key binary data size.
+<listitem><simpara>the key binary data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the key data format.
+<listitem><simpara>the key data format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the key data2 password.
+<listitem><simpara>the key data2 password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the key password callback.
+<listitem><simpara>the key password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssAppKeyLoadSECItem" role="function">
 <title>xmlSecNssAppKeyLoadSECItem ()</title>
-<indexterm zone="xmlSecNssAppKeyLoadSECItem"><primary sortas="xmlSecNssAppKeyLoadSECItem">xmlSecNssAppKeyLoadSECItem</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecNssAppKeyLoadSECItem          (<link linkend="SECItem">SECItem</link> *secItem,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
-<para>
-Reads key from a file</para>
-<para>
+<indexterm zone="xmlSecNssAppKeyLoadSECItem"><primary>xmlSecNssAppKeyLoadSECItem</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecNssAppKeyLoadSECItem          (<parameter><link linkend="SECItem"><type>SECItem</type></link> *secItem</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
+<para>
+Reads key from a file
 </para><variablelist role="params">
 <varlistentry><term><parameter>secItem</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to sec item.
+<listitem><simpara>the pointer to sec item.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the key format.
+<listitem><simpara>the key format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the key password.
+<listitem><simpara>the key password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the key password callback.
+<listitem><simpara>the key password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssAppPkcs12Load" role="function">
 <title>xmlSecNssAppPkcs12Load ()</title>
-<indexterm zone="xmlSecNssAppPkcs12Load"><primary sortas="xmlSecNssAppPkcs12Load">xmlSecNssAppPkcs12Load</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecNssAppPkcs12Load              (const <link linkend="char">char</link> *filename,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<indexterm zone="xmlSecNssAppPkcs12Load"><primary>xmlSecNssAppPkcs12Load</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecNssAppPkcs12Load              (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 file.
 For uniformity, call xmlSecNssAppKeyLoad instead of this function. Pass
-in format=xmlSecKeyDataFormatPkcs12.</para>
-<para>
+in format=xmlSecKeyDataFormatPkcs12.
 </para><variablelist role="params">
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the PKCS12 key filename.
+<listitem><simpara>the PKCS12 key filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the PKCS12 file password.
+<listitem><simpara>the PKCS12 file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the password callback.
+<listitem><simpara>the password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssAppPkcs12LoadMemory" role="function">
 <title>xmlSecNssAppPkcs12LoadMemory ()</title>
-<indexterm zone="xmlSecNssAppPkcs12LoadMemory"><primary sortas="xmlSecNssAppPkcs12LoadMemory">xmlSecNssAppPkcs12LoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecNssAppPkcs12LoadMemory        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<indexterm zone="xmlSecNssAppPkcs12LoadMemory"><primary>xmlSecNssAppPkcs12LoadMemory</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecNssAppPkcs12LoadMemory        (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 binary data.
 For uniformity, call xmlSecNssAppKeyLoad instead of this function. Pass
-in format=xmlSecKeyDataFormatPkcs12.</para>
-<para>
+in format=xmlSecKeyDataFormatPkcs12.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the key binary data.
+<listitem><simpara>the key binary data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the key binary data size.
+<listitem><simpara>the key binary data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the PKCS12 password.
+<listitem><simpara>the PKCS12 password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the password callback.
+<listitem><simpara>the password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssAppPkcs12LoadSECItem" role="function">
 <title>xmlSecNssAppPkcs12LoadSECItem ()</title>
-<indexterm zone="xmlSecNssAppPkcs12LoadSECItem"><primary sortas="xmlSecNssAppPkcs12LoadSECItem">xmlSecNssAppPkcs12LoadSECItem</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecNssAppPkcs12LoadSECItem       (<link linkend="SECItem">SECItem</link> *secItem,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<indexterm zone="xmlSecNssAppPkcs12LoadSECItem"><primary>xmlSecNssAppPkcs12LoadSECItem</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecNssAppPkcs12LoadSECItem       (<parameter><link linkend="SECItem"><type>SECItem</type></link> *secItem</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 SECItem.
 For uniformity, call xmlSecNssAppKeyLoad instead of this function. Pass
-in format=xmlSecKeyDataFormatPkcs12.</para>
-<para>
+in format=xmlSecKeyDataFormatPkcs12.
 </para><variablelist role="params">
 <varlistentry><term><parameter>secItem</parameter>&#160;:</term>
-<listitem><simpara>            the <parameter>SECItem</parameter> object.
+<listitem><simpara>the <parameter>SECItem</parameter> object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the PKCS12 file password.
+<listitem><simpara>the PKCS12 file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the password callback.
+<listitem><simpara>the password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssAppKeyCertLoad" role="function">
 <title>xmlSecNssAppKeyCertLoad ()</title>
-<indexterm zone="xmlSecNssAppKeyCertLoad"><primary sortas="xmlSecNssAppKeyCertLoad">xmlSecNssAppKeyCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppKeyCertLoad             (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
-<para>
-Reads the certificate from $<parameter>filename</parameter> and adds it to key</para>
+<indexterm zone="xmlSecNssAppKeyCertLoad"><primary>xmlSecNssAppKeyCertLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssAppKeyCertLoad             (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);</programlisting>
 <para>
+Reads the certificate from $<parameter>filename</parameter> and adds it to key
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the certificate filename.
+<listitem><simpara>the certificate filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssAppKeyCertLoadMemory" role="function">
 <title>xmlSecNssAppKeyCertLoadMemory ()</title>
-<indexterm zone="xmlSecNssAppKeyCertLoadMemory"><primary sortas="xmlSecNssAppKeyCertLoadMemory">xmlSecNssAppKeyCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppKeyCertLoadMemory       (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
-<para>
-Reads the certificate from <parameter>data</parameter> and adds it to key</para>
+<indexterm zone="xmlSecNssAppKeyCertLoadMemory"><primary>xmlSecNssAppKeyCertLoadMemory</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssAppKeyCertLoadMemory       (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);</programlisting>
 <para>
+Reads the certificate from <parameter>data</parameter> and adds it to key
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the key binary data.
+<listitem><simpara>the key binary data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the key binary data size.
+<listitem><simpara>the key binary data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate format.
+<listitem><simpara>the certificate format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssAppKeyCertLoadSECItem" role="function">
 <title>xmlSecNssAppKeyCertLoadSECItem ()</title>
-<indexterm zone="xmlSecNssAppKeyCertLoadSECItem"><primary sortas="xmlSecNssAppKeyCertLoadSECItem">xmlSecNssAppKeyCertLoadSECItem</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppKeyCertLoadSECItem      (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="SECItem">SECItem</link> *secItem,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
-<para>
-Reads the certificate from <parameter>secItem</parameter> and adds it to key</para>
+<indexterm zone="xmlSecNssAppKeyCertLoadSECItem"><primary>xmlSecNssAppKeyCertLoadSECItem</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssAppKeyCertLoadSECItem      (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="SECItem"><type>SECItem</type></link> *secItem</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);</programlisting>
 <para>
+Reads the certificate from <parameter>secItem</parameter> and adds it to key
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>secItem</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to SECItem.
+<listitem><simpara>the pointer to SECItem.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate format.
+<listitem><simpara>the certificate format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssAppKeyFromCertLoadSECItem" role="function">
 <title>xmlSecNssAppKeyFromCertLoadSECItem ()</title>
-<indexterm zone="xmlSecNssAppKeyFromCertLoadSECItem"><primary sortas="xmlSecNssAppKeyFromCertLoadSECItem">xmlSecNssAppKeyFromCertLoadSECItem</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecNssAppKeyFromCertLoadSECItem  (<link linkend="SECItem">SECItem</link> *secItem,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
-<para>
-Loads public key from cert.</para>
+<indexterm zone="xmlSecNssAppKeyFromCertLoadSECItem"><primary>xmlSecNssAppKeyFromCertLoadSECItem</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecNssAppKeyFromCertLoadSECItem  (<parameter><link linkend="SECItem"><type>SECItem</type></link> *secItem</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);</programlisting>
 <para>
+Loads public key from cert.
 </para><variablelist role="params">
 <varlistentry><term><parameter>secItem</parameter>&#160;:</term>
-<listitem><simpara>            the <parameter>SECItem</parameter> object.
+<listitem><simpara>the <parameter>SECItem</parameter> object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the cert format.
+<listitem><simpara>the cert format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssAppGetDefaultPwdCallback" role="function">
 <title>xmlSecNssAppGetDefaultPwdCallback ()</title>
-<indexterm zone="xmlSecNssAppGetDefaultPwdCallback"><primary sortas="xmlSecNssAppGetDefaultPwdCallback">xmlSecNssAppGetDefaultPwdCallback</primary></indexterm><programlisting><link linkend="void">void</link>*               xmlSecNssAppGetDefaultPwdCallback   (void);</programlisting>
-<para>
-Gets default password callback.</para>
+<indexterm zone="xmlSecNssAppGetDefaultPwdCallback"><primary>xmlSecNssAppGetDefaultPwdCallback</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>*               xmlSecNssAppGetDefaultPwdCallback   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets default password callback.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> default password callback.
 </simpara></listitem></varlistentry>
@@ -552,7 +543,4 @@ Gets default password callback.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/nss/bignum.sgml b/docs/api/sgml/nss/bignum.sgml
index 7ee8f6c..d49fd4d 100644
--- a/docs/api/sgml/nss/bignum.sgml
+++ b/docs/api/sgml/nss/bignum.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-nss-bignum.top_of_page">bignum</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC-NSS Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC-NSS Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>bignum</refname>
 <refpurpose>Big numbers helper functions.</refpurpose>
@@ -13,53 +14,43 @@
 <refsynopsisdiv id="xmlsec-nss-bignum.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="SECItem">SECItem</link>*            <link linkend="xmlSecNssNodeGetBigNumValue">xmlSecNssNodeGetBigNumValue</link>         (<link linkend="PRArenaPool">PRArenaPool</link> *arena,
-                                                         const <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         <link linkend="SECItem">SECItem</link> *a);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssNodeSetBigNumValue">xmlSecNssNodeSetBigNumValue</link>         (<link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         const <link linkend="SECItem">SECItem</link> *a,
-                                                         <link linkend="int">int</link> addLineBreaks);
+<synopsis><link linkend="SECItem"><returnvalue>SECItem</returnvalue></link>*            <link linkend="xmlSecNssNodeGetBigNumValue">xmlSecNssNodeGetBigNumValue</link>         (<parameter><link linkend="PRArenaPool"><type>PRArenaPool</type></link> *arena</parameter>,
+                                                         <parameter>const <link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter><link linkend="SECItem"><type>SECItem</type></link> *a</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssNodeSetBigNumValue">xmlSecNssNodeSetBigNumValue</link>         (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter>const <link linkend="SECItem"><type>SECItem</type></link> *a</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> addLineBreaks</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-nss-bignum.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Big numbers helper functions.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-nss-bignum.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecNssNodeGetBigNumValue" role="function">
 <title>xmlSecNssNodeGetBigNumValue ()</title>
-<indexterm zone="xmlSecNssNodeGetBigNumValue"><primary sortas="xmlSecNssNodeGetBigNumValue">xmlSecNssNodeGetBigNumValue</primary></indexterm><programlisting><link linkend="SECItem">SECItem</link>*            xmlSecNssNodeGetBigNumValue         (<link linkend="PRArenaPool">PRArenaPool</link> *arena,
-                                                         const <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         <link linkend="SECItem">SECItem</link> *a);</programlisting>
+<indexterm zone="xmlSecNssNodeGetBigNumValue"><primary>xmlSecNssNodeGetBigNumValue</primary></indexterm>
+<programlisting><link linkend="SECItem"><returnvalue>SECItem</returnvalue></link>*            xmlSecNssNodeGetBigNumValue         (<parameter><link linkend="PRArenaPool"><type>PRArenaPool</type></link> *arena</parameter>,
+                                                         <parameter>const <link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter><link linkend="SECItem"><type>SECItem</type></link> *a</parameter>);</programlisting>
 <para>
 Converts the node content from CryptoBinary format
 (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-CryptoBinary"><type>sec-CryptoBinary</type></link>)
 to a SECItem. If no SECItem object provided then a new
-one is created (caller is responsible for freeing it).</para>
-<para>
+one is created (caller is responsible for freeing it).
 </para><variablelist role="params">
 <varlistentry><term><parameter>arena</parameter>&#160;:</term>
-<listitem><simpara> the arena from which to allocate memory
+<listitem><simpara>the arena from which to allocate memory
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>cur</parameter>&#160;:</term>
-<listitem><simpara> the poitner to an XML node.
+<listitem><simpara>the poitner to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>a</parameter>&#160;:</term>
-<listitem><simpara> a SECItem object to hold the BigNum value
+<listitem><simpara>a SECItem object to hold the BigNum value
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a pointer to SECItem produced from CryptoBinary string
 or NULL if an error occurs.
@@ -67,25 +58,25 @@ or NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssNodeSetBigNumValue" role="function">
 <title>xmlSecNssNodeSetBigNumValue ()</title>
-<indexterm zone="xmlSecNssNodeSetBigNumValue"><primary sortas="xmlSecNssNodeSetBigNumValue">xmlSecNssNodeSetBigNumValue</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssNodeSetBigNumValue         (<link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         const <link linkend="SECItem">SECItem</link> *a,
-                                                         <link linkend="int">int</link> addLineBreaks);</programlisting>
+<indexterm zone="xmlSecNssNodeSetBigNumValue"><primary>xmlSecNssNodeSetBigNumValue</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssNodeSetBigNumValue         (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter>const <link linkend="SECItem"><type>SECItem</type></link> *a</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> addLineBreaks</parameter>);</programlisting>
 <para>
 Converts SECItem to CryptoBinary string
 (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-CryptoBinary"><type>sec-CryptoBinary</type></link>)
 and sets it as the content of the given node. If the
 addLineBreaks is set then line breaks are added
-before and after the CryptoBinary string.</para>
-<para>
+before and after the CryptoBinary string.
 </para><variablelist role="params">
 <varlistentry><term><parameter>cur</parameter>&#160;:</term>
-<listitem><simpara> the pointer to an XML node.
+<listitem><simpara>the pointer to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>a</parameter>&#160;:</term>
-<listitem><simpara> a SECItem containing the BigNum value.
+<listitem><simpara>a SECItem containing the BigNum value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>addLineBreaks</parameter>&#160;:</term>
-<listitem><simpara> if the flag is equal to 1 then
+<listitem><simpara>if the flag is equal to 1 then
              linebreaks will be added before and after
              new buffer content.
 </simpara></listitem></varlistentry>
@@ -95,7 +86,4 @@ before and after the CryptoBinary string.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/nss/crypto.sgml b/docs/api/sgml/nss/crypto.sgml
index 801e7e5..3b6a38d 100644
--- a/docs/api/sgml/nss/crypto.sgml
+++ b/docs/api/sgml/nss/crypto.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-nss-crypto.top_of_page">crypto</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC-NSS Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC-NSS Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>crypto</refname>
 <refpurpose>Crypto transforms implementation for NSS.</refpurpose>
@@ -13,855 +14,845 @@
 <refsynopsisdiv id="xmlsec-nss-crypto.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  <link linkend="xmlSecCryptoGetFunctions-nss">xmlSecCryptoGetFunctions_nss</link>
-                                                        (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssInit">xmlSecNssInit</link>                       (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssShutdown">xmlSecNssShutdown</link>                   (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssKeysMngrInit">xmlSecNssKeysMngrInit</link>               (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssGenerateRandom">xmlSecNssGenerateRandom</link>             (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="void">void</link>                <link linkend="xmlSecNssErrorsDefaultCallback">xmlSecNssErrorsDefaultCallback</link>      (const <link linkend="char">char</link> *file,
-                                                         <link linkend="int">int</link> line,
-                                                         const <link linkend="char">char</link> *func,
-                                                         const <link linkend="char">char</link> *errorObject,
-                                                         const <link linkend="char">char</link> *errorSubject,
-                                                         <link linkend="int">int</link> reason,
-                                                         const <link linkend="char">char</link> *msg);
-<link linkend="PK11SlotInfo">PK11SlotInfo</link> *      <link linkend="xmlSecNssGetInternalKeySlot">xmlSecNssGetInternalKeySlot</link>         (void);
+<synopsis><link linkend="xmlSecCryptoDLFunctions"><returnvalue>xmlSecCryptoDLFunctionsPtr</returnvalue></link>  <link linkend="xmlSecCryptoGetFunctions-nss">xmlSecCryptoGetFunctions_nss</link>
+                                                        (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssInit">xmlSecNssInit</link>                       (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssShutdown">xmlSecNssShutdown</link>                   (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssKeysMngrInit">xmlSecNssKeysMngrInit</link>               (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssGenerateRandom">xmlSecNssGenerateRandom</link>             (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buffer</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecNssErrorsDefaultCallback">xmlSecNssErrorsDefaultCallback</link>      (<parameter>const <link linkend="char"><type>char</type></link> *file</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> line</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *func</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorObject</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorSubject</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> reason</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *msg</parameter>);
+<link linkend="PK11SlotInfo"><returnvalue>PK11SlotInfo</returnvalue></link> *      <link linkend="xmlSecNssGetInternalKeySlot">xmlSecNssGetInternalKeySlot</link>         (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssKeyDataAesId">xmlSecNssKeyDataAesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecNssKeyDataAesGetKlass">xmlSecNssKeyDataAesGetKlass</link>         (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssKeyDataAesSet">xmlSecNssKeyDataAesSet</link>              (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecNssKeyDataAesGetKlass">xmlSecNssKeyDataAesGetKlass</link>         (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssKeyDataAesSet">xmlSecNssKeyDataAesSet</link>              (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);
 #define             <link linkend="xmlSecNssTransformAes128CbcId">xmlSecNssTransformAes128CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformAes128CbcGetKlass">xmlSecNssTransformAes128CbcGetKlass</link> (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformAes128CbcGetKlass">xmlSecNssTransformAes128CbcGetKlass</link> (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformAes192CbcId">xmlSecNssTransformAes192CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformAes192CbcGetKlass">xmlSecNssTransformAes192CbcGetKlass</link> (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformAes192CbcGetKlass">xmlSecNssTransformAes192CbcGetKlass</link> (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformAes256CbcId">xmlSecNssTransformAes256CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformAes256CbcGetKlass">xmlSecNssTransformAes256CbcGetKlass</link> (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformAes256CbcGetKlass">xmlSecNssTransformAes256CbcGetKlass</link> (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformKWAes128Id">xmlSecNssTransformKWAes128Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformKWAes128GetKlass">xmlSecNssTransformKWAes128GetKlass</link>  (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformKWAes128GetKlass">xmlSecNssTransformKWAes128GetKlass</link>  (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformKWAes192Id">xmlSecNssTransformKWAes192Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformKWAes192GetKlass">xmlSecNssTransformKWAes192GetKlass</link>  (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformKWAes192GetKlass">xmlSecNssTransformKWAes192GetKlass</link>  (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformKWAes256Id">xmlSecNssTransformKWAes256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformKWAes256GetKlass">xmlSecNssTransformKWAes256GetKlass</link>  (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformKWAes256GetKlass">xmlSecNssTransformKWAes256GetKlass</link>  (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssKeyDataDesId">xmlSecNssKeyDataDesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecNssKeyDataDesGetKlass">xmlSecNssKeyDataDesGetKlass</link>         (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssKeyDataDesSet">xmlSecNssKeyDataDesSet</link>              (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecNssKeyDataDesGetKlass">xmlSecNssKeyDataDesGetKlass</link>         (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssKeyDataDesSet">xmlSecNssKeyDataDesSet</link>              (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);
 #define             <link linkend="xmlSecNssTransformDes3CbcId">xmlSecNssTransformDes3CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformDes3CbcGetKlass">xmlSecNssTransformDes3CbcGetKlass</link>   (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformDes3CbcGetKlass">xmlSecNssTransformDes3CbcGetKlass</link>   (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformKWDes3Id">xmlSecNssTransformKWDes3Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformKWDes3GetKlass">xmlSecNssTransformKWDes3GetKlass</link>    (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformKWDes3GetKlass">xmlSecNssTransformKWDes3GetKlass</link>    (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssKeyDataDsaId">xmlSecNssKeyDataDsaId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecNssKeyDataDsaGetKlass">xmlSecNssKeyDataDsaGetKlass</link>         (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecNssKeyDataDsaGetKlass">xmlSecNssKeyDataDsaGetKlass</link>         (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformDsaSha1Id">xmlSecNssTransformDsaSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformDsaSha1GetKlass">xmlSecNssTransformDsaSha1GetKlass</link>   (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssHmacGetMinOutputLength">xmlSecNssHmacGetMinOutputLength</link>     (void);
-<link linkend="void">void</link>                <link linkend="xmlSecNssHmacSetMinOutputLength">xmlSecNssHmacSetMinOutputLength</link>     (<link linkend="int">int</link> min_length);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformDsaSha1GetKlass">xmlSecNssTransformDsaSha1GetKlass</link>   (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssHmacGetMinOutputLength">xmlSecNssHmacGetMinOutputLength</link>     (<parameter><type>void</type></parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecNssHmacSetMinOutputLength">xmlSecNssHmacSetMinOutputLength</link>     (<parameter><link linkend="int"><type>int</type></link> min_length</parameter>);
 #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);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecNssKeyDataHmacGetKlass">xmlSecNssKeyDataHmacGetKlass</link>        (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssKeyDataHmacSet">xmlSecNssKeyDataHmacSet</link>             (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);
 #define             <link linkend="xmlSecNssTransformHmacMd5Id">xmlSecNssTransformHmacMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformHmacMd5GetKlass">xmlSecNssTransformHmacMd5GetKlass</link>   (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformHmacMd5GetKlass">xmlSecNssTransformHmacMd5GetKlass</link>   (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformHmacRipemd160Id">xmlSecNssTransformHmacRipemd160Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformHmacRipemd160GetKlass">xmlSecNssTransformHmacRipemd160GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformHmacRipemd160GetKlass">xmlSecNssTransformHmacRipemd160GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformHmacSha1Id">xmlSecNssTransformHmacSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformHmacSha1GetKlass">xmlSecNssTransformHmacSha1GetKlass</link>  (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformHmacSha1GetKlass">xmlSecNssTransformHmacSha1GetKlass</link>  (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformHmacSha256Id">xmlSecNssTransformHmacSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformHmacSha256GetKlass">xmlSecNssTransformHmacSha256GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformHmacSha256GetKlass">xmlSecNssTransformHmacSha256GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformHmacSha384Id">xmlSecNssTransformHmacSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformHmacSha384GetKlass">xmlSecNssTransformHmacSha384GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformHmacSha384GetKlass">xmlSecNssTransformHmacSha384GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformHmacSha512Id">xmlSecNssTransformHmacSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformHmacSha512GetKlass">xmlSecNssTransformHmacSha512GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformHmacSha512GetKlass">xmlSecNssTransformHmacSha512GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssKeyDataRsaId">xmlSecNssKeyDataRsaId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecNssKeyDataRsaGetKlass">xmlSecNssKeyDataRsaGetKlass</link>         (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecNssKeyDataRsaGetKlass">xmlSecNssKeyDataRsaGetKlass</link>         (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformRsaMd5Id">xmlSecNssTransformRsaMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformRsaMd5GetKlass">xmlSecNssTransformRsaMd5GetKlass</link>    (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformRsaMd5GetKlass">xmlSecNssTransformRsaMd5GetKlass</link>    (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformRsaSha1Id">xmlSecNssTransformRsaSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformRsaSha1GetKlass">xmlSecNssTransformRsaSha1GetKlass</link>   (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformRsaSha1GetKlass">xmlSecNssTransformRsaSha1GetKlass</link>   (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformRsaSha256Id">xmlSecNssTransformRsaSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformRsaSha256GetKlass">xmlSecNssTransformRsaSha256GetKlass</link> (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformRsaSha256GetKlass">xmlSecNssTransformRsaSha256GetKlass</link> (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformRsaSha384Id">xmlSecNssTransformRsaSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformRsaSha384GetKlass">xmlSecNssTransformRsaSha384GetKlass</link> (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformRsaSha384GetKlass">xmlSecNssTransformRsaSha384GetKlass</link> (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformRsaSha512Id">xmlSecNssTransformRsaSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformRsaSha512GetKlass">xmlSecNssTransformRsaSha512GetKlass</link> (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformRsaSha512GetKlass">xmlSecNssTransformRsaSha512GetKlass</link> (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformRsaPkcs1Id">xmlSecNssTransformRsaPkcs1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformRsaPkcs1GetKlass">xmlSecNssTransformRsaPkcs1GetKlass</link>  (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformRsaPkcs1GetKlass">xmlSecNssTransformRsaPkcs1GetKlass</link>  (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformRsaOaepId">xmlSecNssTransformRsaOaepId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformRsaOaepGetKlass">xmlSecNssTransformRsaOaepGetKlass</link>   (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformRsaOaepGetKlass">xmlSecNssTransformRsaOaepGetKlass</link>   (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformSha1Id">xmlSecNssTransformSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformSha1GetKlass">xmlSecNssTransformSha1GetKlass</link>      (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformSha1GetKlass">xmlSecNssTransformSha1GetKlass</link>      (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformSha256Id">xmlSecNssTransformSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformSha256GetKlass">xmlSecNssTransformSha256GetKlass</link>    (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformSha256GetKlass">xmlSecNssTransformSha256GetKlass</link>    (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformSha384Id">xmlSecNssTransformSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformSha384GetKlass">xmlSecNssTransformSha384GetKlass</link>    (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformSha384GetKlass">xmlSecNssTransformSha384GetKlass</link>    (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformSha512Id">xmlSecNssTransformSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformSha512GetKlass">xmlSecNssTransformSha512GetKlass</link>    (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformSha512GetKlass">xmlSecNssTransformSha512GetKlass</link>    (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssTransformMd5Id">xmlSecNssTransformMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformMd5GetKlass">xmlSecNssTransformMd5GetKlass</link>       (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecNssTransformMd5GetKlass">xmlSecNssTransformMd5GetKlass</link>       (<parameter><type>void</type></parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-nss-crypto.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Crypto transforms implementation for NSS.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-nss-crypto.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecCryptoGetFunctions-nss" role="function">
 <title>xmlSecCryptoGetFunctions_nss ()</title>
-<indexterm zone="xmlSecCryptoGetFunctions-nss"><primary sortas="xmlSecCryptoGetFunctions_nss">xmlSecCryptoGetFunctions_nss</primary></indexterm><programlisting><link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  xmlSecCryptoGetFunctions_nss
-                                                        (void);</programlisting>
-<para>
-Gets the pointer to xmlsec-nss functions table.</para>
+<indexterm zone="xmlSecCryptoGetFunctions-nss"><primary>xmlSecCryptoGetFunctions_nss</primary></indexterm>
+<programlisting><link linkend="xmlSecCryptoDLFunctions"><returnvalue>xmlSecCryptoDLFunctionsPtr</returnvalue></link>  xmlSecCryptoGetFunctions_nss
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets the pointer to xmlsec-nss functions table.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the xmlsec-nss functions table or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssInit" role="function">
 <title>xmlSecNssInit ()</title>
-<indexterm zone="xmlSecNssInit"><primary sortas="xmlSecNssInit">xmlSecNssInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssInit                       (void);</programlisting>
-<para>
-XMLSec library specific crypto engine initialization.</para>
+<indexterm zone="xmlSecNssInit"><primary>xmlSecNssInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssInit                       (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+XMLSec library specific crypto engine initialization.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssShutdown" role="function">
 <title>xmlSecNssShutdown ()</title>
-<indexterm zone="xmlSecNssShutdown"><primary sortas="xmlSecNssShutdown">xmlSecNssShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssShutdown                   (void);</programlisting>
-<para>
-XMLSec library specific crypto engine shutdown.</para>
+<indexterm zone="xmlSecNssShutdown"><primary>xmlSecNssShutdown</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssShutdown                   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+XMLSec library specific crypto engine shutdown.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeysMngrInit" role="function">
 <title>xmlSecNssKeysMngrInit ()</title>
-<indexterm zone="xmlSecNssKeysMngrInit"><primary sortas="xmlSecNssKeysMngrInit">xmlSecNssKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssKeysMngrInit               (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
-<para>
-Adds NSS specific key data stores in keys manager.</para>
+<indexterm zone="xmlSecNssKeysMngrInit"><primary>xmlSecNssKeysMngrInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssKeysMngrInit               (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);</programlisting>
 <para>
+Adds NSS specific key data stores in keys manager.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssGenerateRandom" role="function">
 <title>xmlSecNssGenerateRandom ()</title>
-<indexterm zone="xmlSecNssGenerateRandom"><primary sortas="xmlSecNssGenerateRandom">xmlSecNssGenerateRandom</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssGenerateRandom             (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
-<para>
-Generates <parameter>size</parameter> random bytes and puts result in <parameter>buffer</parameter>.</para>
+<indexterm zone="xmlSecNssGenerateRandom"><primary>xmlSecNssGenerateRandom</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssGenerateRandom             (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buffer</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);</programlisting>
 <para>
+Generates <parameter>size</parameter> random bytes and puts result in <parameter>buffer</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buffer</parameter>&#160;:</term>
-<listitem><simpara>             the destination buffer.
+<listitem><simpara>the destination buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the numer of bytes to generate.
+<listitem><simpara>the numer of bytes to generate.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssErrorsDefaultCallback" role="function">
 <title>xmlSecNssErrorsDefaultCallback ()</title>
-<indexterm zone="xmlSecNssErrorsDefaultCallback"><primary sortas="xmlSecNssErrorsDefaultCallback">xmlSecNssErrorsDefaultCallback</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecNssErrorsDefaultCallback      (const <link linkend="char">char</link> *file,
-                                                         <link linkend="int">int</link> line,
-                                                         const <link linkend="char">char</link> *func,
-                                                         const <link linkend="char">char</link> *errorObject,
-                                                         const <link linkend="char">char</link> *errorSubject,
-                                                         <link linkend="int">int</link> reason,
-                                                         const <link linkend="char">char</link> *msg);</programlisting>
-<para>
-The default errors reporting callback function.</para>
+<indexterm zone="xmlSecNssErrorsDefaultCallback"><primary>xmlSecNssErrorsDefaultCallback</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecNssErrorsDefaultCallback      (<parameter>const <link linkend="char"><type>char</type></link> *file</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> line</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *func</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorObject</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorSubject</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> reason</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *msg</parameter>);</programlisting>
 <para>
+The default errors reporting callback function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>file</parameter>&#160;:</term>
-<listitem><simpara>               the error location file name (__FILE__ macro).
+<listitem><simpara>the error location file name (__FILE__ macro).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>line</parameter>&#160;:</term>
-<listitem><simpara>               the error location line number (__LINE__ macro).
+<listitem><simpara>the error location line number (__LINE__ macro).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>func</parameter>&#160;:</term>
-<listitem><simpara>               the error location function name (__FUNCTION__ macro).
+<listitem><simpara>the error location function name (__FUNCTION__ macro).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>errorObject</parameter>&#160;:</term>
-<listitem><simpara>        the error specific error object
+<listitem><simpara>the error specific error object
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>errorSubject</parameter>&#160;:</term>
-<listitem><simpara>       the error specific error subject.
+<listitem><simpara>the error specific error subject.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>reason</parameter>&#160;:</term>
-<listitem><simpara>             the error code.
+<listitem><simpara>the error code.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>msg</parameter>&#160;:</term>
-<listitem><simpara>                the additional error message.
+<listitem><simpara>the additional error message.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssGetInternalKeySlot" role="function">
 <title>xmlSecNssGetInternalKeySlot ()</title>
-<indexterm zone="xmlSecNssGetInternalKeySlot"><primary sortas="xmlSecNssGetInternalKeySlot">xmlSecNssGetInternalKeySlot</primary></indexterm><programlisting><link linkend="PK11SlotInfo">PK11SlotInfo</link> *      xmlSecNssGetInternalKeySlot         (void);</programlisting>
-<para>
-Gets internal NSS key slot.</para>
+<indexterm zone="xmlSecNssGetInternalKeySlot"><primary>xmlSecNssGetInternalKeySlot</primary></indexterm>
+<programlisting><link linkend="PK11SlotInfo"><returnvalue>PK11SlotInfo</returnvalue></link> *      xmlSecNssGetInternalKeySlot         (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets internal NSS key slot.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> internal key slot and initializes it if needed.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeyDataAesId" role="macro">
 <title>xmlSecNssKeyDataAesId</title>
-<indexterm zone="xmlSecNssKeyDataAesId"><primary sortas="xmlSecNssKeyDataAesId">xmlSecNssKeyDataAesId</primary></indexterm><programlisting>#define             xmlSecNssKeyDataAesId</programlisting>
-<para>
-The AES key data klass.</para>
+<indexterm zone="xmlSecNssKeyDataAesId"><primary>xmlSecNssKeyDataAesId</primary></indexterm>
+<programlisting>#define             xmlSecNssKeyDataAesId</programlisting>
 <para>
+The AES key data klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssKeyDataAesGetKlass" role="function">
 <title>xmlSecNssKeyDataAesGetKlass ()</title>
-<indexterm zone="xmlSecNssKeyDataAesGetKlass"><primary sortas="xmlSecNssKeyDataAesGetKlass">xmlSecNssKeyDataAesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecNssKeyDataAesGetKlass         (void);</programlisting>
-<para>
-The AES key data klass.</para>
+<indexterm zone="xmlSecNssKeyDataAesGetKlass"><primary>xmlSecNssKeyDataAesGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecNssKeyDataAesGetKlass         (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The AES key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeyDataAesSet" role="function">
 <title>xmlSecNssKeyDataAesSet ()</title>
-<indexterm zone="xmlSecNssKeyDataAesSet"><primary sortas="xmlSecNssKeyDataAesSet">xmlSecNssKeyDataAesSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssKeyDataAesSet              (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
-<para>
-Sets the value of AES key data.</para>
+<indexterm zone="xmlSecNssKeyDataAesSet"><primary>xmlSecNssKeyDataAesSet</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssKeyDataAesSet              (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);</programlisting>
 <para>
+Sets the value of AES key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to AES key data.
+<listitem><simpara>the pointer to AES key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key value.
+<listitem><simpara>the pointer to key value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the key value size (in bytes).
+<listitem><simpara>the key value size (in bytes).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformAes128CbcId" role="macro">
 <title>xmlSecNssTransformAes128CbcId</title>
-<indexterm zone="xmlSecNssTransformAes128CbcId"><primary sortas="xmlSecNssTransformAes128CbcId">xmlSecNssTransformAes128CbcId</primary></indexterm><programlisting>#define             xmlSecNssTransformAes128CbcId</programlisting>
-<para>
-The AES128 CBC cipher transform klass.</para>
+<indexterm zone="xmlSecNssTransformAes128CbcId"><primary>xmlSecNssTransformAes128CbcId</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformAes128CbcId</programlisting>
 <para>
+The AES128 CBC cipher transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformAes128CbcGetKlass" role="function">
 <title>xmlSecNssTransformAes128CbcGetKlass ()</title>
-<indexterm zone="xmlSecNssTransformAes128CbcGetKlass"><primary sortas="xmlSecNssTransformAes128CbcGetKlass">xmlSecNssTransformAes128CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformAes128CbcGetKlass (void);</programlisting>
-<para>
-AES 128 CBC encryption transform klass.</para>
+<indexterm zone="xmlSecNssTransformAes128CbcGetKlass"><primary>xmlSecNssTransformAes128CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformAes128CbcGetKlass (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+AES 128 CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 128 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformAes192CbcId" role="macro">
 <title>xmlSecNssTransformAes192CbcId</title>
-<indexterm zone="xmlSecNssTransformAes192CbcId"><primary sortas="xmlSecNssTransformAes192CbcId">xmlSecNssTransformAes192CbcId</primary></indexterm><programlisting>#define             xmlSecNssTransformAes192CbcId</programlisting>
-<para>
-The AES192 CBC cipher transform klass.</para>
+<indexterm zone="xmlSecNssTransformAes192CbcId"><primary>xmlSecNssTransformAes192CbcId</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformAes192CbcId</programlisting>
 <para>
+The AES192 CBC cipher transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformAes192CbcGetKlass" role="function">
 <title>xmlSecNssTransformAes192CbcGetKlass ()</title>
-<indexterm zone="xmlSecNssTransformAes192CbcGetKlass"><primary sortas="xmlSecNssTransformAes192CbcGetKlass">xmlSecNssTransformAes192CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformAes192CbcGetKlass (void);</programlisting>
-<para>
-AES 192 CBC encryption transform klass.</para>
+<indexterm zone="xmlSecNssTransformAes192CbcGetKlass"><primary>xmlSecNssTransformAes192CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformAes192CbcGetKlass (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+AES 192 CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 192 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformAes256CbcId" role="macro">
 <title>xmlSecNssTransformAes256CbcId</title>
-<indexterm zone="xmlSecNssTransformAes256CbcId"><primary sortas="xmlSecNssTransformAes256CbcId">xmlSecNssTransformAes256CbcId</primary></indexterm><programlisting>#define             xmlSecNssTransformAes256CbcId</programlisting>
-<para>
-The AES256 CBC cipher transform klass.</para>
+<indexterm zone="xmlSecNssTransformAes256CbcId"><primary>xmlSecNssTransformAes256CbcId</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformAes256CbcId</programlisting>
 <para>
+The AES256 CBC cipher transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformAes256CbcGetKlass" role="function">
 <title>xmlSecNssTransformAes256CbcGetKlass ()</title>
-<indexterm zone="xmlSecNssTransformAes256CbcGetKlass"><primary sortas="xmlSecNssTransformAes256CbcGetKlass">xmlSecNssTransformAes256CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformAes256CbcGetKlass (void);</programlisting>
-<para>
-AES 256 CBC encryption transform klass.</para>
+<indexterm zone="xmlSecNssTransformAes256CbcGetKlass"><primary>xmlSecNssTransformAes256CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformAes256CbcGetKlass (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+AES 256 CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 256 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformKWAes128Id" role="macro">
 <title>xmlSecNssTransformKWAes128Id</title>
-<indexterm zone="xmlSecNssTransformKWAes128Id"><primary sortas="xmlSecNssTransformKWAes128Id">xmlSecNssTransformKWAes128Id</primary></indexterm><programlisting>#define             xmlSecNssTransformKWAes128Id</programlisting>
-<para>
-The AES 128 key wrap transform klass.</para>
+<indexterm zone="xmlSecNssTransformKWAes128Id"><primary>xmlSecNssTransformKWAes128Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformKWAes128Id</programlisting>
 <para>
+The AES 128 key wrap transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformKWAes128GetKlass" role="function">
 <title>xmlSecNssTransformKWAes128GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformKWAes128GetKlass"><primary sortas="xmlSecNssTransformKWAes128GetKlass">xmlSecNssTransformKWAes128GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformKWAes128GetKlass  (void);</programlisting>
-<para>
-The AES-128 key wrapper transform klass.</para>
+<indexterm zone="xmlSecNssTransformKWAes128GetKlass"><primary>xmlSecNssTransformKWAes128GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformKWAes128GetKlass  (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The AES-128 key wrapper transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-128 key wrapper transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformKWAes192Id" role="macro">
 <title>xmlSecNssTransformKWAes192Id</title>
-<indexterm zone="xmlSecNssTransformKWAes192Id"><primary sortas="xmlSecNssTransformKWAes192Id">xmlSecNssTransformKWAes192Id</primary></indexterm><programlisting>#define             xmlSecNssTransformKWAes192Id</programlisting>
-<para>
-The AES 192 key wrap transform klass.</para>
+<indexterm zone="xmlSecNssTransformKWAes192Id"><primary>xmlSecNssTransformKWAes192Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformKWAes192Id</programlisting>
 <para>
+The AES 192 key wrap transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformKWAes192GetKlass" role="function">
 <title>xmlSecNssTransformKWAes192GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformKWAes192GetKlass"><primary sortas="xmlSecNssTransformKWAes192GetKlass">xmlSecNssTransformKWAes192GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformKWAes192GetKlass  (void);</programlisting>
-<para>
-The AES-192 key wrapper transform klass.</para>
+<indexterm zone="xmlSecNssTransformKWAes192GetKlass"><primary>xmlSecNssTransformKWAes192GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformKWAes192GetKlass  (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The AES-192 key wrapper transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-192 key wrapper transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformKWAes256Id" role="macro">
 <title>xmlSecNssTransformKWAes256Id</title>
-<indexterm zone="xmlSecNssTransformKWAes256Id"><primary sortas="xmlSecNssTransformKWAes256Id">xmlSecNssTransformKWAes256Id</primary></indexterm><programlisting>#define             xmlSecNssTransformKWAes256Id</programlisting>
-<para>
-The AES 256 key wrap transform klass.</para>
+<indexterm zone="xmlSecNssTransformKWAes256Id"><primary>xmlSecNssTransformKWAes256Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformKWAes256Id</programlisting>
 <para>
+The AES 256 key wrap transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformKWAes256GetKlass" role="function">
 <title>xmlSecNssTransformKWAes256GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformKWAes256GetKlass"><primary sortas="xmlSecNssTransformKWAes256GetKlass">xmlSecNssTransformKWAes256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformKWAes256GetKlass  (void);</programlisting>
-<para>
-The AES-256 key wrapper transform klass.</para>
+<indexterm zone="xmlSecNssTransformKWAes256GetKlass"><primary>xmlSecNssTransformKWAes256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformKWAes256GetKlass  (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The AES-256 key wrapper transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-256 key wrapper transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeyDataDesId" role="macro">
 <title>xmlSecNssKeyDataDesId</title>
-<indexterm zone="xmlSecNssKeyDataDesId"><primary sortas="xmlSecNssKeyDataDesId">xmlSecNssKeyDataDesId</primary></indexterm><programlisting>#define             xmlSecNssKeyDataDesId</programlisting>
-<para>
-The DES key data klass.</para>
+<indexterm zone="xmlSecNssKeyDataDesId"><primary>xmlSecNssKeyDataDesId</primary></indexterm>
+<programlisting>#define             xmlSecNssKeyDataDesId</programlisting>
 <para>
+The DES key data klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssKeyDataDesGetKlass" role="function">
 <title>xmlSecNssKeyDataDesGetKlass ()</title>
-<indexterm zone="xmlSecNssKeyDataDesGetKlass"><primary sortas="xmlSecNssKeyDataDesGetKlass">xmlSecNssKeyDataDesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecNssKeyDataDesGetKlass         (void);</programlisting>
-<para>
-The DES key data klass.</para>
+<indexterm zone="xmlSecNssKeyDataDesGetKlass"><primary>xmlSecNssKeyDataDesGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecNssKeyDataDesGetKlass         (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The DES key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DES key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeyDataDesSet" role="function">
 <title>xmlSecNssKeyDataDesSet ()</title>
-<indexterm zone="xmlSecNssKeyDataDesSet"><primary sortas="xmlSecNssKeyDataDesSet">xmlSecNssKeyDataDesSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssKeyDataDesSet              (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
-<para>
-Sets the value of DES key data.</para>
+<indexterm zone="xmlSecNssKeyDataDesSet"><primary>xmlSecNssKeyDataDesSet</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssKeyDataDesSet              (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);</programlisting>
 <para>
+Sets the value of DES key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to DES key data.
+<listitem><simpara>the pointer to DES key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key value.
+<listitem><simpara>the pointer to key value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the key value size (in bytes).
+<listitem><simpara>the key value size (in bytes).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformDes3CbcId" role="macro">
 <title>xmlSecNssTransformDes3CbcId</title>
-<indexterm zone="xmlSecNssTransformDes3CbcId"><primary sortas="xmlSecNssTransformDes3CbcId">xmlSecNssTransformDes3CbcId</primary></indexterm><programlisting>#define             xmlSecNssTransformDes3CbcId</programlisting>
-<para>
-The Triple DES CBC cipher transform klass.</para>
+<indexterm zone="xmlSecNssTransformDes3CbcId"><primary>xmlSecNssTransformDes3CbcId</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformDes3CbcId</programlisting>
 <para>
+The Triple DES CBC cipher transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformDes3CbcGetKlass" role="function">
 <title>xmlSecNssTransformDes3CbcGetKlass ()</title>
-<indexterm zone="xmlSecNssTransformDes3CbcGetKlass"><primary sortas="xmlSecNssTransformDes3CbcGetKlass">xmlSecNssTransformDes3CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformDes3CbcGetKlass   (void);</programlisting>
-<para>
-Triple DES CBC encryption transform klass.</para>
+<indexterm zone="xmlSecNssTransformDes3CbcGetKlass"><primary>xmlSecNssTransformDes3CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformDes3CbcGetKlass   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Triple DES CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to Triple DES encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformKWDes3Id" role="macro">
 <title>xmlSecNssTransformKWDes3Id</title>
-<indexterm zone="xmlSecNssTransformKWDes3Id"><primary sortas="xmlSecNssTransformKWDes3Id">xmlSecNssTransformKWDes3Id</primary></indexterm><programlisting>#define             xmlSecNssTransformKWDes3Id</programlisting>
-<para>
-The DES3 CBC cipher transform klass.</para>
+<indexterm zone="xmlSecNssTransformKWDes3Id"><primary>xmlSecNssTransformKWDes3Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformKWDes3Id</programlisting>
 <para>
+The DES3 KW transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformKWDes3GetKlass" role="function">
 <title>xmlSecNssTransformKWDes3GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformKWDes3GetKlass"><primary sortas="xmlSecNssTransformKWDes3GetKlass">xmlSecNssTransformKWDes3GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformKWDes3GetKlass    (void);</programlisting>
-<para>
-The Triple DES key wrapper transform klass.</para>
+<indexterm zone="xmlSecNssTransformKWDes3GetKlass"><primary>xmlSecNssTransformKWDes3GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformKWDes3GetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The Triple DES key wrapper transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Triple DES key wrapper transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeyDataDsaId" role="macro">
 <title>xmlSecNssKeyDataDsaId</title>
-<indexterm zone="xmlSecNssKeyDataDsaId"><primary sortas="xmlSecNssKeyDataDsaId">xmlSecNssKeyDataDsaId</primary></indexterm><programlisting>#define             xmlSecNssKeyDataDsaId</programlisting>
-<para>
-The DSA key klass.</para>
+<indexterm zone="xmlSecNssKeyDataDsaId"><primary>xmlSecNssKeyDataDsaId</primary></indexterm>
+<programlisting>#define             xmlSecNssKeyDataDsaId</programlisting>
 <para>
+The DSA key klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssKeyDataDsaGetKlass" role="function">
 <title>xmlSecNssKeyDataDsaGetKlass ()</title>
-<indexterm zone="xmlSecNssKeyDataDsaGetKlass"><primary sortas="xmlSecNssKeyDataDsaGetKlass">xmlSecNssKeyDataDsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecNssKeyDataDsaGetKlass         (void);</programlisting>
-<para>
-The DSA key data klass.</para>
+<indexterm zone="xmlSecNssKeyDataDsaGetKlass"><primary>xmlSecNssKeyDataDsaGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecNssKeyDataDsaGetKlass         (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The DSA key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to DSA key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformDsaSha1Id" role="macro">
 <title>xmlSecNssTransformDsaSha1Id</title>
-<indexterm zone="xmlSecNssTransformDsaSha1Id"><primary sortas="xmlSecNssTransformDsaSha1Id">xmlSecNssTransformDsaSha1Id</primary></indexterm><programlisting>#define             xmlSecNssTransformDsaSha1Id</programlisting>
-<para>
-The DSA SHA1 signature transform klass.</para>
+<indexterm zone="xmlSecNssTransformDsaSha1Id"><primary>xmlSecNssTransformDsaSha1Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformDsaSha1Id</programlisting>
 <para>
+The DSA SHA1 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformDsaSha1GetKlass" role="function">
 <title>xmlSecNssTransformDsaSha1GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformDsaSha1GetKlass"><primary sortas="xmlSecNssTransformDsaSha1GetKlass">xmlSecNssTransformDsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformDsaSha1GetKlass   (void);</programlisting>
-<para>
-The DSA-SHA1 signature transform klass.</para>
+<indexterm zone="xmlSecNssTransformDsaSha1GetKlass"><primary>xmlSecNssTransformDsaSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformDsaSha1GetKlass   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The DSA-SHA1 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DSA-SHA1 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssHmacGetMinOutputLength" role="function">
 <title>xmlSecNssHmacGetMinOutputLength ()</title>
-<indexterm zone="xmlSecNssHmacGetMinOutputLength"><primary sortas="xmlSecNssHmacGetMinOutputLength">xmlSecNssHmacGetMinOutputLength</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssHmacGetMinOutputLength     (void);</programlisting>
-<para>
-Gets the value of min HMAC length.</para>
+<indexterm zone="xmlSecNssHmacGetMinOutputLength"><primary>xmlSecNssHmacGetMinOutputLength</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssHmacGetMinOutputLength     (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets the value of min HMAC length.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the min HMAC output length
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssHmacSetMinOutputLength" role="function">
 <title>xmlSecNssHmacSetMinOutputLength ()</title>
-<indexterm zone="xmlSecNssHmacSetMinOutputLength"><primary sortas="xmlSecNssHmacSetMinOutputLength">xmlSecNssHmacSetMinOutputLength</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecNssHmacSetMinOutputLength     (<link linkend="int">int</link> min_length);</programlisting>
-<para>
-Sets the min HMAC output length</para>
+<indexterm zone="xmlSecNssHmacSetMinOutputLength"><primary>xmlSecNssHmacSetMinOutputLength</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecNssHmacSetMinOutputLength     (<parameter><link linkend="int"><type>int</type></link> min_length</parameter>);</programlisting>
 <para>
+Sets the min HMAC output length
 </para><variablelist role="params">
 <varlistentry><term><parameter>min_length</parameter>&#160;:</term>
-<listitem><simpara> the new min length
+<listitem><simpara>the new min length
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeyDataHmacId" role="macro">
 <title>xmlSecNssKeyDataHmacId</title>
-<indexterm zone="xmlSecNssKeyDataHmacId"><primary sortas="xmlSecNssKeyDataHmacId">xmlSecNssKeyDataHmacId</primary></indexterm><programlisting>#define             xmlSecNssKeyDataHmacId</programlisting>
-<para>
-The DHMAC key data klass.</para>
+<indexterm zone="xmlSecNssKeyDataHmacId"><primary>xmlSecNssKeyDataHmacId</primary></indexterm>
+<programlisting>#define             xmlSecNssKeyDataHmacId</programlisting>
 <para>
+The DHMAC key data klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssKeyDataHmacGetKlass" role="function">
 <title>xmlSecNssKeyDataHmacGetKlass ()</title>
-<indexterm zone="xmlSecNssKeyDataHmacGetKlass"><primary sortas="xmlSecNssKeyDataHmacGetKlass">xmlSecNssKeyDataHmacGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecNssKeyDataHmacGetKlass        (void);</programlisting>
-<para>
-The HMAC key data klass.</para>
+<indexterm zone="xmlSecNssKeyDataHmacGetKlass"><primary>xmlSecNssKeyDataHmacGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecNssKeyDataHmacGetKlass        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> HMAC key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeyDataHmacSet" role="function">
 <title>xmlSecNssKeyDataHmacSet ()</title>
-<indexterm zone="xmlSecNssKeyDataHmacSet"><primary sortas="xmlSecNssKeyDataHmacSet">xmlSecNssKeyDataHmacSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssKeyDataHmacSet             (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
-<para>
-Sets the value of HMAC key data.</para>
+<indexterm zone="xmlSecNssKeyDataHmacSet"><primary>xmlSecNssKeyDataHmacSet</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssKeyDataHmacSet             (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);</programlisting>
 <para>
+Sets the value of HMAC key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to HMAC key data.
+<listitem><simpara>the pointer to HMAC key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key value.
+<listitem><simpara>the pointer to key value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the key value size (in bytes).
+<listitem><simpara>the key value size (in bytes).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformHmacMd5Id" role="macro">
 <title>xmlSecNssTransformHmacMd5Id</title>
-<indexterm zone="xmlSecNssTransformHmacMd5Id"><primary sortas="xmlSecNssTransformHmacMd5Id">xmlSecNssTransformHmacMd5Id</primary></indexterm><programlisting>#define             xmlSecNssTransformHmacMd5Id</programlisting>
-<para>
-The HMAC with MD5 signature transform klass.</para>
+<indexterm zone="xmlSecNssTransformHmacMd5Id"><primary>xmlSecNssTransformHmacMd5Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformHmacMd5Id</programlisting>
 <para>
+The HMAC with MD5 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformHmacMd5GetKlass" role="function">
 <title>xmlSecNssTransformHmacMd5GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformHmacMd5GetKlass"><primary sortas="xmlSecNssTransformHmacMd5GetKlass">xmlSecNssTransformHmacMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformHmacMd5GetKlass   (void);</programlisting>
-<para>
-The HMAC-MD5 transform klass.</para>
+<indexterm zone="xmlSecNssTransformHmacMd5GetKlass"><primary>xmlSecNssTransformHmacMd5GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformHmacMd5GetKlass   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-MD5 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-MD5 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformHmacRipemd160Id" role="macro">
 <title>xmlSecNssTransformHmacRipemd160Id</title>
-<indexterm zone="xmlSecNssTransformHmacRipemd160Id"><primary sortas="xmlSecNssTransformHmacRipemd160Id">xmlSecNssTransformHmacRipemd160Id</primary></indexterm><programlisting>#define             xmlSecNssTransformHmacRipemd160Id</programlisting>
-<para>
-The HMAC with RipeMD160 signature transform klass.</para>
+<indexterm zone="xmlSecNssTransformHmacRipemd160Id"><primary>xmlSecNssTransformHmacRipemd160Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformHmacRipemd160Id</programlisting>
 <para>
+The HMAC with RipeMD160 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformHmacRipemd160GetKlass" role="function">
 <title>xmlSecNssTransformHmacRipemd160GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformHmacRipemd160GetKlass"><primary sortas="xmlSecNssTransformHmacRipemd160GetKlass">xmlSecNssTransformHmacRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformHmacRipemd160GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-RIPEMD160 transform klass.</para>
+<indexterm zone="xmlSecNssTransformHmacRipemd160GetKlass"><primary>xmlSecNssTransformHmacRipemd160GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformHmacRipemd160GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-RIPEMD160 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-RIPEMD160 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformHmacSha1Id" role="macro">
 <title>xmlSecNssTransformHmacSha1Id</title>
-<indexterm zone="xmlSecNssTransformHmacSha1Id"><primary sortas="xmlSecNssTransformHmacSha1Id">xmlSecNssTransformHmacSha1Id</primary></indexterm><programlisting>#define             xmlSecNssTransformHmacSha1Id</programlisting>
-<para>
-The HMAC with SHA1 signature transform klass.</para>
+<indexterm zone="xmlSecNssTransformHmacSha1Id"><primary>xmlSecNssTransformHmacSha1Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformHmacSha1Id</programlisting>
 <para>
+The HMAC with SHA1 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformHmacSha1GetKlass" role="function">
 <title>xmlSecNssTransformHmacSha1GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformHmacSha1GetKlass"><primary sortas="xmlSecNssTransformHmacSha1GetKlass">xmlSecNssTransformHmacSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformHmacSha1GetKlass  (void);</programlisting>
-<para>
-The HMAC-SHA1 transform klass.</para>
+<indexterm zone="xmlSecNssTransformHmacSha1GetKlass"><primary>xmlSecNssTransformHmacSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformHmacSha1GetKlass  (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA1 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA1 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformHmacSha256Id" role="macro">
 <title>xmlSecNssTransformHmacSha256Id</title>
-<indexterm zone="xmlSecNssTransformHmacSha256Id"><primary sortas="xmlSecNssTransformHmacSha256Id">xmlSecNssTransformHmacSha256Id</primary></indexterm><programlisting>#define             xmlSecNssTransformHmacSha256Id</programlisting>
-<para>
-The HMAC with SHA256 signature transform klass.</para>
+<indexterm zone="xmlSecNssTransformHmacSha256Id"><primary>xmlSecNssTransformHmacSha256Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformHmacSha256Id</programlisting>
 <para>
+The HMAC with SHA256 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformHmacSha256GetKlass" role="function">
 <title>xmlSecNssTransformHmacSha256GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformHmacSha256GetKlass"><primary sortas="xmlSecNssTransformHmacSha256GetKlass">xmlSecNssTransformHmacSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformHmacSha256GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-SHA256 transform klass.</para>
+<indexterm zone="xmlSecNssTransformHmacSha256GetKlass"><primary>xmlSecNssTransformHmacSha256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformHmacSha256GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA256 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA256 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformHmacSha384Id" role="macro">
 <title>xmlSecNssTransformHmacSha384Id</title>
-<indexterm zone="xmlSecNssTransformHmacSha384Id"><primary sortas="xmlSecNssTransformHmacSha384Id">xmlSecNssTransformHmacSha384Id</primary></indexterm><programlisting>#define             xmlSecNssTransformHmacSha384Id</programlisting>
-<para>
-The HMAC with SHA384 signature transform klass.</para>
+<indexterm zone="xmlSecNssTransformHmacSha384Id"><primary>xmlSecNssTransformHmacSha384Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformHmacSha384Id</programlisting>
 <para>
+The HMAC with SHA384 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformHmacSha384GetKlass" role="function">
 <title>xmlSecNssTransformHmacSha384GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformHmacSha384GetKlass"><primary sortas="xmlSecNssTransformHmacSha384GetKlass">xmlSecNssTransformHmacSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformHmacSha384GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-SHA384 transform klass.</para>
+<indexterm zone="xmlSecNssTransformHmacSha384GetKlass"><primary>xmlSecNssTransformHmacSha384GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformHmacSha384GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA384 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA384 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformHmacSha512Id" role="macro">
 <title>xmlSecNssTransformHmacSha512Id</title>
-<indexterm zone="xmlSecNssTransformHmacSha512Id"><primary sortas="xmlSecNssTransformHmacSha512Id">xmlSecNssTransformHmacSha512Id</primary></indexterm><programlisting>#define             xmlSecNssTransformHmacSha512Id</programlisting>
-<para>
-The HMAC with SHA512 signature transform klass.</para>
+<indexterm zone="xmlSecNssTransformHmacSha512Id"><primary>xmlSecNssTransformHmacSha512Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformHmacSha512Id</programlisting>
 <para>
+The HMAC with SHA512 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformHmacSha512GetKlass" role="function">
 <title>xmlSecNssTransformHmacSha512GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformHmacSha512GetKlass"><primary sortas="xmlSecNssTransformHmacSha512GetKlass">xmlSecNssTransformHmacSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformHmacSha512GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-SHA512 transform klass.</para>
+<indexterm zone="xmlSecNssTransformHmacSha512GetKlass"><primary>xmlSecNssTransformHmacSha512GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformHmacSha512GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA512 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA512 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeyDataRsaId" role="macro">
 <title>xmlSecNssKeyDataRsaId</title>
-<indexterm zone="xmlSecNssKeyDataRsaId"><primary sortas="xmlSecNssKeyDataRsaId">xmlSecNssKeyDataRsaId</primary></indexterm><programlisting>#define             xmlSecNssKeyDataRsaId</programlisting>
-<para>
-The RSA key klass.</para>
+<indexterm zone="xmlSecNssKeyDataRsaId"><primary>xmlSecNssKeyDataRsaId</primary></indexterm>
+<programlisting>#define             xmlSecNssKeyDataRsaId</programlisting>
 <para>
+The RSA key klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssKeyDataRsaGetKlass" role="function">
 <title>xmlSecNssKeyDataRsaGetKlass ()</title>
-<indexterm zone="xmlSecNssKeyDataRsaGetKlass"><primary sortas="xmlSecNssKeyDataRsaGetKlass">xmlSecNssKeyDataRsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecNssKeyDataRsaGetKlass         (void);</programlisting>
-<para>
-The RSA key data klass.</para>
+<indexterm zone="xmlSecNssKeyDataRsaGetKlass"><primary>xmlSecNssKeyDataRsaGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecNssKeyDataRsaGetKlass         (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to RSA key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformRsaMd5Id" role="macro">
 <title>xmlSecNssTransformRsaMd5Id</title>
-<indexterm zone="xmlSecNssTransformRsaMd5Id"><primary sortas="xmlSecNssTransformRsaMd5Id">xmlSecNssTransformRsaMd5Id</primary></indexterm><programlisting>#define             xmlSecNssTransformRsaMd5Id</programlisting>
-<para>
-The RSA-MD5 signature transform klass.</para>
+<indexterm zone="xmlSecNssTransformRsaMd5Id"><primary>xmlSecNssTransformRsaMd5Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformRsaMd5Id</programlisting>
 <para>
+The RSA-MD5 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformRsaMd5GetKlass" role="function">
 <title>xmlSecNssTransformRsaMd5GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformRsaMd5GetKlass"><primary sortas="xmlSecNssTransformRsaMd5GetKlass">xmlSecNssTransformRsaMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformRsaMd5GetKlass    (void);</programlisting>
-<para>
-The RSA-MD5 signature transform klass.</para>
+<indexterm zone="xmlSecNssTransformRsaMd5GetKlass"><primary>xmlSecNssTransformRsaMd5GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformRsaMd5GetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-MD5 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-MD5 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformRsaSha1Id" role="macro">
 <title>xmlSecNssTransformRsaSha1Id</title>
-<indexterm zone="xmlSecNssTransformRsaSha1Id"><primary sortas="xmlSecNssTransformRsaSha1Id">xmlSecNssTransformRsaSha1Id</primary></indexterm><programlisting>#define             xmlSecNssTransformRsaSha1Id</programlisting>
-<para>
-The RSA-SHA1 signature transform klass.</para>
+<indexterm zone="xmlSecNssTransformRsaSha1Id"><primary>xmlSecNssTransformRsaSha1Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformRsaSha1Id</programlisting>
 <para>
+The RSA-SHA1 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformRsaSha1GetKlass" role="function">
 <title>xmlSecNssTransformRsaSha1GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformRsaSha1GetKlass"><primary sortas="xmlSecNssTransformRsaSha1GetKlass">xmlSecNssTransformRsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformRsaSha1GetKlass   (void);</programlisting>
-<para>
-The RSA-SHA1 signature transform klass.</para>
+<indexterm zone="xmlSecNssTransformRsaSha1GetKlass"><primary>xmlSecNssTransformRsaSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformRsaSha1GetKlass   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-SHA1 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA1 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformRsaSha256Id" role="macro">
 <title>xmlSecNssTransformRsaSha256Id</title>
-<indexterm zone="xmlSecNssTransformRsaSha256Id"><primary sortas="xmlSecNssTransformRsaSha256Id">xmlSecNssTransformRsaSha256Id</primary></indexterm><programlisting>#define             xmlSecNssTransformRsaSha256Id</programlisting>
-<para>
-The RSA-SHA256 signature transform klass.</para>
+<indexterm zone="xmlSecNssTransformRsaSha256Id"><primary>xmlSecNssTransformRsaSha256Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformRsaSha256Id</programlisting>
 <para>
+The RSA-SHA256 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformRsaSha256GetKlass" role="function">
 <title>xmlSecNssTransformRsaSha256GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformRsaSha256GetKlass"><primary sortas="xmlSecNssTransformRsaSha256GetKlass">xmlSecNssTransformRsaSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformRsaSha256GetKlass (void);</programlisting>
-<para>
-The RSA-SHA256 signature transform klass.</para>
+<indexterm zone="xmlSecNssTransformRsaSha256GetKlass"><primary>xmlSecNssTransformRsaSha256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformRsaSha256GetKlass (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-SHA256 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA256 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformRsaSha384Id" role="macro">
 <title>xmlSecNssTransformRsaSha384Id</title>
-<indexterm zone="xmlSecNssTransformRsaSha384Id"><primary sortas="xmlSecNssTransformRsaSha384Id">xmlSecNssTransformRsaSha384Id</primary></indexterm><programlisting>#define             xmlSecNssTransformRsaSha384Id</programlisting>
-<para>
-The RSA-SHA384 signature transform klass.</para>
+<indexterm zone="xmlSecNssTransformRsaSha384Id"><primary>xmlSecNssTransformRsaSha384Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformRsaSha384Id</programlisting>
 <para>
+The RSA-SHA384 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformRsaSha384GetKlass" role="function">
 <title>xmlSecNssTransformRsaSha384GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformRsaSha384GetKlass"><primary sortas="xmlSecNssTransformRsaSha384GetKlass">xmlSecNssTransformRsaSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformRsaSha384GetKlass (void);</programlisting>
-<para>
-The RSA-SHA384 signature transform klass.</para>
+<indexterm zone="xmlSecNssTransformRsaSha384GetKlass"><primary>xmlSecNssTransformRsaSha384GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformRsaSha384GetKlass (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-SHA384 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA384 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformRsaSha512Id" role="macro">
 <title>xmlSecNssTransformRsaSha512Id</title>
-<indexterm zone="xmlSecNssTransformRsaSha512Id"><primary sortas="xmlSecNssTransformRsaSha512Id">xmlSecNssTransformRsaSha512Id</primary></indexterm><programlisting>#define             xmlSecNssTransformRsaSha512Id</programlisting>
-<para>
-The RSA-SHA512 signature transform klass.</para>
+<indexterm zone="xmlSecNssTransformRsaSha512Id"><primary>xmlSecNssTransformRsaSha512Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformRsaSha512Id</programlisting>
 <para>
+The RSA-SHA512 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformRsaSha512GetKlass" role="function">
 <title>xmlSecNssTransformRsaSha512GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformRsaSha512GetKlass"><primary sortas="xmlSecNssTransformRsaSha512GetKlass">xmlSecNssTransformRsaSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformRsaSha512GetKlass (void);</programlisting>
-<para>
-The RSA-SHA512 signature transform klass.</para>
+<indexterm zone="xmlSecNssTransformRsaSha512GetKlass"><primary>xmlSecNssTransformRsaSha512GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformRsaSha512GetKlass (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-SHA512 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA512 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformRsaPkcs1Id" role="macro">
 <title>xmlSecNssTransformRsaPkcs1Id</title>
-<indexterm zone="xmlSecNssTransformRsaPkcs1Id"><primary sortas="xmlSecNssTransformRsaPkcs1Id">xmlSecNssTransformRsaPkcs1Id</primary></indexterm><programlisting>#define             xmlSecNssTransformRsaPkcs1Id</programlisting>
-<para>
-The RSA PKCS1 key transport transform klass.</para>
+<indexterm zone="xmlSecNssTransformRsaPkcs1Id"><primary>xmlSecNssTransformRsaPkcs1Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformRsaPkcs1Id</programlisting>
 <para>
+The RSA PKCS1 key transport transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformRsaPkcs1GetKlass" role="function">
 <title>xmlSecNssTransformRsaPkcs1GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformRsaPkcs1GetKlass"><primary sortas="xmlSecNssTransformRsaPkcs1GetKlass">xmlSecNssTransformRsaPkcs1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformRsaPkcs1GetKlass  (void);</programlisting>
-<para>
-The RSA-PKCS1 key transport transform klass.</para>
+<indexterm zone="xmlSecNssTransformRsaPkcs1GetKlass"><primary>xmlSecNssTransformRsaPkcs1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformRsaPkcs1GetKlass  (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-PKCS1 key transport transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-PKCS1 key transport transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformRsaOaepId" role="macro">
 <title>xmlSecNssTransformRsaOaepId</title>
-<indexterm zone="xmlSecNssTransformRsaOaepId"><primary sortas="xmlSecNssTransformRsaOaepId">xmlSecNssTransformRsaOaepId</primary></indexterm><programlisting>#define             xmlSecNssTransformRsaOaepId</programlisting>
-<para>
-The RSA OAEP key transport transform klass.</para>
+<indexterm zone="xmlSecNssTransformRsaOaepId"><primary>xmlSecNssTransformRsaOaepId</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformRsaOaepId</programlisting>
 <para>
+The RSA OAEP key transport transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformRsaOaepGetKlass" role="function">
 <title>xmlSecNssTransformRsaOaepGetKlass ()</title>
-<indexterm zone="xmlSecNssTransformRsaOaepGetKlass"><primary sortas="xmlSecNssTransformRsaOaepGetKlass">xmlSecNssTransformRsaOaepGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformRsaOaepGetKlass   (void);</programlisting>
-<para>
-The RSA-PKCS1 key transport transform klass.</para>
+<indexterm zone="xmlSecNssTransformRsaOaepGetKlass"><primary>xmlSecNssTransformRsaOaepGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformRsaOaepGetKlass   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-PKCS1 key transport transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-PKCS1 key transport transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformSha1Id" role="macro">
 <title>xmlSecNssTransformSha1Id</title>
-<indexterm zone="xmlSecNssTransformSha1Id"><primary sortas="xmlSecNssTransformSha1Id">xmlSecNssTransformSha1Id</primary></indexterm><programlisting>#define             xmlSecNssTransformSha1Id</programlisting>
-<para>
-The SHA1 digest transform klass.</para>
+<indexterm zone="xmlSecNssTransformSha1Id"><primary>xmlSecNssTransformSha1Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformSha1Id</programlisting>
 <para>
+The SHA1 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformSha1GetKlass" role="function">
 <title>xmlSecNssTransformSha1GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformSha1GetKlass"><primary sortas="xmlSecNssTransformSha1GetKlass">xmlSecNssTransformSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformSha1GetKlass      (void);</programlisting>
-<para>
-SHA-1 digest transform klass.</para>
+<indexterm zone="xmlSecNssTransformSha1GetKlass"><primary>xmlSecNssTransformSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformSha1GetKlass      (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA-1 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-1 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformSha256Id" role="macro">
 <title>xmlSecNssTransformSha256Id</title>
-<indexterm zone="xmlSecNssTransformSha256Id"><primary sortas="xmlSecNssTransformSha256Id">xmlSecNssTransformSha256Id</primary></indexterm><programlisting>#define             xmlSecNssTransformSha256Id</programlisting>
-<para>
-The SHA256 digest transform klass.</para>
+<indexterm zone="xmlSecNssTransformSha256Id"><primary>xmlSecNssTransformSha256Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformSha256Id</programlisting>
 <para>
+The SHA256 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformSha256GetKlass" role="function">
 <title>xmlSecNssTransformSha256GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformSha256GetKlass"><primary sortas="xmlSecNssTransformSha256GetKlass">xmlSecNssTransformSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformSha256GetKlass    (void);</programlisting>
-<para>
-SHA256 digest transform klass.</para>
+<indexterm zone="xmlSecNssTransformSha256GetKlass"><primary>xmlSecNssTransformSha256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformSha256GetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA256 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA256 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformSha384Id" role="macro">
 <title>xmlSecNssTransformSha384Id</title>
-<indexterm zone="xmlSecNssTransformSha384Id"><primary sortas="xmlSecNssTransformSha384Id">xmlSecNssTransformSha384Id</primary></indexterm><programlisting>#define             xmlSecNssTransformSha384Id</programlisting>
-<para>
-The SHA384 digest transform klass.</para>
+<indexterm zone="xmlSecNssTransformSha384Id"><primary>xmlSecNssTransformSha384Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformSha384Id</programlisting>
 <para>
+The SHA384 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformSha384GetKlass" role="function">
 <title>xmlSecNssTransformSha384GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformSha384GetKlass"><primary sortas="xmlSecNssTransformSha384GetKlass">xmlSecNssTransformSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformSha384GetKlass    (void);</programlisting>
-<para>
-SHA384 digest transform klass.</para>
+<indexterm zone="xmlSecNssTransformSha384GetKlass"><primary>xmlSecNssTransformSha384GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformSha384GetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA384 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA384 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformSha512Id" role="macro">
 <title>xmlSecNssTransformSha512Id</title>
-<indexterm zone="xmlSecNssTransformSha512Id"><primary sortas="xmlSecNssTransformSha512Id">xmlSecNssTransformSha512Id</primary></indexterm><programlisting>#define             xmlSecNssTransformSha512Id</programlisting>
-<para>
-The SHA512 digest transform klass.</para>
+<indexterm zone="xmlSecNssTransformSha512Id"><primary>xmlSecNssTransformSha512Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformSha512Id</programlisting>
 <para>
+The SHA512 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformSha512GetKlass" role="function">
 <title>xmlSecNssTransformSha512GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformSha512GetKlass"><primary sortas="xmlSecNssTransformSha512GetKlass">xmlSecNssTransformSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformSha512GetKlass    (void);</programlisting>
-<para>
-SHA512 digest transform klass.</para>
+<indexterm zone="xmlSecNssTransformSha512GetKlass"><primary>xmlSecNssTransformSha512GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformSha512GetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA512 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA512 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssTransformMd5Id" role="macro">
 <title>xmlSecNssTransformMd5Id</title>
-<indexterm zone="xmlSecNssTransformMd5Id"><primary sortas="xmlSecNssTransformMd5Id">xmlSecNssTransformMd5Id</primary></indexterm><programlisting>#define             xmlSecNssTransformMd5Id</programlisting>
-<para>
-The MD5 digest transform klass.</para>
+<indexterm zone="xmlSecNssTransformMd5Id"><primary>xmlSecNssTransformMd5Id</primary></indexterm>
+<programlisting>#define             xmlSecNssTransformMd5Id</programlisting>
 <para>
+The MD5 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssTransformMd5GetKlass" role="function">
 <title>xmlSecNssTransformMd5GetKlass ()</title>
-<indexterm zone="xmlSecNssTransformMd5GetKlass"><primary sortas="xmlSecNssTransformMd5GetKlass">xmlSecNssTransformMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformMd5GetKlass       (void);</programlisting>
-<para>
-MD5 digest transform klass.</para>
+<indexterm zone="xmlSecNssTransformMd5GetKlass"><primary>xmlSecNssTransformMd5GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecNssTransformMd5GetKlass       (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+MD5 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to MD5 digest transform klass.
 </simpara></listitem></varlistentry>
@@ -869,7 +860,4 @@ MD5 digest transform klass.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/nss/keysstore.sgml b/docs/api/sgml/nss/keysstore.sgml
index 4d74e89..2f92d68 100644
--- a/docs/api/sgml/nss/keysstore.sgml
+++ b/docs/api/sgml/nss/keysstore.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-nss-keysstore.top_of_page">keysstore</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC-NSS Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC-NSS Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>keysstore</refname>
 <refpurpose>Keys store implementation for NSS.</refpurpose>
@@ -13,110 +14,100 @@
 <refsynopsisdiv id="xmlsec-nss-keysstore.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-#define             <link linkend="xmlSecNssKeysStoreId">xmlSecNssKeysStoreId</link>
-<link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link>    <link linkend="xmlSecNssKeysStoreGetKlass">xmlSecNssKeysStoreGetKlass</link>          (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssKeysStoreAdoptKey">xmlSecNssKeysStoreAdoptKey</link>          (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssKeysStoreLoad">xmlSecNssKeysStoreLoad</link>              (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         const <link linkend="char">char</link> *uri,
-                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssKeysStoreSave">xmlSecNssKeysStoreSave</link>              (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<synopsis>#define             <link linkend="xmlSecNssKeysStoreId">xmlSecNssKeysStoreId</link>
+<link linkend="xmlSecKeyStoreId"><returnvalue>xmlSecKeyStoreId</returnvalue></link>    <link linkend="xmlSecNssKeysStoreGetKlass">xmlSecNssKeysStoreGetKlass</link>          (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssKeysStoreAdoptKey">xmlSecNssKeysStoreAdoptKey</link>          (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssKeysStoreLoad">xmlSecNssKeysStoreLoad</link>              (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *uri</parameter>,
+                                                         <parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> keysMngr</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssKeysStoreSave">xmlSecNssKeysStoreSave</link>              (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-nss-keysstore.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Keys store implementation for NSS.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-nss-keysstore.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecNssKeysStoreId" role="macro">
 <title>xmlSecNssKeysStoreId</title>
-<indexterm zone="xmlSecNssKeysStoreId"><primary sortas="xmlSecNssKeysStoreId">xmlSecNssKeysStoreId</primary></indexterm><programlisting>#define xmlSecNssKeysStoreId            xmlSecNssKeysStoreGetKlass()
+<indexterm zone="xmlSecNssKeysStoreId"><primary>xmlSecNssKeysStoreId</primary></indexterm>
+<programlisting>#define xmlSecNssKeysStoreId            xmlSecNssKeysStoreGetKlass()
 </programlisting>
 <para>
-A Nss keys store klass id.</para>
-<para>
+A Nss keys store klass id.
 </para></refsect2>
 <refsect2 id="xmlSecNssKeysStoreGetKlass" role="function">
 <title>xmlSecNssKeysStoreGetKlass ()</title>
-<indexterm zone="xmlSecNssKeysStoreGetKlass"><primary sortas="xmlSecNssKeysStoreGetKlass">xmlSecNssKeysStoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link>    xmlSecNssKeysStoreGetKlass          (void);</programlisting>
-<para>
-The Nss list based keys store klass.</para>
+<indexterm zone="xmlSecNssKeysStoreGetKlass"><primary>xmlSecNssKeysStoreGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyStoreId"><returnvalue>xmlSecKeyStoreId</returnvalue></link>    xmlSecNssKeysStoreGetKlass          (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The Nss list based keys store klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Nss list based keys store klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeysStoreAdoptKey" role="function">
 <title>xmlSecNssKeysStoreAdoptKey ()</title>
-<indexterm zone="xmlSecNssKeysStoreAdoptKey"><primary sortas="xmlSecNssKeysStoreAdoptKey">xmlSecNssKeysStoreAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssKeysStoreAdoptKey          (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
-<para>
-Adds <parameter>key</parameter> to the <parameter>store</parameter>.</para>
+<indexterm zone="xmlSecNssKeysStoreAdoptKey"><primary>xmlSecNssKeysStoreAdoptKey</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssKeysStoreAdoptKey          (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);</programlisting>
 <para>
+Adds <parameter>key</parameter> to the <parameter>store</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to Nss keys store.
+<listitem><simpara>the pointer to Nss keys store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeysStoreLoad" role="function">
 <title>xmlSecNssKeysStoreLoad ()</title>
-<indexterm zone="xmlSecNssKeysStoreLoad"><primary sortas="xmlSecNssKeysStoreLoad">xmlSecNssKeysStoreLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssKeysStoreLoad              (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         const <link linkend="char">char</link> *uri,
-                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
-<para>
-Reads keys from an XML file.</para>
+<indexterm zone="xmlSecNssKeysStoreLoad"><primary>xmlSecNssKeysStoreLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssKeysStoreLoad              (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *uri</parameter>,
+                                                         <parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> keysMngr</parameter>);</programlisting>
 <para>
+Reads keys from an XML file.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to Nss keys store.
+<listitem><simpara>the pointer to Nss keys store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>uri</parameter>&#160;:</term>
-<listitem><simpara>                the filename.
+<listitem><simpara>the filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keysMngr</parameter>&#160;:</term>
-<listitem><simpara>           the pointer to associated keys manager.
+<listitem><simpara>the pointer to associated keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeysStoreSave" role="function">
 <title>xmlSecNssKeysStoreSave ()</title>
-<indexterm zone="xmlSecNssKeysStoreSave"><primary sortas="xmlSecNssKeysStoreSave">xmlSecNssKeysStoreSave</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssKeysStoreSave              (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
-<para>
-Writes keys from <parameter>store</parameter> to an XML file.</para>
+<indexterm zone="xmlSecNssKeysStoreSave"><primary>xmlSecNssKeysStoreSave</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssKeysStoreSave              (<parameter><link linkend="xmlSecKeyStore"><type>xmlSecKeyStorePtr</type></link> store</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
+Writes keys from <parameter>store</parameter> to an XML file.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to Nss keys store.
+<listitem><simpara>the pointer to Nss keys store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the filename.
+<listitem><simpara>the filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the saved keys type (public, private, ...).
+<listitem><simpara>the saved keys type (public, private, ...).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
@@ -124,7 +115,4 @@ Writes keys from <parameter>store</parameter> to an XML file.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/nss/pkikeys.sgml b/docs/api/sgml/nss/pkikeys.sgml
index f08736a..929d34a 100644
--- a/docs/api/sgml/nss/pkikeys.sgml
+++ b/docs/api/sgml/nss/pkikeys.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-nss-pkikeys.top_of_page">pkikeys</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC-NSS Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC-NSS Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>pkikeys</refname>
 <refpurpose>PKI keys data implementation.</refpurpose>
@@ -13,61 +14,51 @@
 <refsynopsisdiv id="xmlsec-nss-pkikeys.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    <link linkend="xmlSecNssPKIAdoptKey">xmlSecNssPKIAdoptKey</link>                (<link linkend="SECKEYPrivateKey">SECKEYPrivateKey</link> *privkey,
-                                                         <link linkend="SECKEYPublicKey">SECKEYPublicKey</link> *pubkey);
-<link linkend="SECKEYPublicKey">SECKEYPublicKey</link>*    <link linkend="xmlSecNssPKIKeyDataGetPubKey">xmlSecNssPKIKeyDataGetPubKey</link>        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="SECKEYPrivateKey">SECKEYPrivateKey</link>*   <link linkend="xmlSecNssPKIKeyDataGetPrivKey">xmlSecNssPKIKeyDataGetPrivKey</link>       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="KeyType">KeyType</link>             <link linkend="xmlSecNssPKIKeyDataGetKeyType">xmlSecNssPKIKeyDataGetKeyType</link>       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssPKIKeyDataDuplicate">xmlSecNssPKIKeyDataDuplicate</link>        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> dst,
-                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> src);
+<synopsis><link linkend="xmlSecKeyData"><returnvalue>xmlSecKeyDataPtr</returnvalue></link>    <link linkend="xmlSecNssPKIAdoptKey">xmlSecNssPKIAdoptKey</link>                (<parameter><link linkend="SECKEYPrivateKey"><type>SECKEYPrivateKey</type></link> *privkey</parameter>,
+                                                         <parameter><link linkend="SECKEYPublicKey"><type>SECKEYPublicKey</type></link> *pubkey</parameter>);
+<link linkend="SECKEYPublicKey"><returnvalue>SECKEYPublicKey</returnvalue></link>*    <link linkend="xmlSecNssPKIKeyDataGetPubKey">xmlSecNssPKIKeyDataGetPubKey</link>        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="SECKEYPrivateKey"><returnvalue>SECKEYPrivateKey</returnvalue></link>*   <link linkend="xmlSecNssPKIKeyDataGetPrivKey">xmlSecNssPKIKeyDataGetPrivKey</link>       (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="KeyType"><returnvalue>KeyType</returnvalue></link>             <link linkend="xmlSecNssPKIKeyDataGetKeyType">xmlSecNssPKIKeyDataGetKeyType</link>       (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssPKIKeyDataDuplicate">xmlSecNssPKIKeyDataDuplicate</link>        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> dst</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> src</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-nss-pkikeys.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 PKI keys data implementation.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-nss-pkikeys.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecNssPKIAdoptKey" role="function">
 <title>xmlSecNssPKIAdoptKey ()</title>
-<indexterm zone="xmlSecNssPKIAdoptKey"><primary sortas="xmlSecNssPKIAdoptKey">xmlSecNssPKIAdoptKey</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    xmlSecNssPKIAdoptKey                (<link linkend="SECKEYPrivateKey">SECKEYPrivateKey</link> *privkey,
-                                                         <link linkend="SECKEYPublicKey">SECKEYPublicKey</link> *pubkey);</programlisting>
+<indexterm zone="xmlSecNssPKIAdoptKey"><primary>xmlSecNssPKIAdoptKey</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyData"><returnvalue>xmlSecKeyDataPtr</returnvalue></link>    xmlSecNssPKIAdoptKey                (<parameter><link linkend="SECKEYPrivateKey"><type>SECKEYPrivateKey</type></link> *privkey</parameter>,
+                                                         <parameter><link linkend="SECKEYPublicKey"><type>SECKEYPublicKey</type></link> *pubkey</parameter>);</programlisting>
 <para>
 Build a KeyData object from the given Private Key and Public
-Key handles.</para>
-<para>
+Key handles.
 </para><variablelist role="params">
 <varlistentry><term><parameter>privkey</parameter>&#160;:</term>
-<listitem><simpara>        the NSS Private Key handle
+<listitem><simpara>the NSS Private Key handle
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pubkey</parameter>&#160;:</term>
-<listitem><simpara>         the NSS Public Key handle
+<listitem><simpara>the NSS Public Key handle
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to KeyData object or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssPKIKeyDataGetPubKey" role="function">
 <title>xmlSecNssPKIKeyDataGetPubKey ()</title>
-<indexterm zone="xmlSecNssPKIKeyDataGetPubKey"><primary sortas="xmlSecNssPKIKeyDataGetPubKey">xmlSecNssPKIKeyDataGetPubKey</primary></indexterm><programlisting><link linkend="SECKEYPublicKey">SECKEYPublicKey</link>*    xmlSecNssPKIKeyDataGetPubKey        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets the Public Key from the key data.</para>
+<indexterm zone="xmlSecNssPKIKeyDataGetPubKey"><primary>xmlSecNssPKIKeyDataGetPubKey</primary></indexterm>
+<programlisting><link linkend="SECKEYPublicKey"><returnvalue>SECKEYPublicKey</returnvalue></link>*    xmlSecNssPKIKeyDataGetPubKey        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets the Public Key from the key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to NSS Key data.
+<listitem><simpara>the pointer to NSS Key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SECKEYPublicKey or NULL if an error occurs.
 Caller is responsible for freeing the key when done
@@ -75,13 +66,13 @@ Caller is responsible for freeing the key when done
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssPKIKeyDataGetPrivKey" role="function">
 <title>xmlSecNssPKIKeyDataGetPrivKey ()</title>
-<indexterm zone="xmlSecNssPKIKeyDataGetPrivKey"><primary sortas="xmlSecNssPKIKeyDataGetPrivKey">xmlSecNssPKIKeyDataGetPrivKey</primary></indexterm><programlisting><link linkend="SECKEYPrivateKey">SECKEYPrivateKey</link>*   xmlSecNssPKIKeyDataGetPrivKey       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets the Private Key from the key data.</para>
+<indexterm zone="xmlSecNssPKIKeyDataGetPrivKey"><primary>xmlSecNssPKIKeyDataGetPrivKey</primary></indexterm>
+<programlisting><link linkend="SECKEYPrivateKey"><returnvalue>SECKEYPrivateKey</returnvalue></link>*   xmlSecNssPKIKeyDataGetPrivKey       (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets the Private Key from the key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to NSS Key data.
+<listitem><simpara>the pointer to NSS Key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SECKEYPrivateKey or NULL if an error occurs.
 Caller is responsible for freeing the key when done
@@ -89,30 +80,30 @@ Caller is responsible for freeing the key when done
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssPKIKeyDataGetKeyType" role="function">
 <title>xmlSecNssPKIKeyDataGetKeyType ()</title>
-<indexterm zone="xmlSecNssPKIKeyDataGetKeyType"><primary sortas="xmlSecNssPKIKeyDataGetKeyType">xmlSecNssPKIKeyDataGetKeyType</primary></indexterm><programlisting><link linkend="KeyType">KeyType</link>             xmlSecNssPKIKeyDataGetKeyType       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets the Key Type from the key data.</para>
+<indexterm zone="xmlSecNssPKIKeyDataGetKeyType"><primary>xmlSecNssPKIKeyDataGetKeyType</primary></indexterm>
+<programlisting><link linkend="KeyType"><returnvalue>KeyType</returnvalue></link>             xmlSecNssPKIKeyDataGetKeyType       (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets the Key Type from the key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to NSS Key data.
+<listitem><simpara>the pointer to NSS Key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Key Type
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssPKIKeyDataDuplicate" role="function">
 <title>xmlSecNssPKIKeyDataDuplicate ()</title>
-<indexterm zone="xmlSecNssPKIKeyDataDuplicate"><primary sortas="xmlSecNssPKIKeyDataDuplicate">xmlSecNssPKIKeyDataDuplicate</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssPKIKeyDataDuplicate        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> dst,
-                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> src);</programlisting>
-<para>
-Duplicates the keydata from src to dst</para>
+<indexterm zone="xmlSecNssPKIKeyDataDuplicate"><primary>xmlSecNssPKIKeyDataDuplicate</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssPKIKeyDataDuplicate        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> dst</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> src</parameter>);</programlisting>
 <para>
+Duplicates the keydata from src to dst
 </para><variablelist role="params">
 <varlistentry><term><parameter>dst</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to NSS Key data to copy to.
+<listitem><simpara>the pointer to NSS Key data to copy to.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>src</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to NSS Key data to copy from.
+<listitem><simpara>the pointer to NSS Key data to copy from.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> -1 on error, 0 on success
 </simpara></listitem></varlistentry>
@@ -120,7 +111,4 @@ Duplicates the keydata from src to dst</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/nss/x509.sgml b/docs/api/sgml/nss/x509.sgml
index 4703f45..073604e 100644
--- a/docs/api/sgml/nss/x509.sgml
+++ b/docs/api/sgml/nss/x509.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-nss-x509.top_of_page">x509</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC-NSS Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC-NSS Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>x509</refname>
 <refpurpose>X509 certificates support implementation for NSS.</refpurpose>
@@ -13,85 +14,75 @@
 <refsynopsisdiv id="xmlsec-nss-x509.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-#define             <link linkend="xmlSecNssKeyDataX509Id">xmlSecNssKeyDataX509Id</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecNssKeyDataX509GetKlass">xmlSecNssKeyDataX509GetKlass</link>        (void);
-<link linkend="CERTCertificate">CERTCertificate</link>*    <link linkend="xmlSecNssKeyDataX509GetKeyCert">xmlSecNssKeyDataX509GetKeyCert</link>      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssKeyDataX509AdoptKeyCert">xmlSecNssKeyDataX509AdoptKeyCert</link>    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="CERTCertificate">CERTCertificate</link> *cert);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssKeyDataX509AdoptCert">xmlSecNssKeyDataX509AdoptCert</link>       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="CERTCertificate">CERTCertificate</link> *cert);
-<link linkend="CERTCertificate">CERTCertificate</link>*    <link linkend="xmlSecNssKeyDataX509GetCert">xmlSecNssKeyDataX509GetCert</link>         (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecNssKeyDataX509GetCertsSize">xmlSecNssKeyDataX509GetCertsSize</link>    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssKeyDataX509AdoptCrl">xmlSecNssKeyDataX509AdoptCrl</link>        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="CERTSignedCrl">CERTSignedCrl</link> *crl);
-<link linkend="CERTSignedCrl">CERTSignedCrl</link>*      <link linkend="xmlSecNssKeyDataX509GetCrl">xmlSecNssKeyDataX509GetCrl</link>          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecNssKeyDataX509GetCrlsSize">xmlSecNssKeyDataX509GetCrlsSize</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    <link linkend="xmlSecNssX509CertGetKey">xmlSecNssX509CertGetKey</link>             (<link linkend="CERTCertificate">CERTCertificate</link> *cert);
+<synopsis>#define             <link linkend="xmlSecNssKeyDataX509Id">xmlSecNssKeyDataX509Id</link>
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecNssKeyDataX509GetKlass">xmlSecNssKeyDataX509GetKlass</link>        (<parameter><type>void</type></parameter>);
+<link linkend="CERTCertificate"><returnvalue>CERTCertificate</returnvalue></link>*    <link linkend="xmlSecNssKeyDataX509GetKeyCert">xmlSecNssKeyDataX509GetKeyCert</link>      (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssKeyDataX509AdoptKeyCert">xmlSecNssKeyDataX509AdoptKeyCert</link>    (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="CERTCertificate"><type>CERTCertificate</type></link> *cert</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssKeyDataX509AdoptCert">xmlSecNssKeyDataX509AdoptCert</link>       (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="CERTCertificate"><type>CERTCertificate</type></link> *cert</parameter>);
+<link linkend="CERTCertificate"><returnvalue>CERTCertificate</returnvalue></link>*    <link linkend="xmlSecNssKeyDataX509GetCert">xmlSecNssKeyDataX509GetCert</link>         (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);
+<link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          <link linkend="xmlSecNssKeyDataX509GetCertsSize">xmlSecNssKeyDataX509GetCertsSize</link>    (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssKeyDataX509AdoptCrl">xmlSecNssKeyDataX509AdoptCrl</link>        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="CERTSignedCrl"><type>CERTSignedCrl</type></link> *crl</parameter>);
+<link linkend="CERTSignedCrl"><returnvalue>CERTSignedCrl</returnvalue></link>*      <link linkend="xmlSecNssKeyDataX509GetCrl">xmlSecNssKeyDataX509GetCrl</link>          (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);
+<link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          <link linkend="xmlSecNssKeyDataX509GetCrlsSize">xmlSecNssKeyDataX509GetCrlsSize</link>     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="xmlSecKeyData"><returnvalue>xmlSecKeyDataPtr</returnvalue></link>    <link linkend="xmlSecNssX509CertGetKey">xmlSecNssX509CertGetKey</link>             (<parameter><link linkend="CERTCertificate"><type>CERTCertificate</type></link> *cert</parameter>);
 #define             <link linkend="xmlSecNssKeyDataRawX509CertId">xmlSecNssKeyDataRawX509CertId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecNssKeyDataRawX509CertGetKlass">xmlSecNssKeyDataRawX509CertGetKlass</link> (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecNssKeyDataRawX509CertGetKlass">xmlSecNssKeyDataRawX509CertGetKlass</link> (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecNssX509StoreId">xmlSecNssX509StoreId</link>
-<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>  <link linkend="xmlSecNssX509StoreGetKlass">xmlSecNssX509StoreGetKlass</link>        (void);
-<link linkend="CERTCertificate">CERTCertificate</link>*    <link linkend="xmlSecNssX509StoreFindCert">xmlSecNssX509StoreFindCert</link>          (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="xmlChar">xmlChar</link> *subjectName,
-                                                         <link linkend="xmlChar">xmlChar</link> *issuerName,
-                                                         <link linkend="xmlChar">xmlChar</link> *issuerSerial,
-                                                         <link linkend="xmlChar">xmlChar</link> *ski,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);
-<link linkend="CERTCertificate">CERTCertificate</link>*    <link linkend="xmlSecNssX509StoreVerify">xmlSecNssX509StoreVerify</link>            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="CERTCertList">CERTCertList</link> *certs,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecNssX509StoreAdoptCert">xmlSecNssX509StoreAdoptCert</link>         (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="CERTCertificate">CERTCertificate</link> *cert,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="xmlSecKeyDataStoreId"><returnvalue>xmlSecKeyDataStoreId</returnvalue></link>  <link linkend="xmlSecNssX509StoreGetKlass">xmlSecNssX509StoreGetKlass</link>        (<parameter><type>void</type></parameter>);
+<link linkend="CERTCertificate"><returnvalue>CERTCertificate</returnvalue></link>*    <link linkend="xmlSecNssX509StoreFindCert">xmlSecNssX509StoreFindCert</link>          (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="xmlChar"><type>xmlChar</type></link> *subjectName</parameter>,
+                                                         <parameter><link linkend="xmlChar"><type>xmlChar</type></link> *issuerName</parameter>,
+                                                         <parameter><link linkend="xmlChar"><type>xmlChar</type></link> *issuerSerial</parameter>,
+                                                         <parameter><link linkend="xmlChar"><type>xmlChar</type></link> *ski</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtx</type></link> *keyInfoCtx</parameter>);
+<link linkend="CERTCertificate"><returnvalue>CERTCertificate</returnvalue></link>*    <link linkend="xmlSecNssX509StoreVerify">xmlSecNssX509StoreVerify</link>            (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="CERTCertList"><type>CERTCertList</type></link> *certs</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtx</type></link> *keyInfoCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNssX509StoreAdoptCert">xmlSecNssX509StoreAdoptCert</link>         (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="CERTCertificate"><type>CERTCertificate</type></link> *cert</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-nss-x509.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 X509 certificates support implementation for NSS.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-nss-x509.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecNssKeyDataX509Id" role="macro">
 <title>xmlSecNssKeyDataX509Id</title>
-<indexterm zone="xmlSecNssKeyDataX509Id"><primary sortas="xmlSecNssKeyDataX509Id">xmlSecNssKeyDataX509Id</primary></indexterm><programlisting>#define             xmlSecNssKeyDataX509Id</programlisting>
-<para>
-The NSS X509 data klass.</para>
+<indexterm zone="xmlSecNssKeyDataX509Id"><primary>xmlSecNssKeyDataX509Id</primary></indexterm>
+<programlisting>#define             xmlSecNssKeyDataX509Id</programlisting>
 <para>
+The NSS X509 data klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssKeyDataX509GetKlass" role="function">
 <title>xmlSecNssKeyDataX509GetKlass ()</title>
-<indexterm zone="xmlSecNssKeyDataX509GetKlass"><primary sortas="xmlSecNssKeyDataX509GetKlass">xmlSecNssKeyDataX509GetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecNssKeyDataX509GetKlass        (void);</programlisting>
-<para>
-The NSS X509 key data klass (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-X509Data"><type>sec-X509Data</type></link>).</para>
+<indexterm zone="xmlSecNssKeyDataX509GetKlass"><primary>xmlSecNssKeyDataX509GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecNssKeyDataX509GetKlass        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The NSS X509 key data klass (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-X509Data"><type>sec-X509Data</type></link>).
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the X509 data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeyDataX509GetKeyCert" role="function">
 <title>xmlSecNssKeyDataX509GetKeyCert ()</title>
-<indexterm zone="xmlSecNssKeyDataX509GetKeyCert"><primary sortas="xmlSecNssKeyDataX509GetKeyCert">xmlSecNssKeyDataX509GetKeyCert</primary></indexterm><programlisting><link linkend="CERTCertificate">CERTCertificate</link>*    xmlSecNssKeyDataX509GetKeyCert      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets the certificate from which the key was extracted.</para>
+<indexterm zone="xmlSecNssKeyDataX509GetKeyCert"><primary>xmlSecNssKeyDataX509GetKeyCert</primary></indexterm>
+<programlisting><link linkend="CERTCertificate"><returnvalue>CERTCertificate</returnvalue></link>*    xmlSecNssKeyDataX509GetKeyCert      (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets the certificate from which the key was extracted.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the key's certificate or NULL if key data was not used for key
 extraction or an error occurs.
@@ -99,51 +90,51 @@ extraction or an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeyDataX509AdoptKeyCert" role="function">
 <title>xmlSecNssKeyDataX509AdoptKeyCert ()</title>
-<indexterm zone="xmlSecNssKeyDataX509AdoptKeyCert"><primary sortas="xmlSecNssKeyDataX509AdoptKeyCert">xmlSecNssKeyDataX509AdoptKeyCert</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssKeyDataX509AdoptKeyCert    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="CERTCertificate">CERTCertificate</link> *cert);</programlisting>
-<para>
-Sets the key's certificate in <parameter>data</parameter>.</para>
+<indexterm zone="xmlSecNssKeyDataX509AdoptKeyCert"><primary>xmlSecNssKeyDataX509AdoptKeyCert</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssKeyDataX509AdoptKeyCert    (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="CERTCertificate"><type>CERTCertificate</type></link> *cert</parameter>);</programlisting>
 <para>
+Sets the key's certificate in <parameter>data</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>cert</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to NSS X509 certificate.
+<listitem><simpara>the pointer to NSS X509 certificate.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeyDataX509AdoptCert" role="function">
 <title>xmlSecNssKeyDataX509AdoptCert ()</title>
-<indexterm zone="xmlSecNssKeyDataX509AdoptCert"><primary sortas="xmlSecNssKeyDataX509AdoptCert">xmlSecNssKeyDataX509AdoptCert</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssKeyDataX509AdoptCert       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="CERTCertificate">CERTCertificate</link> *cert);</programlisting>
-<para>
-Adds certificate to the X509 key data.</para>
+<indexterm zone="xmlSecNssKeyDataX509AdoptCert"><primary>xmlSecNssKeyDataX509AdoptCert</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssKeyDataX509AdoptCert       (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="CERTCertificate"><type>CERTCertificate</type></link> *cert</parameter>);</programlisting>
 <para>
+Adds certificate to the X509 key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>cert</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to NSS X509 certificate.
+<listitem><simpara>the pointer to NSS X509 certificate.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeyDataX509GetCert" role="function">
 <title>xmlSecNssKeyDataX509GetCert ()</title>
-<indexterm zone="xmlSecNssKeyDataX509GetCert"><primary sortas="xmlSecNssKeyDataX509GetCert">xmlSecNssKeyDataX509GetCert</primary></indexterm><programlisting><link linkend="CERTCertificate">CERTCertificate</link>*    xmlSecNssKeyDataX509GetCert         (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
-<para>
-Gets a certificate from X509 key data.</para>
+<indexterm zone="xmlSecNssKeyDataX509GetCert"><primary>xmlSecNssKeyDataX509GetCert</primary></indexterm>
+<programlisting><link linkend="CERTCertificate"><returnvalue>CERTCertificate</returnvalue></link>*    xmlSecNssKeyDataX509GetCert         (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);</programlisting>
 <para>
+Gets a certificate from X509 key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pos</parameter>&#160;:</term>
-<listitem><simpara>                the desired certificate position.
+<listitem><simpara>the desired certificate position.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to certificate or NULL if <parameter>pos</parameter> is larger than the
 number of certificates in <parameter>data</parameter> or an error occurs.
@@ -151,47 +142,47 @@ number of certificates in <parameter>data</parameter> or an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeyDataX509GetCertsSize" role="function">
 <title>xmlSecNssKeyDataX509GetCertsSize ()</title>
-<indexterm zone="xmlSecNssKeyDataX509GetCertsSize"><primary sortas="xmlSecNssKeyDataX509GetCertsSize">xmlSecNssKeyDataX509GetCertsSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecNssKeyDataX509GetCertsSize    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets the number of certificates in <parameter>data</parameter>.</para>
+<indexterm zone="xmlSecNssKeyDataX509GetCertsSize"><primary>xmlSecNssKeyDataX509GetCertsSize</primary></indexterm>
+<programlisting><link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          xmlSecNssKeyDataX509GetCertsSize    (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets the number of certificates in <parameter>data</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> te number of certificates in <parameter>data</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeyDataX509AdoptCrl" role="function">
 <title>xmlSecNssKeyDataX509AdoptCrl ()</title>
-<indexterm zone="xmlSecNssKeyDataX509AdoptCrl"><primary sortas="xmlSecNssKeyDataX509AdoptCrl">xmlSecNssKeyDataX509AdoptCrl</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssKeyDataX509AdoptCrl        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="CERTSignedCrl">CERTSignedCrl</link> *crl);</programlisting>
-<para>
-Adds CRL to the X509 key data.</para>
+<indexterm zone="xmlSecNssKeyDataX509AdoptCrl"><primary>xmlSecNssKeyDataX509AdoptCrl</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssKeyDataX509AdoptCrl        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="CERTSignedCrl"><type>CERTSignedCrl</type></link> *crl</parameter>);</programlisting>
 <para>
+Adds CRL to the X509 key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>crl</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to NSS X509 CRL.
+<listitem><simpara>the pointer to NSS X509 CRL.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeyDataX509GetCrl" role="function">
 <title>xmlSecNssKeyDataX509GetCrl ()</title>
-<indexterm zone="xmlSecNssKeyDataX509GetCrl"><primary sortas="xmlSecNssKeyDataX509GetCrl">xmlSecNssKeyDataX509GetCrl</primary></indexterm><programlisting><link linkend="CERTSignedCrl">CERTSignedCrl</link>*      xmlSecNssKeyDataX509GetCrl          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
-<para>
-Gets a CRL from X509 key data.</para>
+<indexterm zone="xmlSecNssKeyDataX509GetCrl"><primary>xmlSecNssKeyDataX509GetCrl</primary></indexterm>
+<programlisting><link linkend="CERTSignedCrl"><returnvalue>CERTSignedCrl</returnvalue></link>*      xmlSecNssKeyDataX509GetCrl          (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);</programlisting>
 <para>
+Gets a CRL from X509 key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pos</parameter>&#160;:</term>
-<listitem><simpara>                the desired CRL position.
+<listitem><simpara>the desired CRL position.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to CRL or NULL if <parameter>pos</parameter> is larger than the
 number of CRLs in <parameter>data</parameter> or an error occurs.
@@ -199,93 +190,93 @@ number of CRLs in <parameter>data</parameter> or an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeyDataX509GetCrlsSize" role="function">
 <title>xmlSecNssKeyDataX509GetCrlsSize ()</title>
-<indexterm zone="xmlSecNssKeyDataX509GetCrlsSize"><primary sortas="xmlSecNssKeyDataX509GetCrlsSize">xmlSecNssKeyDataX509GetCrlsSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecNssKeyDataX509GetCrlsSize     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets the number of CRLs in <parameter>data</parameter>.</para>
+<indexterm zone="xmlSecNssKeyDataX509GetCrlsSize"><primary>xmlSecNssKeyDataX509GetCrlsSize</primary></indexterm>
+<programlisting><link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          xmlSecNssKeyDataX509GetCrlsSize     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets the number of CRLs in <parameter>data</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> te number of CRLs in <parameter>data</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssX509CertGetKey" role="function">
 <title>xmlSecNssX509CertGetKey ()</title>
-<indexterm zone="xmlSecNssX509CertGetKey"><primary sortas="xmlSecNssX509CertGetKey">xmlSecNssX509CertGetKey</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    xmlSecNssX509CertGetKey             (<link linkend="CERTCertificate">CERTCertificate</link> *cert);</programlisting>
-<para>
-Extracts public key from the <parameter>cert</parameter>.</para>
+<indexterm zone="xmlSecNssX509CertGetKey"><primary>xmlSecNssX509CertGetKey</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyData"><returnvalue>xmlSecKeyDataPtr</returnvalue></link>    xmlSecNssX509CertGetKey             (<parameter><link linkend="CERTCertificate"><type>CERTCertificate</type></link> *cert</parameter>);</programlisting>
 <para>
+Extracts public key from the <parameter>cert</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>cert</parameter>&#160;:</term>
-<listitem><simpara>               the certificate.
+<listitem><simpara>the certificate.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> public key value or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssKeyDataRawX509CertId" role="macro">
 <title>xmlSecNssKeyDataRawX509CertId</title>
-<indexterm zone="xmlSecNssKeyDataRawX509CertId"><primary sortas="xmlSecNssKeyDataRawX509CertId">xmlSecNssKeyDataRawX509CertId</primary></indexterm><programlisting>#define             xmlSecNssKeyDataRawX509CertId</programlisting>
-<para>
-The NSS raw X509 certificate klass.</para>
+<indexterm zone="xmlSecNssKeyDataRawX509CertId"><primary>xmlSecNssKeyDataRawX509CertId</primary></indexterm>
+<programlisting>#define             xmlSecNssKeyDataRawX509CertId</programlisting>
 <para>
+The NSS raw X509 certificate klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssKeyDataRawX509CertGetKlass" role="function">
 <title>xmlSecNssKeyDataRawX509CertGetKlass ()</title>
-<indexterm zone="xmlSecNssKeyDataRawX509CertGetKlass"><primary sortas="xmlSecNssKeyDataRawX509CertGetKlass">xmlSecNssKeyDataRawX509CertGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecNssKeyDataRawX509CertGetKlass (void);</programlisting>
-<para>
-The raw X509 certificates key data klass.</para>
+<indexterm zone="xmlSecNssKeyDataRawX509CertGetKlass"><primary>xmlSecNssKeyDataRawX509CertGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecNssKeyDataRawX509CertGetKlass (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The raw X509 certificates key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> raw X509 certificates key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssX509StoreId" role="macro">
 <title>xmlSecNssX509StoreId</title>
-<indexterm zone="xmlSecNssX509StoreId"><primary sortas="xmlSecNssX509StoreId">xmlSecNssX509StoreId</primary></indexterm><programlisting>#define             xmlSecNssX509StoreId</programlisting>
-<para>
-The NSS X509 store klass.</para>
+<indexterm zone="xmlSecNssX509StoreId"><primary>xmlSecNssX509StoreId</primary></indexterm>
+<programlisting>#define             xmlSecNssX509StoreId</programlisting>
 <para>
+The NSS X509 store klass.
 </para></refsect2>
 <refsect2 id="xmlSecNssX509StoreGetKlass" role="function">
 <title>xmlSecNssX509StoreGetKlass ()</title>
-<indexterm zone="xmlSecNssX509StoreGetKlass"><primary sortas="xmlSecNssX509StoreGetKlass">xmlSecNssX509StoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>  xmlSecNssX509StoreGetKlass        (void);</programlisting>
-<para>
-The NSS X509 certificates key data store klass.</para>
+<indexterm zone="xmlSecNssX509StoreGetKlass"><primary>xmlSecNssX509StoreGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataStoreId"><returnvalue>xmlSecKeyDataStoreId</returnvalue></link>  xmlSecNssX509StoreGetKlass        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The NSS X509 certificates key data store klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to NSS X509 certificates key data store klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssX509StoreFindCert" role="function">
 <title>xmlSecNssX509StoreFindCert ()</title>
-<indexterm zone="xmlSecNssX509StoreFindCert"><primary sortas="xmlSecNssX509StoreFindCert">xmlSecNssX509StoreFindCert</primary></indexterm><programlisting><link linkend="CERTCertificate">CERTCertificate</link>*    xmlSecNssX509StoreFindCert          (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="xmlChar">xmlChar</link> *subjectName,
-                                                         <link linkend="xmlChar">xmlChar</link> *issuerName,
-                                                         <link linkend="xmlChar">xmlChar</link> *issuerSerial,
-                                                         <link linkend="xmlChar">xmlChar</link> *ski,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);</programlisting>
-<para>
-Searches <parameter>store</parameter> for a certificate that matches given criteria.</para>
-<para>
+<indexterm zone="xmlSecNssX509StoreFindCert"><primary>xmlSecNssX509StoreFindCert</primary></indexterm>
+<programlisting><link linkend="CERTCertificate"><returnvalue>CERTCertificate</returnvalue></link>*    xmlSecNssX509StoreFindCert          (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="xmlChar"><type>xmlChar</type></link> *subjectName</parameter>,
+                                                         <parameter><link linkend="xmlChar"><type>xmlChar</type></link> *issuerName</parameter>,
+                                                         <parameter><link linkend="xmlChar"><type>xmlChar</type></link> *issuerSerial</parameter>,
+                                                         <parameter><link linkend="xmlChar"><type>xmlChar</type></link> *ski</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtx</type></link> *keyInfoCtx</parameter>);</programlisting>
+<para>
+Searches <parameter>store</parameter> for a certificate that matches given criteria.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</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>&#160;:</term>
-<listitem><simpara>        the desired certificate name.
+<listitem><simpara>the desired certificate name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>issuerName</parameter>&#160;:</term>
-<listitem><simpara>         the desired certificate issuer name.
+<listitem><simpara>the desired certificate issuer name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>issuerSerial</parameter>&#160;:</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>&#160;:</term>
-<listitem><simpara>                the desired certificate SKI.
+<listitem><simpara>the desired certificate SKI.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
+<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>&#160;:</term><listitem><simpara> pointer to found certificate or NULL if certificate is not found
 or an error occurs.
@@ -293,42 +284,42 @@ or an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssX509StoreVerify" role="function">
 <title>xmlSecNssX509StoreVerify ()</title>
-<indexterm zone="xmlSecNssX509StoreVerify"><primary sortas="xmlSecNssX509StoreVerify">xmlSecNssX509StoreVerify</primary></indexterm><programlisting><link linkend="CERTCertificate">CERTCertificate</link>*    xmlSecNssX509StoreVerify            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="CERTCertList">CERTCertList</link> *certs,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);</programlisting>
-<para>
-Verifies <parameter>certs</parameter> list.</para>
+<indexterm zone="xmlSecNssX509StoreVerify"><primary>xmlSecNssX509StoreVerify</primary></indexterm>
+<programlisting><link linkend="CERTCertificate"><returnvalue>CERTCertificate</returnvalue></link>*    xmlSecNssX509StoreVerify            (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="CERTCertList"><type>CERTCertList</type></link> *certs</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtx</type></link> *keyInfoCtx</parameter>);</programlisting>
 <para>
+Verifies <parameter>certs</parameter> list.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</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>certs</parameter>&#160;:</term>
-<listitem><simpara>              the untrusted certificates stack.
+<listitem><simpara>the untrusted certificates stack.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
+<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>&#160;:</term><listitem><simpara> pointer to the first verified certificate from <parameter>certs</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNssX509StoreAdoptCert" role="function">
 <title>xmlSecNssX509StoreAdoptCert ()</title>
-<indexterm zone="xmlSecNssX509StoreAdoptCert"><primary sortas="xmlSecNssX509StoreAdoptCert">xmlSecNssX509StoreAdoptCert</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssX509StoreAdoptCert         (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="CERTCertificate">CERTCertificate</link> *cert,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
-<para>
-Adds trusted (root) or untrusted certificate to the store.</para>
+<indexterm zone="xmlSecNssX509StoreAdoptCert"><primary>xmlSecNssX509StoreAdoptCert</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNssX509StoreAdoptCert         (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="CERTCertificate"><type>CERTCertificate</type></link> *cert</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
+Adds trusted (root) or untrusted certificate to the store.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</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>cert</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to NSS X509 certificate.
+<listitem><simpara>the pointer to NSS X509 certificate.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the certificate type (trusted/untrusted).
+<listitem><simpara>the certificate type (trusted/untrusted).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
@@ -336,7 +327,4 @@ Adds trusted (root) or untrusted certificate to the store.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/openssl/app.sgml b/docs/api/sgml/openssl/app.sgml
index e398485..d8be7f9 100644
--- a/docs/api/sgml/openssl/app.sgml
+++ b/docs/api/sgml/openssl/app.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-openssl-app.top_of_page">app</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC-OPENSSL Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC-OPENSSL Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>app</refname>
 <refpurpose>Application functions implementation for OpenSSL.</refpurpose>
@@ -13,222 +14,212 @@
 <refsynopsisdiv id="xmlsec-openssl-app.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppInit">xmlSecOpenSSLAppInit</link>                (const <link linkend="char">char</link> *config);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppShutdown">xmlSecOpenSSLAppShutdown</link>            (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppDefaultKeysMngrInit">xmlSecOpenSSLAppDefaultKeysMngrInit</link> (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppDefaultKeysMngrAdoptKey">xmlSecOpenSSLAppDefaultKeysMngrAdoptKey</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppDefaultKeysMngrLoad">xmlSecOpenSSLAppDefaultKeysMngrLoad</link> (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *uri);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppDefaultKeysMngrSave">xmlSecOpenSSLAppDefaultKeysMngrSave</link> (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppKeysMngrCertLoad">xmlSecOpenSSLAppKeysMngrCertLoad</link>    (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppKeysMngrCertLoadMemory">xmlSecOpenSSLAppKeysMngrCertLoadMemory</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppKeysMngrCertLoadBIO">xmlSecOpenSSLAppKeysMngrCertLoadBIO</link> (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="BIO--CAPS">BIO</link> *bio,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppKeysMngrAddCertsPath">xmlSecOpenSSLAppKeysMngrAddCertsPath</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *path);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppKeysMngrAddCertsFile">xmlSecOpenSSLAppKeysMngrAddCertsFile</link>
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *file);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecOpenSSLAppKeyLoad">xmlSecOpenSSLAppKeyLoad</link>             (const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecOpenSSLAppKeyLoadMemory">xmlSecOpenSSLAppKeyLoadMemory</link>       (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecOpenSSLAppKeyLoadBIO">xmlSecOpenSSLAppKeyLoadBIO</link>          (<link linkend="BIO--CAPS">BIO</link> *bio,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecOpenSSLAppPkcs12Load">xmlSecOpenSSLAppPkcs12Load</link>          (const <link linkend="char">char</link> *filename,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecOpenSSLAppPkcs12LoadMemory">xmlSecOpenSSLAppPkcs12LoadMemory</link>    (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecOpenSSLAppPkcs12LoadBIO">xmlSecOpenSSLAppPkcs12LoadBIO</link>       (<link linkend="BIO--CAPS">BIO</link> *bio,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppKeyCertLoad">xmlSecOpenSSLAppKeyCertLoad</link>         (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppKeyCertLoadMemory">xmlSecOpenSSLAppKeyCertLoadMemory</link>   (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppKeyCertLoadBIO">xmlSecOpenSSLAppKeyCertLoadBIO</link>      (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="BIO--CAPS">BIO</link> *bio,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecOpenSSLAppKeyFromCertLoadBIO">xmlSecOpenSSLAppKeyFromCertLoadBIO</link>  (<link linkend="BIO--CAPS">BIO</link> *bio,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="void">void</link>*               <link linkend="xmlSecOpenSSLAppGetDefaultPwdCallback">xmlSecOpenSSLAppGetDefaultPwdCallback</link>
-                                                        (void);
+<synopsis><link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLAppInit">xmlSecOpenSSLAppInit</link>                (<parameter>const <link linkend="char"><type>char</type></link> *config</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLAppShutdown">xmlSecOpenSSLAppShutdown</link>            (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLAppDefaultKeysMngrInit">xmlSecOpenSSLAppDefaultKeysMngrInit</link> (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLAppDefaultKeysMngrAdoptKey">xmlSecOpenSSLAppDefaultKeysMngrAdoptKey</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLAppDefaultKeysMngrLoad">xmlSecOpenSSLAppDefaultKeysMngrLoad</link> (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *uri</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLAppDefaultKeysMngrSave">xmlSecOpenSSLAppDefaultKeysMngrSave</link> (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLAppKeysMngrCertLoad">xmlSecOpenSSLAppKeysMngrCertLoad</link>    (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLAppKeysMngrCertLoadMemory">xmlSecOpenSSLAppKeysMngrCertLoadMemory</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLAppKeysMngrCertLoadBIO">xmlSecOpenSSLAppKeysMngrCertLoadBIO</link> (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="BIO:CAPS"><type>BIO</type></link> *bio</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLAppKeysMngrAddCertsPath">xmlSecOpenSSLAppKeysMngrAddCertsPath</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *path</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLAppKeysMngrAddCertsFile">xmlSecOpenSSLAppKeysMngrAddCertsFile</link>
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *file</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecOpenSSLAppKeyLoad">xmlSecOpenSSLAppKeyLoad</link>             (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecOpenSSLAppKeyLoadMemory">xmlSecOpenSSLAppKeyLoadMemory</link>       (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecOpenSSLAppKeyLoadBIO">xmlSecOpenSSLAppKeyLoadBIO</link>          (<parameter><link linkend="BIO:CAPS"><type>BIO</type></link> *bio</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecOpenSSLAppPkcs12Load">xmlSecOpenSSLAppPkcs12Load</link>          (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecOpenSSLAppPkcs12LoadMemory">xmlSecOpenSSLAppPkcs12LoadMemory</link>    (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecOpenSSLAppPkcs12LoadBIO">xmlSecOpenSSLAppPkcs12LoadBIO</link>       (<parameter><link linkend="BIO:CAPS"><type>BIO</type></link> *bio</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLAppKeyCertLoad">xmlSecOpenSSLAppKeyCertLoad</link>         (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLAppKeyCertLoadMemory">xmlSecOpenSSLAppKeyCertLoadMemory</link>   (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLAppKeyCertLoadBIO">xmlSecOpenSSLAppKeyCertLoadBIO</link>      (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="BIO:CAPS"><type>BIO</type></link> *bio</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        <link linkend="xmlSecOpenSSLAppKeyFromCertLoadBIO">xmlSecOpenSSLAppKeyFromCertLoadBIO</link>  (<parameter><link linkend="BIO:CAPS"><type>BIO</type></link> *bio</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>*               <link linkend="xmlSecOpenSSLAppGetDefaultPwdCallback">xmlSecOpenSSLAppGetDefaultPwdCallback</link>
+                                                        (<parameter><type>void</type></parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-openssl-app.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Application functions implementation for OpenSSL.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-openssl-app.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecOpenSSLAppInit" role="function">
 <title>xmlSecOpenSSLAppInit ()</title>
-<indexterm zone="xmlSecOpenSSLAppInit"><primary sortas="xmlSecOpenSSLAppInit">xmlSecOpenSSLAppInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppInit                (const <link linkend="char">char</link> *config);</programlisting>
+<indexterm zone="xmlSecOpenSSLAppInit"><primary>xmlSecOpenSSLAppInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLAppInit                (<parameter>const <link linkend="char"><type>char</type></link> *config</parameter>);</programlisting>
 <para>
 General crypto engine initialization. This function is used
 by XMLSec command line utility and called before
-<parameter>xmlSecInit</parameter> function.</para>
-<para>
+<parameter>xmlSecInit</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>config</parameter>&#160;:</term>
-<listitem><simpara>             the path to certs.
+<listitem><simpara>the path to certs.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppShutdown" role="function">
 <title>xmlSecOpenSSLAppShutdown ()</title>
-<indexterm zone="xmlSecOpenSSLAppShutdown"><primary sortas="xmlSecOpenSSLAppShutdown">xmlSecOpenSSLAppShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppShutdown            (void);</programlisting>
+<indexterm zone="xmlSecOpenSSLAppShutdown"><primary>xmlSecOpenSSLAppShutdown</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLAppShutdown            (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after
-<parameter>xmlSecShutdown</parameter> function.</para>
-<para>
+<parameter>xmlSecShutdown</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppDefaultKeysMngrInit" role="function">
 <title>xmlSecOpenSSLAppDefaultKeysMngrInit ()</title>
-<indexterm zone="xmlSecOpenSSLAppDefaultKeysMngrInit"><primary sortas="xmlSecOpenSSLAppDefaultKeysMngrInit">xmlSecOpenSSLAppDefaultKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppDefaultKeysMngrInit (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
+<indexterm zone="xmlSecOpenSSLAppDefaultKeysMngrInit"><primary>xmlSecOpenSSLAppDefaultKeysMngrInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLAppDefaultKeysMngrInit (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);</programlisting>
 <para>
 Initializes <parameter>mngr</parameter> with simple keys store <link linkend="xmlSecSimpleKeysStoreId"><type>xmlSecSimpleKeysStoreId</type></link>
-and a default OpenSSL crypto key data stores.</para>
-<para>
+and a default OpenSSL crypto key data stores.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppDefaultKeysMngrAdoptKey" role="function">
 <title>xmlSecOpenSSLAppDefaultKeysMngrAdoptKey ()</title>
-<indexterm zone="xmlSecOpenSSLAppDefaultKeysMngrAdoptKey"><primary sortas="xmlSecOpenSSLAppDefaultKeysMngrAdoptKey">xmlSecOpenSSLAppDefaultKeysMngrAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppDefaultKeysMngrAdoptKey
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<indexterm zone="xmlSecOpenSSLAppDefaultKeysMngrAdoptKey"><primary>xmlSecOpenSSLAppDefaultKeysMngrAdoptKey</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLAppDefaultKeysMngrAdoptKey
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);</programlisting>
 <para>
 Adds <parameter>key</parameter> to the keys manager <parameter>mngr</parameter> created with <link linkend="xmlSecOpenSSLAppDefaultKeysMngrInit"><type>xmlSecOpenSSLAppDefaultKeysMngrInit</type></link>
-function.</para>
-<para>
+function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppDefaultKeysMngrLoad" role="function">
 <title>xmlSecOpenSSLAppDefaultKeysMngrLoad ()</title>
-<indexterm zone="xmlSecOpenSSLAppDefaultKeysMngrLoad"><primary sortas="xmlSecOpenSSLAppDefaultKeysMngrLoad">xmlSecOpenSSLAppDefaultKeysMngrLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppDefaultKeysMngrLoad (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *uri);</programlisting>
+<indexterm zone="xmlSecOpenSSLAppDefaultKeysMngrLoad"><primary>xmlSecOpenSSLAppDefaultKeysMngrLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLAppDefaultKeysMngrLoad (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *uri</parameter>);</programlisting>
 <para>
 Loads XML keys file from <parameter>uri</parameter> to the keys manager <parameter>mngr</parameter> created
-with <link linkend="xmlSecOpenSSLAppDefaultKeysMngrInit"><type>xmlSecOpenSSLAppDefaultKeysMngrInit</type></link> function.</para>
-<para>
+with <link linkend="xmlSecOpenSSLAppDefaultKeysMngrInit"><type>xmlSecOpenSSLAppDefaultKeysMngrInit</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>uri</parameter>&#160;:</term>
-<listitem><simpara>                the uri.
+<listitem><simpara>the uri.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppDefaultKeysMngrSave" role="function">
 <title>xmlSecOpenSSLAppDefaultKeysMngrSave ()</title>
-<indexterm zone="xmlSecOpenSSLAppDefaultKeysMngrSave"><primary sortas="xmlSecOpenSSLAppDefaultKeysMngrSave">xmlSecOpenSSLAppDefaultKeysMngrSave</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppDefaultKeysMngrSave (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
-<para>
-Saves keys from <parameter>mngr</parameter> to  XML keys file.</para>
+<indexterm zone="xmlSecOpenSSLAppDefaultKeysMngrSave"><primary>xmlSecOpenSSLAppDefaultKeysMngrSave</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLAppDefaultKeysMngrSave (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
+Saves keys from <parameter>mngr</parameter> to  XML keys file.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the destination filename.
+<listitem><simpara>the destination filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the type of keys to save (public/private/symmetric).
+<listitem><simpara>the type of keys to save (public/private/symmetric).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppKeysMngrCertLoad" role="function">
 <title>xmlSecOpenSSLAppKeysMngrCertLoad ()</title>
-<indexterm zone="xmlSecOpenSSLAppKeysMngrCertLoad"><primary sortas="xmlSecOpenSSLAppKeysMngrCertLoad">xmlSecOpenSSLAppKeysMngrCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppKeysMngrCertLoad    (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<indexterm zone="xmlSecOpenSSLAppKeysMngrCertLoad"><primary>xmlSecOpenSSLAppKeysMngrCertLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLAppKeysMngrCertLoad    (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
 Reads cert from <parameter>filename</parameter> and adds to the list of trusted or known
-untrusted certs in <parameter>store</parameter>.</para>
-<para>
+untrusted certs in <parameter>store</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the keys manager.
+<listitem><simpara>the keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the certificate file.
+<listitem><simpara>the certificate file.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the flag that indicates is the certificate in <parameter>filename</parameter>
+<listitem><simpara>the flag that indicates is the certificate in <parameter>filename</parameter>
                      trusted or not.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
@@ -236,365 +227,365 @@ untrusted certs in <parameter>store</parameter>.</para>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppKeysMngrCertLoadMemory" role="function">
 <title>xmlSecOpenSSLAppKeysMngrCertLoadMemory ()</title>
-<indexterm zone="xmlSecOpenSSLAppKeysMngrCertLoadMemory"><primary sortas="xmlSecOpenSSLAppKeysMngrCertLoadMemory">xmlSecOpenSSLAppKeysMngrCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppKeysMngrCertLoadMemory
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<indexterm zone="xmlSecOpenSSLAppKeysMngrCertLoadMemory"><primary>xmlSecOpenSSLAppKeysMngrCertLoadMemory</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLAppKeysMngrCertLoadMemory
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</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>
+untrusted certs in <parameter>store</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the keys manager.
+<listitem><simpara>the keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the certificate binary data.
+<listitem><simpara>the certificate binary data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the certificate binary data size.
+<listitem><simpara>the certificate binary data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the flag that indicates is the certificate trusted or not.
+<listitem><simpara>the flag that indicates is the certificate trusted or not.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppKeysMngrCertLoadBIO" role="function">
 <title>xmlSecOpenSSLAppKeysMngrCertLoadBIO ()</title>
-<indexterm zone="xmlSecOpenSSLAppKeysMngrCertLoadBIO"><primary sortas="xmlSecOpenSSLAppKeysMngrCertLoadBIO">xmlSecOpenSSLAppKeysMngrCertLoadBIO</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppKeysMngrCertLoadBIO (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         <link linkend="BIO--CAPS">BIO</link> *bio,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<indexterm zone="xmlSecOpenSSLAppKeysMngrCertLoadBIO"><primary>xmlSecOpenSSLAppKeysMngrCertLoadBIO</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLAppKeysMngrCertLoadBIO (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter><link linkend="BIO:CAPS"><type>BIO</type></link> *bio</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
 Reads cert from an OpenSSL BIO object and adds to the list of trusted or known
-untrusted certs in <parameter>store</parameter>.</para>
-<para>
+untrusted certs in <parameter>store</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the keys manager.
+<listitem><simpara>the keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bio</parameter>&#160;:</term>
-<listitem><simpara>                the certificate BIO.
+<listitem><simpara>the certificate BIO.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the flag that indicates is the certificate trusted or not.
+<listitem><simpara>the flag that indicates is the certificate trusted or not.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppKeysMngrAddCertsPath" role="function">
 <title>xmlSecOpenSSLAppKeysMngrAddCertsPath ()</title>
-<indexterm zone="xmlSecOpenSSLAppKeysMngrAddCertsPath"><primary sortas="xmlSecOpenSSLAppKeysMngrAddCertsPath">xmlSecOpenSSLAppKeysMngrAddCertsPath</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppKeysMngrAddCertsPath
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *path);</programlisting>
-<para>
-Reads cert from <parameter>path</parameter> and adds to the list of trusted certificates.</para>
+<indexterm zone="xmlSecOpenSSLAppKeysMngrAddCertsPath"><primary>xmlSecOpenSSLAppKeysMngrAddCertsPath</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLAppKeysMngrAddCertsPath
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *path</parameter>);</programlisting>
 <para>
+Reads cert from <parameter>path</parameter> and adds to the list of trusted certificates.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the keys manager.
+<listitem><simpara>the keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>path</parameter>&#160;:</term>
-<listitem><simpara>               the path to trusted certificates.
+<listitem><simpara>the path to trusted certificates.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppKeysMngrAddCertsFile" role="function">
 <title>xmlSecOpenSSLAppKeysMngrAddCertsFile ()</title>
-<indexterm zone="xmlSecOpenSSLAppKeysMngrAddCertsFile"><primary sortas="xmlSecOpenSSLAppKeysMngrAddCertsFile">xmlSecOpenSSLAppKeysMngrAddCertsFile</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppKeysMngrAddCertsFile
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *file);</programlisting>
+<indexterm zone="xmlSecOpenSSLAppKeysMngrAddCertsFile"><primary>xmlSecOpenSSLAppKeysMngrAddCertsFile</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLAppKeysMngrAddCertsFile
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *file</parameter>);</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>
+It is possible for <parameter>file</parameter> to contain multiple certs.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the keys manager.
+<listitem><simpara>the keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>file</parameter>&#160;:</term>
-<listitem><simpara>               the file containing trusted certificates.
+<listitem><simpara>the file containing trusted certificates.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppKeyLoad" role="function">
 <title>xmlSecOpenSSLAppKeyLoad ()</title>
-<indexterm zone="xmlSecOpenSSLAppKeyLoad"><primary sortas="xmlSecOpenSSLAppKeyLoad">xmlSecOpenSSLAppKeyLoad</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecOpenSSLAppKeyLoad             (const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
-<para>
-Reads key from the a file.</para>
-<para>
+<indexterm zone="xmlSecOpenSSLAppKeyLoad"><primary>xmlSecOpenSSLAppKeyLoad</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecOpenSSLAppKeyLoad             (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
+<para>
+Reads key from the a file.
 </para><variablelist role="params">
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the key filename.
+<listitem><simpara>the key filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the key file format.
+<listitem><simpara>the key file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the key file password.
+<listitem><simpara>the key file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the key password callback.
+<listitem><simpara>the key password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppKeyLoadMemory" role="function">
 <title>xmlSecOpenSSLAppKeyLoadMemory ()</title>
-<indexterm zone="xmlSecOpenSSLAppKeyLoadMemory"><primary sortas="xmlSecOpenSSLAppKeyLoadMemory">xmlSecOpenSSLAppKeyLoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecOpenSSLAppKeyLoadMemory       (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
-<para>
-Reads key from the memory buffer.</para>
-<para>
+<indexterm zone="xmlSecOpenSSLAppKeyLoadMemory"><primary>xmlSecOpenSSLAppKeyLoadMemory</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecOpenSSLAppKeyLoadMemory       (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
+<para>
+Reads key from the memory buffer.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the binary key data.
+<listitem><simpara>the binary key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the size of binary key.
+<listitem><simpara>the size of binary key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the key file format.
+<listitem><simpara>the key file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the key file password.
+<listitem><simpara>the key file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the key password callback.
+<listitem><simpara>the key password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppKeyLoadBIO" role="function">
 <title>xmlSecOpenSSLAppKeyLoadBIO ()</title>
-<indexterm zone="xmlSecOpenSSLAppKeyLoadBIO"><primary sortas="xmlSecOpenSSLAppKeyLoadBIO">xmlSecOpenSSLAppKeyLoadBIO</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecOpenSSLAppKeyLoadBIO          (<link linkend="BIO--CAPS">BIO</link> *bio,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
-<para>
-Reads key from the an OpenSSL BIO object.</para>
-<para>
+<indexterm zone="xmlSecOpenSSLAppKeyLoadBIO"><primary>xmlSecOpenSSLAppKeyLoadBIO</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecOpenSSLAppKeyLoadBIO          (<parameter><link linkend="BIO:CAPS"><type>BIO</type></link> *bio</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
+<para>
+Reads key from the an OpenSSL BIO object.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bio</parameter>&#160;:</term>
-<listitem><simpara>                the key BIO.
+<listitem><simpara>the key BIO.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the key file format.
+<listitem><simpara>the key file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the key file password.
+<listitem><simpara>the key file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the key password callback.
+<listitem><simpara>the key password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppPkcs12Load" role="function">
 <title>xmlSecOpenSSLAppPkcs12Load ()</title>
-<indexterm zone="xmlSecOpenSSLAppPkcs12Load"><primary sortas="xmlSecOpenSSLAppPkcs12Load">xmlSecOpenSSLAppPkcs12Load</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecOpenSSLAppPkcs12Load          (const <link linkend="char">char</link> *filename,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<indexterm zone="xmlSecOpenSSLAppPkcs12Load"><primary>xmlSecOpenSSLAppPkcs12Load</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecOpenSSLAppPkcs12Load          (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 file.
 For uniformity, call xmlSecOpenSSLAppKeyLoad instead of this function. Pass
-in format=xmlSecKeyDataFormatPkcs12.</para>
-<para>
+in format=xmlSecKeyDataFormatPkcs12.
 </para><variablelist role="params">
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the PKCS12 key filename.
+<listitem><simpara>the PKCS12 key filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the PKCS12 file password.
+<listitem><simpara>the PKCS12 file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the password callback.
+<listitem><simpara>the password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppPkcs12LoadMemory" role="function">
 <title>xmlSecOpenSSLAppPkcs12LoadMemory ()</title>
-<indexterm zone="xmlSecOpenSSLAppPkcs12LoadMemory"><primary sortas="xmlSecOpenSSLAppPkcs12LoadMemory">xmlSecOpenSSLAppPkcs12LoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecOpenSSLAppPkcs12LoadMemory    (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<indexterm zone="xmlSecOpenSSLAppPkcs12LoadMemory"><primary>xmlSecOpenSSLAppPkcs12LoadMemory</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecOpenSSLAppPkcs12LoadMemory    (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 data in memory buffer.
 For uniformity, call xmlSecOpenSSLAppKeyLoad instead of this function. Pass
-in format=xmlSecKeyDataFormatPkcs12.</para>
-<para>
+in format=xmlSecKeyDataFormatPkcs12.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the PKCS12 binary data.
+<listitem><simpara>the PKCS12 binary data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the PKCS12 binary data size.
+<listitem><simpara>the PKCS12 binary data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the PKCS12 file password.
+<listitem><simpara>the PKCS12 file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the password callback.
+<listitem><simpara>the password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppPkcs12LoadBIO" role="function">
 <title>xmlSecOpenSSLAppPkcs12LoadBIO ()</title>
-<indexterm zone="xmlSecOpenSSLAppPkcs12LoadBIO"><primary sortas="xmlSecOpenSSLAppPkcs12LoadBIO">xmlSecOpenSSLAppPkcs12LoadBIO</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecOpenSSLAppPkcs12LoadBIO       (<link linkend="BIO--CAPS">BIO</link> *bio,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<indexterm zone="xmlSecOpenSSLAppPkcs12LoadBIO"><primary>xmlSecOpenSSLAppPkcs12LoadBIO</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecOpenSSLAppPkcs12LoadBIO       (<parameter><link linkend="BIO:CAPS"><type>BIO</type></link> *bio</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 data in an OpenSSL BIO object.
 For uniformity, call xmlSecOpenSSLAppKeyLoad instead of this function. Pass
-in format=xmlSecKeyDataFormatPkcs12.</para>
-<para>
+in format=xmlSecKeyDataFormatPkcs12.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bio</parameter>&#160;:</term>
-<listitem><simpara>                the PKCS12 key bio.
+<listitem><simpara>the PKCS12 key bio.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the PKCS12 file password.
+<listitem><simpara>the PKCS12 file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the password callback.
+<listitem><simpara>the password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppKeyCertLoad" role="function">
 <title>xmlSecOpenSSLAppKeyCertLoad ()</title>
-<indexterm zone="xmlSecOpenSSLAppKeyCertLoad"><primary sortas="xmlSecOpenSSLAppKeyCertLoad">xmlSecOpenSSLAppKeyCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppKeyCertLoad         (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
-<para>
-Reads the certificate from $<parameter>filename</parameter> and adds it to key.</para>
+<indexterm zone="xmlSecOpenSSLAppKeyCertLoad"><primary>xmlSecOpenSSLAppKeyCertLoad</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLAppKeyCertLoad         (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);</programlisting>
 <para>
+Reads the certificate from $<parameter>filename</parameter> and adds it to key.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the certificate filename.
+<listitem><simpara>the certificate filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppKeyCertLoadMemory" role="function">
 <title>xmlSecOpenSSLAppKeyCertLoadMemory ()</title>
-<indexterm zone="xmlSecOpenSSLAppKeyCertLoadMemory"><primary sortas="xmlSecOpenSSLAppKeyCertLoadMemory">xmlSecOpenSSLAppKeyCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppKeyCertLoadMemory   (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
-<para>
-Reads the certificate from memory buffer and adds it to key.</para>
+<indexterm zone="xmlSecOpenSSLAppKeyCertLoadMemory"><primary>xmlSecOpenSSLAppKeyCertLoadMemory</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLAppKeyCertLoadMemory   (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);</programlisting>
 <para>
+Reads the certificate from memory buffer and adds it to key.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the certificate binary data.
+<listitem><simpara>the certificate binary data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the certificate binary data size.
+<listitem><simpara>the certificate binary data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppKeyCertLoadBIO" role="function">
 <title>xmlSecOpenSSLAppKeyCertLoadBIO ()</title>
-<indexterm zone="xmlSecOpenSSLAppKeyCertLoadBIO"><primary sortas="xmlSecOpenSSLAppKeyCertLoadBIO">xmlSecOpenSSLAppKeyCertLoadBIO</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppKeyCertLoadBIO      (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         <link linkend="BIO--CAPS">BIO</link> *bio,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
-<para>
-Reads the certificate from memory buffer and adds it to key.</para>
+<indexterm zone="xmlSecOpenSSLAppKeyCertLoadBIO"><primary>xmlSecOpenSSLAppKeyCertLoadBIO</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLAppKeyCertLoadBIO      (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter><link linkend="BIO:CAPS"><type>BIO</type></link> *bio</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);</programlisting>
 <para>
+Reads the certificate from memory buffer and adds it to key.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bio</parameter>&#160;:</term>
-<listitem><simpara>                the certificate bio.
+<listitem><simpara>the certificate bio.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppKeyFromCertLoadBIO" role="function">
 <title>xmlSecOpenSSLAppKeyFromCertLoadBIO ()</title>
-<indexterm zone="xmlSecOpenSSLAppKeyFromCertLoadBIO"><primary sortas="xmlSecOpenSSLAppKeyFromCertLoadBIO">xmlSecOpenSSLAppKeyFromCertLoadBIO</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecOpenSSLAppKeyFromCertLoadBIO  (<link linkend="BIO--CAPS">BIO</link> *bio,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
-<para>
-Loads public key from cert.</para>
+<indexterm zone="xmlSecOpenSSLAppKeyFromCertLoadBIO"><primary>xmlSecOpenSSLAppKeyFromCertLoadBIO</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        xmlSecOpenSSLAppKeyFromCertLoadBIO  (<parameter><link linkend="BIO:CAPS"><type>BIO</type></link> *bio</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);</programlisting>
 <para>
+Loads public key from cert.
 </para><variablelist role="params">
 <varlistentry><term><parameter>bio</parameter>&#160;:</term>
-<listitem><simpara>                the BIO.
+<listitem><simpara>the BIO.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the cert format.
+<listitem><simpara>the cert format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLAppGetDefaultPwdCallback" role="function">
 <title>xmlSecOpenSSLAppGetDefaultPwdCallback ()</title>
-<indexterm zone="xmlSecOpenSSLAppGetDefaultPwdCallback"><primary sortas="xmlSecOpenSSLAppGetDefaultPwdCallback">xmlSecOpenSSLAppGetDefaultPwdCallback</primary></indexterm><programlisting><link linkend="void">void</link>*               xmlSecOpenSSLAppGetDefaultPwdCallback
-                                                        (void);</programlisting>
-<para>
-Gets default password callback.</para>
+<indexterm zone="xmlSecOpenSSLAppGetDefaultPwdCallback"><primary>xmlSecOpenSSLAppGetDefaultPwdCallback</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>*               xmlSecOpenSSLAppGetDefaultPwdCallback
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets default password callback.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> default password callback.
 </simpara></listitem></varlistentry>
@@ -602,7 +593,4 @@ Gets default password callback.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/openssl/bn.sgml b/docs/api/sgml/openssl/bn.sgml
index 08014a1..6474a54 100644
--- a/docs/api/sgml/openssl/bn.sgml
+++ b/docs/api/sgml/openssl/bn.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-openssl-bn.top_of_page">bn</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC-OPENSSL Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC-OPENSSL Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>bn</refname>
 <refpurpose>Big numbers helper functions.</refpurpose>
@@ -13,48 +14,38 @@
 <refsynopsisdiv id="xmlsec-openssl-bn.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="BIGNUM--CAPS">BIGNUM</link>*             <link linkend="xmlSecOpenSSLNodeGetBNValue">xmlSecOpenSSLNodeGetBNValue</link>         (const <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         <link linkend="BIGNUM--CAPS">BIGNUM</link> **a);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLNodeSetBNValue">xmlSecOpenSSLNodeSetBNValue</link>         (<link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         const <link linkend="BIGNUM--CAPS">BIGNUM</link> *a,
-                                                         <link linkend="int">int</link> addLineBreaks);
+<synopsis><link linkend="BIGNUM:CAPS"><returnvalue>BIGNUM</returnvalue></link>*             <link linkend="xmlSecOpenSSLNodeGetBNValue">xmlSecOpenSSLNodeGetBNValue</link>         (<parameter>const <link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter><link linkend="BIGNUM:CAPS"><type>BIGNUM</type></link> **a</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLNodeSetBNValue">xmlSecOpenSSLNodeSetBNValue</link>         (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter>const <link linkend="BIGNUM:CAPS"><type>BIGNUM</type></link> *a</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> addLineBreaks</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-openssl-bn.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Big numbers helper functions.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-openssl-bn.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecOpenSSLNodeGetBNValue" role="function">
 <title>xmlSecOpenSSLNodeGetBNValue ()</title>
-<indexterm zone="xmlSecOpenSSLNodeGetBNValue"><primary sortas="xmlSecOpenSSLNodeGetBNValue">xmlSecOpenSSLNodeGetBNValue</primary></indexterm><programlisting><link linkend="BIGNUM--CAPS">BIGNUM</link>*             xmlSecOpenSSLNodeGetBNValue         (const <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         <link linkend="BIGNUM--CAPS">BIGNUM</link> **a);</programlisting>
+<indexterm zone="xmlSecOpenSSLNodeGetBNValue"><primary>xmlSecOpenSSLNodeGetBNValue</primary></indexterm>
+<programlisting><link linkend="BIGNUM:CAPS"><returnvalue>BIGNUM</returnvalue></link>*             xmlSecOpenSSLNodeGetBNValue         (<parameter>const <link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter><link linkend="BIGNUM:CAPS"><type>BIGNUM</type></link> **a</parameter>);</programlisting>
 <para>
 Converts the node content from CryptoBinary format
 (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-CryptoBinary"><type>sec-CryptoBinary</type></link>)
 to a BIGNUM. If no BIGNUM buffer provided then a new
-BIGNUM is created (caller is responsible for freeing it).</para>
-<para>
+BIGNUM is created (caller is responsible for freeing it).
 </para><variablelist role="params">
 <varlistentry><term><parameter>cur</parameter>&#160;:</term>
-<listitem><simpara> the poitner to an XML node.
+<listitem><simpara>the poitner to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>a</parameter>&#160;:</term>
-<listitem><simpara> the BIGNUM buffer.
+<listitem><simpara>the BIGNUM buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a pointer to BIGNUM produced from CryptoBinary string
 or NULL if an error occurs.
@@ -62,25 +53,25 @@ or NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLNodeSetBNValue" role="function">
 <title>xmlSecOpenSSLNodeSetBNValue ()</title>
-<indexterm zone="xmlSecOpenSSLNodeSetBNValue"><primary sortas="xmlSecOpenSSLNodeSetBNValue">xmlSecOpenSSLNodeSetBNValue</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLNodeSetBNValue         (<link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         const <link linkend="BIGNUM--CAPS">BIGNUM</link> *a,
-                                                         <link linkend="int">int</link> addLineBreaks);</programlisting>
+<indexterm zone="xmlSecOpenSSLNodeSetBNValue"><primary>xmlSecOpenSSLNodeSetBNValue</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLNodeSetBNValue         (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter>const <link linkend="BIGNUM:CAPS"><type>BIGNUM</type></link> *a</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> addLineBreaks</parameter>);</programlisting>
 <para>
 Converts BIGNUM to CryptoBinary string
 (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-CryptoBinary"><type>sec-CryptoBinary</type></link>)
 and sets it as the content of the given node. If the
 addLineBreaks is set then line breaks are added
-before and after the CryptoBinary string.</para>
-<para>
+before and after the CryptoBinary string.
 </para><variablelist role="params">
 <varlistentry><term><parameter>cur</parameter>&#160;:</term>
-<listitem><simpara> the pointer to an XML node.
+<listitem><simpara>the pointer to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>a</parameter>&#160;:</term>
-<listitem><simpara> the BIGNUM.
+<listitem><simpara>the BIGNUM.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>addLineBreaks</parameter>&#160;:</term>
-<listitem><simpara> if the flag is equal to 1 then
+<listitem><simpara>if the flag is equal to 1 then
              linebreaks will be added before and after
              new buffer content.
 </simpara></listitem></varlistentry>
@@ -90,7 +81,4 @@ before and after the CryptoBinary string.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/openssl/crypto.sgml b/docs/api/sgml/openssl/crypto.sgml
index 1ee77f5..3efbdeb 100644
--- a/docs/api/sgml/openssl/crypto.sgml
+++ b/docs/api/sgml/openssl/crypto.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-openssl-crypto.top_of_page">crypto</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC-OPENSSL Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC-OPENSSL Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>crypto</refname>
 <refpurpose>Crypto transforms implementation for OpenSSL.</refpurpose>
@@ -13,1178 +14,1165 @@
 <refsynopsisdiv id="xmlsec-openssl-crypto.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  <link linkend="xmlSecCryptoGetFunctions-openssl">xmlSecCryptoGetFunctions_openssl</link>
-                                                        (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLInit">xmlSecOpenSSLInit</link>                   (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLShutdown">xmlSecOpenSSLShutdown</link>               (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeysMngrInit">xmlSecOpenSSLKeysMngrInit</link>           (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLGenerateRandom">xmlSecOpenSSLGenerateRandom</link>         (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLSetDefaultTrustedCertsFolder">xmlSecOpenSSLSetDefaultTrustedCertsFolder</link>
-                                                        (const <link linkend="xmlChar">xmlChar</link> *path);
-const <link linkend="xmlChar">xmlChar</link>*      <link linkend="xmlSecOpenSSLGetDefaultTrustedCertsFolder">xmlSecOpenSSLGetDefaultTrustedCertsFolder</link>
-                                                        (void);
+<synopsis><link linkend="xmlSecCryptoDLFunctions"><returnvalue>xmlSecCryptoDLFunctionsPtr</returnvalue></link>  <link linkend="xmlSecCryptoGetFunctions-openssl">xmlSecCryptoGetFunctions_openssl</link>
+                                                        (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLInit">xmlSecOpenSSLInit</link>                   (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLShutdown">xmlSecOpenSSLShutdown</link>               (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLKeysMngrInit">xmlSecOpenSSLKeysMngrInit</link>           (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLGenerateRandom">xmlSecOpenSSLGenerateRandom</link>         (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buffer</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLSetDefaultTrustedCertsFolder">xmlSecOpenSSLSetDefaultTrustedCertsFolder</link>
+                                                        (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *path</parameter>);
+const <link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*      <link linkend="xmlSecOpenSSLGetDefaultTrustedCertsFolder">xmlSecOpenSSLGetDefaultTrustedCertsFolder</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLKeyDataAesId">xmlSecOpenSSLKeyDataAesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecOpenSSLKeyDataAesGetKlass">xmlSecOpenSSLKeyDataAesGetKlass</link>     (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeyDataAesSet">xmlSecOpenSSLKeyDataAesSet</link>          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecOpenSSLKeyDataAesGetKlass">xmlSecOpenSSLKeyDataAesGetKlass</link>     (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLKeyDataAesSet">xmlSecOpenSSLKeyDataAesSet</link>          (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformAes128CbcId">xmlSecOpenSSLTransformAes128CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformAes128CbcGetKlass">xmlSecOpenSSLTransformAes128CbcGetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformAes128CbcGetKlass">xmlSecOpenSSLTransformAes128CbcGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformAes192CbcId">xmlSecOpenSSLTransformAes192CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformAes192CbcGetKlass">xmlSecOpenSSLTransformAes192CbcGetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformAes192CbcGetKlass">xmlSecOpenSSLTransformAes192CbcGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformAes256CbcId">xmlSecOpenSSLTransformAes256CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformAes256CbcGetKlass">xmlSecOpenSSLTransformAes256CbcGetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformAes256CbcGetKlass">xmlSecOpenSSLTransformAes256CbcGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformKWAes128Id">xmlSecOpenSSLTransformKWAes128Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformKWAes128GetKlass">xmlSecOpenSSLTransformKWAes128GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformKWAes128GetKlass">xmlSecOpenSSLTransformKWAes128GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformKWAes192Id">xmlSecOpenSSLTransformKWAes192Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformKWAes192GetKlass">xmlSecOpenSSLTransformKWAes192GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformKWAes192GetKlass">xmlSecOpenSSLTransformKWAes192GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformKWAes256Id">xmlSecOpenSSLTransformKWAes256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformKWAes256GetKlass">xmlSecOpenSSLTransformKWAes256GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformKWAes256GetKlass">xmlSecOpenSSLTransformKWAes256GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLKeyDataDesId">xmlSecOpenSSLKeyDataDesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecOpenSSLKeyDataDesGetKlass">xmlSecOpenSSLKeyDataDesGetKlass</link>     (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeyDataDesSet">xmlSecOpenSSLKeyDataDesSet</link>          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecOpenSSLKeyDataDesGetKlass">xmlSecOpenSSLKeyDataDesGetKlass</link>     (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLKeyDataDesSet">xmlSecOpenSSLKeyDataDesSet</link>          (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformDes3CbcId">xmlSecOpenSSLTransformDes3CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformDes3CbcGetKlass">xmlSecOpenSSLTransformDes3CbcGetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformDes3CbcGetKlass">xmlSecOpenSSLTransformDes3CbcGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformKWDes3Id">xmlSecOpenSSLTransformKWDes3Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformKWDes3GetKlass">xmlSecOpenSSLTransformKWDes3GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformKWDes3GetKlass">xmlSecOpenSSLTransformKWDes3GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLKeyDataDsaId">xmlSecOpenSSLKeyDataDsaId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecOpenSSLKeyDataDsaGetKlass">xmlSecOpenSSLKeyDataDsaGetKlass</link>     (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeyDataDsaAdoptDsa">xmlSecOpenSSLKeyDataDsaAdoptDsa</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="DSA--CAPS">DSA</link> *dsa);
-<link linkend="DSA--CAPS">DSA</link>*                <link linkend="xmlSecOpenSSLKeyDataDsaGetDsa">xmlSecOpenSSLKeyDataDsaGetDsa</link>       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeyDataDsaAdoptEvp">xmlSecOpenSSLKeyDataDsaAdoptEvp</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="EVP-PKEY--CAPS">EVP_PKEY</link> *pKey);
-<link linkend="EVP-PKEY--CAPS">EVP_PKEY</link>*           <link linkend="xmlSecOpenSSLKeyDataDsaGetEvp">xmlSecOpenSSLKeyDataDsaGetEvp</link>       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecOpenSSLKeyDataDsaGetKlass">xmlSecOpenSSLKeyDataDsaGetKlass</link>     (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLKeyDataDsaAdoptDsa">xmlSecOpenSSLKeyDataDsaAdoptDsa</link>     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="DSA:CAPS"><type>DSA</type></link> *dsa</parameter>);
+<link linkend="DSA:CAPS"><returnvalue>DSA</returnvalue></link>*                <link linkend="xmlSecOpenSSLKeyDataDsaGetDsa">xmlSecOpenSSLKeyDataDsaGetDsa</link>       (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLKeyDataDsaAdoptEvp">xmlSecOpenSSLKeyDataDsaAdoptEvp</link>     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="EVP-PKEY:CAPS"><type>EVP_PKEY</type></link> *pKey</parameter>);
+<link linkend="EVP-PKEY:CAPS"><returnvalue>EVP_PKEY</returnvalue></link>*           <link linkend="xmlSecOpenSSLKeyDataDsaGetEvp">xmlSecOpenSSLKeyDataDsaGetEvp</link>       (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
 #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);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformDsaSha1GetKlass">xmlSecOpenSSLTransformDsaSha1GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLHmacGetMinOutputLength">xmlSecOpenSSLHmacGetMinOutputLength</link> (<parameter><type>void</type></parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecOpenSSLHmacSetMinOutputLength">xmlSecOpenSSLHmacSetMinOutputLength</link> (<parameter><link linkend="int"><type>int</type></link> min_length</parameter>);
 #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);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecOpenSSLKeyDataHmacGetKlass">xmlSecOpenSSLKeyDataHmacGetKlass</link>    (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLKeyDataHmacSet">xmlSecOpenSSLKeyDataHmacSet</link>         (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformHmacMd5Id">xmlSecOpenSSLTransformHmacMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformHmacMd5GetKlass">xmlSecOpenSSLTransformHmacMd5GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformHmacMd5GetKlass">xmlSecOpenSSLTransformHmacMd5GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformHmacRipemd160Id">xmlSecOpenSSLTransformHmacRipemd160Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformHmacRipemd160GetKlass">xmlSecOpenSSLTransformHmacRipemd160GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformHmacRipemd160GetKlass">xmlSecOpenSSLTransformHmacRipemd160GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformHmacSha1Id">xmlSecOpenSSLTransformHmacSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformHmacSha1GetKlass">xmlSecOpenSSLTransformHmacSha1GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformHmacSha1GetKlass">xmlSecOpenSSLTransformHmacSha1GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformHmacSha224Id">xmlSecOpenSSLTransformHmacSha224Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformHmacSha224GetKlass">xmlSecOpenSSLTransformHmacSha224GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformHmacSha224GetKlass">xmlSecOpenSSLTransformHmacSha224GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformHmacSha256Id">xmlSecOpenSSLTransformHmacSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformHmacSha256GetKlass">xmlSecOpenSSLTransformHmacSha256GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformHmacSha256GetKlass">xmlSecOpenSSLTransformHmacSha256GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformHmacSha384Id">xmlSecOpenSSLTransformHmacSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformHmacSha384GetKlass">xmlSecOpenSSLTransformHmacSha384GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformHmacSha384GetKlass">xmlSecOpenSSLTransformHmacSha384GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformHmacSha512Id">xmlSecOpenSSLTransformHmacSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformHmacSha512GetKlass">xmlSecOpenSSLTransformHmacSha512GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformHmacSha512GetKlass">xmlSecOpenSSLTransformHmacSha512GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformMd5Id">xmlSecOpenSSLTransformMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformMd5GetKlass">xmlSecOpenSSLTransformMd5GetKlass</link>   (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformMd5GetKlass">xmlSecOpenSSLTransformMd5GetKlass</link>   (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformRipemd160Id">xmlSecOpenSSLTransformRipemd160Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformRipemd160GetKlass">xmlSecOpenSSLTransformRipemd160GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformRipemd160GetKlass">xmlSecOpenSSLTransformRipemd160GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLKeyDataRsaId">xmlSecOpenSSLKeyDataRsaId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecOpenSSLKeyDataRsaGetKlass">xmlSecOpenSSLKeyDataRsaGetKlass</link>     (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeyDataRsaAdoptRsa">xmlSecOpenSSLKeyDataRsaAdoptRsa</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="RSA--CAPS">RSA</link> *rsa);
-<link linkend="RSA--CAPS">RSA</link>*                <link linkend="xmlSecOpenSSLKeyDataRsaGetRsa">xmlSecOpenSSLKeyDataRsaGetRsa</link>       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeyDataRsaAdoptEvp">xmlSecOpenSSLKeyDataRsaAdoptEvp</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="EVP-PKEY--CAPS">EVP_PKEY</link> *pKey);
-<link linkend="EVP-PKEY--CAPS">EVP_PKEY</link>*           <link linkend="xmlSecOpenSSLKeyDataRsaGetEvp">xmlSecOpenSSLKeyDataRsaGetEvp</link>       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecOpenSSLKeyDataRsaGetKlass">xmlSecOpenSSLKeyDataRsaGetKlass</link>     (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLKeyDataRsaAdoptRsa">xmlSecOpenSSLKeyDataRsaAdoptRsa</link>     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="RSA:CAPS"><type>RSA</type></link> *rsa</parameter>);
+<link linkend="RSA:CAPS"><returnvalue>RSA</returnvalue></link>*                <link linkend="xmlSecOpenSSLKeyDataRsaGetRsa">xmlSecOpenSSLKeyDataRsaGetRsa</link>       (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLKeyDataRsaAdoptEvp">xmlSecOpenSSLKeyDataRsaAdoptEvp</link>     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="EVP-PKEY:CAPS"><type>EVP_PKEY</type></link> *pKey</parameter>);
+<link linkend="EVP-PKEY:CAPS"><returnvalue>EVP_PKEY</returnvalue></link>*           <link linkend="xmlSecOpenSSLKeyDataRsaGetEvp">xmlSecOpenSSLKeyDataRsaGetEvp</link>       (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformRsaMd5Id">xmlSecOpenSSLTransformRsaMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformRsaMd5GetKlass">xmlSecOpenSSLTransformRsaMd5GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformRsaMd5GetKlass">xmlSecOpenSSLTransformRsaMd5GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformRsaRipemd160Id">xmlSecOpenSSLTransformRsaRipemd160Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformRsaRipemd160GetKlass">xmlSecOpenSSLTransformRsaRipemd160GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformRsaRipemd160GetKlass">xmlSecOpenSSLTransformRsaRipemd160GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformRsaSha1Id">xmlSecOpenSSLTransformRsaSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformRsaSha1GetKlass">xmlSecOpenSSLTransformRsaSha1GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformRsaSha1GetKlass">xmlSecOpenSSLTransformRsaSha1GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformRsaSha224Id">xmlSecOpenSSLTransformRsaSha224Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformRsaSha224GetKlass">xmlSecOpenSSLTransformRsaSha224GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformRsaSha224GetKlass">xmlSecOpenSSLTransformRsaSha224GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformRsaSha256Id">xmlSecOpenSSLTransformRsaSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformRsaSha256GetKlass">xmlSecOpenSSLTransformRsaSha256GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformRsaSha256GetKlass">xmlSecOpenSSLTransformRsaSha256GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformRsaSha384Id">xmlSecOpenSSLTransformRsaSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformRsaSha384GetKlass">xmlSecOpenSSLTransformRsaSha384GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformRsaSha384GetKlass">xmlSecOpenSSLTransformRsaSha384GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformRsaSha512Id">xmlSecOpenSSLTransformRsaSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformRsaSha512GetKlass">xmlSecOpenSSLTransformRsaSha512GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformRsaSha512GetKlass">xmlSecOpenSSLTransformRsaSha512GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformRsaPkcs1Id">xmlSecOpenSSLTransformRsaPkcs1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformRsaPkcs1GetKlass">xmlSecOpenSSLTransformRsaPkcs1GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformRsaPkcs1GetKlass">xmlSecOpenSSLTransformRsaPkcs1GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformRsaOaepId">xmlSecOpenSSLTransformRsaOaepId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformRsaOaepGetKlass">xmlSecOpenSSLTransformRsaOaepGetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformRsaOaepGetKlass">xmlSecOpenSSLTransformRsaOaepGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformSha1Id">xmlSecOpenSSLTransformSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformSha1GetKlass">xmlSecOpenSSLTransformSha1GetKlass</link>  (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformSha1GetKlass">xmlSecOpenSSLTransformSha1GetKlass</link>  (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformSha224Id">xmlSecOpenSSLTransformSha224Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformSha224GetKlass">xmlSecOpenSSLTransformSha224GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformSha224GetKlass">xmlSecOpenSSLTransformSha224GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformSha256Id">xmlSecOpenSSLTransformSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformSha256GetKlass">xmlSecOpenSSLTransformSha256GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformSha256GetKlass">xmlSecOpenSSLTransformSha256GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformSha384Id">xmlSecOpenSSLTransformSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformSha384GetKlass">xmlSecOpenSSLTransformSha384GetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformSha384GetKlass">xmlSecOpenSSLTransformSha384GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLTransformSha512Id">xmlSecOpenSSLTransformSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformSha512GetKlass">xmlSecOpenSSLTransformSha512GetKlass</link>
-                                                        (void);
-#define             <link linkend="XMLSEC-OPENSSL-ERRORS-LIB--CAPS">XMLSEC_OPENSSL_ERRORS_LIB</link>
-#define             <link linkend="XMLSEC-OPENSSL-ERRORS-FUNCTION--CAPS">XMLSEC_OPENSSL_ERRORS_FUNCTION</link>
-<link linkend="void">void</link>                <link linkend="xmlSecOpenSSLErrorsDefaultCallback">xmlSecOpenSSLErrorsDefaultCallback</link>  (const <link linkend="char">char</link> *file,
-                                                         <link linkend="int">int</link> line,
-                                                         const <link linkend="char">char</link> *func,
-                                                         const <link linkend="char">char</link> *errorObject,
-                                                         const <link linkend="char">char</link> *errorSubject,
-                                                         <link linkend="int">int</link> reason,
-                                                         const <link linkend="char">char</link> *msg);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecOpenSSLTransformSha512GetKlass">xmlSecOpenSSLTransformSha512GetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
+#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"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecOpenSSLErrorsDefaultCallback">xmlSecOpenSSLErrorsDefaultCallback</link>  (<parameter>const <link linkend="char"><type>char</type></link> *file</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> line</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *func</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorObject</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorSubject</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> reason</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *msg</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-openssl-crypto.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Crypto transforms implementation for OpenSSL.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-openssl-crypto.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecCryptoGetFunctions-openssl" role="function">
 <title>xmlSecCryptoGetFunctions_openssl ()</title>
-<indexterm zone="xmlSecCryptoGetFunctions-openssl"><primary sortas="xmlSecCryptoGetFunctions_openssl">xmlSecCryptoGetFunctions_openssl</primary></indexterm><programlisting><link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  xmlSecCryptoGetFunctions_openssl
-                                                        (void);</programlisting>
-<para>
-Gets the pointer to xmlsec-openssl functions table.</para>
+<indexterm zone="xmlSecCryptoGetFunctions-openssl"><primary>xmlSecCryptoGetFunctions_openssl</primary></indexterm>
+<programlisting><link linkend="xmlSecCryptoDLFunctions"><returnvalue>xmlSecCryptoDLFunctionsPtr</returnvalue></link>  xmlSecCryptoGetFunctions_openssl
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets the pointer to xmlsec-openssl functions table.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the xmlsec-openssl functions table or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLInit" role="function">
 <title>xmlSecOpenSSLInit ()</title>
-<indexterm zone="xmlSecOpenSSLInit"><primary sortas="xmlSecOpenSSLInit">xmlSecOpenSSLInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLInit                   (void);</programlisting>
-<para>
-XMLSec library specific crypto engine initialization.</para>
+<indexterm zone="xmlSecOpenSSLInit"><primary>xmlSecOpenSSLInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLInit                   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+XMLSec library specific crypto engine initialization.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLShutdown" role="function">
 <title>xmlSecOpenSSLShutdown ()</title>
-<indexterm zone="xmlSecOpenSSLShutdown"><primary sortas="xmlSecOpenSSLShutdown">xmlSecOpenSSLShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLShutdown               (void);</programlisting>
-<para>
-XMLSec library specific crypto engine shutdown.</para>
+<indexterm zone="xmlSecOpenSSLShutdown"><primary>xmlSecOpenSSLShutdown</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLShutdown               (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+XMLSec library specific crypto engine shutdown.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeysMngrInit" role="function">
 <title>xmlSecOpenSSLKeysMngrInit ()</title>
-<indexterm zone="xmlSecOpenSSLKeysMngrInit"><primary sortas="xmlSecOpenSSLKeysMngrInit">xmlSecOpenSSLKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeysMngrInit           (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
-<para>
-Adds OpenSSL specific key data stores in keys manager.</para>
+<indexterm zone="xmlSecOpenSSLKeysMngrInit"><primary>xmlSecOpenSSLKeysMngrInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLKeysMngrInit           (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);</programlisting>
 <para>
+Adds OpenSSL specific key data stores in keys manager.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLGenerateRandom" role="function">
 <title>xmlSecOpenSSLGenerateRandom ()</title>
-<indexterm zone="xmlSecOpenSSLGenerateRandom"><primary sortas="xmlSecOpenSSLGenerateRandom">xmlSecOpenSSLGenerateRandom</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLGenerateRandom         (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
-<para>
-Generates <parameter>size</parameter> random bytes and puts result in <parameter>buffer</parameter>.</para>
+<indexterm zone="xmlSecOpenSSLGenerateRandom"><primary>xmlSecOpenSSLGenerateRandom</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLGenerateRandom         (<parameter><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link> buffer</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);</programlisting>
 <para>
+Generates <parameter>size</parameter> random bytes and puts result in <parameter>buffer</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buffer</parameter>&#160;:</term>
-<listitem><simpara>             the destination buffer.
+<listitem><simpara>the destination buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the numer of bytes to generate.
+<listitem><simpara>the numer of bytes to generate.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLSetDefaultTrustedCertsFolder" role="function">
 <title>xmlSecOpenSSLSetDefaultTrustedCertsFolder ()</title>
-<indexterm zone="xmlSecOpenSSLSetDefaultTrustedCertsFolder"><primary sortas="xmlSecOpenSSLSetDefaultTrustedCertsFolder">xmlSecOpenSSLSetDefaultTrustedCertsFolder</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLSetDefaultTrustedCertsFolder
-                                                        (const <link linkend="xmlChar">xmlChar</link> *path);</programlisting>
-<para>
-Sets the default trusted certs folder.</para>
+<indexterm zone="xmlSecOpenSSLSetDefaultTrustedCertsFolder"><primary>xmlSecOpenSSLSetDefaultTrustedCertsFolder</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLSetDefaultTrustedCertsFolder
+                                                        (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *path</parameter>);</programlisting>
 <para>
+Sets the default trusted certs folder.
 </para><variablelist role="params">
 <varlistentry><term><parameter>path</parameter>&#160;:</term>
-<listitem><simpara>       the default trusted certs path.
+<listitem><simpara>the default trusted certs path.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLGetDefaultTrustedCertsFolder" role="function">
 <title>xmlSecOpenSSLGetDefaultTrustedCertsFolder ()</title>
-<indexterm zone="xmlSecOpenSSLGetDefaultTrustedCertsFolder"><primary sortas="xmlSecOpenSSLGetDefaultTrustedCertsFolder">xmlSecOpenSSLGetDefaultTrustedCertsFolder</primary></indexterm><programlisting>const <link linkend="xmlChar">xmlChar</link>*      xmlSecOpenSSLGetDefaultTrustedCertsFolder
-                                                        (void);</programlisting>
-<para>
-Gets the default trusted certs folder.</para>
+<indexterm zone="xmlSecOpenSSLGetDefaultTrustedCertsFolder"><primary>xmlSecOpenSSLGetDefaultTrustedCertsFolder</primary></indexterm>
+<programlisting>const <link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*      xmlSecOpenSSLGetDefaultTrustedCertsFolder
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets the default trusted certs folder.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the default trusted cert folder.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataAesId" role="macro">
 <title>xmlSecOpenSSLKeyDataAesId</title>
-<indexterm zone="xmlSecOpenSSLKeyDataAesId"><primary sortas="xmlSecOpenSSLKeyDataAesId">xmlSecOpenSSLKeyDataAesId</primary></indexterm><programlisting>#define             xmlSecOpenSSLKeyDataAesId</programlisting>
-<para>
-The AES key klass.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataAesId"><primary>xmlSecOpenSSLKeyDataAesId</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLKeyDataAesId</programlisting>
 <para>
+The AES key klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataAesGetKlass" role="function">
 <title>xmlSecOpenSSLKeyDataAesGetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataAesGetKlass"><primary sortas="xmlSecOpenSSLKeyDataAesGetKlass">xmlSecOpenSSLKeyDataAesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecOpenSSLKeyDataAesGetKlass     (void);</programlisting>
-<para>
-The AES key data klass.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataAesGetKlass"><primary>xmlSecOpenSSLKeyDataAesGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecOpenSSLKeyDataAesGetKlass     (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The AES key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataAesSet" role="function">
 <title>xmlSecOpenSSLKeyDataAesSet ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataAesSet"><primary sortas="xmlSecOpenSSLKeyDataAesSet">xmlSecOpenSSLKeyDataAesSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeyDataAesSet          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
-<para>
-Sets the value of AES key data.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataAesSet"><primary>xmlSecOpenSSLKeyDataAesSet</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLKeyDataAesSet          (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);</programlisting>
 <para>
+Sets the value of AES key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to AES key data.
+<listitem><simpara>the pointer to AES key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key value.
+<listitem><simpara>the pointer to key value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the key value size (in bytes).
+<listitem><simpara>the key value size (in bytes).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformAes128CbcId" role="macro">
 <title>xmlSecOpenSSLTransformAes128CbcId</title>
-<indexterm zone="xmlSecOpenSSLTransformAes128CbcId"><primary sortas="xmlSecOpenSSLTransformAes128CbcId">xmlSecOpenSSLTransformAes128CbcId</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformAes128CbcId</programlisting>
-<para>
-The AES128 CBC cipher transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformAes128CbcId"><primary>xmlSecOpenSSLTransformAes128CbcId</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformAes128CbcId</programlisting>
 <para>
+The AES128 CBC cipher transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformAes128CbcGetKlass" role="function">
 <title>xmlSecOpenSSLTransformAes128CbcGetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformAes128CbcGetKlass"><primary sortas="xmlSecOpenSSLTransformAes128CbcGetKlass">xmlSecOpenSSLTransformAes128CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformAes128CbcGetKlass
-                                                        (void);</programlisting>
-<para>
-AES 128 CBC encryption transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformAes128CbcGetKlass"><primary>xmlSecOpenSSLTransformAes128CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformAes128CbcGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+AES 128 CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 128 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformAes192CbcId" role="macro">
 <title>xmlSecOpenSSLTransformAes192CbcId</title>
-<indexterm zone="xmlSecOpenSSLTransformAes192CbcId"><primary sortas="xmlSecOpenSSLTransformAes192CbcId">xmlSecOpenSSLTransformAes192CbcId</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformAes192CbcId</programlisting>
-<para>
-The AES192 CBC cipher transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformAes192CbcId"><primary>xmlSecOpenSSLTransformAes192CbcId</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformAes192CbcId</programlisting>
 <para>
+The AES192 CBC cipher transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformAes192CbcGetKlass" role="function">
 <title>xmlSecOpenSSLTransformAes192CbcGetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformAes192CbcGetKlass"><primary sortas="xmlSecOpenSSLTransformAes192CbcGetKlass">xmlSecOpenSSLTransformAes192CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformAes192CbcGetKlass
-                                                        (void);</programlisting>
-<para>
-AES 192 CBC encryption transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformAes192CbcGetKlass"><primary>xmlSecOpenSSLTransformAes192CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformAes192CbcGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+AES 192 CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 192 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformAes256CbcId" role="macro">
 <title>xmlSecOpenSSLTransformAes256CbcId</title>
-<indexterm zone="xmlSecOpenSSLTransformAes256CbcId"><primary sortas="xmlSecOpenSSLTransformAes256CbcId">xmlSecOpenSSLTransformAes256CbcId</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformAes256CbcId</programlisting>
-<para>
-The AES256 CBC cipher transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformAes256CbcId"><primary>xmlSecOpenSSLTransformAes256CbcId</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformAes256CbcId</programlisting>
 <para>
+The AES256 CBC cipher transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformAes256CbcGetKlass" role="function">
 <title>xmlSecOpenSSLTransformAes256CbcGetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformAes256CbcGetKlass"><primary sortas="xmlSecOpenSSLTransformAes256CbcGetKlass">xmlSecOpenSSLTransformAes256CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformAes256CbcGetKlass
-                                                        (void);</programlisting>
-<para>
-AES 256 CBC encryption transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformAes256CbcGetKlass"><primary>xmlSecOpenSSLTransformAes256CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformAes256CbcGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+AES 256 CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 256 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformKWAes128Id" role="macro">
 <title>xmlSecOpenSSLTransformKWAes128Id</title>
-<indexterm zone="xmlSecOpenSSLTransformKWAes128Id"><primary sortas="xmlSecOpenSSLTransformKWAes128Id">xmlSecOpenSSLTransformKWAes128Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformKWAes128Id</programlisting>
-<para>
-The AES 128 key wrap transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformKWAes128Id"><primary>xmlSecOpenSSLTransformKWAes128Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformKWAes128Id</programlisting>
 <para>
+The AES 128 key wrap transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformKWAes128GetKlass" role="function">
 <title>xmlSecOpenSSLTransformKWAes128GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformKWAes128GetKlass"><primary sortas="xmlSecOpenSSLTransformKWAes128GetKlass">xmlSecOpenSSLTransformKWAes128GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformKWAes128GetKlass
-                                                        (void);</programlisting>
-<para>
-The AES-128 kew wrapper transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformKWAes128GetKlass"><primary>xmlSecOpenSSLTransformKWAes128GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformKWAes128GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The AES-128 kew wrapper transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-128 kew wrapper transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformKWAes192Id" role="macro">
 <title>xmlSecOpenSSLTransformKWAes192Id</title>
-<indexterm zone="xmlSecOpenSSLTransformKWAes192Id"><primary sortas="xmlSecOpenSSLTransformKWAes192Id">xmlSecOpenSSLTransformKWAes192Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformKWAes192Id</programlisting>
-<para>
-The AES 192 key wrap transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformKWAes192Id"><primary>xmlSecOpenSSLTransformKWAes192Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformKWAes192Id</programlisting>
 <para>
+The AES 192 key wrap transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformKWAes192GetKlass" role="function">
 <title>xmlSecOpenSSLTransformKWAes192GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformKWAes192GetKlass"><primary sortas="xmlSecOpenSSLTransformKWAes192GetKlass">xmlSecOpenSSLTransformKWAes192GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformKWAes192GetKlass
-                                                        (void);</programlisting>
-<para>
-The AES-192 kew wrapper transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformKWAes192GetKlass"><primary>xmlSecOpenSSLTransformKWAes192GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformKWAes192GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The AES-192 kew wrapper transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-192 kew wrapper transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformKWAes256Id" role="macro">
 <title>xmlSecOpenSSLTransformKWAes256Id</title>
-<indexterm zone="xmlSecOpenSSLTransformKWAes256Id"><primary sortas="xmlSecOpenSSLTransformKWAes256Id">xmlSecOpenSSLTransformKWAes256Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformKWAes256Id</programlisting>
-<para>
-The AES 256 key wrap transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformKWAes256Id"><primary>xmlSecOpenSSLTransformKWAes256Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformKWAes256Id</programlisting>
 <para>
+The AES 256 key wrap transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformKWAes256GetKlass" role="function">
 <title>xmlSecOpenSSLTransformKWAes256GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformKWAes256GetKlass"><primary sortas="xmlSecOpenSSLTransformKWAes256GetKlass">xmlSecOpenSSLTransformKWAes256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformKWAes256GetKlass
-                                                        (void);</programlisting>
-<para>
-The AES-256 kew wrapper transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformKWAes256GetKlass"><primary>xmlSecOpenSSLTransformKWAes256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformKWAes256GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The AES-256 kew wrapper transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-256 kew wrapper transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataDesId" role="macro">
 <title>xmlSecOpenSSLKeyDataDesId</title>
-<indexterm zone="xmlSecOpenSSLKeyDataDesId"><primary sortas="xmlSecOpenSSLKeyDataDesId">xmlSecOpenSSLKeyDataDesId</primary></indexterm><programlisting>#define             xmlSecOpenSSLKeyDataDesId</programlisting>
-<para>
-The DES key klass.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataDesId"><primary>xmlSecOpenSSLKeyDataDesId</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLKeyDataDesId</programlisting>
 <para>
+The DES key klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataDesGetKlass" role="function">
 <title>xmlSecOpenSSLKeyDataDesGetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataDesGetKlass"><primary sortas="xmlSecOpenSSLKeyDataDesGetKlass">xmlSecOpenSSLKeyDataDesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecOpenSSLKeyDataDesGetKlass     (void);</programlisting>
-<para>
-The DES key data klass.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataDesGetKlass"><primary>xmlSecOpenSSLKeyDataDesGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecOpenSSLKeyDataDesGetKlass     (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The DES key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DES key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataDesSet" role="function">
 <title>xmlSecOpenSSLKeyDataDesSet ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataDesSet"><primary sortas="xmlSecOpenSSLKeyDataDesSet">xmlSecOpenSSLKeyDataDesSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeyDataDesSet          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
-<para>
-Sets the value of DES key data.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataDesSet"><primary>xmlSecOpenSSLKeyDataDesSet</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLKeyDataDesSet          (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);</programlisting>
 <para>
+Sets the value of DES key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to DES key data.
+<listitem><simpara>the pointer to DES key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key value.
+<listitem><simpara>the pointer to key value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the key value size (in bytes).
+<listitem><simpara>the key value size (in bytes).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformDes3CbcId" role="macro">
 <title>xmlSecOpenSSLTransformDes3CbcId</title>
-<indexterm zone="xmlSecOpenSSLTransformDes3CbcId"><primary sortas="xmlSecOpenSSLTransformDes3CbcId">xmlSecOpenSSLTransformDes3CbcId</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformDes3CbcId</programlisting>
-<para>
-The DES3 CBC cipher transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformDes3CbcId"><primary>xmlSecOpenSSLTransformDes3CbcId</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformDes3CbcId</programlisting>
 <para>
+The DES3 CBC cipher transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformDes3CbcGetKlass" role="function">
 <title>xmlSecOpenSSLTransformDes3CbcGetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformDes3CbcGetKlass"><primary sortas="xmlSecOpenSSLTransformDes3CbcGetKlass">xmlSecOpenSSLTransformDes3CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformDes3CbcGetKlass
-                                                        (void);</programlisting>
-<para>
-Triple DES CBC encryption transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformDes3CbcGetKlass"><primary>xmlSecOpenSSLTransformDes3CbcGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformDes3CbcGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Triple DES CBC encryption transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to Triple DES encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformKWDes3Id" role="macro">
 <title>xmlSecOpenSSLTransformKWDes3Id</title>
-<indexterm zone="xmlSecOpenSSLTransformKWDes3Id"><primary sortas="xmlSecOpenSSLTransformKWDes3Id">xmlSecOpenSSLTransformKWDes3Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformKWDes3Id</programlisting>
-<para>
-The DES3 CBC cipher transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformKWDes3Id"><primary>xmlSecOpenSSLTransformKWDes3Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformKWDes3Id</programlisting>
 <para>
+The DES3 KW transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformKWDes3GetKlass" role="function">
 <title>xmlSecOpenSSLTransformKWDes3GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformKWDes3GetKlass"><primary sortas="xmlSecOpenSSLTransformKWDes3GetKlass">xmlSecOpenSSLTransformKWDes3GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformKWDes3GetKlass
-                                                        (void);</programlisting>
-<para>
-The Triple DES key wrapper transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformKWDes3GetKlass"><primary>xmlSecOpenSSLTransformKWDes3GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformKWDes3GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The Triple DES key wrapper transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Triple DES key wrapper transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataDsaId" role="macro">
 <title>xmlSecOpenSSLKeyDataDsaId</title>
-<indexterm zone="xmlSecOpenSSLKeyDataDsaId"><primary sortas="xmlSecOpenSSLKeyDataDsaId">xmlSecOpenSSLKeyDataDsaId</primary></indexterm><programlisting>#define             xmlSecOpenSSLKeyDataDsaId</programlisting>
-<para>
-The DSA key klass.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataDsaId"><primary>xmlSecOpenSSLKeyDataDsaId</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLKeyDataDsaId</programlisting>
 <para>
+The DSA key klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataDsaGetKlass" role="function">
 <title>xmlSecOpenSSLKeyDataDsaGetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataDsaGetKlass"><primary sortas="xmlSecOpenSSLKeyDataDsaGetKlass">xmlSecOpenSSLKeyDataDsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecOpenSSLKeyDataDsaGetKlass     (void);</programlisting>
-<para>
-The DSA key data klass.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataDsaGetKlass"><primary>xmlSecOpenSSLKeyDataDsaGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecOpenSSLKeyDataDsaGetKlass     (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The DSA key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to DSA key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataDsaAdoptDsa" role="function">
 <title>xmlSecOpenSSLKeyDataDsaAdoptDsa ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataDsaAdoptDsa"><primary sortas="xmlSecOpenSSLKeyDataDsaAdoptDsa">xmlSecOpenSSLKeyDataDsaAdoptDsa</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeyDataDsaAdoptDsa     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="DSA--CAPS">DSA</link> *dsa);</programlisting>
-<para>
-Sets the value of DSA key data.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataDsaAdoptDsa"><primary>xmlSecOpenSSLKeyDataDsaAdoptDsa</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLKeyDataDsaAdoptDsa     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="DSA:CAPS"><type>DSA</type></link> *dsa</parameter>);</programlisting>
 <para>
+Sets the value of DSA key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to DSA key data.
+<listitem><simpara>the pointer to DSA key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dsa</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to OpenSSL DSA key.
+<listitem><simpara>the pointer to OpenSSL DSA key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataDsaGetDsa" role="function">
 <title>xmlSecOpenSSLKeyDataDsaGetDsa ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataDsaGetDsa"><primary sortas="xmlSecOpenSSLKeyDataDsaGetDsa">xmlSecOpenSSLKeyDataDsaGetDsa</primary></indexterm><programlisting><link linkend="DSA--CAPS">DSA</link>*                xmlSecOpenSSLKeyDataDsaGetDsa       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets the OpenSSL DSA key from DSA key data.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataDsaGetDsa"><primary>xmlSecOpenSSLKeyDataDsaGetDsa</primary></indexterm>
+<programlisting><link linkend="DSA:CAPS"><returnvalue>DSA</returnvalue></link>*                xmlSecOpenSSLKeyDataDsaGetDsa       (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets the OpenSSL DSA key from DSA key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to DSA key data.
+<listitem><simpara>the pointer to DSA key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to OpenSSL DSA key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataDsaAdoptEvp" role="function">
 <title>xmlSecOpenSSLKeyDataDsaAdoptEvp ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataDsaAdoptEvp"><primary sortas="xmlSecOpenSSLKeyDataDsaAdoptEvp">xmlSecOpenSSLKeyDataDsaAdoptEvp</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeyDataDsaAdoptEvp     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="EVP-PKEY--CAPS">EVP_PKEY</link> *pKey);</programlisting>
-<para>
-Sets the DSA key data value to OpenSSL EVP key.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataDsaAdoptEvp"><primary>xmlSecOpenSSLKeyDataDsaAdoptEvp</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLKeyDataDsaAdoptEvp     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="EVP-PKEY:CAPS"><type>EVP_PKEY</type></link> *pKey</parameter>);</programlisting>
 <para>
+Sets the DSA key data value to OpenSSL EVP key.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to DSA key data.
+<listitem><simpara>the pointer to DSA key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pKey</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to OpenSSL EVP key.
+<listitem><simpara>the pointer to OpenSSL EVP key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataDsaGetEvp" role="function">
 <title>xmlSecOpenSSLKeyDataDsaGetEvp ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataDsaGetEvp"><primary sortas="xmlSecOpenSSLKeyDataDsaGetEvp">xmlSecOpenSSLKeyDataDsaGetEvp</primary></indexterm><programlisting><link linkend="EVP-PKEY--CAPS">EVP_PKEY</link>*           xmlSecOpenSSLKeyDataDsaGetEvp       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets the OpenSSL EVP key from DSA key data.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataDsaGetEvp"><primary>xmlSecOpenSSLKeyDataDsaGetEvp</primary></indexterm>
+<programlisting><link linkend="EVP-PKEY:CAPS"><returnvalue>EVP_PKEY</returnvalue></link>*           xmlSecOpenSSLKeyDataDsaGetEvp       (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets the OpenSSL EVP key from DSA key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to DSA key data.
+<listitem><simpara>the pointer to DSA key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to OpenSSL EVP key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformDsaSha1Id" role="macro">
 <title>xmlSecOpenSSLTransformDsaSha1Id</title>
-<indexterm zone="xmlSecOpenSSLTransformDsaSha1Id"><primary sortas="xmlSecOpenSSLTransformDsaSha1Id">xmlSecOpenSSLTransformDsaSha1Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformDsaSha1Id</programlisting>
-<para>
-The DSA SHA1 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformDsaSha1Id"><primary>xmlSecOpenSSLTransformDsaSha1Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformDsaSha1Id</programlisting>
 <para>
+The DSA SHA1 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformDsaSha1GetKlass" role="function">
 <title>xmlSecOpenSSLTransformDsaSha1GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformDsaSha1GetKlass"><primary sortas="xmlSecOpenSSLTransformDsaSha1GetKlass">xmlSecOpenSSLTransformDsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformDsaSha1GetKlass
-                                                        (void);</programlisting>
-<para>
-The DSA-SHA1 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformDsaSha1GetKlass"><primary>xmlSecOpenSSLTransformDsaSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformDsaSha1GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The DSA-SHA1 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DSA-SHA1 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLHmacGetMinOutputLength" role="function">
 <title>xmlSecOpenSSLHmacGetMinOutputLength ()</title>
-<indexterm zone="xmlSecOpenSSLHmacGetMinOutputLength"><primary sortas="xmlSecOpenSSLHmacGetMinOutputLength">xmlSecOpenSSLHmacGetMinOutputLength</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLHmacGetMinOutputLength (void);</programlisting>
-<para>
-Gets the value of min HMAC length.</para>
+<indexterm zone="xmlSecOpenSSLHmacGetMinOutputLength"><primary>xmlSecOpenSSLHmacGetMinOutputLength</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLHmacGetMinOutputLength (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets the value of min HMAC length.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the min HMAC output length
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLHmacSetMinOutputLength" role="function">
 <title>xmlSecOpenSSLHmacSetMinOutputLength ()</title>
-<indexterm zone="xmlSecOpenSSLHmacSetMinOutputLength"><primary sortas="xmlSecOpenSSLHmacSetMinOutputLength">xmlSecOpenSSLHmacSetMinOutputLength</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecOpenSSLHmacSetMinOutputLength (<link linkend="int">int</link> min_length);</programlisting>
-<para>
-Sets the min HMAC output length</para>
+<indexterm zone="xmlSecOpenSSLHmacSetMinOutputLength"><primary>xmlSecOpenSSLHmacSetMinOutputLength</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecOpenSSLHmacSetMinOutputLength (<parameter><link linkend="int"><type>int</type></link> min_length</parameter>);</programlisting>
 <para>
+Sets the min HMAC output length
 </para><variablelist role="params">
 <varlistentry><term><parameter>min_length</parameter>&#160;:</term>
-<listitem><simpara> the new min length
+<listitem><simpara>the new min length
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataHmacId" role="macro">
 <title>xmlSecOpenSSLKeyDataHmacId</title>
-<indexterm zone="xmlSecOpenSSLKeyDataHmacId"><primary sortas="xmlSecOpenSSLKeyDataHmacId">xmlSecOpenSSLKeyDataHmacId</primary></indexterm><programlisting>#define             xmlSecOpenSSLKeyDataHmacId</programlisting>
-<para>
-The DHMAC key klass.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataHmacId"><primary>xmlSecOpenSSLKeyDataHmacId</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLKeyDataHmacId</programlisting>
 <para>
+The DHMAC key klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataHmacGetKlass" role="function">
 <title>xmlSecOpenSSLKeyDataHmacGetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataHmacGetKlass"><primary sortas="xmlSecOpenSSLKeyDataHmacGetKlass">xmlSecOpenSSLKeyDataHmacGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecOpenSSLKeyDataHmacGetKlass    (void);</programlisting>
-<para>
-The HMAC key data klass.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataHmacGetKlass"><primary>xmlSecOpenSSLKeyDataHmacGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecOpenSSLKeyDataHmacGetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> HMAC key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataHmacSet" role="function">
 <title>xmlSecOpenSSLKeyDataHmacSet ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataHmacSet"><primary sortas="xmlSecOpenSSLKeyDataHmacSet">xmlSecOpenSSLKeyDataHmacSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeyDataHmacSet         (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
-<para>
-Sets the value of HMAC key data.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataHmacSet"><primary>xmlSecOpenSSLKeyDataHmacSet</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLKeyDataHmacSet         (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufSize</parameter>);</programlisting>
 <para>
+Sets the value of HMAC key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to HMAC key data.
+<listitem><simpara>the pointer to HMAC key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buf</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key value.
+<listitem><simpara>the pointer to key value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
-<listitem><simpara>            the key value size (in bytes).
+<listitem><simpara>the key value size (in bytes).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformHmacMd5Id" role="macro">
 <title>xmlSecOpenSSLTransformHmacMd5Id</title>
-<indexterm zone="xmlSecOpenSSLTransformHmacMd5Id"><primary sortas="xmlSecOpenSSLTransformHmacMd5Id">xmlSecOpenSSLTransformHmacMd5Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformHmacMd5Id</programlisting>
-<para>
-The HMAC with MD5 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformHmacMd5Id"><primary>xmlSecOpenSSLTransformHmacMd5Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformHmacMd5Id</programlisting>
 <para>
+The HMAC with MD5 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformHmacMd5GetKlass" role="function">
 <title>xmlSecOpenSSLTransformHmacMd5GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformHmacMd5GetKlass"><primary sortas="xmlSecOpenSSLTransformHmacMd5GetKlass">xmlSecOpenSSLTransformHmacMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformHmacMd5GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-MD5 transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformHmacMd5GetKlass"><primary>xmlSecOpenSSLTransformHmacMd5GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformHmacMd5GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-MD5 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-MD5 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformHmacRipemd160Id" role="macro">
 <title>xmlSecOpenSSLTransformHmacRipemd160Id</title>
-<indexterm zone="xmlSecOpenSSLTransformHmacRipemd160Id"><primary sortas="xmlSecOpenSSLTransformHmacRipemd160Id">xmlSecOpenSSLTransformHmacRipemd160Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformHmacRipemd160Id</programlisting>
-<para>
-The HMAC with RipeMD160 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformHmacRipemd160Id"><primary>xmlSecOpenSSLTransformHmacRipemd160Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformHmacRipemd160Id</programlisting>
 <para>
+The HMAC with RipeMD160 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformHmacRipemd160GetKlass" role="function">
 <title>xmlSecOpenSSLTransformHmacRipemd160GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformHmacRipemd160GetKlass"><primary sortas="xmlSecOpenSSLTransformHmacRipemd160GetKlass">xmlSecOpenSSLTransformHmacRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformHmacRipemd160GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-RIPEMD160 transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformHmacRipemd160GetKlass"><primary>xmlSecOpenSSLTransformHmacRipemd160GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformHmacRipemd160GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-RIPEMD160 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-RIPEMD160 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformHmacSha1Id" role="macro">
 <title>xmlSecOpenSSLTransformHmacSha1Id</title>
-<indexterm zone="xmlSecOpenSSLTransformHmacSha1Id"><primary sortas="xmlSecOpenSSLTransformHmacSha1Id">xmlSecOpenSSLTransformHmacSha1Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformHmacSha1Id</programlisting>
-<para>
-The HMAC with SHA1 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformHmacSha1Id"><primary>xmlSecOpenSSLTransformHmacSha1Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformHmacSha1Id</programlisting>
 <para>
+The HMAC with SHA1 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformHmacSha1GetKlass" role="function">
 <title>xmlSecOpenSSLTransformHmacSha1GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformHmacSha1GetKlass"><primary sortas="xmlSecOpenSSLTransformHmacSha1GetKlass">xmlSecOpenSSLTransformHmacSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformHmacSha1GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-SHA1 transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformHmacSha1GetKlass"><primary>xmlSecOpenSSLTransformHmacSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformHmacSha1GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA1 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA1 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformHmacSha224Id" role="macro">
 <title>xmlSecOpenSSLTransformHmacSha224Id</title>
-<indexterm zone="xmlSecOpenSSLTransformHmacSha224Id"><primary sortas="xmlSecOpenSSLTransformHmacSha224Id">xmlSecOpenSSLTransformHmacSha224Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformHmacSha224Id</programlisting>
-<para>
-The HMAC with SHA224 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformHmacSha224Id"><primary>xmlSecOpenSSLTransformHmacSha224Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformHmacSha224Id</programlisting>
 <para>
+The HMAC with SHA224 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformHmacSha224GetKlass" role="function">
 <title>xmlSecOpenSSLTransformHmacSha224GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformHmacSha224GetKlass"><primary sortas="xmlSecOpenSSLTransformHmacSha224GetKlass">xmlSecOpenSSLTransformHmacSha224GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformHmacSha224GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-SHA224 transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformHmacSha224GetKlass"><primary>xmlSecOpenSSLTransformHmacSha224GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformHmacSha224GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA224 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA224 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformHmacSha256Id" role="macro">
 <title>xmlSecOpenSSLTransformHmacSha256Id</title>
-<indexterm zone="xmlSecOpenSSLTransformHmacSha256Id"><primary sortas="xmlSecOpenSSLTransformHmacSha256Id">xmlSecOpenSSLTransformHmacSha256Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformHmacSha256Id</programlisting>
-<para>
-The HMAC with SHA256 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformHmacSha256Id"><primary>xmlSecOpenSSLTransformHmacSha256Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformHmacSha256Id</programlisting>
 <para>
+The HMAC with SHA256 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformHmacSha256GetKlass" role="function">
 <title>xmlSecOpenSSLTransformHmacSha256GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformHmacSha256GetKlass"><primary sortas="xmlSecOpenSSLTransformHmacSha256GetKlass">xmlSecOpenSSLTransformHmacSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformHmacSha256GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-SHA256 transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformHmacSha256GetKlass"><primary>xmlSecOpenSSLTransformHmacSha256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformHmacSha256GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA256 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA256 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformHmacSha384Id" role="macro">
 <title>xmlSecOpenSSLTransformHmacSha384Id</title>
-<indexterm zone="xmlSecOpenSSLTransformHmacSha384Id"><primary sortas="xmlSecOpenSSLTransformHmacSha384Id">xmlSecOpenSSLTransformHmacSha384Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformHmacSha384Id</programlisting>
-<para>
-The HMAC with SHA384 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformHmacSha384Id"><primary>xmlSecOpenSSLTransformHmacSha384Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformHmacSha384Id</programlisting>
 <para>
+The HMAC with SHA384 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformHmacSha384GetKlass" role="function">
 <title>xmlSecOpenSSLTransformHmacSha384GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformHmacSha384GetKlass"><primary sortas="xmlSecOpenSSLTransformHmacSha384GetKlass">xmlSecOpenSSLTransformHmacSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformHmacSha384GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-SHA384 transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformHmacSha384GetKlass"><primary>xmlSecOpenSSLTransformHmacSha384GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformHmacSha384GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA384 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA384 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformHmacSha512Id" role="macro">
 <title>xmlSecOpenSSLTransformHmacSha512Id</title>
-<indexterm zone="xmlSecOpenSSLTransformHmacSha512Id"><primary sortas="xmlSecOpenSSLTransformHmacSha512Id">xmlSecOpenSSLTransformHmacSha512Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformHmacSha512Id</programlisting>
-<para>
-The HMAC with SHA512 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformHmacSha512Id"><primary>xmlSecOpenSSLTransformHmacSha512Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformHmacSha512Id</programlisting>
 <para>
+The HMAC with SHA512 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformHmacSha512GetKlass" role="function">
 <title>xmlSecOpenSSLTransformHmacSha512GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformHmacSha512GetKlass"><primary sortas="xmlSecOpenSSLTransformHmacSha512GetKlass">xmlSecOpenSSLTransformHmacSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformHmacSha512GetKlass
-                                                        (void);</programlisting>
-<para>
-The HMAC-SHA512 transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformHmacSha512GetKlass"><primary>xmlSecOpenSSLTransformHmacSha512GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformHmacSha512GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The HMAC-SHA512 transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA512 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformMd5Id" role="macro">
 <title>xmlSecOpenSSLTransformMd5Id</title>
-<indexterm zone="xmlSecOpenSSLTransformMd5Id"><primary sortas="xmlSecOpenSSLTransformMd5Id">xmlSecOpenSSLTransformMd5Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformMd5Id</programlisting>
-<para>
-The MD5 digest transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformMd5Id"><primary>xmlSecOpenSSLTransformMd5Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformMd5Id</programlisting>
 <para>
+The MD5 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformMd5GetKlass" role="function">
 <title>xmlSecOpenSSLTransformMd5GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformMd5GetKlass"><primary sortas="xmlSecOpenSSLTransformMd5GetKlass">xmlSecOpenSSLTransformMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformMd5GetKlass   (void);</programlisting>
-<para>
-MD5 digest transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformMd5GetKlass"><primary>xmlSecOpenSSLTransformMd5GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformMd5GetKlass   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+MD5 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to MD5 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformRipemd160Id" role="macro">
 <title>xmlSecOpenSSLTransformRipemd160Id</title>
-<indexterm zone="xmlSecOpenSSLTransformRipemd160Id"><primary sortas="xmlSecOpenSSLTransformRipemd160Id">xmlSecOpenSSLTransformRipemd160Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformRipemd160Id</programlisting>
-<para>
-The RIPEMD160 digest transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformRipemd160Id"><primary>xmlSecOpenSSLTransformRipemd160Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformRipemd160Id</programlisting>
 <para>
+The RIPEMD160 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformRipemd160GetKlass" role="function">
 <title>xmlSecOpenSSLTransformRipemd160GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformRipemd160GetKlass"><primary sortas="xmlSecOpenSSLTransformRipemd160GetKlass">xmlSecOpenSSLTransformRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformRipemd160GetKlass
-                                                        (void);</programlisting>
-<para>
-RIPEMD-160 digest transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformRipemd160GetKlass"><primary>xmlSecOpenSSLTransformRipemd160GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformRipemd160GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+RIPEMD-160 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to RIPEMD-160 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataRsaId" role="macro">
 <title>xmlSecOpenSSLKeyDataRsaId</title>
-<indexterm zone="xmlSecOpenSSLKeyDataRsaId"><primary sortas="xmlSecOpenSSLKeyDataRsaId">xmlSecOpenSSLKeyDataRsaId</primary></indexterm><programlisting>#define             xmlSecOpenSSLKeyDataRsaId</programlisting>
-<para>
-The RSA key klass.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataRsaId"><primary>xmlSecOpenSSLKeyDataRsaId</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLKeyDataRsaId</programlisting>
 <para>
+The RSA key klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataRsaGetKlass" role="function">
 <title>xmlSecOpenSSLKeyDataRsaGetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataRsaGetKlass"><primary sortas="xmlSecOpenSSLKeyDataRsaGetKlass">xmlSecOpenSSLKeyDataRsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecOpenSSLKeyDataRsaGetKlass     (void);</programlisting>
-<para>
-The OpenSSL RSA key data klass.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataRsaGetKlass"><primary>xmlSecOpenSSLKeyDataRsaGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecOpenSSLKeyDataRsaGetKlass     (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The OpenSSL RSA key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to OpenSSL RSA key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataRsaAdoptRsa" role="function">
 <title>xmlSecOpenSSLKeyDataRsaAdoptRsa ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataRsaAdoptRsa"><primary sortas="xmlSecOpenSSLKeyDataRsaAdoptRsa">xmlSecOpenSSLKeyDataRsaAdoptRsa</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeyDataRsaAdoptRsa     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="RSA--CAPS">RSA</link> *rsa);</programlisting>
-<para>
-Sets the value of RSA key data.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataRsaAdoptRsa"><primary>xmlSecOpenSSLKeyDataRsaAdoptRsa</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLKeyDataRsaAdoptRsa     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="RSA:CAPS"><type>RSA</type></link> *rsa</parameter>);</programlisting>
 <para>
+Sets the value of RSA key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to RSA key data.
+<listitem><simpara>the pointer to RSA key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>rsa</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to OpenSSL RSA key.
+<listitem><simpara>the pointer to OpenSSL RSA key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataRsaGetRsa" role="function">
 <title>xmlSecOpenSSLKeyDataRsaGetRsa ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataRsaGetRsa"><primary sortas="xmlSecOpenSSLKeyDataRsaGetRsa">xmlSecOpenSSLKeyDataRsaGetRsa</primary></indexterm><programlisting><link linkend="RSA--CAPS">RSA</link>*                xmlSecOpenSSLKeyDataRsaGetRsa       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets the OpenSSL RSA key from RSA key data.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataRsaGetRsa"><primary>xmlSecOpenSSLKeyDataRsaGetRsa</primary></indexterm>
+<programlisting><link linkend="RSA:CAPS"><returnvalue>RSA</returnvalue></link>*                xmlSecOpenSSLKeyDataRsaGetRsa       (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets the OpenSSL RSA key from RSA key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to RSA key data.
+<listitem><simpara>the pointer to RSA key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to OpenSSL RSA key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataRsaAdoptEvp" role="function">
 <title>xmlSecOpenSSLKeyDataRsaAdoptEvp ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataRsaAdoptEvp"><primary sortas="xmlSecOpenSSLKeyDataRsaAdoptEvp">xmlSecOpenSSLKeyDataRsaAdoptEvp</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeyDataRsaAdoptEvp     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="EVP-PKEY--CAPS">EVP_PKEY</link> *pKey);</programlisting>
-<para>
-Sets the RSA key data value to OpenSSL EVP key.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataRsaAdoptEvp"><primary>xmlSecOpenSSLKeyDataRsaAdoptEvp</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLKeyDataRsaAdoptEvp     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="EVP-PKEY:CAPS"><type>EVP_PKEY</type></link> *pKey</parameter>);</programlisting>
 <para>
+Sets the RSA key data value to OpenSSL EVP key.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to RSA key data.
+<listitem><simpara>the pointer to RSA key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pKey</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to OpenSSL EVP key.
+<listitem><simpara>the pointer to OpenSSL EVP key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataRsaGetEvp" role="function">
 <title>xmlSecOpenSSLKeyDataRsaGetEvp ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataRsaGetEvp"><primary sortas="xmlSecOpenSSLKeyDataRsaGetEvp">xmlSecOpenSSLKeyDataRsaGetEvp</primary></indexterm><programlisting><link linkend="EVP-PKEY--CAPS">EVP_PKEY</link>*           xmlSecOpenSSLKeyDataRsaGetEvp       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets the OpenSSL EVP key from RSA key data.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataRsaGetEvp"><primary>xmlSecOpenSSLKeyDataRsaGetEvp</primary></indexterm>
+<programlisting><link linkend="EVP-PKEY:CAPS"><returnvalue>EVP_PKEY</returnvalue></link>*           xmlSecOpenSSLKeyDataRsaGetEvp       (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets the OpenSSL EVP key from RSA key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to RSA key data.
+<listitem><simpara>the pointer to RSA key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to OpenSSL EVP key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformRsaMd5Id" role="macro">
 <title>xmlSecOpenSSLTransformRsaMd5Id</title>
-<indexterm zone="xmlSecOpenSSLTransformRsaMd5Id"><primary sortas="xmlSecOpenSSLTransformRsaMd5Id">xmlSecOpenSSLTransformRsaMd5Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformRsaMd5Id</programlisting>
-<para>
-The RSA-MD5 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformRsaMd5Id"><primary>xmlSecOpenSSLTransformRsaMd5Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformRsaMd5Id</programlisting>
 <para>
+The RSA-MD5 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformRsaMd5GetKlass" role="function">
 <title>xmlSecOpenSSLTransformRsaMd5GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformRsaMd5GetKlass"><primary sortas="xmlSecOpenSSLTransformRsaMd5GetKlass">xmlSecOpenSSLTransformRsaMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformRsaMd5GetKlass
-                                                        (void);</programlisting>
-<para>
-The RSA-MD5 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformRsaMd5GetKlass"><primary>xmlSecOpenSSLTransformRsaMd5GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformRsaMd5GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-MD5 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-MD5 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformRsaRipemd160Id" role="macro">
 <title>xmlSecOpenSSLTransformRsaRipemd160Id</title>
-<indexterm zone="xmlSecOpenSSLTransformRsaRipemd160Id"><primary sortas="xmlSecOpenSSLTransformRsaRipemd160Id">xmlSecOpenSSLTransformRsaRipemd160Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformRsaRipemd160Id</programlisting>
-<para>
-The RSA-RIPEMD160 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformRsaRipemd160Id"><primary>xmlSecOpenSSLTransformRsaRipemd160Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformRsaRipemd160Id</programlisting>
 <para>
+The RSA-RIPEMD160 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformRsaRipemd160GetKlass" role="function">
 <title>xmlSecOpenSSLTransformRsaRipemd160GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformRsaRipemd160GetKlass"><primary sortas="xmlSecOpenSSLTransformRsaRipemd160GetKlass">xmlSecOpenSSLTransformRsaRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformRsaRipemd160GetKlass
-                                                        (void);</programlisting>
-<para>
-The RSA-RIPEMD160 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformRsaRipemd160GetKlass"><primary>xmlSecOpenSSLTransformRsaRipemd160GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformRsaRipemd160GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-RIPEMD160 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-RIPEMD160 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformRsaSha1Id" role="macro">
 <title>xmlSecOpenSSLTransformRsaSha1Id</title>
-<indexterm zone="xmlSecOpenSSLTransformRsaSha1Id"><primary sortas="xmlSecOpenSSLTransformRsaSha1Id">xmlSecOpenSSLTransformRsaSha1Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformRsaSha1Id</programlisting>
-<para>
-The RSA-SHA1 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformRsaSha1Id"><primary>xmlSecOpenSSLTransformRsaSha1Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformRsaSha1Id</programlisting>
 <para>
+The RSA-SHA1 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformRsaSha1GetKlass" role="function">
 <title>xmlSecOpenSSLTransformRsaSha1GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformRsaSha1GetKlass"><primary sortas="xmlSecOpenSSLTransformRsaSha1GetKlass">xmlSecOpenSSLTransformRsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformRsaSha1GetKlass
-                                                        (void);</programlisting>
-<para>
-The RSA-SHA1 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformRsaSha1GetKlass"><primary>xmlSecOpenSSLTransformRsaSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformRsaSha1GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-SHA1 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA1 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformRsaSha224Id" role="macro">
 <title>xmlSecOpenSSLTransformRsaSha224Id</title>
-<indexterm zone="xmlSecOpenSSLTransformRsaSha224Id"><primary sortas="xmlSecOpenSSLTransformRsaSha224Id">xmlSecOpenSSLTransformRsaSha224Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformRsaSha224Id</programlisting>
-<para>
-The RSA-SHA224 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformRsaSha224Id"><primary>xmlSecOpenSSLTransformRsaSha224Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformRsaSha224Id</programlisting>
 <para>
+The RSA-SHA224 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformRsaSha224GetKlass" role="function">
 <title>xmlSecOpenSSLTransformRsaSha224GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformRsaSha224GetKlass"><primary sortas="xmlSecOpenSSLTransformRsaSha224GetKlass">xmlSecOpenSSLTransformRsaSha224GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformRsaSha224GetKlass
-                                                        (void);</programlisting>
-<para>
-The RSA-SHA224 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformRsaSha224GetKlass"><primary>xmlSecOpenSSLTransformRsaSha224GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformRsaSha224GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-SHA224 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA224 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformRsaSha256Id" role="macro">
 <title>xmlSecOpenSSLTransformRsaSha256Id</title>
-<indexterm zone="xmlSecOpenSSLTransformRsaSha256Id"><primary sortas="xmlSecOpenSSLTransformRsaSha256Id">xmlSecOpenSSLTransformRsaSha256Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformRsaSha256Id</programlisting>
-<para>
-The RSA-SHA256 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformRsaSha256Id"><primary>xmlSecOpenSSLTransformRsaSha256Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformRsaSha256Id</programlisting>
 <para>
+The RSA-SHA256 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformRsaSha256GetKlass" role="function">
 <title>xmlSecOpenSSLTransformRsaSha256GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformRsaSha256GetKlass"><primary sortas="xmlSecOpenSSLTransformRsaSha256GetKlass">xmlSecOpenSSLTransformRsaSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformRsaSha256GetKlass
-                                                        (void);</programlisting>
-<para>
-The RSA-SHA256 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformRsaSha256GetKlass"><primary>xmlSecOpenSSLTransformRsaSha256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformRsaSha256GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-SHA256 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA256 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformRsaSha384Id" role="macro">
 <title>xmlSecOpenSSLTransformRsaSha384Id</title>
-<indexterm zone="xmlSecOpenSSLTransformRsaSha384Id"><primary sortas="xmlSecOpenSSLTransformRsaSha384Id">xmlSecOpenSSLTransformRsaSha384Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformRsaSha384Id</programlisting>
-<para>
-The RSA-SHA384 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformRsaSha384Id"><primary>xmlSecOpenSSLTransformRsaSha384Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformRsaSha384Id</programlisting>
 <para>
+The RSA-SHA384 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformRsaSha384GetKlass" role="function">
 <title>xmlSecOpenSSLTransformRsaSha384GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformRsaSha384GetKlass"><primary sortas="xmlSecOpenSSLTransformRsaSha384GetKlass">xmlSecOpenSSLTransformRsaSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformRsaSha384GetKlass
-                                                        (void);</programlisting>
-<para>
-The RSA-SHA384 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformRsaSha384GetKlass"><primary>xmlSecOpenSSLTransformRsaSha384GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformRsaSha384GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-SHA384 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA384 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformRsaSha512Id" role="macro">
 <title>xmlSecOpenSSLTransformRsaSha512Id</title>
-<indexterm zone="xmlSecOpenSSLTransformRsaSha512Id"><primary sortas="xmlSecOpenSSLTransformRsaSha512Id">xmlSecOpenSSLTransformRsaSha512Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformRsaSha512Id</programlisting>
-<para>
-The RSA-SHA512 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformRsaSha512Id"><primary>xmlSecOpenSSLTransformRsaSha512Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformRsaSha512Id</programlisting>
 <para>
+The RSA-SHA512 signature transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformRsaSha512GetKlass" role="function">
 <title>xmlSecOpenSSLTransformRsaSha512GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformRsaSha512GetKlass"><primary sortas="xmlSecOpenSSLTransformRsaSha512GetKlass">xmlSecOpenSSLTransformRsaSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformRsaSha512GetKlass
-                                                        (void);</programlisting>
-<para>
-The RSA-SHA512 signature transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformRsaSha512GetKlass"><primary>xmlSecOpenSSLTransformRsaSha512GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformRsaSha512GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-SHA512 signature transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA512 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformRsaPkcs1Id" role="macro">
 <title>xmlSecOpenSSLTransformRsaPkcs1Id</title>
-<indexterm zone="xmlSecOpenSSLTransformRsaPkcs1Id"><primary sortas="xmlSecOpenSSLTransformRsaPkcs1Id">xmlSecOpenSSLTransformRsaPkcs1Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformRsaPkcs1Id</programlisting>
-<para>
-The RSA PKCS1 key transport transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformRsaPkcs1Id"><primary>xmlSecOpenSSLTransformRsaPkcs1Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformRsaPkcs1Id</programlisting>
 <para>
+The RSA PKCS1 key transport transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformRsaPkcs1GetKlass" role="function">
 <title>xmlSecOpenSSLTransformRsaPkcs1GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformRsaPkcs1GetKlass"><primary sortas="xmlSecOpenSSLTransformRsaPkcs1GetKlass">xmlSecOpenSSLTransformRsaPkcs1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformRsaPkcs1GetKlass
-                                                        (void);</programlisting>
-<para>
-The RSA-PKCS1 key transport transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformRsaPkcs1GetKlass"><primary>xmlSecOpenSSLTransformRsaPkcs1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformRsaPkcs1GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-PKCS1 key transport transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-PKCS1 key transport transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformRsaOaepId" role="macro">
 <title>xmlSecOpenSSLTransformRsaOaepId</title>
-<indexterm zone="xmlSecOpenSSLTransformRsaOaepId"><primary sortas="xmlSecOpenSSLTransformRsaOaepId">xmlSecOpenSSLTransformRsaOaepId</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformRsaOaepId</programlisting>
-<para>
-The RSA PKCS1 key transport transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformRsaOaepId"><primary>xmlSecOpenSSLTransformRsaOaepId</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformRsaOaepId</programlisting>
 <para>
+The RSA PKCS1 key transport transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformRsaOaepGetKlass" role="function">
 <title>xmlSecOpenSSLTransformRsaOaepGetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformRsaOaepGetKlass"><primary sortas="xmlSecOpenSSLTransformRsaOaepGetKlass">xmlSecOpenSSLTransformRsaOaepGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformRsaOaepGetKlass
-                                                        (void);</programlisting>
-<para>
-The RSA-OAEP key transport transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformRsaOaepGetKlass"><primary>xmlSecOpenSSLTransformRsaOaepGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformRsaOaepGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The RSA-OAEP key transport transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-OAEP key transport transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformSha1Id" role="macro">
 <title>xmlSecOpenSSLTransformSha1Id</title>
-<indexterm zone="xmlSecOpenSSLTransformSha1Id"><primary sortas="xmlSecOpenSSLTransformSha1Id">xmlSecOpenSSLTransformSha1Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformSha1Id</programlisting>
-<para>
-The SHA1 digest transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformSha1Id"><primary>xmlSecOpenSSLTransformSha1Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformSha1Id</programlisting>
 <para>
+The SHA1 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformSha1GetKlass" role="function">
 <title>xmlSecOpenSSLTransformSha1GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformSha1GetKlass"><primary sortas="xmlSecOpenSSLTransformSha1GetKlass">xmlSecOpenSSLTransformSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformSha1GetKlass  (void);</programlisting>
-<para>
-SHA-1 digest transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformSha1GetKlass"><primary>xmlSecOpenSSLTransformSha1GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformSha1GetKlass  (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA-1 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-1 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformSha224Id" role="macro">
 <title>xmlSecOpenSSLTransformSha224Id</title>
-<indexterm zone="xmlSecOpenSSLTransformSha224Id"><primary sortas="xmlSecOpenSSLTransformSha224Id">xmlSecOpenSSLTransformSha224Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformSha224Id</programlisting>
-<para>
-The SHA224 digest transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformSha224Id"><primary>xmlSecOpenSSLTransformSha224Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformSha224Id</programlisting>
 <para>
+The SHA224 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformSha224GetKlass" role="function">
 <title>xmlSecOpenSSLTransformSha224GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformSha224GetKlass"><primary sortas="xmlSecOpenSSLTransformSha224GetKlass">xmlSecOpenSSLTransformSha224GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformSha224GetKlass
-                                                        (void);</programlisting>
-<para>
-SHA-224 digest transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformSha224GetKlass"><primary>xmlSecOpenSSLTransformSha224GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformSha224GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA-224 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-224 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformSha256Id" role="macro">
 <title>xmlSecOpenSSLTransformSha256Id</title>
-<indexterm zone="xmlSecOpenSSLTransformSha256Id"><primary sortas="xmlSecOpenSSLTransformSha256Id">xmlSecOpenSSLTransformSha256Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformSha256Id</programlisting>
-<para>
-The SHA256 digest transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformSha256Id"><primary>xmlSecOpenSSLTransformSha256Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformSha256Id</programlisting>
 <para>
+The SHA256 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformSha256GetKlass" role="function">
 <title>xmlSecOpenSSLTransformSha256GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformSha256GetKlass"><primary sortas="xmlSecOpenSSLTransformSha256GetKlass">xmlSecOpenSSLTransformSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformSha256GetKlass
-                                                        (void);</programlisting>
-<para>
-SHA-256 digest transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformSha256GetKlass"><primary>xmlSecOpenSSLTransformSha256GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformSha256GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA-256 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-256 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformSha384Id" role="macro">
 <title>xmlSecOpenSSLTransformSha384Id</title>
-<indexterm zone="xmlSecOpenSSLTransformSha384Id"><primary sortas="xmlSecOpenSSLTransformSha384Id">xmlSecOpenSSLTransformSha384Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformSha384Id</programlisting>
-<para>
-The SHA384 digest transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformSha384Id"><primary>xmlSecOpenSSLTransformSha384Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformSha384Id</programlisting>
 <para>
+The SHA384 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformSha384GetKlass" role="function">
 <title>xmlSecOpenSSLTransformSha384GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformSha384GetKlass"><primary sortas="xmlSecOpenSSLTransformSha384GetKlass">xmlSecOpenSSLTransformSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformSha384GetKlass
-                                                        (void);</programlisting>
-<para>
-SHA-384 digest transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformSha384GetKlass"><primary>xmlSecOpenSSLTransformSha384GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformSha384GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA-384 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-384 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformSha512Id" role="macro">
 <title>xmlSecOpenSSLTransformSha512Id</title>
-<indexterm zone="xmlSecOpenSSLTransformSha512Id"><primary sortas="xmlSecOpenSSLTransformSha512Id">xmlSecOpenSSLTransformSha512Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformSha512Id</programlisting>
-<para>
-The SHA512 digest transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformSha512Id"><primary>xmlSecOpenSSLTransformSha512Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLTransformSha512Id</programlisting>
 <para>
+The SHA512 digest transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLTransformSha512GetKlass" role="function">
 <title>xmlSecOpenSSLTransformSha512GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLTransformSha512GetKlass"><primary sortas="xmlSecOpenSSLTransformSha512GetKlass">xmlSecOpenSSLTransformSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformSha512GetKlass
-                                                        (void);</programlisting>
-<para>
-SHA-512 digest transform klass.</para>
+<indexterm zone="xmlSecOpenSSLTransformSha512GetKlass"><primary>xmlSecOpenSSLTransformSha512GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecOpenSSLTransformSha512GetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+SHA-512 digest transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-512 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="XMLSEC-OPENSSL-ERRORS-LIB--CAPS" role="macro">
+<refsect2 id="XMLSEC-OPENSSL-ERRORS-LIB:CAPS" role="macro">
 <title>XMLSEC_OPENSSL_ERRORS_LIB</title>
-<indexterm zone="XMLSEC-OPENSSL-ERRORS-LIB--CAPS"><primary sortas="XMLSEC_OPENSSL_ERRORS_LIB">XMLSEC_OPENSSL_ERRORS_LIB</primary></indexterm><programlisting>#define XMLSEC_OPENSSL_ERRORS_LIB                       (ERR_LIB_USER + 57)
+<indexterm zone="XMLSEC-OPENSSL-ERRORS-LIB:CAPS"><primary>XMLSEC_OPENSSL_ERRORS_LIB</primary></indexterm>
+<programlisting>#define XMLSEC_OPENSSL_ERRORS_LIB                       (ERR_LIB_USER + 57)
 </programlisting>
 <para>
-Macro. The XMLSec library klass for OpenSSL errors reporting functions.</para>
-<para>
+Macro. The XMLSec library klass for OpenSSL errors reporting functions.
 </para></refsect2>
-<refsect2 id="XMLSEC-OPENSSL-ERRORS-FUNCTION--CAPS" role="macro">
+<refsect2 id="XMLSEC-OPENSSL-ERRORS-FUNCTION:CAPS" role="macro">
 <title>XMLSEC_OPENSSL_ERRORS_FUNCTION</title>
-<indexterm zone="XMLSEC-OPENSSL-ERRORS-FUNCTION--CAPS"><primary sortas="XMLSEC_OPENSSL_ERRORS_FUNCTION">XMLSEC_OPENSSL_ERRORS_FUNCTION</primary></indexterm><programlisting>#define XMLSEC_OPENSSL_ERRORS_FUNCTION                  0
+<indexterm zone="XMLSEC-OPENSSL-ERRORS-FUNCTION:CAPS"><primary>XMLSEC_OPENSSL_ERRORS_FUNCTION</primary></indexterm>
+<programlisting>#define XMLSEC_OPENSSL_ERRORS_FUNCTION                  0
 </programlisting>
 <para>
-Macro. The XMLSec library functions OpenSSL errors reporting functions.</para>
-<para>
+Macro. The XMLSec library functions OpenSSL errors reporting functions.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLErrorsDefaultCallback" role="function">
 <title>xmlSecOpenSSLErrorsDefaultCallback ()</title>
-<indexterm zone="xmlSecOpenSSLErrorsDefaultCallback"><primary sortas="xmlSecOpenSSLErrorsDefaultCallback">xmlSecOpenSSLErrorsDefaultCallback</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecOpenSSLErrorsDefaultCallback  (const <link linkend="char">char</link> *file,
-                                                         <link linkend="int">int</link> line,
-                                                         const <link linkend="char">char</link> *func,
-                                                         const <link linkend="char">char</link> *errorObject,
-                                                         const <link linkend="char">char</link> *errorSubject,
-                                                         <link linkend="int">int</link> reason,
-                                                         const <link linkend="char">char</link> *msg);</programlisting>
-<para>
-The default OpenSSL errors reporting callback function.</para>
-<para>
+<indexterm zone="xmlSecOpenSSLErrorsDefaultCallback"><primary>xmlSecOpenSSLErrorsDefaultCallback</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecOpenSSLErrorsDefaultCallback  (<parameter>const <link linkend="char"><type>char</type></link> *file</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> line</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *func</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorObject</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *errorSubject</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> reason</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *msg</parameter>);</programlisting>
+<para>
+The default OpenSSL errors reporting callback function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>file</parameter>&#160;:</term>
-<listitem><simpara>               the error location file name (__FILE__ macro).
+<listitem><simpara>the error location file name (__FILE__ macro).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>line</parameter>&#160;:</term>
-<listitem><simpara>               the error location line number (__LINE__ macro).
+<listitem><simpara>the error location line number (__LINE__ macro).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>func</parameter>&#160;:</term>
-<listitem><simpara>               the error location function name (__FUNCTION__ macro).
+<listitem><simpara>the error location function name (__FUNCTION__ macro).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>errorObject</parameter>&#160;:</term>
-<listitem><simpara>        the error specific error object
+<listitem><simpara>the error specific error object
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>errorSubject</parameter>&#160;:</term>
-<listitem><simpara>       the error specific error subject.
+<listitem><simpara>the error specific error subject.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>reason</parameter>&#160;:</term>
-<listitem><simpara>             the error code.
+<listitem><simpara>the error code.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>msg</parameter>&#160;:</term>
-<listitem><simpara>                the additional error message.
+<listitem><simpara>the additional error message.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/openssl/evp.sgml b/docs/api/sgml/openssl/evp.sgml
index 7b7501c..9ba36b4 100644
--- a/docs/api/sgml/openssl/evp.sgml
+++ b/docs/api/sgml/openssl/evp.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-openssl-evp.top_of_page">evp</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC-OPENSSL Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC-OPENSSL Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>evp</refname>
 <refpurpose>EVP keys data implementation.</refpurpose>
@@ -13,84 +14,74 @@
 <refsynopsisdiv id="xmlsec-openssl-evp.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLEvpKeyDataAdoptEvp">xmlSecOpenSSLEvpKeyDataAdoptEvp</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="EVP-PKEY--CAPS">EVP_PKEY</link> *pKey);
-<link linkend="EVP-PKEY--CAPS">EVP_PKEY</link>*           <link linkend="xmlSecOpenSSLEvpKeyDataGetEvp">xmlSecOpenSSLEvpKeyDataGetEvp</link>       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="EVP-PKEY--CAPS">EVP_PKEY</link>*           <link linkend="xmlSecOpenSSLEvpKeyDup">xmlSecOpenSSLEvpKeyDup</link>              (<link linkend="EVP-PKEY--CAPS">EVP_PKEY</link> *pKey);
-<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    <link linkend="xmlSecOpenSSLEvpKeyAdopt">xmlSecOpenSSLEvpKeyAdopt</link>            (<link linkend="EVP-PKEY--CAPS">EVP_PKEY</link> *pKey);
+<synopsis><link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLEvpKeyDataAdoptEvp">xmlSecOpenSSLEvpKeyDataAdoptEvp</link>     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="EVP-PKEY:CAPS"><type>EVP_PKEY</type></link> *pKey</parameter>);
+<link linkend="EVP-PKEY:CAPS"><returnvalue>EVP_PKEY</returnvalue></link>*           <link linkend="xmlSecOpenSSLEvpKeyDataGetEvp">xmlSecOpenSSLEvpKeyDataGetEvp</link>       (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="EVP-PKEY:CAPS"><returnvalue>EVP_PKEY</returnvalue></link>*           <link linkend="xmlSecOpenSSLEvpKeyDup">xmlSecOpenSSLEvpKeyDup</link>              (<parameter><link linkend="EVP-PKEY:CAPS"><type>EVP_PKEY</type></link> *pKey</parameter>);
+<link linkend="xmlSecKeyData"><returnvalue>xmlSecKeyDataPtr</returnvalue></link>    <link linkend="xmlSecOpenSSLEvpKeyAdopt">xmlSecOpenSSLEvpKeyAdopt</link>            (<parameter><link linkend="EVP-PKEY:CAPS"><type>EVP_PKEY</type></link> *pKey</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-openssl-evp.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 EVP keys data implementation.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-openssl-evp.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecOpenSSLEvpKeyDataAdoptEvp" role="function">
 <title>xmlSecOpenSSLEvpKeyDataAdoptEvp ()</title>
-<indexterm zone="xmlSecOpenSSLEvpKeyDataAdoptEvp"><primary sortas="xmlSecOpenSSLEvpKeyDataAdoptEvp">xmlSecOpenSSLEvpKeyDataAdoptEvp</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLEvpKeyDataAdoptEvp     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="EVP-PKEY--CAPS">EVP_PKEY</link> *pKey);</programlisting>
-<para>
-Sets the value of key data.</para>
+<indexterm zone="xmlSecOpenSSLEvpKeyDataAdoptEvp"><primary>xmlSecOpenSSLEvpKeyDataAdoptEvp</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLEvpKeyDataAdoptEvp     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="EVP-PKEY:CAPS"><type>EVP_PKEY</type></link> *pKey</parameter>);</programlisting>
 <para>
+Sets the value of key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to OpenSSL EVP key data.
+<listitem><simpara>the pointer to OpenSSL EVP key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pKey</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to EVP key.
+<listitem><simpara>the pointer to EVP key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLEvpKeyDataGetEvp" role="function">
 <title>xmlSecOpenSSLEvpKeyDataGetEvp ()</title>
-<indexterm zone="xmlSecOpenSSLEvpKeyDataGetEvp"><primary sortas="xmlSecOpenSSLEvpKeyDataGetEvp">xmlSecOpenSSLEvpKeyDataGetEvp</primary></indexterm><programlisting><link linkend="EVP-PKEY--CAPS">EVP_PKEY</link>*           xmlSecOpenSSLEvpKeyDataGetEvp       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets the EVP_PKEY from the key data.</para>
+<indexterm zone="xmlSecOpenSSLEvpKeyDataGetEvp"><primary>xmlSecOpenSSLEvpKeyDataGetEvp</primary></indexterm>
+<programlisting><link linkend="EVP-PKEY:CAPS"><returnvalue>EVP_PKEY</returnvalue></link>*           xmlSecOpenSSLEvpKeyDataGetEvp       (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets the EVP_PKEY from the key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to OpenSSL EVP data.
+<listitem><simpara>the pointer to OpenSSL EVP data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to EVP_PKEY or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLEvpKeyDup" role="function">
 <title>xmlSecOpenSSLEvpKeyDup ()</title>
-<indexterm zone="xmlSecOpenSSLEvpKeyDup"><primary sortas="xmlSecOpenSSLEvpKeyDup">xmlSecOpenSSLEvpKeyDup</primary></indexterm><programlisting><link linkend="EVP-PKEY--CAPS">EVP_PKEY</link>*           xmlSecOpenSSLEvpKeyDup              (<link linkend="EVP-PKEY--CAPS">EVP_PKEY</link> *pKey);</programlisting>
-<para>
-Duplicates <parameter>pKey</parameter>.</para>
+<indexterm zone="xmlSecOpenSSLEvpKeyDup"><primary>xmlSecOpenSSLEvpKeyDup</primary></indexterm>
+<programlisting><link linkend="EVP-PKEY:CAPS"><returnvalue>EVP_PKEY</returnvalue></link>*           xmlSecOpenSSLEvpKeyDup              (<parameter><link linkend="EVP-PKEY:CAPS"><type>EVP_PKEY</type></link> *pKey</parameter>);</programlisting>
 <para>
+Duplicates <parameter>pKey</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>pKey</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to EVP_PKEY.
+<listitem><simpara>the pointer to EVP_PKEY.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created EVP_PKEY object or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLEvpKeyAdopt" role="function">
 <title>xmlSecOpenSSLEvpKeyAdopt ()</title>
-<indexterm zone="xmlSecOpenSSLEvpKeyAdopt"><primary sortas="xmlSecOpenSSLEvpKeyAdopt">xmlSecOpenSSLEvpKeyAdopt</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    xmlSecOpenSSLEvpKeyAdopt            (<link linkend="EVP-PKEY--CAPS">EVP_PKEY</link> *pKey);</programlisting>
-<para>
-Creates xmlsec key object from OpenSSL key object.</para>
+<indexterm zone="xmlSecOpenSSLEvpKeyAdopt"><primary>xmlSecOpenSSLEvpKeyAdopt</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyData"><returnvalue>xmlSecKeyDataPtr</returnvalue></link>    xmlSecOpenSSLEvpKeyAdopt            (<parameter><link linkend="EVP-PKEY:CAPS"><type>EVP_PKEY</type></link> *pKey</parameter>);</programlisting>
 <para>
+Creates xmlsec key object from OpenSSL key object.
 </para><variablelist role="params">
 <varlistentry><term><parameter>pKey</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to EVP_PKEY.
+<listitem><simpara>the pointer to EVP_PKEY.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created xmlsec key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
@@ -98,7 +89,4 @@ Creates xmlsec key object from OpenSSL key object.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/openssl/x509.sgml b/docs/api/sgml/openssl/x509.sgml
index aca586b..ad52ede 100644
--- a/docs/api/sgml/openssl/x509.sgml
+++ b/docs/api/sgml/openssl/x509.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-openssl-x509.top_of_page">x509</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC-OPENSSL Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC-OPENSSL Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>x509</refname>
 <refpurpose>X509 certificates support implementation for OpenSSL.</refpurpose>
@@ -13,113 +14,103 @@
 <refsynopsisdiv id="xmlsec-openssl-x509.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-#define             <link linkend="XMLSEC-STACK-OF-X509--CAPS">XMLSEC_STACK_OF_X509</link>
-#define             <link linkend="XMLSEC-STACK-OF-X509-CRL--CAPS">XMLSEC_STACK_OF_X509_CRL</link>
+<synopsis>#define             <link linkend="XMLSEC-STACK-OF-X509:CAPS">XMLSEC_STACK_OF_X509</link>
+#define             <link linkend="XMLSEC-STACK-OF-X509-CRL:CAPS">XMLSEC_STACK_OF_X509_CRL</link>
 #define             <link linkend="xmlSecOpenSSLKeyDataX509Id">xmlSecOpenSSLKeyDataX509Id</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecOpenSSLKeyDataX509GetKlass">xmlSecOpenSSLKeyDataX509GetKlass</link>    (void);
-<link linkend="X509--CAPS">X509</link>*               <link linkend="xmlSecOpenSSLKeyDataX509GetKeyCert">xmlSecOpenSSLKeyDataX509GetKeyCert</link>  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeyDataX509AdoptKeyCert">xmlSecOpenSSLKeyDataX509AdoptKeyCert</link>
-                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="X509--CAPS">X509</link> *cert);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeyDataX509AdoptCert">xmlSecOpenSSLKeyDataX509AdoptCert</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="X509--CAPS">X509</link> *cert);
-<link linkend="X509--CAPS">X509</link>*               <link linkend="xmlSecOpenSSLKeyDataX509GetCert">xmlSecOpenSSLKeyDataX509GetCert</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecOpenSSLKeyDataX509GetCertsSize">xmlSecOpenSSLKeyDataX509GetCertsSize</link>
-                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeyDataX509AdoptCrl">xmlSecOpenSSLKeyDataX509AdoptCrl</link>    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="X509-CRL--CAPS">X509_CRL</link> *crl);
-<link linkend="X509-CRL--CAPS">X509_CRL</link>*           <link linkend="xmlSecOpenSSLKeyDataX509GetCrl">xmlSecOpenSSLKeyDataX509GetCrl</link>      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecOpenSSLKeyDataX509GetCrlsSize">xmlSecOpenSSLKeyDataX509GetCrlsSize</link> (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    <link linkend="xmlSecOpenSSLX509CertGetKey">xmlSecOpenSSLX509CertGetKey</link>         (<link linkend="X509--CAPS">X509</link> *cert);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecOpenSSLKeyDataX509GetKlass">xmlSecOpenSSLKeyDataX509GetKlass</link>    (<parameter><type>void</type></parameter>);
+<link linkend="X509:CAPS"><returnvalue>X509</returnvalue></link>*               <link linkend="xmlSecOpenSSLKeyDataX509GetKeyCert">xmlSecOpenSSLKeyDataX509GetKeyCert</link>  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLKeyDataX509AdoptKeyCert">xmlSecOpenSSLKeyDataX509AdoptKeyCert</link>
+                                                        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="X509:CAPS"><type>X509</type></link> *cert</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLKeyDataX509AdoptCert">xmlSecOpenSSLKeyDataX509AdoptCert</link>   (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="X509:CAPS"><type>X509</type></link> *cert</parameter>);
+<link linkend="X509:CAPS"><returnvalue>X509</returnvalue></link>*               <link linkend="xmlSecOpenSSLKeyDataX509GetCert">xmlSecOpenSSLKeyDataX509GetCert</link>     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);
+<link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          <link linkend="xmlSecOpenSSLKeyDataX509GetCertsSize">xmlSecOpenSSLKeyDataX509GetCertsSize</link>
+                                                        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLKeyDataX509AdoptCrl">xmlSecOpenSSLKeyDataX509AdoptCrl</link>    (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="X509-CRL:CAPS"><type>X509_CRL</type></link> *crl</parameter>);
+<link linkend="X509-CRL:CAPS"><returnvalue>X509_CRL</returnvalue></link>*           <link linkend="xmlSecOpenSSLKeyDataX509GetCrl">xmlSecOpenSSLKeyDataX509GetCrl</link>      (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);
+<link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          <link linkend="xmlSecOpenSSLKeyDataX509GetCrlsSize">xmlSecOpenSSLKeyDataX509GetCrlsSize</link> (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);
+<link linkend="xmlSecKeyData"><returnvalue>xmlSecKeyDataPtr</returnvalue></link>    <link linkend="xmlSecOpenSSLX509CertGetKey">xmlSecOpenSSLX509CertGetKey</link>         (<parameter><link linkend="X509:CAPS"><type>X509</type></link> *cert</parameter>);
 #define             <link linkend="xmlSecOpenSSLKeyDataRawX509CertId">xmlSecOpenSSLKeyDataRawX509CertId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecOpenSSLKeyDataRawX509CertGetKlass">xmlSecOpenSSLKeyDataRawX509CertGetKlass</link>
-                                                        (void);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     <link linkend="xmlSecOpenSSLKeyDataRawX509CertGetKlass">xmlSecOpenSSLKeyDataRawX509CertGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecOpenSSLX509StoreId">xmlSecOpenSSLX509StoreId</link>
-<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>  <link linkend="xmlSecOpenSSLX509StoreGetKlass">xmlSecOpenSSLX509StoreGetKlass</link>    (void);
-<link linkend="X509--CAPS">X509</link>*               <link linkend="xmlSecOpenSSLX509StoreFindCert">xmlSecOpenSSLX509StoreFindCert</link>      (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="xmlChar">xmlChar</link> *subjectName,
-                                                         <link linkend="xmlChar">xmlChar</link> *issuerName,
-                                                         <link linkend="xmlChar">xmlChar</link> *issuerSerial,
-                                                         <link linkend="xmlChar">xmlChar</link> *ski,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);
-<link linkend="X509--CAPS">X509</link>*               <link linkend="xmlSecOpenSSLX509StoreVerify">xmlSecOpenSSLX509StoreVerify</link>        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="XMLSEC-STACK-OF-X509--CAPS">XMLSEC_STACK_OF_X509</link> *certs,
-                                                         <link linkend="XMLSEC-STACK-OF-X509-CRL--CAPS">XMLSEC_STACK_OF_X509_CRL</link> *crls,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLX509StoreAdoptCert">xmlSecOpenSSLX509StoreAdoptCert</link>     (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="X509--CAPS">X509</link> *cert,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLX509StoreAdoptCrl">xmlSecOpenSSLX509StoreAdoptCrl</link>      (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="X509-CRL--CAPS">X509_CRL</link> *crl);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLX509StoreAddCertsPath">xmlSecOpenSSLX509StoreAddCertsPath</link>  (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         const <link linkend="char">char</link> *path);
-<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLX509StoreAddCertsFile">xmlSecOpenSSLX509StoreAddCertsFile</link>  (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         const <link linkend="char">char</link> *file);
+<link linkend="xmlSecKeyDataStoreId"><returnvalue>xmlSecKeyDataStoreId</returnvalue></link>  <link linkend="xmlSecOpenSSLX509StoreGetKlass">xmlSecOpenSSLX509StoreGetKlass</link>    (<parameter><type>void</type></parameter>);
+<link linkend="X509:CAPS"><returnvalue>X509</returnvalue></link>*               <link linkend="xmlSecOpenSSLX509StoreFindCert">xmlSecOpenSSLX509StoreFindCert</link>      (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="xmlChar"><type>xmlChar</type></link> *subjectName</parameter>,
+                                                         <parameter><link linkend="xmlChar"><type>xmlChar</type></link> *issuerName</parameter>,
+                                                         <parameter><link linkend="xmlChar"><type>xmlChar</type></link> *issuerSerial</parameter>,
+                                                         <parameter><link linkend="xmlChar"><type>xmlChar</type></link> *ski</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtx</type></link> *keyInfoCtx</parameter>);
+<link linkend="X509:CAPS"><returnvalue>X509</returnvalue></link>*               <link linkend="xmlSecOpenSSLX509StoreVerify">xmlSecOpenSSLX509StoreVerify</link>        (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="XMLSEC-STACK-OF-X509:CAPS"><type>XMLSEC_STACK_OF_X509</type></link> *certs</parameter>,
+                                                         <parameter><link linkend="XMLSEC-STACK-OF-X509-CRL:CAPS"><type>XMLSEC_STACK_OF_X509_CRL</type></link> *crls</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtx</type></link> *keyInfoCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLX509StoreAdoptCert">xmlSecOpenSSLX509StoreAdoptCert</link>     (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="X509:CAPS"><type>X509</type></link> *cert</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLX509StoreAdoptCrl">xmlSecOpenSSLX509StoreAdoptCrl</link>      (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="X509-CRL:CAPS"><type>X509_CRL</type></link> *crl</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLX509StoreAddCertsPath">xmlSecOpenSSLX509StoreAddCertsPath</link>  (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *path</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecOpenSSLX509StoreAddCertsFile">xmlSecOpenSSLX509StoreAddCertsFile</link>  (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *file</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-openssl-x509.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 X509 certificates support implementation for OpenSSL.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-openssl-x509.details" role="details">
 <title role="details.title">Details</title>
-<refsect2 id="XMLSEC-STACK-OF-X509--CAPS" role="macro">
+<refsect2 id="XMLSEC-STACK-OF-X509:CAPS" role="macro">
 <title>XMLSEC_STACK_OF_X509</title>
-<indexterm zone="XMLSEC-STACK-OF-X509--CAPS"><primary sortas="XMLSEC_STACK_OF_X509">XMLSEC_STACK_OF_X509</primary></indexterm><programlisting>#define XMLSEC_STACK_OF_X509            STACK_OF(X509)
+<indexterm zone="XMLSEC-STACK-OF-X509:CAPS"><primary>XMLSEC_STACK_OF_X509</primary></indexterm>
+<programlisting>#define XMLSEC_STACK_OF_X509            STACK_OF(X509)
 </programlisting>
 <para>
-Macro. To make docbook happy.</para>
-<para>
+Macro. To make docbook happy.
 </para></refsect2>
-<refsect2 id="XMLSEC-STACK-OF-X509-CRL--CAPS" role="macro">
+<refsect2 id="XMLSEC-STACK-OF-X509-CRL:CAPS" role="macro">
 <title>XMLSEC_STACK_OF_X509_CRL</title>
-<indexterm zone="XMLSEC-STACK-OF-X509-CRL--CAPS"><primary sortas="XMLSEC_STACK_OF_X509_CRL">XMLSEC_STACK_OF_X509_CRL</primary></indexterm><programlisting>#define XMLSEC_STACK_OF_X509_CRL        STACK_OF(X509_CRL)
+<indexterm zone="XMLSEC-STACK-OF-X509-CRL:CAPS"><primary>XMLSEC_STACK_OF_X509_CRL</primary></indexterm>
+<programlisting>#define XMLSEC_STACK_OF_X509_CRL        STACK_OF(X509_CRL)
 </programlisting>
 <para>
-Macro. To make docbook happy.</para>
-<para>
+Macro. To make docbook happy.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataX509Id" role="macro">
 <title>xmlSecOpenSSLKeyDataX509Id</title>
-<indexterm zone="xmlSecOpenSSLKeyDataX509Id"><primary sortas="xmlSecOpenSSLKeyDataX509Id">xmlSecOpenSSLKeyDataX509Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLKeyDataX509Id</programlisting>
-<para>
-The OpenSSL X509 data klass.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataX509Id"><primary>xmlSecOpenSSLKeyDataX509Id</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLKeyDataX509Id</programlisting>
 <para>
+The OpenSSL X509 data klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataX509GetKlass" role="function">
 <title>xmlSecOpenSSLKeyDataX509GetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataX509GetKlass"><primary sortas="xmlSecOpenSSLKeyDataX509GetKlass">xmlSecOpenSSLKeyDataX509GetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecOpenSSLKeyDataX509GetKlass    (void);</programlisting>
-<para>
-The OpenSSL X509 key data klass (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-X509Data"><type>sec-X509Data</type></link>).</para>
+<indexterm zone="xmlSecOpenSSLKeyDataX509GetKlass"><primary>xmlSecOpenSSLKeyDataX509GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecOpenSSLKeyDataX509GetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The OpenSSL X509 key data klass (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-X509Data"><type>sec-X509Data</type></link>).
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the X509 data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataX509GetKeyCert" role="function">
 <title>xmlSecOpenSSLKeyDataX509GetKeyCert ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataX509GetKeyCert"><primary sortas="xmlSecOpenSSLKeyDataX509GetKeyCert">xmlSecOpenSSLKeyDataX509GetKeyCert</primary></indexterm><programlisting><link linkend="X509--CAPS">X509</link>*               xmlSecOpenSSLKeyDataX509GetKeyCert  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets the certificate from which the key was extracted.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataX509GetKeyCert"><primary>xmlSecOpenSSLKeyDataX509GetKeyCert</primary></indexterm>
+<programlisting><link linkend="X509:CAPS"><returnvalue>X509</returnvalue></link>*               xmlSecOpenSSLKeyDataX509GetKeyCert  (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets the certificate from which the key was extracted.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the key's certificate or NULL if key data was not used for key
 extraction or an error occurs.
@@ -127,52 +118,52 @@ extraction or an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataX509AdoptKeyCert" role="function">
 <title>xmlSecOpenSSLKeyDataX509AdoptKeyCert ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataX509AdoptKeyCert"><primary sortas="xmlSecOpenSSLKeyDataX509AdoptKeyCert">xmlSecOpenSSLKeyDataX509AdoptKeyCert</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeyDataX509AdoptKeyCert
-                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="X509--CAPS">X509</link> *cert);</programlisting>
-<para>
-Sets the key's certificate in <parameter>data</parameter>.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataX509AdoptKeyCert"><primary>xmlSecOpenSSLKeyDataX509AdoptKeyCert</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLKeyDataX509AdoptKeyCert
+                                                        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="X509:CAPS"><type>X509</type></link> *cert</parameter>);</programlisting>
 <para>
+Sets the key's certificate in <parameter>data</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>cert</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to OpenSSL X509 certificate.
+<listitem><simpara>the pointer to OpenSSL X509 certificate.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataX509AdoptCert" role="function">
 <title>xmlSecOpenSSLKeyDataX509AdoptCert ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataX509AdoptCert"><primary sortas="xmlSecOpenSSLKeyDataX509AdoptCert">xmlSecOpenSSLKeyDataX509AdoptCert</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeyDataX509AdoptCert   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="X509--CAPS">X509</link> *cert);</programlisting>
-<para>
-Adds certificate to the X509 key data.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataX509AdoptCert"><primary>xmlSecOpenSSLKeyDataX509AdoptCert</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLKeyDataX509AdoptCert   (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="X509:CAPS"><type>X509</type></link> *cert</parameter>);</programlisting>
 <para>
+Adds certificate to the X509 key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>cert</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to OpenSSL X509 certificate.
+<listitem><simpara>the pointer to OpenSSL X509 certificate.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataX509GetCert" role="function">
 <title>xmlSecOpenSSLKeyDataX509GetCert ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataX509GetCert"><primary sortas="xmlSecOpenSSLKeyDataX509GetCert">xmlSecOpenSSLKeyDataX509GetCert</primary></indexterm><programlisting><link linkend="X509--CAPS">X509</link>*               xmlSecOpenSSLKeyDataX509GetCert     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
-<para>
-Gets a certificate from X509 key data.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataX509GetCert"><primary>xmlSecOpenSSLKeyDataX509GetCert</primary></indexterm>
+<programlisting><link linkend="X509:CAPS"><returnvalue>X509</returnvalue></link>*               xmlSecOpenSSLKeyDataX509GetCert     (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);</programlisting>
 <para>
+Gets a certificate from X509 key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pos</parameter>&#160;:</term>
-<listitem><simpara>                the desired certificate position.
+<listitem><simpara>the desired certificate position.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to certificate or NULL if <parameter>pos</parameter> is larger than the
 number of certificates in <parameter>data</parameter> or an error occurs.
@@ -180,48 +171,48 @@ number of certificates in <parameter>data</parameter> or an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataX509GetCertsSize" role="function">
 <title>xmlSecOpenSSLKeyDataX509GetCertsSize ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataX509GetCertsSize"><primary sortas="xmlSecOpenSSLKeyDataX509GetCertsSize">xmlSecOpenSSLKeyDataX509GetCertsSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecOpenSSLKeyDataX509GetCertsSize
-                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets the number of certificates in <parameter>data</parameter>.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataX509GetCertsSize"><primary>xmlSecOpenSSLKeyDataX509GetCertsSize</primary></indexterm>
+<programlisting><link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          xmlSecOpenSSLKeyDataX509GetCertsSize
+                                                        (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets the number of certificates in <parameter>data</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> te number of certificates in <parameter>data</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataX509AdoptCrl" role="function">
 <title>xmlSecOpenSSLKeyDataX509AdoptCrl ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataX509AdoptCrl"><primary sortas="xmlSecOpenSSLKeyDataX509AdoptCrl">xmlSecOpenSSLKeyDataX509AdoptCrl</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeyDataX509AdoptCrl    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="X509-CRL--CAPS">X509_CRL</link> *crl);</programlisting>
-<para>
-Adds CRL to the X509 key data.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataX509AdoptCrl"><primary>xmlSecOpenSSLKeyDataX509AdoptCrl</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLKeyDataX509AdoptCrl    (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="X509-CRL:CAPS"><type>X509_CRL</type></link> *crl</parameter>);</programlisting>
 <para>
+Adds CRL to the X509 key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>crl</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to OpenSSL X509 CRL.
+<listitem><simpara>the pointer to OpenSSL X509 CRL.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataX509GetCrl" role="function">
 <title>xmlSecOpenSSLKeyDataX509GetCrl ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataX509GetCrl"><primary sortas="xmlSecOpenSSLKeyDataX509GetCrl">xmlSecOpenSSLKeyDataX509GetCrl</primary></indexterm><programlisting><link linkend="X509-CRL--CAPS">X509_CRL</link>*           xmlSecOpenSSLKeyDataX509GetCrl      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
-<para>
-Gets a CRL from X509 key data.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataX509GetCrl"><primary>xmlSecOpenSSLKeyDataX509GetCrl</primary></indexterm>
+<programlisting><link linkend="X509-CRL:CAPS"><returnvalue>X509_CRL</returnvalue></link>*           xmlSecOpenSSLKeyDataX509GetCrl      (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);</programlisting>
 <para>
+Gets a CRL from X509 key data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pos</parameter>&#160;:</term>
-<listitem><simpara>                the desired CRL position.
+<listitem><simpara>the desired CRL position.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to CRL or NULL if <parameter>pos</parameter> is larger than the
 number of CRLs in <parameter>data</parameter> or an error occurs.
@@ -229,94 +220,94 @@ number of CRLs in <parameter>data</parameter> or an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataX509GetCrlsSize" role="function">
 <title>xmlSecOpenSSLKeyDataX509GetCrlsSize ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataX509GetCrlsSize"><primary sortas="xmlSecOpenSSLKeyDataX509GetCrlsSize">xmlSecOpenSSLKeyDataX509GetCrlsSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecOpenSSLKeyDataX509GetCrlsSize (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
-<para>
-Gets the number of CRLs in <parameter>data</parameter>.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataX509GetCrlsSize"><primary>xmlSecOpenSSLKeyDataX509GetCrlsSize</primary></indexterm>
+<programlisting><link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          xmlSecOpenSSLKeyDataX509GetCrlsSize (<parameter><link linkend="xmlSecKeyData"><type>xmlSecKeyDataPtr</type></link> data</parameter>);</programlisting>
 <para>
+Gets the number of CRLs in <parameter>data</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to X509 key data.
+<listitem><simpara>the pointer to X509 key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> te number of CRLs in <parameter>data</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLX509CertGetKey" role="function">
 <title>xmlSecOpenSSLX509CertGetKey ()</title>
-<indexterm zone="xmlSecOpenSSLX509CertGetKey"><primary sortas="xmlSecOpenSSLX509CertGetKey">xmlSecOpenSSLX509CertGetKey</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    xmlSecOpenSSLX509CertGetKey         (<link linkend="X509--CAPS">X509</link> *cert);</programlisting>
-<para>
-Extracts public key from the <parameter>cert</parameter>.</para>
+<indexterm zone="xmlSecOpenSSLX509CertGetKey"><primary>xmlSecOpenSSLX509CertGetKey</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyData"><returnvalue>xmlSecKeyDataPtr</returnvalue></link>    xmlSecOpenSSLX509CertGetKey         (<parameter><link linkend="X509:CAPS"><type>X509</type></link> *cert</parameter>);</programlisting>
 <para>
+Extracts public key from the <parameter>cert</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>cert</parameter>&#160;:</term>
-<listitem><simpara>               the certificate.
+<listitem><simpara>the certificate.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> public key value or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataRawX509CertId" role="macro">
 <title>xmlSecOpenSSLKeyDataRawX509CertId</title>
-<indexterm zone="xmlSecOpenSSLKeyDataRawX509CertId"><primary sortas="xmlSecOpenSSLKeyDataRawX509CertId">xmlSecOpenSSLKeyDataRawX509CertId</primary></indexterm><programlisting>#define             xmlSecOpenSSLKeyDataRawX509CertId</programlisting>
-<para>
-The OpenSSL raw X509 certificate klass.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataRawX509CertId"><primary>xmlSecOpenSSLKeyDataRawX509CertId</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLKeyDataRawX509CertId</programlisting>
 <para>
+The OpenSSL raw X509 certificate klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLKeyDataRawX509CertGetKlass" role="function">
 <title>xmlSecOpenSSLKeyDataRawX509CertGetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLKeyDataRawX509CertGetKlass"><primary sortas="xmlSecOpenSSLKeyDataRawX509CertGetKlass">xmlSecOpenSSLKeyDataRawX509CertGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecOpenSSLKeyDataRawX509CertGetKlass
-                                                        (void);</programlisting>
-<para>
-The raw X509 certificates key data klass.</para>
+<indexterm zone="xmlSecOpenSSLKeyDataRawX509CertGetKlass"><primary>xmlSecOpenSSLKeyDataRawX509CertGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     xmlSecOpenSSLKeyDataRawX509CertGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The raw X509 certificates key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> raw X509 certificates key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLX509StoreId" role="macro">
 <title>xmlSecOpenSSLX509StoreId</title>
-<indexterm zone="xmlSecOpenSSLX509StoreId"><primary sortas="xmlSecOpenSSLX509StoreId">xmlSecOpenSSLX509StoreId</primary></indexterm><programlisting>#define             xmlSecOpenSSLX509StoreId</programlisting>
-<para>
-The OpenSSL X509 store klass.</para>
+<indexterm zone="xmlSecOpenSSLX509StoreId"><primary>xmlSecOpenSSLX509StoreId</primary></indexterm>
+<programlisting>#define             xmlSecOpenSSLX509StoreId</programlisting>
 <para>
+The OpenSSL X509 store klass.
 </para></refsect2>
 <refsect2 id="xmlSecOpenSSLX509StoreGetKlass" role="function">
 <title>xmlSecOpenSSLX509StoreGetKlass ()</title>
-<indexterm zone="xmlSecOpenSSLX509StoreGetKlass"><primary sortas="xmlSecOpenSSLX509StoreGetKlass">xmlSecOpenSSLX509StoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>  xmlSecOpenSSLX509StoreGetKlass    (void);</programlisting>
-<para>
-The OpenSSL X509 certificates key data store klass.</para>
+<indexterm zone="xmlSecOpenSSLX509StoreGetKlass"><primary>xmlSecOpenSSLX509StoreGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataStoreId"><returnvalue>xmlSecKeyDataStoreId</returnvalue></link>  xmlSecOpenSSLX509StoreGetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The OpenSSL X509 certificates key data store klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to OpenSSL X509 certificates key data store klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLX509StoreFindCert" role="function">
 <title>xmlSecOpenSSLX509StoreFindCert ()</title>
-<indexterm zone="xmlSecOpenSSLX509StoreFindCert"><primary sortas="xmlSecOpenSSLX509StoreFindCert">xmlSecOpenSSLX509StoreFindCert</primary></indexterm><programlisting><link linkend="X509--CAPS">X509</link>*               xmlSecOpenSSLX509StoreFindCert      (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="xmlChar">xmlChar</link> *subjectName,
-                                                         <link linkend="xmlChar">xmlChar</link> *issuerName,
-                                                         <link linkend="xmlChar">xmlChar</link> *issuerSerial,
-                                                         <link linkend="xmlChar">xmlChar</link> *ski,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);</programlisting>
-<para>
-Searches <parameter>store</parameter> for a certificate that matches given criteria.</para>
-<para>
+<indexterm zone="xmlSecOpenSSLX509StoreFindCert"><primary>xmlSecOpenSSLX509StoreFindCert</primary></indexterm>
+<programlisting><link linkend="X509:CAPS"><returnvalue>X509</returnvalue></link>*               xmlSecOpenSSLX509StoreFindCert      (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="xmlChar"><type>xmlChar</type></link> *subjectName</parameter>,
+                                                         <parameter><link linkend="xmlChar"><type>xmlChar</type></link> *issuerName</parameter>,
+                                                         <parameter><link linkend="xmlChar"><type>xmlChar</type></link> *issuerSerial</parameter>,
+                                                         <parameter><link linkend="xmlChar"><type>xmlChar</type></link> *ski</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtx</type></link> *keyInfoCtx</parameter>);</programlisting>
+<para>
+Searches <parameter>store</parameter> for a certificate that matches given criteria.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</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>&#160;:</term>
-<listitem><simpara>        the desired certificate name.
+<listitem><simpara>the desired certificate name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>issuerName</parameter>&#160;:</term>
-<listitem><simpara>         the desired certificate issuer name.
+<listitem><simpara>the desired certificate issuer name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>issuerSerial</parameter>&#160;:</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>&#160;:</term>
-<listitem><simpara>                the desired certificate SKI.
+<listitem><simpara>the desired certificate SKI.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
+<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>&#160;:</term><listitem><simpara> pointer to found certificate or NULL if certificate is not found
 or an error occurs.
@@ -324,99 +315,99 @@ or an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLX509StoreVerify" role="function">
 <title>xmlSecOpenSSLX509StoreVerify ()</title>
-<indexterm zone="xmlSecOpenSSLX509StoreVerify"><primary sortas="xmlSecOpenSSLX509StoreVerify">xmlSecOpenSSLX509StoreVerify</primary></indexterm><programlisting><link linkend="X509--CAPS">X509</link>*               xmlSecOpenSSLX509StoreVerify        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="XMLSEC-STACK-OF-X509--CAPS">XMLSEC_STACK_OF_X509</link> *certs,
-                                                         <link linkend="XMLSEC-STACK-OF-X509-CRL--CAPS">XMLSEC_STACK_OF_X509_CRL</link> *crls,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);</programlisting>
-<para>
-Verifies <parameter>certs</parameter> list.</para>
+<indexterm zone="xmlSecOpenSSLX509StoreVerify"><primary>xmlSecOpenSSLX509StoreVerify</primary></indexterm>
+<programlisting><link linkend="X509:CAPS"><returnvalue>X509</returnvalue></link>*               xmlSecOpenSSLX509StoreVerify        (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="XMLSEC-STACK-OF-X509:CAPS"><type>XMLSEC_STACK_OF_X509</type></link> *certs</parameter>,
+                                                         <parameter><link linkend="XMLSEC-STACK-OF-X509-CRL:CAPS"><type>XMLSEC_STACK_OF_X509_CRL</type></link> *crls</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtx</type></link> *keyInfoCtx</parameter>);</programlisting>
 <para>
+Verifies <parameter>certs</parameter> list.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</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>certs</parameter>&#160;:</term>
-<listitem><simpara>              the untrusted certificates stack.
+<listitem><simpara>the untrusted certificates stack.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>crls</parameter>&#160;:</term>
-<listitem><simpara>               the crls stack.
+<listitem><simpara>the crls stack.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
+<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>&#160;:</term><listitem><simpara> pointer to the first verified certificate from <parameter>certs</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLX509StoreAdoptCert" role="function">
 <title>xmlSecOpenSSLX509StoreAdoptCert ()</title>
-<indexterm zone="xmlSecOpenSSLX509StoreAdoptCert"><primary sortas="xmlSecOpenSSLX509StoreAdoptCert">xmlSecOpenSSLX509StoreAdoptCert</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLX509StoreAdoptCert     (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="X509--CAPS">X509</link> *cert,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
-<para>
-Adds trusted (root) or untrusted certificate to the store.</para>
+<indexterm zone="xmlSecOpenSSLX509StoreAdoptCert"><primary>xmlSecOpenSSLX509StoreAdoptCert</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLX509StoreAdoptCert     (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="X509:CAPS"><type>X509</type></link> *cert</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
+Adds trusted (root) or untrusted certificate to the store.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</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>cert</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to OpenSSL X509 certificate.
+<listitem><simpara>the pointer to OpenSSL X509 certificate.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the certificate type (trusted/untrusted).
+<listitem><simpara>the certificate type (trusted/untrusted).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLX509StoreAdoptCrl" role="function">
 <title>xmlSecOpenSSLX509StoreAdoptCrl ()</title>
-<indexterm zone="xmlSecOpenSSLX509StoreAdoptCrl"><primary sortas="xmlSecOpenSSLX509StoreAdoptCrl">xmlSecOpenSSLX509StoreAdoptCrl</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLX509StoreAdoptCrl      (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         <link linkend="X509-CRL--CAPS">X509_CRL</link> *crl);</programlisting>
-<para>
-Adds X509 CRL to the store.</para>
+<indexterm zone="xmlSecOpenSSLX509StoreAdoptCrl"><primary>xmlSecOpenSSLX509StoreAdoptCrl</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLX509StoreAdoptCrl      (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter><link linkend="X509-CRL:CAPS"><type>X509_CRL</type></link> *crl</parameter>);</programlisting>
 <para>
+Adds X509 CRL to the store.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</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>crl</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to OpenSSL X509_CRL.
+<listitem><simpara>the pointer to OpenSSL X509_CRL.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLX509StoreAddCertsPath" role="function">
 <title>xmlSecOpenSSLX509StoreAddCertsPath ()</title>
-<indexterm zone="xmlSecOpenSSLX509StoreAddCertsPath"><primary sortas="xmlSecOpenSSLX509StoreAddCertsPath">xmlSecOpenSSLX509StoreAddCertsPath</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLX509StoreAddCertsPath  (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         const <link linkend="char">char</link> *path);</programlisting>
+<indexterm zone="xmlSecOpenSSLX509StoreAddCertsPath"><primary>xmlSecOpenSSLX509StoreAddCertsPath</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLX509StoreAddCertsPath  (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *path</parameter>);</programlisting>
 <para>
 Adds all certs in the <parameter>path</parameter> to the list of trusted certs
-in <parameter>store</parameter>.</para>
-<para>
+in <parameter>store</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara> the pointer to OpenSSL x509 store.
+<listitem><simpara>the pointer to OpenSSL x509 store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>path</parameter>&#160;:</term>
-<listitem><simpara> the path to the certs dir.
+<listitem><simpara>the path to the certs dir.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecOpenSSLX509StoreAddCertsFile" role="function">
 <title>xmlSecOpenSSLX509StoreAddCertsFile ()</title>
-<indexterm zone="xmlSecOpenSSLX509StoreAddCertsFile"><primary sortas="xmlSecOpenSSLX509StoreAddCertsFile">xmlSecOpenSSLX509StoreAddCertsFile</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLX509StoreAddCertsFile  (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                                         const <link linkend="char">char</link> *file);</programlisting>
+<indexterm zone="xmlSecOpenSSLX509StoreAddCertsFile"><primary>xmlSecOpenSSLX509StoreAddCertsFile</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecOpenSSLX509StoreAddCertsFile  (<parameter><link linkend="xmlSecKeyDataStore"><type>xmlSecKeyDataStorePtr</type></link> store</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *file</parameter>);</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>
+in <parameter>store</parameter>. It is possible for <parameter>file</parameter> to contain multiple certs.
 </para><variablelist role="params">
 <varlistentry><term><parameter>store</parameter>&#160;:</term>
-<listitem><simpara> the pointer to OpenSSL x509 store.
+<listitem><simpara>the pointer to OpenSSL x509 store.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>file</parameter>&#160;:</term>
-<listitem><simpara> the certs file.
+<listitem><simpara>the certs file.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
@@ -424,7 +415,4 @@ in <parameter>store</parameter>. It is possible for <parameter>file</parameter>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/parser.sgml b/docs/api/sgml/parser.sgml
index f2ad805..b0260ab 100644
--- a/docs/api/sgml/parser.sgml
+++ b/docs/api/sgml/parser.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-parser.top_of_page">parser</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>parser</refname>
 <refpurpose>Parser transform implementation.</refpurpose>
@@ -13,121 +14,111 @@
 <refsynopsisdiv id="xmlsec-parser.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="xmlDoc">xmlDocPtr</link>           <link linkend="xmlSecParseFile">xmlSecParseFile</link>                     (const <link linkend="char">char</link> *filename);
-<link linkend="xmlDoc">xmlDocPtr</link>           <link linkend="xmlSecParseMemory">xmlSecParseMemory</link>                   (const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size,
-                                                         <link linkend="int">int</link> recovery);
-<link linkend="xmlDoc">xmlDocPtr</link>           <link linkend="xmlSecParseMemoryExt">xmlSecParseMemoryExt</link>                (const <link linkend="xmlSecByte">xmlSecByte</link> *prefix,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> prefixSize,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufferSize,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *postfix,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> postfixSize);
+<synopsis><link linkend="xmlDoc"><returnvalue>xmlDocPtr</returnvalue></link>           <link linkend="xmlSecParseFile">xmlSecParseFile</link>                     (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>);
+<link linkend="xmlDoc"><returnvalue>xmlDocPtr</returnvalue></link>           <link linkend="xmlSecParseMemory">xmlSecParseMemory</link>                   (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buffer</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> recovery</parameter>);
+<link linkend="xmlDoc"><returnvalue>xmlDocPtr</returnvalue></link>           <link linkend="xmlSecParseMemoryExt">xmlSecParseMemoryExt</link>                (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *prefix</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> prefixSize</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buffer</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufferSize</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *postfix</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> postfixSize</parameter>);
 #define             <link linkend="xmlSecTransformXmlParserId">xmlSecTransformXmlParserId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformXmlParserGetKlass">xmlSecTransformXmlParserGetKlass</link>    (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformXmlParserGetKlass">xmlSecTransformXmlParserGetKlass</link>    (<parameter><type>void</type></parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-parser.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Parser transform implementation.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-parser.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecParseFile" role="function">
 <title>xmlSecParseFile ()</title>
-<indexterm zone="xmlSecParseFile"><primary sortas="xmlSecParseFile">xmlSecParseFile</primary></indexterm><programlisting><link linkend="xmlDoc">xmlDocPtr</link>           xmlSecParseFile                     (const <link linkend="char">char</link> *filename);</programlisting>
+<indexterm zone="xmlSecParseFile"><primary>xmlSecParseFile</primary></indexterm>
+<programlisting><link linkend="xmlDoc"><returnvalue>xmlDocPtr</returnvalue></link>           xmlSecParseFile                     (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>);</programlisting>
 <para>
 Loads XML Doc from file <parameter>filename</parameter>. We need a special version because of
-c14n issue. The code is copied from <link linkend="xmlSAXParseFileWithData"><function>xmlSAXParseFileWithData()</function></link> function.</para>
-<para>
+c14n issue. The code is copied from <link linkend="xmlSAXParseFileWithData"><function>xmlSAXParseFileWithData()</function></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the filename.
+<listitem><simpara>the filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the loaded XML document or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecParseMemory" role="function">
 <title>xmlSecParseMemory ()</title>
-<indexterm zone="xmlSecParseMemory"><primary sortas="xmlSecParseMemory">xmlSecParseMemory</primary></indexterm><programlisting><link linkend="xmlDoc">xmlDocPtr</link>           xmlSecParseMemory                   (const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size,
-                                                         <link linkend="int">int</link> recovery);</programlisting>
+<indexterm zone="xmlSecParseMemory"><primary>xmlSecParseMemory</primary></indexterm>
+<programlisting><link linkend="xmlDoc"><returnvalue>xmlDocPtr</returnvalue></link>           xmlSecParseMemory                   (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buffer</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> recovery</parameter>);</programlisting>
 <para>
 Loads XML Doc from memory. We need a special version because of
-c14n issue. The code is copied from <link linkend="xmlSAXParseMemory"><function>xmlSAXParseMemory()</function></link> function.</para>
-<para>
+c14n issue. The code is copied from <link linkend="xmlSAXParseMemory"><function>xmlSAXParseMemory()</function></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>buffer</parameter>&#160;:</term>
-<listitem><simpara>             the input buffer.
+<listitem><simpara>the input buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the input buffer size.
+<listitem><simpara>the input buffer size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>recovery</parameter>&#160;:</term>
-<listitem><simpara>           the flag.
+<listitem><simpara>the flag.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the loaded XML document or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecParseMemoryExt" role="function">
 <title>xmlSecParseMemoryExt ()</title>
-<indexterm zone="xmlSecParseMemoryExt"><primary sortas="xmlSecParseMemoryExt">xmlSecParseMemoryExt</primary></indexterm><programlisting><link linkend="xmlDoc">xmlDocPtr</link>           xmlSecParseMemoryExt                (const <link linkend="xmlSecByte">xmlSecByte</link> *prefix,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> prefixSize,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufferSize,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *postfix,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> postfixSize);</programlisting>
-<para>
-Loads XML Doc from 3 chunks of memory: <parameter>prefix</parameter>, <parameter>buffer</parameter> and <parameter>postfix</parameter>.</para>
+<indexterm zone="xmlSecParseMemoryExt"><primary>xmlSecParseMemoryExt</primary></indexterm>
+<programlisting><link linkend="xmlDoc"><returnvalue>xmlDocPtr</returnvalue></link>           xmlSecParseMemoryExt                (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *prefix</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> prefixSize</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buffer</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bufferSize</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *postfix</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> postfixSize</parameter>);</programlisting>
 <para>
+Loads XML Doc from 3 chunks of memory: <parameter>prefix</parameter>, <parameter>buffer</parameter> and <parameter>postfix</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>prefix</parameter>&#160;:</term>
-<listitem><simpara>             the first part of the input.
+<listitem><simpara>the first part of the input.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>prefixSize</parameter>&#160;:</term>
-<listitem><simpara>         the size of the first part of the input.
+<listitem><simpara>the size of the first part of the input.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buffer</parameter>&#160;:</term>
-<listitem><simpara>             the second part of the input.
+<listitem><simpara>the second part of the input.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>bufferSize</parameter>&#160;:</term>
-<listitem><simpara>         the size of the second part of the input.
+<listitem><simpara>the size of the second part of the input.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>postfix</parameter>&#160;:</term>
-<listitem><simpara>            the third part of the input.
+<listitem><simpara>the third part of the input.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>postfixSize</parameter>&#160;:</term>
-<listitem><simpara>        the size of the third part of the input.
+<listitem><simpara>the size of the third part of the input.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the loaded XML document or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformXmlParserId" role="macro">
 <title>xmlSecTransformXmlParserId</title>
-<indexterm zone="xmlSecTransformXmlParserId"><primary sortas="xmlSecTransformXmlParserId">xmlSecTransformXmlParserId</primary></indexterm><programlisting>#define             xmlSecTransformXmlParserId</programlisting>
-<para>
-The XML Parser transform klass.</para>
+<indexterm zone="xmlSecTransformXmlParserId"><primary>xmlSecTransformXmlParserId</primary></indexterm>
+<programlisting>#define             xmlSecTransformXmlParserId</programlisting>
 <para>
+The XML Parser transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformXmlParserGetKlass" role="function">
 <title>xmlSecTransformXmlParserGetKlass ()</title>
-<indexterm zone="xmlSecTransformXmlParserGetKlass"><primary sortas="xmlSecTransformXmlParserGetKlass">xmlSecTransformXmlParserGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformXmlParserGetKlass    (void);</programlisting>
-<para>
-The XML parser transform.</para>
+<indexterm zone="xmlSecTransformXmlParserGetKlass"><primary>xmlSecTransformXmlParserGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformXmlParserGetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The XML parser transform.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> XML parser transform klass.
 </simpara></listitem></varlistentry>
@@ -135,7 +126,4 @@ The XML parser transform.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/private.sgml b/docs/api/sgml/private.sgml
index 9ce42cf..1dd5760 100644
--- a/docs/api/sgml/private.sgml
+++ b/docs/api/sgml/private.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-private.top_of_page">private</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>private</refname>
 <refpurpose>Private header for building xmlsec-crypto-engine libraries.</refpurpose>
@@ -13,122 +14,112 @@
 <refsynopsisdiv id="xmlsec-private.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="int">int</link>                 (<link linkend="xmlSecCryptoInitMethod">*xmlSecCryptoInitMethod</link>)           (void);
-<link linkend="int">int</link>                 (<link linkend="xmlSecCryptoShutdownMethod">*xmlSecCryptoShutdownMethod</link>)       (void);
-<link linkend="int">int</link>                 (<link linkend="xmlSecCryptoKeysMngrInitMethod">*xmlSecCryptoKeysMngrInitMethod</link>)   (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     (<link linkend="xmlSecCryptoKeyDataGetKlassMethod">*xmlSecCryptoKeyDataGetKlassMethod</link>)
-                                                        (void);
-<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>  (<link linkend="xmlSecCryptoKeyDataStoreGetKlassMethod">*xmlSecCryptoKeyDataStoreGetKlassMethod</link>)
-                                                        (void);
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   (<link linkend="xmlSecCryptoTransformGetKlassMethod">*xmlSecCryptoTransformGetKlassMethod</link>)
-                                                        (void);
-<link linkend="int">int</link>                 (<link linkend="xmlSecCryptoAppInitMethod">*xmlSecCryptoAppInitMethod</link>)        (const <link linkend="char">char</link> *config);
-<link linkend="int">int</link>                 (<link linkend="xmlSecCryptoAppShutdownMethod">*xmlSecCryptoAppShutdownMethod</link>)    (void);
-<link linkend="int">int</link>                 (<link linkend="xmlSecCryptoAppKeysMngrCertLoadMethod">*xmlSecCryptoAppKeysMngrCertLoadMethod</link>)
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>                 (<link linkend="xmlSecCryptoAppKeysMngrCertLoadMemoryMethod">*xmlSecCryptoAppKeysMngrCertLoadMemoryMethod</link>)
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        (<link linkend="xmlSecCryptoAppKeyLoadMethod">*xmlSecCryptoAppKeyLoadMethod</link>)     (const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        (<link linkend="xmlSecCryptoAppKeyLoadMemoryMethod">*xmlSecCryptoAppKeyLoadMemoryMethod</link>)
-                                                        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        (<link linkend="xmlSecCryptoAppPkcs12LoadMethod">*xmlSecCryptoAppPkcs12LoadMethod</link>)  (const <link linkend="char">char</link> *filename,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link>        (<link linkend="xmlSecCryptoAppPkcs12LoadMemoryMethod">*xmlSecCryptoAppPkcs12LoadMemoryMethod</link>)
-                                                        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="int">int</link>                 (<link linkend="xmlSecCryptoAppKeyCertLoadMethod">*xmlSecCryptoAppKeyCertLoadMethod</link>) (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="int">int</link>                 (<link linkend="xmlSecCryptoAppKeyCertLoadMemoryMethod">*xmlSecCryptoAppKeyCertLoadMemoryMethod</link>)
-                                                        (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
+<synopsis><link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecCryptoInitMethod">*xmlSecCryptoInitMethod</link>)           (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecCryptoShutdownMethod">*xmlSecCryptoShutdownMethod</link>)       (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecCryptoKeysMngrInitMethod">*xmlSecCryptoKeysMngrInitMethod</link>)   (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);
+<link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     (<link linkend="xmlSecCryptoKeyDataGetKlassMethod">*xmlSecCryptoKeyDataGetKlassMethod</link>)
+                                                        (<parameter><type>void</type></parameter>);
+<link linkend="xmlSecKeyDataStoreId"><returnvalue>xmlSecKeyDataStoreId</returnvalue></link>  (<link linkend="xmlSecCryptoKeyDataStoreGetKlassMethod">*xmlSecCryptoKeyDataStoreGetKlassMethod</link>)
+                                                        (<parameter><type>void</type></parameter>);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   (<link linkend="xmlSecCryptoTransformGetKlassMethod">*xmlSecCryptoTransformGetKlassMethod</link>)
+                                                        (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecCryptoAppInitMethod">*xmlSecCryptoAppInitMethod</link>)        (<parameter>const <link linkend="char"><type>char</type></link> *config</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecCryptoAppShutdownMethod">*xmlSecCryptoAppShutdownMethod</link>)    (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecCryptoAppKeysMngrCertLoadMethod">*xmlSecCryptoAppKeysMngrCertLoadMethod</link>)
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecCryptoAppKeysMngrCertLoadMemoryMethod">*xmlSecCryptoAppKeysMngrCertLoadMemoryMethod</link>)
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        (<link linkend="xmlSecCryptoAppKeyLoadMethod">*xmlSecCryptoAppKeyLoadMethod</link>)     (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        (<link linkend="xmlSecCryptoAppKeyLoadMemoryMethod">*xmlSecCryptoAppKeyLoadMemoryMethod</link>)
+                                                        (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        (<link linkend="xmlSecCryptoAppPkcs12LoadMethod">*xmlSecCryptoAppPkcs12LoadMethod</link>)  (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        (<link linkend="xmlSecCryptoAppPkcs12LoadMemoryMethod">*xmlSecCryptoAppPkcs12LoadMemoryMethod</link>)
+                                                        (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecCryptoAppKeyCertLoadMethod">*xmlSecCryptoAppKeyCertLoadMethod</link>) (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecCryptoAppKeyCertLoadMemoryMethod">*xmlSecCryptoAppKeyCertLoadMemoryMethod</link>)
+                                                        (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);
 struct              <link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctions</link>;
 #define             <link linkend="xmlSecStrPrintf">xmlSecStrPrintf</link>
 #define             <link linkend="xmlSecStrVPrintf">xmlSecStrVPrintf</link>
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-private.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Private header for building xmlsec-crypto-engine libraries.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-private.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecCryptoInitMethod" role="function">
 <title>xmlSecCryptoInitMethod ()</title>
-<indexterm zone="xmlSecCryptoInitMethod"><primary sortas="xmlSecCryptoInitMethod">xmlSecCryptoInitMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecCryptoInitMethod)           (void);</programlisting>
-<para>
-xmlsec-crypto libraryinitialization method.</para>
+<indexterm zone="xmlSecCryptoInitMethod"><primary>xmlSecCryptoInitMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecCryptoInitMethod)           (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+xmlsec-crypto libraryinitialization method.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoShutdownMethod" role="function">
 <title>xmlSecCryptoShutdownMethod ()</title>
-<indexterm zone="xmlSecCryptoShutdownMethod"><primary sortas="xmlSecCryptoShutdownMethod">xmlSecCryptoShutdownMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecCryptoShutdownMethod)       (void);</programlisting>
-<para>
-xmlsec-crypto library shutdown method.</para>
+<indexterm zone="xmlSecCryptoShutdownMethod"><primary>xmlSecCryptoShutdownMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecCryptoShutdownMethod)       (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+xmlsec-crypto library shutdown method.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoKeysMngrInitMethod" role="function">
 <title>xmlSecCryptoKeysMngrInitMethod ()</title>
-<indexterm zone="xmlSecCryptoKeysMngrInitMethod"><primary sortas="xmlSecCryptoKeysMngrInitMethod">xmlSecCryptoKeysMngrInitMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecCryptoKeysMngrInitMethod)   (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
-<para>
-Initializes <parameter>mngr</parameter> with xmlsec-crypto library specific data.</para>
+<indexterm zone="xmlSecCryptoKeysMngrInitMethod"><primary>xmlSecCryptoKeysMngrInitMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecCryptoKeysMngrInitMethod)   (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>);</programlisting>
 <para>
+Initializes <parameter>mngr</parameter> with xmlsec-crypto library specific data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoKeyDataGetKlassMethod" role="function">
 <title>xmlSecCryptoKeyDataGetKlassMethod ()</title>
-<indexterm zone="xmlSecCryptoKeyDataGetKlassMethod"><primary sortas="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     (*xmlSecCryptoKeyDataGetKlassMethod)
-                                                        (void);</programlisting>
-<para>
-Gets the key data klass.</para>
+<indexterm zone="xmlSecCryptoKeyDataGetKlassMethod"><primary>xmlSecCryptoKeyDataGetKlassMethod</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataId"><returnvalue>xmlSecKeyDataId</returnvalue></link>     (*xmlSecCryptoKeyDataGetKlassMethod)
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets the key data klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to key data klass or NULL if an error occurs
 (the xmlsec-crypto library is not loaded or this key data klass is not
@@ -137,11 +128,11 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoKeyDataStoreGetKlassMethod" role="function">
 <title>xmlSecCryptoKeyDataStoreGetKlassMethod ()</title>
-<indexterm zone="xmlSecCryptoKeyDataStoreGetKlassMethod"><primary sortas="xmlSecCryptoKeyDataStoreGetKlassMethod">xmlSecCryptoKeyDataStoreGetKlassMethod</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>  (*xmlSecCryptoKeyDataStoreGetKlassMethod)
-                                                        (void);</programlisting>
-<para>
-Gets the key data store klass.</para>
+<indexterm zone="xmlSecCryptoKeyDataStoreGetKlassMethod"><primary>xmlSecCryptoKeyDataStoreGetKlassMethod</primary></indexterm>
+<programlisting><link linkend="xmlSecKeyDataStoreId"><returnvalue>xmlSecKeyDataStoreId</returnvalue></link>  (*xmlSecCryptoKeyDataStoreGetKlassMethod)
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets the key data store klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to key data store klass or NULL if an error occurs
 (the xmlsec-crypto library is not loaded or this key data store klass is not
@@ -150,11 +141,11 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoTransformGetKlassMethod" role="function">
 <title>xmlSecCryptoTransformGetKlassMethod ()</title>
-<indexterm zone="xmlSecCryptoTransformGetKlassMethod"><primary sortas="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   (*xmlSecCryptoTransformGetKlassMethod)
-                                                        (void);</programlisting>
-<para>
-Gets the transform klass.</para>
+<indexterm zone="xmlSecCryptoTransformGetKlassMethod"><primary>xmlSecCryptoTransformGetKlassMethod</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   (*xmlSecCryptoTransformGetKlassMethod)
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets the transform klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to transform klass or NULL if an error occurs
 (the xmlsec-crypto library is not loaded or this transform is not
@@ -163,54 +154,54 @@ implemented).
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppInitMethod" role="function">
 <title>xmlSecCryptoAppInitMethod ()</title>
-<indexterm zone="xmlSecCryptoAppInitMethod"><primary sortas="xmlSecCryptoAppInitMethod">xmlSecCryptoAppInitMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecCryptoAppInitMethod)        (const <link linkend="char">char</link> *config);</programlisting>
+<indexterm zone="xmlSecCryptoAppInitMethod"><primary>xmlSecCryptoAppInitMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecCryptoAppInitMethod)        (<parameter>const <link linkend="char"><type>char</type></link> *config</parameter>);</programlisting>
 <para>
 General crypto engine initialization. This function is used
 by XMLSec command line utility and called before
-<parameter>xmlSecInit</parameter> function.</para>
-<para>
+<parameter>xmlSecInit</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>config</parameter>&#160;:</term>
-<listitem><simpara>             the path to crypto library configuration.
+<listitem><simpara>the path to crypto library configuration.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppShutdownMethod" role="function">
 <title>xmlSecCryptoAppShutdownMethod ()</title>
-<indexterm zone="xmlSecCryptoAppShutdownMethod"><primary sortas="xmlSecCryptoAppShutdownMethod">xmlSecCryptoAppShutdownMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecCryptoAppShutdownMethod)    (void);</programlisting>
+<indexterm zone="xmlSecCryptoAppShutdownMethod"><primary>xmlSecCryptoAppShutdownMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecCryptoAppShutdownMethod)    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after
-<parameter>xmlSecShutdown</parameter> function.</para>
-<para>
+<parameter>xmlSecShutdown</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppKeysMngrCertLoadMethod" role="function">
 <title>xmlSecCryptoAppKeysMngrCertLoadMethod ()</title>
-<indexterm zone="xmlSecCryptoAppKeysMngrCertLoadMethod"><primary sortas="xmlSecCryptoAppKeysMngrCertLoadMethod">xmlSecCryptoAppKeysMngrCertLoadMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecCryptoAppKeysMngrCertLoadMethod)
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<indexterm zone="xmlSecCryptoAppKeysMngrCertLoadMethod"><primary>xmlSecCryptoAppKeysMngrCertLoadMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecCryptoAppKeysMngrCertLoadMethod)
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
 Reads cert from <parameter>filename</parameter> and adds to the list of trusted or known
-untrusted certs in <parameter>store</parameter>.</para>
-<para>
+untrusted certs in <parameter>store</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the keys manager.
+<listitem><simpara>the keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the certificate file.
+<listitem><simpara>the certificate file.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the flag that indicates is the certificate in <parameter>filename</parameter>
+<listitem><simpara>the flag that indicates is the certificate in <parameter>filename</parameter>
                      trusted or not.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
@@ -218,31 +209,31 @@ untrusted certs in <parameter>store</parameter>.</para>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppKeysMngrCertLoadMemoryMethod" role="function">
 <title>xmlSecCryptoAppKeysMngrCertLoadMemoryMethod ()</title>
-<indexterm zone="xmlSecCryptoAppKeysMngrCertLoadMemoryMethod"><primary sortas="xmlSecCryptoAppKeysMngrCertLoadMemoryMethod">xmlSecCryptoAppKeysMngrCertLoadMemoryMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecCryptoAppKeysMngrCertLoadMemoryMethod)
-                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<indexterm zone="xmlSecCryptoAppKeysMngrCertLoadMemoryMethod"><primary>xmlSecCryptoAppKeysMngrCertLoadMemoryMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecCryptoAppKeysMngrCertLoadMemoryMethod)
+                                                        (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> mngr</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataType"><type>xmlSecKeyDataType</type></link> type</parameter>);</programlisting>
 <para>
 Reads cert from <parameter>data</parameter> and adds to the list of trusted or known
-untrusted certs in <parameter>store</parameter>.</para>
-<para>
+untrusted certs in <parameter>store</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mngr</parameter>&#160;:</term>
-<listitem><simpara>               the keys manager.
+<listitem><simpara>the keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the key data.
+<listitem><simpara>the key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the key data size.
+<listitem><simpara>the key data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate format.
+<listitem><simpara>the certificate format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the flag that indicates is the certificate in <parameter>data</parameter>
+<listitem><simpara>the flag that indicates is the certificate in <parameter>data</parameter>
                      trusted or not.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
@@ -250,176 +241,177 @@ untrusted certs in <parameter>store</parameter>.</para>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppKeyLoadMethod" role="function">
 <title>xmlSecCryptoAppKeyLoadMethod ()</title>
-<indexterm zone="xmlSecCryptoAppKeyLoadMethod"><primary sortas="xmlSecCryptoAppKeyLoadMethod">xmlSecCryptoAppKeyLoadMethod</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        (*xmlSecCryptoAppKeyLoadMethod)     (const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
-<para>
-Reads key from the a file.</para>
-<para>
+<indexterm zone="xmlSecCryptoAppKeyLoadMethod"><primary>xmlSecCryptoAppKeyLoadMethod</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        (*xmlSecCryptoAppKeyLoadMethod)     (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
+<para>
+Reads key from the a file.
 </para><variablelist role="params">
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the key filename.
+<listitem><simpara>the key filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the key file format.
+<listitem><simpara>the key file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the key file password.
+<listitem><simpara>the key file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the key password callback.
+<listitem><simpara>the key password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppKeyLoadMemoryMethod" role="function">
 <title>xmlSecCryptoAppKeyLoadMemoryMethod ()</title>
-<indexterm zone="xmlSecCryptoAppKeyLoadMemoryMethod"><primary sortas="xmlSecCryptoAppKeyLoadMemoryMethod">xmlSecCryptoAppKeyLoadMemoryMethod</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        (*xmlSecCryptoAppKeyLoadMemoryMethod)
-                                                        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
-<para>
-Reads key from the binary data buffer.</para>
-<para>
+<indexterm zone="xmlSecCryptoAppKeyLoadMemoryMethod"><primary>xmlSecCryptoAppKeyLoadMemoryMethod</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        (*xmlSecCryptoAppKeyLoadMemoryMethod)
+                                                        (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
+<para>
+Reads key from the binary data buffer.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the key data.
+<listitem><simpara>the key data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the key data size.
+<listitem><simpara>the key data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the key data format.
+<listitem><simpara>the key data format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the key data password.
+<listitem><simpara>the key data password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the key password callback.
+<listitem><simpara>the key password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppPkcs12LoadMethod" role="function">
 <title>xmlSecCryptoAppPkcs12LoadMethod ()</title>
-<indexterm zone="xmlSecCryptoAppPkcs12LoadMethod"><primary sortas="xmlSecCryptoAppPkcs12LoadMethod">xmlSecCryptoAppPkcs12LoadMethod</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        (*xmlSecCryptoAppPkcs12LoadMethod)  (const <link linkend="char">char</link> *filename,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<indexterm zone="xmlSecCryptoAppPkcs12LoadMethod"><primary>xmlSecCryptoAppPkcs12LoadMethod</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        (*xmlSecCryptoAppPkcs12LoadMethod)  (<parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 file.
 For uniformity, call xmlSecCryptoAppKeyLoad instead of this function. Pass
-in format=xmlSecKeyDataFormatPkcs12.</para>
-<para>
+in format=xmlSecKeyDataFormatPkcs12.
 </para><variablelist role="params">
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the PKCS12 key filename.
+<listitem><simpara>the PKCS12 key filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the PKCS12 file password.
+<listitem><simpara>the PKCS12 file password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the password callback.
+<listitem><simpara>the password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppPkcs12LoadMemoryMethod" role="function">
 <title>xmlSecCryptoAppPkcs12LoadMemoryMethod ()</title>
-<indexterm zone="xmlSecCryptoAppPkcs12LoadMemoryMethod"><primary sortas="xmlSecCryptoAppPkcs12LoadMemoryMethod">xmlSecCryptoAppPkcs12LoadMemoryMethod</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        (*xmlSecCryptoAppPkcs12LoadMemoryMethod)
-                                                        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         const <link linkend="char">char</link> *pwd,
-                                                         <link linkend="void">void</link> *pwdCallback,
-                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<indexterm zone="xmlSecCryptoAppPkcs12LoadMemoryMethod"><primary>xmlSecCryptoAppPkcs12LoadMemoryMethod</primary></indexterm>
+<programlisting><link linkend="xmlSecKey"><returnvalue>xmlSecKeyPtr</returnvalue></link>        (*xmlSecCryptoAppPkcs12LoadMemoryMethod)
+                                                        (<parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *pwd</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallback</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> *pwdCallbackCtx</parameter>);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 binary data.
 For uniformity, call xmlSecCryptoAppKeyLoad instead of this function. Pass
-in format=xmlSecKeyDataFormatPkcs12.</para>
-<para>
+in format=xmlSecKeyDataFormatPkcs12.
 </para><variablelist role="params">
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the pkcs12 data.
+<listitem><simpara>the pkcs12 data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the pkcs12 data size.
+<listitem><simpara>the pkcs12 data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwd</parameter>&#160;:</term>
-<listitem><simpara>                the PKCS12 data password.
+<listitem><simpara>the PKCS12 data password.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
-<listitem><simpara>        the password callback.
+<listitem><simpara>the password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
-<listitem><simpara>     the user context for password callback.
+<listitem><simpara>the user context for password callback.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppKeyCertLoadMethod" role="function">
 <title>xmlSecCryptoAppKeyCertLoadMethod ()</title>
-<indexterm zone="xmlSecCryptoAppKeyCertLoadMethod"><primary sortas="xmlSecCryptoAppKeyCertLoadMethod">xmlSecCryptoAppKeyCertLoadMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecCryptoAppKeyCertLoadMethod) (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="char">char</link> *filename,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
-<para>
-Reads the certificate from $<parameter>filename</parameter> and adds it to key.</para>
+<indexterm zone="xmlSecCryptoAppKeyCertLoadMethod"><primary>xmlSecCryptoAppKeyCertLoadMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecCryptoAppKeyCertLoadMethod) (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="char"><type>char</type></link> *filename</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);</programlisting>
 <para>
+Reads the certificate from $<parameter>filename</parameter> and adds it to key.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>filename</parameter>&#160;:</term>
-<listitem><simpara>           the certificate filename.
+<listitem><simpara>the certificate filename.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate file format.
+<listitem><simpara>the certificate file format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoAppKeyCertLoadMemoryMethod" role="function">
 <title>xmlSecCryptoAppKeyCertLoadMemoryMethod ()</title>
-<indexterm zone="xmlSecCryptoAppKeyCertLoadMemoryMethod"><primary sortas="xmlSecCryptoAppKeyCertLoadMemoryMethod">xmlSecCryptoAppKeyCertLoadMemoryMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecCryptoAppKeyCertLoadMemoryMethod)
-                                                        (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
-<para>
-Reads the certificate from binary <parameter>data</parameter> buffer and adds it to key.</para>
-<para>
+<indexterm zone="xmlSecCryptoAppKeyCertLoadMemoryMethod"><primary>xmlSecCryptoAppKeyCertLoadMemoryMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecCryptoAppKeyCertLoadMemoryMethod)
+                                                        (<parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyDataFormat"><type>xmlSecKeyDataFormat</type></link> format</parameter>);</programlisting>
+<para>
+Reads the certificate from binary <parameter>data</parameter> buffer and adds it to key.
 </para><variablelist role="params">
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the cert data.
+<listitem><simpara>the cert data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the cert data size.
+<listitem><simpara>the cert data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>format</parameter>&#160;:</term>
-<listitem><simpara>             the certificate data format.
+<listitem><simpara>the certificate data format.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCryptoDLFunctions" role="struct">
 <title>struct xmlSecCryptoDLFunctions</title>
-<indexterm zone="xmlSecCryptoDLFunctions"><primary sortas="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctions</primary></indexterm><programlisting>struct xmlSecCryptoDLFunctions {
+<indexterm zone="xmlSecCryptoDLFunctions"><primary>xmlSecCryptoDLFunctions</primary></indexterm>
+<programlisting>struct xmlSecCryptoDLFunctions {
     /* Crypto Init/shutdown */
     xmlSecCryptoInitMethod                       cryptoInit;
     xmlSecCryptoShutdownMethod                   cryptoShutdown;
@@ -493,335 +485,270 @@ Reads the certificate from binary <parameter>data</parameter> buffer and adds it
 };
 </programlisting>
 <para>
-The list of crypto engine functions, key data and transform classes.</para>
-<para>
+The list of crypto engine functions, key data and transform classes.
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="xmlSecCryptoInitMethod">xmlSecCryptoInitMethod</link>&#160;<structfield>cryptoInit</structfield>;</term>
-<listitem><simpara>                 the xmlsec-crypto library initialization method.
+<varlistentry><term><link linkend="xmlSecCryptoInitMethod"><type>xmlSecCryptoInitMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.cryptoInit">cryptoInit</structfield>;</term>
+<listitem><simpara>the xmlsec-crypto library initialization method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoShutdownMethod">xmlSecCryptoShutdownMethod</link>&#160;<structfield>cryptoShutdown</structfield>;</term>
-<listitem><simpara>             the xmlsec-crypto library shutdown method.
+<varlistentry><term><link linkend="xmlSecCryptoShutdownMethod"><type>xmlSecCryptoShutdownMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.cryptoShutdown">cryptoShutdown</structfield>;</term>
+<listitem><simpara>the xmlsec-crypto library shutdown method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoKeysMngrInitMethod">xmlSecCryptoKeysMngrInitMethod</link>&#160;<structfield>cryptoKeysMngrInit</structfield>;</term>
-<listitem><simpara>         the xmlsec-crypto library keys manager init method.
+<varlistentry><term><link linkend="xmlSecCryptoKeysMngrInitMethod"><type>xmlSecCryptoKeysMngrInitMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.cryptoKeysMngrInit">cryptoKeysMngrInit</structfield>;</term>
+<listitem><simpara>the xmlsec-crypto library keys manager init method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link>&#160;<structfield>keyDataAesGetKlass</structfield>;</term>
-<listitem><simpara>         the method to get pointer to AES key data klass.
+<varlistentry><term><link linkend="xmlSecCryptoKeyDataGetKlassMethod"><type>xmlSecCryptoKeyDataGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.keyDataAesGetKlass">keyDataAesGetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to AES key data klass.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link>&#160;<structfield>keyDataDesGetKlass</structfield>;</term>
-<listitem><simpara>         the method to get pointer to DES key data klass.
+<varlistentry><term><link linkend="xmlSecCryptoKeyDataGetKlassMethod"><type>xmlSecCryptoKeyDataGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.keyDataDesGetKlass">keyDataDesGetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to DES key data klass.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link>&#160;<structfield>keyDataDsaGetKlass</structfield>;</term>
-<listitem><simpara>         the method to get pointer to DSA key data klass.
+<varlistentry><term><link linkend="xmlSecCryptoKeyDataGetKlassMethod"><type>xmlSecCryptoKeyDataGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.keyDataDsaGetKlass">keyDataDsaGetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to DSA key data klass.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link>&#160;<structfield>keyDataGost2001GetKlass</structfield>;</term>
-<listitem><simpara>    the method to get pointer to GOST 2001 key data klass.
+<varlistentry><term><link linkend="xmlSecCryptoKeyDataGetKlassMethod"><type>xmlSecCryptoKeyDataGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.keyDataGost2001GetKlass">keyDataGost2001GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to GOST 2001 key data klass.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link>&#160;<structfield>keyDataHmacGetKlass</structfield>;</term>
-<listitem><simpara>        the method to get pointer to HMAC key data klass.
+<varlistentry><term><link linkend="xmlSecCryptoKeyDataGetKlassMethod"><type>xmlSecCryptoKeyDataGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.keyDataHmacGetKlass">keyDataHmacGetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to HMAC key data klass.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link>&#160;<structfield>keyDataRsaGetKlass</structfield>;</term>
-<listitem><simpara>         the method to get pointer to RSA key data klass.
+<varlistentry><term><link linkend="xmlSecCryptoKeyDataGetKlassMethod"><type>xmlSecCryptoKeyDataGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.keyDataRsaGetKlass">keyDataRsaGetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to RSA key data klass.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link>&#160;<structfield>keyDataX509GetKlass</structfield>;</term>
-<listitem><simpara>        the method to get pointer to X509 key data klass.
+<varlistentry><term><link linkend="xmlSecCryptoKeyDataGetKlassMethod"><type>xmlSecCryptoKeyDataGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.keyDataX509GetKlass">keyDataX509GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to X509 key data klass.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link>&#160;<structfield>keyDataRawX509CertGetKlass</structfield>;</term>
-<listitem><simpara> the method to get pointer to raw X509 cert key data klass.
+<varlistentry><term><link linkend="xmlSecCryptoKeyDataGetKlassMethod"><type>xmlSecCryptoKeyDataGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.keyDataRawX509CertGetKlass">keyDataRawX509CertGetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to raw X509 cert key data klass.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoKeyDataStoreGetKlassMethod">xmlSecCryptoKeyDataStoreGetKlassMethod</link>&#160;<structfield>x509StoreGetKlass</structfield>;</term>
-<listitem><simpara>          the method to get pointer to X509 key data store.
+<varlistentry><term><link linkend="xmlSecCryptoKeyDataStoreGetKlassMethod"><type>xmlSecCryptoKeyDataStoreGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.x509StoreGetKlass">x509StoreGetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to X509 key data store.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformAes128CbcGetKlass</structfield>;</term>
-<listitem><simpara> the method to get pointer to AES 128 encryption transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformAes128CbcGetKlass">transformAes128CbcGetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to AES 128 encryption transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformAes192CbcGetKlass</structfield>;</term>
-<listitem><simpara> the method to get pointer to AES 192 encryption transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformAes192CbcGetKlass">transformAes192CbcGetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to AES 192 encryption transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformAes256CbcGetKlass</structfield>;</term>
-<listitem><simpara> the method to get pointer to AES 256 encryption transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformAes256CbcGetKlass">transformAes256CbcGetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to AES 256 encryption transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformKWAes128GetKlass</structfield>;</term>
-<listitem><simpara>  the method to get pointer to AES 128 key wrapper transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformKWAes128GetKlass">transformKWAes128GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to AES 128 key wrapper transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformKWAes192GetKlass</structfield>;</term>
-<listitem><simpara>  the method to get pointer to AES 192 key wrapper transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformKWAes192GetKlass">transformKWAes192GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to AES 192 key wrapper transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformKWAes256GetKlass</structfield>;</term>
-<listitem><simpara>  the method to get pointer to AES 256 key wrapper transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformKWAes256GetKlass">transformKWAes256GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to AES 256 key wrapper transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformDes3CbcGetKlass</structfield>;</term>
-<listitem><simpara>   the method to get pointer to Triple DES encryption transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformDes3CbcGetKlass">transformDes3CbcGetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to Triple DES encryption transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformKWDes3GetKlass</structfield>;</term>
-<listitem><simpara>    the method to get pointer to Triple DES key wrapper transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformKWDes3GetKlass">transformKWDes3GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to Triple DES key wrapper transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformDsaSha1GetKlass</structfield>;</term>
-<listitem><simpara>   the method to get pointer to DSA-SHA1 signature transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformDsaSha1GetKlass">transformDsaSha1GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to DSA-SHA1 signature transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformGost2001GostR3411_94GetKlass</structfield>;</term>
-<listitem><simpara> the method to get pointer to GOST2001 transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformGost2001GostR3411-94GetKlass">transformGost2001GostR3411_94GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to GOST2001 transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformHmacMd5GetKlass</structfield>;</term>
-<listitem><simpara>   the method to get pointer to HMAC-MD5 transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformHmacMd5GetKlass">transformHmacMd5GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to HMAC-MD5 transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformHmacRipemd160GetKlass</structfield>;</term>
-<listitem><simpara> the method to get pointer to HMAC-RIPEMD160 transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformHmacRipemd160GetKlass">transformHmacRipemd160GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to HMAC-RIPEMD160 transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformHmacSha1GetKlass</structfield>;</term>
-<listitem><simpara>  the method to get pointer to HMAC-SHA1 transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformHmacSha1GetKlass">transformHmacSha1GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to HMAC-SHA1 transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformHmacSha224GetKlass</structfield>;</term>
-<listitem><simpara> the method to get pointer to HMAC-SHA224 transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformHmacSha224GetKlass">transformHmacSha224GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to HMAC-SHA224 transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformHmacSha256GetKlass</structfield>;</term>
-<listitem><simpara> the method to get pointer to HMAC-SHA256 transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformHmacSha256GetKlass">transformHmacSha256GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to HMAC-SHA256 transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformHmacSha384GetKlass</structfield>;</term>
-<listitem><simpara> the method to get pointer to HMAC-SHA384 transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformHmacSha384GetKlass">transformHmacSha384GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to HMAC-SHA384 transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformHmacSha512GetKlass</structfield>;</term>
-<listitem><simpara> the method to get pointer to HMAC-SHA512 transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformHmacSha512GetKlass">transformHmacSha512GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to HMAC-SHA512 transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformMd5GetKlass</structfield>;</term>
-<listitem><simpara>       the method to get pointer to MD5 digest transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformMd5GetKlass">transformMd5GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to MD5 digest transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformRipemd160GetKlass</structfield>;</term>
-<listitem><simpara> the method to get pointer to RIPEMD160 digest transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformRipemd160GetKlass">transformRipemd160GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to RIPEMD160 digest transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformRsaMd5GetKlass</structfield>;</term>
-<listitem><simpara>    the method to get pointer to RSA-MD5 signature transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformRsaMd5GetKlass">transformRsaMd5GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to RSA-MD5 signature transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformRsaRipemd160GetKlass</structfield>;</term>
-<listitem><simpara> the method to get pointer to RSA-RIPEMD160 signature transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformRsaRipemd160GetKlass">transformRsaRipemd160GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to RSA-RIPEMD160 signature transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformRsaSha1GetKlass</structfield>;</term>
-<listitem><simpara>   the method to get pointer to RSA-SHA1 signature transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformRsaSha1GetKlass">transformRsaSha1GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to RSA-SHA1 signature transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformRsaSha224GetKlass</structfield>;</term>
-<listitem><simpara> the method to get pointer to RSA-SHA224 signature transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformRsaSha224GetKlass">transformRsaSha224GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to RSA-SHA224 signature transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformRsaSha256GetKlass</structfield>;</term>
-<listitem><simpara> the method to get pointer to RSA-SHA256 signature transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformRsaSha256GetKlass">transformRsaSha256GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to RSA-SHA256 signature transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformRsaSha384GetKlass</structfield>;</term>
-<listitem><simpara> the method to get pointer to RSA-SHA384 signature transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformRsaSha384GetKlass">transformRsaSha384GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to RSA-SHA384 signature transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformRsaSha512GetKlass</structfield>;</term>
-<listitem><simpara> the method to get pointer to RSA-SHA512 signature transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformRsaSha512GetKlass">transformRsaSha512GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to RSA-SHA512 signature transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformRsaPkcs1GetKlass</structfield>;</term>
-<listitem><simpara>  the method to get pointer to RSA-PKCS1_5 key transport transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformRsaPkcs1GetKlass">transformRsaPkcs1GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to RSA-PKCS1_5 key transport transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformRsaOaepGetKlass</structfield>;</term>
-<listitem><simpara>   the method to get pointer to RSA-OAEP key transport transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformRsaOaepGetKlass">transformRsaOaepGetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to RSA-OAEP key transport transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformGostR3411_94GetKlass</structfield>;</term>
-<listitem><simpara> the method to get pointer to GOST R3411 transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformGostR3411-94GetKlass">transformGostR3411_94GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to GOST R3411 transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformSha1GetKlass</structfield>;</term>
-<listitem><simpara>      the method to get pointer to SHA1 digest transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformSha1GetKlass">transformSha1GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to SHA1 digest transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformSha224GetKlass</structfield>;</term>
-<listitem><simpara>    the method to get pointer to SHA224 digest transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformSha224GetKlass">transformSha224GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to SHA224 digest transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformSha256GetKlass</structfield>;</term>
-<listitem><simpara>    the method to get pointer to SHA256 digest transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformSha256GetKlass">transformSha256GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to SHA256 digest transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformSha384GetKlass</structfield>;</term>
-<listitem><simpara>    the method to get pointer to SHA384 digest transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformSha384GetKlass">transformSha384GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to SHA384 digest transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformSha512GetKlass</structfield>;</term>
-<listitem><simpara>    the method to get pointer to SHA512 digest transform.
+<varlistentry><term><link linkend="xmlSecCryptoTransformGetKlassMethod"><type>xmlSecCryptoTransformGetKlassMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.transformSha512GetKlass">transformSha512GetKlass</structfield>;</term>
+<listitem><simpara>the method to get pointer to SHA512 digest transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoAppInitMethod">xmlSecCryptoAppInitMethod</link>&#160;<structfield>cryptoAppInit</structfield>;</term>
-<listitem><simpara>              the default crypto engine initialization method.
+<varlistentry><term><link linkend="xmlSecCryptoAppInitMethod"><type>xmlSecCryptoAppInitMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.cryptoAppInit">cryptoAppInit</structfield>;</term>
+<listitem><simpara>the default crypto engine initialization method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoAppShutdownMethod">xmlSecCryptoAppShutdownMethod</link>&#160;<structfield>cryptoAppShutdown</structfield>;</term>
-<listitem><simpara>          the default crypto engine shutdown method.
+<varlistentry><term><link linkend="xmlSecCryptoAppShutdownMethod"><type>xmlSecCryptoAppShutdownMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.cryptoAppShutdown">cryptoAppShutdown</structfield>;</term>
+<listitem><simpara>the default crypto engine shutdown method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoAppDefaultKeysMngrInitMethod">xmlSecCryptoAppDefaultKeysMngrInitMethod</link>&#160;<structfield>cryptoAppDefaultKeysMngrInit</structfield>;</term>
-<listitem><simpara>       the default keys manager init method.
+<varlistentry><term><link linkend="xmlSecCryptoAppDefaultKeysMngrInitMethod"><type>xmlSecCryptoAppDefaultKeysMngrInitMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.cryptoAppDefaultKeysMngrInit">cryptoAppDefaultKeysMngrInit</structfield>;</term>
+<listitem><simpara>the default keys manager init method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoAppDefaultKeysMngrAdoptKeyMethod">xmlSecCryptoAppDefaultKeysMngrAdoptKeyMethod</link>&#160;<structfield>cryptoAppDefaultKeysMngrAdoptKey</structfield>;</term>
-<listitem><simpara>   the default keys manager adopt key method.
+<varlistentry><term><link linkend="xmlSecCryptoAppDefaultKeysMngrAdoptKeyMethod"><type>xmlSecCryptoAppDefaultKeysMngrAdoptKeyMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.cryptoAppDefaultKeysMngrAdoptKey">cryptoAppDefaultKeysMngrAdoptKey</structfield>;</term>
+<listitem><simpara>the default keys manager adopt key method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoAppDefaultKeysMngrLoadMethod">xmlSecCryptoAppDefaultKeysMngrLoadMethod</link>&#160;<structfield>cryptoAppDefaultKeysMngrLoad</structfield>;</term>
-<listitem><simpara>       the default keys manager load method.
+<varlistentry><term><link linkend="xmlSecCryptoAppDefaultKeysMngrLoadMethod"><type>xmlSecCryptoAppDefaultKeysMngrLoadMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.cryptoAppDefaultKeysMngrLoad">cryptoAppDefaultKeysMngrLoad</structfield>;</term>
+<listitem><simpara>the default keys manager load method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoAppDefaultKeysMngrSaveMethod">xmlSecCryptoAppDefaultKeysMngrSaveMethod</link>&#160;<structfield>cryptoAppDefaultKeysMngrSave</structfield>;</term>
-<listitem><simpara>       the default keys manager save method.
+<varlistentry><term><link linkend="xmlSecCryptoAppDefaultKeysMngrSaveMethod"><type>xmlSecCryptoAppDefaultKeysMngrSaveMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.cryptoAppDefaultKeysMngrSave">cryptoAppDefaultKeysMngrSave</structfield>;</term>
+<listitem><simpara>the default keys manager save method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoAppKeysMngrCertLoadMethod">xmlSecCryptoAppKeysMngrCertLoadMethod</link>&#160;<structfield>cryptoAppKeysMngrCertLoad</structfield>;</term>
-<listitem><simpara>          the default keys manager file cert load method.
+<varlistentry><term><link linkend="xmlSecCryptoAppKeysMngrCertLoadMethod"><type>xmlSecCryptoAppKeysMngrCertLoadMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.cryptoAppKeysMngrCertLoad">cryptoAppKeysMngrCertLoad</structfield>;</term>
+<listitem><simpara>the default keys manager file cert load method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoAppKeysMngrCertLoadMemoryMethod">xmlSecCryptoAppKeysMngrCertLoadMemoryMethod</link>&#160;<structfield>cryptoAppKeysMngrCertLoadMemory</structfield>;</term>
-<listitem><simpara>    the default keys manager memory cert load method.
+<varlistentry><term><link linkend="xmlSecCryptoAppKeysMngrCertLoadMemoryMethod"><type>xmlSecCryptoAppKeysMngrCertLoadMemoryMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.cryptoAppKeysMngrCertLoadMemory">cryptoAppKeysMngrCertLoadMemory</structfield>;</term>
+<listitem><simpara>the default keys manager memory cert load method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoAppKeyLoadMethod">xmlSecCryptoAppKeyLoadMethod</link>&#160;<structfield>cryptoAppKeyLoad</structfield>;</term>
-<listitem><simpara>           the key file load method.
+<varlistentry><term><link linkend="xmlSecCryptoAppKeyLoadMethod"><type>xmlSecCryptoAppKeyLoadMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.cryptoAppKeyLoad">cryptoAppKeyLoad</structfield>;</term>
+<listitem><simpara>the key file load method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoAppKeyLoadMemoryMethod">xmlSecCryptoAppKeyLoadMemoryMethod</link>&#160;<structfield>cryptoAppKeyLoadMemory</structfield>;</term>
-<listitem><simpara>     the meory key load method.
+<varlistentry><term><link linkend="xmlSecCryptoAppKeyLoadMemoryMethod"><type>xmlSecCryptoAppKeyLoadMemoryMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.cryptoAppKeyLoadMemory">cryptoAppKeyLoadMemory</structfield>;</term>
+<listitem><simpara>the meory key load method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoAppPkcs12LoadMethod">xmlSecCryptoAppPkcs12LoadMethod</link>&#160;<structfield>cryptoAppPkcs12Load</structfield>;</term>
-<listitem><simpara>        the pkcs12 file load method.
+<varlistentry><term><link linkend="xmlSecCryptoAppPkcs12LoadMethod"><type>xmlSecCryptoAppPkcs12LoadMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.cryptoAppPkcs12Load">cryptoAppPkcs12Load</structfield>;</term>
+<listitem><simpara>the pkcs12 file load method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoAppPkcs12LoadMemoryMethod">xmlSecCryptoAppPkcs12LoadMemoryMethod</link>&#160;<structfield>cryptoAppPkcs12LoadMemory</structfield>;</term>
-<listitem><simpara>  the memory pkcs12 load method.
+<varlistentry><term><link linkend="xmlSecCryptoAppPkcs12LoadMemoryMethod"><type>xmlSecCryptoAppPkcs12LoadMemoryMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.cryptoAppPkcs12LoadMemory">cryptoAppPkcs12LoadMemory</structfield>;</term>
+<listitem><simpara>the memory pkcs12 load method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoAppKeyCertLoadMethod">xmlSecCryptoAppKeyCertLoadMethod</link>&#160;<structfield>cryptoAppKeyCertLoad</structfield>;</term>
-<listitem><simpara>       the cert file load method.
+<varlistentry><term><link linkend="xmlSecCryptoAppKeyCertLoadMethod"><type>xmlSecCryptoAppKeyCertLoadMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.cryptoAppKeyCertLoad">cryptoAppKeyCertLoad</structfield>;</term>
+<listitem><simpara>the cert file load method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecCryptoAppKeyCertLoadMemoryMethod">xmlSecCryptoAppKeyCertLoadMemoryMethod</link>&#160;<structfield>cryptoAppKeyCertLoadMemory</structfield>;</term>
-<listitem><simpara> the memory cert load method.
+<varlistentry><term><link linkend="xmlSecCryptoAppKeyCertLoadMemoryMethod"><type>xmlSecCryptoAppKeyCertLoadMemoryMethod</type></link>&#160;<structfield id="xmlSecCryptoDLFunctions.cryptoAppKeyCertLoadMemory">cryptoAppKeyCertLoadMemory</structfield>;</term>
+<listitem><simpara>the memory cert load method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>cryptoAppDefaultPwdCallback</structfield>;</term>
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecCryptoDLFunctions.cryptoAppDefaultPwdCallback">cryptoAppDefaultPwdCallback</structfield>;</term>
 <listitem><simpara>the default password callback.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecStrPrintf" role="macro">
 <title>xmlSecStrPrintf</title>
-<indexterm zone="xmlSecStrPrintf"><primary sortas="xmlSecStrPrintf">xmlSecStrPrintf</primary></indexterm><programlisting>#define xmlSecStrPrintf         xmlStrPrintf
+<indexterm zone="xmlSecStrPrintf"><primary>xmlSecStrPrintf</primary></indexterm>
+<programlisting>#define xmlSecStrPrintf         xmlStrPrintf
 </programlisting>
 <para>
-Prints a string (see <parameter>xmlStrPrintf</parameter>).</para>
-<para>
+Prints a string (see <parameter>xmlStrPrintf</parameter>).
 </para></refsect2>
 <refsect2 id="xmlSecStrVPrintf" role="macro">
 <title>xmlSecStrVPrintf</title>
-<indexterm zone="xmlSecStrVPrintf"><primary sortas="xmlSecStrVPrintf">xmlSecStrVPrintf</primary></indexterm><programlisting>#define xmlSecStrVPrintf        xmlStrVPrintf
+<indexterm zone="xmlSecStrVPrintf"><primary>xmlSecStrVPrintf</primary></indexterm>
+<programlisting>#define xmlSecStrVPrintf        xmlStrVPrintf
 </programlisting>
 <para>
-Prints a string (see <parameter>xmlStrVPrintf</parameter>).</para>
-<para>
+Prints a string (see <parameter>xmlStrVPrintf</parameter>).
 </para></refsect2>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/soap.sgml b/docs/api/sgml/soap.sgml
index a26fa7e..71a6e9b 100644
--- a/docs/api/sgml/soap.sgml
+++ b/docs/api/sgml/soap.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-soap.top_of_page">soap</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>soap</refname>
 <refpurpose>Experimental soap support.</refpurpose>
@@ -13,72 +14,63 @@
 <refsynopsisdiv id="xmlsec-soap.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap11CreateEnvelope">xmlSecSoap11CreateEnvelope</link>          (<link linkend="xmlDoc">xmlDocPtr</link> doc);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap11EnsureHeader">xmlSecSoap11EnsureHeader</link>            (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap11AddBodyEntry">xmlSecSoap11AddBodyEntry</link>            (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> entryNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap11AddFaultEntry">xmlSecSoap11AddFaultEntry</link>           (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *faultCodeHref,
-                                                         const <link linkend="xmlChar">xmlChar</link> *faultCodeLocalPart,
-                                                         const <link linkend="xmlChar">xmlChar</link> *faultString,
-                                                         const <link linkend="xmlChar">xmlChar</link> *faultActor);
-<link linkend="int">int</link>                 <link linkend="xmlSecSoap11CheckEnvelope">xmlSecSoap11CheckEnvelope</link>           (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap11GetHeader">xmlSecSoap11GetHeader</link>               (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap11GetBody">xmlSecSoap11GetBody</link>                 (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecSoap11GetBodyEntriesNumber">xmlSecSoap11GetBodyEntriesNumber</link>    (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap11GetBodyEntry">xmlSecSoap11GetBodyEntry</link>            (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap11GetFaultEntry">xmlSecSoap11GetFaultEntry</link>           (<link linkend="xmlNode">xmlNodePtr</link> envNode);
+<synopsis><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecSoap11CreateEnvelope">xmlSecSoap11CreateEnvelope</link>          (<parameter><link linkend="xmlDoc"><type>xmlDocPtr</type></link> doc</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecSoap11EnsureHeader">xmlSecSoap11EnsureHeader</link>            (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecSoap11AddBodyEntry">xmlSecSoap11AddBodyEntry</link>            (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> entryNode</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecSoap11AddFaultEntry">xmlSecSoap11AddFaultEntry</link>           (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *faultCodeHref</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *faultCodeLocalPart</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *faultString</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *faultActor</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecSoap11CheckEnvelope">xmlSecSoap11CheckEnvelope</link>           (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecSoap11GetHeader">xmlSecSoap11GetHeader</link>               (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecSoap11GetBody">xmlSecSoap11GetBody</link>                 (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);
+<link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          <link linkend="xmlSecSoap11GetBodyEntriesNumber">xmlSecSoap11GetBodyEntriesNumber</link>    (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecSoap11GetBodyEntry">xmlSecSoap11GetBodyEntry</link>            (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecSoap11GetFaultEntry">xmlSecSoap11GetFaultEntry</link>           (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);
 enum                <link linkend="xmlSecSoap12FaultCode">xmlSecSoap12FaultCode</link>;
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12CreateEnvelope">xmlSecSoap12CreateEnvelope</link>          (<link linkend="xmlDoc">xmlDocPtr</link> doc);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12EnsureHeader">xmlSecSoap12EnsureHeader</link>            (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12AddBodyEntry">xmlSecSoap12AddBodyEntry</link>            (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> entryNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12AddFaultEntry">xmlSecSoap12AddFaultEntry</link>           (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                                         <link linkend="xmlSecSoap12FaultCode">xmlSecSoap12FaultCode</link> faultCode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *faultReasonText,
-                                                         const <link linkend="xmlChar">xmlChar</link> *faultReasonLang,
-                                                         const <link linkend="xmlChar">xmlChar</link> *faultNodeURI,
-                                                         const <link linkend="xmlChar">xmlChar</link> *faultRole);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12AddFaultSubcode">xmlSecSoap12AddFaultSubcode</link>         (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *subCodeHref,
-                                                         const <link linkend="xmlChar">xmlChar</link> *subCodeName);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12AddFaultReasonText">xmlSecSoap12AddFaultReasonText</link>      (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *faultReasonText,
-                                                         const <link linkend="xmlChar">xmlChar</link> *faultReasonLang);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12AddFaultDetailEntry">xmlSecSoap12AddFaultDetailEntry</link>     (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> detailEntryNode);
-<link linkend="int">int</link>                 <link linkend="xmlSecSoap12CheckEnvelope">xmlSecSoap12CheckEnvelope</link>           (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12GetHeader">xmlSecSoap12GetHeader</link>               (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12GetBody">xmlSecSoap12GetBody</link>                 (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecSoap12GetBodyEntriesNumber">xmlSecSoap12GetBodyEntriesNumber</link>    (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12GetBodyEntry">xmlSecSoap12GetBodyEntry</link>            (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12GetFaultEntry">xmlSecSoap12GetFaultEntry</link>           (<link linkend="xmlNode">xmlNodePtr</link> envNode);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecSoap12CreateEnvelope">xmlSecSoap12CreateEnvelope</link>          (<parameter><link linkend="xmlDoc"><type>xmlDocPtr</type></link> doc</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecSoap12EnsureHeader">xmlSecSoap12EnsureHeader</link>            (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecSoap12AddBodyEntry">xmlSecSoap12AddBodyEntry</link>            (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> entryNode</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecSoap12AddFaultEntry">xmlSecSoap12AddFaultEntry</link>           (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>,
+                                                         <parameter><link linkend="xmlSecSoap12FaultCode"><type>xmlSecSoap12FaultCode</type></link> faultCode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *faultReasonText</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *faultReasonLang</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *faultNodeURI</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *faultRole</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecSoap12AddFaultSubcode">xmlSecSoap12AddFaultSubcode</link>         (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> faultNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *subCodeHref</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *subCodeName</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecSoap12AddFaultReasonText">xmlSecSoap12AddFaultReasonText</link>      (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> faultNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *faultReasonText</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *faultReasonLang</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecSoap12AddFaultDetailEntry">xmlSecSoap12AddFaultDetailEntry</link>     (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> faultNode</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> detailEntryNode</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecSoap12CheckEnvelope">xmlSecSoap12CheckEnvelope</link>           (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecSoap12GetHeader">xmlSecSoap12GetHeader</link>               (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecSoap12GetBody">xmlSecSoap12GetBody</link>                 (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);
+<link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          <link linkend="xmlSecSoap12GetBodyEntriesNumber">xmlSecSoap12GetBodyEntriesNumber</link>    (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecSoap12GetBodyEntry">xmlSecSoap12GetBodyEntry</link>            (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecSoap12GetFaultEntry">xmlSecSoap12GetFaultEntry</link>           (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-soap.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Experimental soap support.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-soap.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecSoap11CreateEnvelope" role="function">
 <title>xmlSecSoap11CreateEnvelope ()</title>
-<indexterm zone="xmlSecSoap11CreateEnvelope"><primary sortas="xmlSecSoap11CreateEnvelope">xmlSecSoap11CreateEnvelope</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap11CreateEnvelope          (<link linkend="xmlDoc">xmlDocPtr</link> doc);</programlisting>
+<indexterm zone="xmlSecSoap11CreateEnvelope"><primary>xmlSecSoap11CreateEnvelope</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecSoap11CreateEnvelope          (<parameter><link linkend="xmlDoc"><type>xmlDocPtr</type></link> doc</parameter>);</programlisting>
 <para>
 Creates a new SOAP Envelope node. Caller is responsible for
 adding the returned node to the XML document.
@@ -96,11 +88,10 @@ XML Schema (http://schemas.xmlsoap.org/soap/envelope/):
                 maxOccurs="unbounded" processContents="lax"/&gt;
         &lt;/xs:sequence&gt;
         &lt;xs:anyAttribute namespace="#<link linkend="other"><type>other</type></link>" processContents="lax"/&gt;
-    &lt;/xs:complexType&gt;</para>
-<para>
+    &lt;/xs:complexType&gt;
 </para><variablelist role="params">
 <varlistentry><term><parameter>doc</parameter>&#160;:</term>
-<listitem><simpara>        the parent doc (might be NULL).
+<listitem><simpara>the parent doc (might be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created &lt;soap:Envelope&gt; node or NULL
 if an error occurs.
@@ -108,7 +99,8 @@ if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap11EnsureHeader" role="function">
 <title>xmlSecSoap11EnsureHeader ()</title>
-<indexterm zone="xmlSecSoap11EnsureHeader"><primary sortas="xmlSecSoap11EnsureHeader">xmlSecSoap11EnsureHeader</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap11EnsureHeader            (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<indexterm zone="xmlSecSoap11EnsureHeader"><primary>xmlSecSoap11EnsureHeader</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecSoap11EnsureHeader            (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);</programlisting>
 <para>
 Gets the pointer to &lt;soap:Header&gt; node (if necessary, the node
 is created).
@@ -124,39 +116,39 @@ XML Schema (http://schemas.xmlsoap.org/soap/envelope/):
                 maxOccurs="unbounded" processContents="lax"/&gt;
         &lt;/xs:sequence&gt;
         &lt;xs:anyAttribute namespace="#<link linkend="other"><type>other</type></link>" processContents="lax"/&gt;
-    &lt;/xs:complexType&gt;</para>
-<para>
+    &lt;/xs:complexType&gt;
 </para><variablelist role="params">
 <varlistentry><term><parameter>envNode</parameter>&#160;:</term>
-<listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
+<listitem><simpara>the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to &lt;soap:Header&gt; node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap11AddBodyEntry" role="function">
 <title>xmlSecSoap11AddBodyEntry ()</title>
-<indexterm zone="xmlSecSoap11AddBodyEntry"><primary sortas="xmlSecSoap11AddBodyEntry">xmlSecSoap11AddBodyEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap11AddBodyEntry            (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> entryNode);</programlisting>
-<para>
-Adds a new entry to &lt;soap:Body&gt; node.</para>
+<indexterm zone="xmlSecSoap11AddBodyEntry"><primary>xmlSecSoap11AddBodyEntry</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecSoap11AddBodyEntry            (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> entryNode</parameter>);</programlisting>
 <para>
+Adds a new entry to &lt;soap:Body&gt; node.
 </para><variablelist role="params">
 <varlistentry><term><parameter>envNode</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to &lt;soap:Envelope&gt; node.
+<listitem><simpara>the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>entryNode</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to body entry node.
+<listitem><simpara>the pointer to body entry node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the added entry (<parameter>contentNode</parameter>) or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap11AddFaultEntry" role="function">
 <title>xmlSecSoap11AddFaultEntry ()</title>
-<indexterm zone="xmlSecSoap11AddFaultEntry"><primary sortas="xmlSecSoap11AddFaultEntry">xmlSecSoap11AddFaultEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap11AddFaultEntry           (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *faultCodeHref,
-                                                         const <link linkend="xmlChar">xmlChar</link> *faultCodeLocalPart,
-                                                         const <link linkend="xmlChar">xmlChar</link> *faultString,
-                                                         const <link linkend="xmlChar">xmlChar</link> *faultActor);</programlisting>
+<indexterm zone="xmlSecSoap11AddFaultEntry"><primary>xmlSecSoap11AddFaultEntry</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecSoap11AddFaultEntry           (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *faultCodeHref</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *faultCodeLocalPart</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *faultString</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *faultActor</parameter>);</programlisting>
 <para>
 Adds &lt;soap:Fault&gt; entry to the <parameter>envNode</parameter>. Note that only one &lt;soap:Fault&gt;
 entry is allowed.
@@ -180,37 +172,36 @@ XML Schema (http://schemas.xmlsoap.org/soap/envelope/):
                 processContents="lax"/&gt;
         &lt;/xs:sequence&gt;
         &lt;xs:anyAttribute namespace="#<link linkend="any"><type>any</type></link>" processContents="lax"/&gt;
-    &lt;/xs:complexType&gt;</para>
-<para>
+    &lt;/xs:complexType&gt;
 </para><variablelist role="params">
 <varlistentry><term><parameter>envNode</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to &lt;soap:Envelope&gt; node.
+<listitem><simpara>the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>faultCodeHref</parameter>&#160;:</term>
-<listitem><simpara>      the fault code QName href (must be known in th context of
+<listitem><simpara>the fault code QName href (must be known in th context of
                      &lt;soap:Body&gt; node).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>faultCodeLocalPart</parameter>&#160;:</term>
-<listitem><simpara> the fault code QName LocalPart.
+<listitem><simpara>the fault code QName LocalPart.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>faultString</parameter>&#160;:</term>
-<listitem><simpara>        the human readable explanation of the fault.
+<listitem><simpara>the human readable explanation of the fault.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>faultActor</parameter>&#160;:</term>
-<listitem><simpara>         the information about who caused the fault (might be NULL).
+<listitem><simpara>the information about who caused the fault (might be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the added entry or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap11CheckEnvelope" role="function">
 <title>xmlSecSoap11CheckEnvelope ()</title>
-<indexterm zone="xmlSecSoap11CheckEnvelope"><primary sortas="xmlSecSoap11CheckEnvelope">xmlSecSoap11CheckEnvelope</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecSoap11CheckEnvelope           (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
-<para>
-Validates &lt;soap:Envelope&gt; node structure.</para>
+<indexterm zone="xmlSecSoap11CheckEnvelope"><primary>xmlSecSoap11CheckEnvelope</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecSoap11CheckEnvelope           (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);</programlisting>
 <para>
+Validates &lt;soap:Envelope&gt; node structure.
 </para><variablelist role="params">
 <varlistentry><term><parameter>envNode</parameter>&#160;:</term>
-<listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
+<listitem><simpara>the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if <parameter>envNode</parameter> has a valid &lt;soap:Envelope&gt; element, 0 if it is
 not valid or a negative value if an error occurs.
@@ -218,76 +209,77 @@ not valid or a negative value if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap11GetHeader" role="function">
 <title>xmlSecSoap11GetHeader ()</title>
-<indexterm zone="xmlSecSoap11GetHeader"><primary sortas="xmlSecSoap11GetHeader">xmlSecSoap11GetHeader</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap11GetHeader               (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
-<para>
-Gets pointer to the &lt;soap:Header&gt; node.</para>
+<indexterm zone="xmlSecSoap11GetHeader"><primary>xmlSecSoap11GetHeader</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecSoap11GetHeader               (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);</programlisting>
 <para>
+Gets pointer to the &lt;soap:Header&gt; node.
 </para><variablelist role="params">
 <varlistentry><term><parameter>envNode</parameter>&#160;:</term>
-<listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
+<listitem><simpara>the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to &lt;soap:Header&gt; node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap11GetBody" role="function">
 <title>xmlSecSoap11GetBody ()</title>
-<indexterm zone="xmlSecSoap11GetBody"><primary sortas="xmlSecSoap11GetBody">xmlSecSoap11GetBody</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap11GetBody                 (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
-<para>
-Gets pointer to the &lt;soap:Body&gt; node.</para>
+<indexterm zone="xmlSecSoap11GetBody"><primary>xmlSecSoap11GetBody</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecSoap11GetBody                 (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);</programlisting>
 <para>
+Gets pointer to the &lt;soap:Body&gt; node.
 </para><variablelist role="params">
 <varlistentry><term><parameter>envNode</parameter>&#160;:</term>
-<listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
+<listitem><simpara>the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to &lt;soap:Body&gt; node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap11GetBodyEntriesNumber" role="function">
 <title>xmlSecSoap11GetBodyEntriesNumber ()</title>
-<indexterm zone="xmlSecSoap11GetBodyEntriesNumber"><primary sortas="xmlSecSoap11GetBodyEntriesNumber">xmlSecSoap11GetBodyEntriesNumber</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecSoap11GetBodyEntriesNumber    (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
-<para>
-Gets the number of body entries.</para>
+<indexterm zone="xmlSecSoap11GetBodyEntriesNumber"><primary>xmlSecSoap11GetBodyEntriesNumber</primary></indexterm>
+<programlisting><link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          xmlSecSoap11GetBodyEntriesNumber    (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);</programlisting>
 <para>
+Gets the number of body entries.
 </para><variablelist role="params">
 <varlistentry><term><parameter>envNode</parameter>&#160;:</term>
-<listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
+<listitem><simpara>the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the number of body entries.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap11GetBodyEntry" role="function">
 <title>xmlSecSoap11GetBodyEntry ()</title>
-<indexterm zone="xmlSecSoap11GetBodyEntry"><primary sortas="xmlSecSoap11GetBodyEntry">xmlSecSoap11GetBodyEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap11GetBodyEntry            (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
-<para>
-Gets the body entry number <parameter>pos</parameter>.</para>
+<indexterm zone="xmlSecSoap11GetBodyEntry"><primary>xmlSecSoap11GetBodyEntry</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecSoap11GetBodyEntry            (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);</programlisting>
 <para>
+Gets the body entry number <parameter>pos</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>envNode</parameter>&#160;:</term>
-<listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
+<listitem><simpara>the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pos</parameter>&#160;:</term>
-<listitem><simpara>        the body entry number.
+<listitem><simpara>the body entry number.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to body entry node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap11GetFaultEntry" role="function">
 <title>xmlSecSoap11GetFaultEntry ()</title>
-<indexterm zone="xmlSecSoap11GetFaultEntry"><primary sortas="xmlSecSoap11GetFaultEntry">xmlSecSoap11GetFaultEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap11GetFaultEntry           (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
-<para>
-Gets the Fault entry (if any).</para>
+<indexterm zone="xmlSecSoap11GetFaultEntry"><primary>xmlSecSoap11GetFaultEntry</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecSoap11GetFaultEntry           (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);</programlisting>
 <para>
+Gets the Fault entry (if any).
 </para><variablelist role="params">
 <varlistentry><term><parameter>envNode</parameter>&#160;:</term>
-<listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
+<listitem><simpara>the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to Fault entry or NULL if it does not exist.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap12FaultCode" role="enum">
 <title>enum xmlSecSoap12FaultCode</title>
-<indexterm zone="xmlSecSoap12FaultCode"><primary sortas="xmlSecSoap12FaultCode">xmlSecSoap12FaultCode</primary></indexterm><programlisting>typedef enum {
+<indexterm zone="xmlSecSoap12FaultCode"><primary>xmlSecSoap12FaultCode</primary></indexterm>
+<programlisting>typedef enum {
     xmlSecSoap12FaultCodeUnknown = 0,
     xmlSecSoap12FaultCodeVersionMismatch,
     xmlSecSoap12FaultCodeMustUnderstand,
@@ -298,17 +290,16 @@ Gets the Fault entry (if any).</para>
 </programlisting>
 <para>
 The values of the &lt;Value&gt; child element information item of the
-&lt;Code&gt; element information item (http://www.w3.org/TR/2003/REC-soap12-part1-20030624/<link linkend="faultcodes"><type>faultcodes</type></link>).</para>
-<para>
+&lt;Code&gt; element information item (http://www.w3.org/TR/2003/REC-soap12-part1-20030624/<link linkend="faultcodes"><type>faultcodes</type></link>).
 </para><variablelist role="enum">
 <varlistentry id="xmlSecSoap12FaultCodeUnknown" role="constant">
 <term><literal>xmlSecSoap12FaultCodeUnknown</literal></term>
-<listitem><simpara>               The fault code is not available.
+<listitem><simpara>The fault code is not available.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecSoap12FaultCodeVersionMismatch" role="constant">
 <term><literal>xmlSecSoap12FaultCodeVersionMismatch</literal></term>
-<listitem><simpara>       The faulting node found an
+<listitem><simpara>The faulting node found an
                                              invalid element information
                                              item instead of the expected
                                              Envelope element information item.
@@ -316,7 +307,7 @@ The values of the &lt;Value&gt; child element information item of the
 </varlistentry>
 <varlistentry id="xmlSecSoap12FaultCodeMustUnderstand" role="constant">
 <term><literal>xmlSecSoap12FaultCodeMustUnderstand</literal></term>
-<listitem><simpara>        An immediate child element
+<listitem><simpara>An immediate child element
                                              information item of the SOAP
                                              Header element information item
                                              targeted at the faulting node
@@ -328,7 +319,7 @@ The values of the &lt;Value&gt; child element information item of the
 </varlistentry>
 <varlistentry id="xmlSecSoap12FaultCodeDataEncodingUnknown" role="constant">
 <term><literal>xmlSecSoap12FaultCodeDataEncodingUnknown</literal></term>
-<listitem><simpara>   A SOAP header block or SOAP
+<listitem><simpara>A SOAP header block or SOAP
                                              body child element information
                                              item targeted at the faulting
                                              SOAP node is scoped with a data
@@ -338,7 +329,7 @@ The values of the &lt;Value&gt; child element information item of the
 </varlistentry>
 <varlistentry id="xmlSecSoap12FaultCodeSender" role="constant">
 <term><literal>xmlSecSoap12FaultCodeSender</literal></term>
-<listitem><simpara>                The message was incorrectly
+<listitem><simpara>The message was incorrectly
                                              formed or did not contain the
                                              appropriate information in order
                                              to succeed.
@@ -346,7 +337,7 @@ The values of the &lt;Value&gt; child element information item of the
 </varlistentry>
 <varlistentry id="xmlSecSoap12FaultCodeReceiver" role="constant">
 <term><literal>xmlSecSoap12FaultCodeReceiver</literal></term>
-<listitem><simpara>              The message could not be processed
+<listitem><simpara>The message could not be processed
                                              for reasons attributable to the
                                              processing of the message rather
                                              than to the contents of the
@@ -356,7 +347,8 @@ The values of the &lt;Value&gt; child element information item of the
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap12CreateEnvelope" role="function">
 <title>xmlSecSoap12CreateEnvelope ()</title>
-<indexterm zone="xmlSecSoap12CreateEnvelope"><primary sortas="xmlSecSoap12CreateEnvelope">xmlSecSoap12CreateEnvelope</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12CreateEnvelope          (<link linkend="xmlDoc">xmlDocPtr</link> doc);</programlisting>
+<indexterm zone="xmlSecSoap12CreateEnvelope"><primary>xmlSecSoap12CreateEnvelope</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecSoap12CreateEnvelope          (<parameter><link linkend="xmlDoc"><type>xmlDocPtr</type></link> doc</parameter>);</programlisting>
 <para>
 Creates a new SOAP 1.2 Envelope node. Caller is responsible for
 adding the returned node to the XML document.
@@ -372,11 +364,10 @@ XML Schema (http://www.w3.org/2003/05/soap-envelope):
             &lt;xs:element ref="tns:Body" minOccurs="1"/&gt;
         &lt;/xs:sequence&gt;
         &lt;xs:anyAttribute namespace="#<link linkend="other"><type>other</type></link>" processContents="lax"/&gt;
-    &lt;/xs:complexType&gt;</para>
-<para>
+    &lt;/xs:complexType&gt;
 </para><variablelist role="params">
 <varlistentry><term><parameter>doc</parameter>&#160;:</term>
-<listitem><simpara>        the parent doc (might be NULL).
+<listitem><simpara>the parent doc (might be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created &lt;soap:Envelope&gt; node or NULL
 if an error occurs.
@@ -384,7 +375,8 @@ if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap12EnsureHeader" role="function">
 <title>xmlSecSoap12EnsureHeader ()</title>
-<indexterm zone="xmlSecSoap12EnsureHeader"><primary sortas="xmlSecSoap12EnsureHeader">xmlSecSoap12EnsureHeader</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12EnsureHeader            (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<indexterm zone="xmlSecSoap12EnsureHeader"><primary>xmlSecSoap12EnsureHeader</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecSoap12EnsureHeader            (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);</programlisting>
 <para>
 Gets the pointer to &lt;soap:Header&gt; node (if necessary, the node
 is created).
@@ -400,19 +392,19 @@ XML Schema (http://www.w3.org/2003/05/soap-envelope):
                     minOccurs="0" maxOccurs="unbounded"/&gt;
         &lt;/xs:sequence&gt;
         &lt;xs:anyAttribute namespace="#<link linkend="other"><type>other</type></link>" processContents="lax"/&gt;
-    &lt;/xs:complexType&gt;</para>
-<para>
+    &lt;/xs:complexType&gt;
 </para><variablelist role="params">
 <varlistentry><term><parameter>envNode</parameter>&#160;:</term>
-<listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
+<listitem><simpara>the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to &lt;soap:Header&gt; node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap12AddBodyEntry" role="function">
 <title>xmlSecSoap12AddBodyEntry ()</title>
-<indexterm zone="xmlSecSoap12AddBodyEntry"><primary sortas="xmlSecSoap12AddBodyEntry">xmlSecSoap12AddBodyEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12AddBodyEntry            (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> entryNode);</programlisting>
+<indexterm zone="xmlSecSoap12AddBodyEntry"><primary>xmlSecSoap12AddBodyEntry</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecSoap12AddBodyEntry            (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> entryNode</parameter>);</programlisting>
 <para>
 Adds a new entry to &lt;soap:Body&gt; node.
 </para>
@@ -427,26 +419,26 @@ XML Schema (http://www.w3.org/2003/05/soap-envelope):
                     minOccurs="0" maxOccurs="unbounded"/&gt;
         &lt;/xs:sequence&gt;
         &lt;xs:anyAttribute namespace="#<link linkend="other"><type>other</type></link>" processContents="lax"/&gt;
-    &lt;/xs:complexType&gt;</para>
-<para>
+    &lt;/xs:complexType&gt;
 </para><variablelist role="params">
 <varlistentry><term><parameter>envNode</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to &lt;soap:Envelope&gt; node.
+<listitem><simpara>the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>entryNode</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to body entry node.
+<listitem><simpara>the pointer to body entry node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the added entry (<parameter>contentNode</parameter>) or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap12AddFaultEntry" role="function">
 <title>xmlSecSoap12AddFaultEntry ()</title>
-<indexterm zone="xmlSecSoap12AddFaultEntry"><primary sortas="xmlSecSoap12AddFaultEntry">xmlSecSoap12AddFaultEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12AddFaultEntry           (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                                         <link linkend="xmlSecSoap12FaultCode">xmlSecSoap12FaultCode</link> faultCode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *faultReasonText,
-                                                         const <link linkend="xmlChar">xmlChar</link> *faultReasonLang,
-                                                         const <link linkend="xmlChar">xmlChar</link> *faultNodeURI,
-                                                         const <link linkend="xmlChar">xmlChar</link> *faultRole);</programlisting>
+<indexterm zone="xmlSecSoap12AddFaultEntry"><primary>xmlSecSoap12AddFaultEntry</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecSoap12AddFaultEntry           (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>,
+                                                         <parameter><link linkend="xmlSecSoap12FaultCode"><type>xmlSecSoap12FaultCode</type></link> faultCode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *faultReasonText</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *faultReasonLang</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *faultNodeURI</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *faultRole</parameter>);</programlisting>
 <para>
 Adds &lt;soap:Fault&gt; entry to the <parameter>envNode</parameter>. Note that only one &lt;soap:Fault&gt;
 entry is allowed.
@@ -517,27 +509,26 @@ XML Schema (http://www.w3.org/2003/05/soap-envelope):
                 minOccurs="0" maxOccurs="unbounded"/&gt;
         &lt;/xs:sequence&gt;
         &lt;xs:anyAttribute namespace="#<link linkend="other"><type>other</type></link>" processContents="lax"/&gt;
-    &lt;/xs:complexType&gt;</para>
-<para>
+    &lt;/xs:complexType&gt;
 </para><variablelist role="params">
 <varlistentry><term><parameter>envNode</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to &lt;soap:Envelope&gt; node.
+<listitem><simpara>the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>faultCode</parameter>&#160;:</term>
-<listitem><simpara>          the fault code.
+<listitem><simpara>the fault code.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>faultReasonText</parameter>&#160;:</term>
-<listitem><simpara>    the human readable explanation of the fault.
+<listitem><simpara>the human readable explanation of the fault.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>faultReasonLang</parameter>&#160;:</term>
-<listitem><simpara>    the language (xml:lang) for <parameter>faultReason</parameter> string.
+<listitem><simpara>the language (xml:lang) for <parameter>faultReason</parameter> string.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>faultNodeURI</parameter>&#160;:</term>
-<listitem><simpara>       the more preciese information about fault source
+<listitem><simpara>the more preciese information about fault source
                      (might be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>faultRole</parameter>&#160;:</term>
-<listitem><simpara>          the role the node was operating in at the point
+<listitem><simpara>the role the node was operating in at the point
                      the fault occurred (might be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the added entry or NULL if an error occurs.
@@ -545,21 +536,21 @@ XML Schema (http://www.w3.org/2003/05/soap-envelope):
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap12AddFaultSubcode" role="function">
 <title>xmlSecSoap12AddFaultSubcode ()</title>
-<indexterm zone="xmlSecSoap12AddFaultSubcode"><primary sortas="xmlSecSoap12AddFaultSubcode">xmlSecSoap12AddFaultSubcode</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12AddFaultSubcode         (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *subCodeHref,
-                                                         const <link linkend="xmlChar">xmlChar</link> *subCodeName);</programlisting>
-<para>
-Adds a new &lt;Subcode&gt; node to the &lt;Code&gt; node or the last &lt;Subcode&gt; node.</para>
+<indexterm zone="xmlSecSoap12AddFaultSubcode"><primary>xmlSecSoap12AddFaultSubcode</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecSoap12AddFaultSubcode         (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> faultNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *subCodeHref</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *subCodeName</parameter>);</programlisting>
 <para>
+Adds a new &lt;Subcode&gt; node to the &lt;Code&gt; node or the last &lt;Subcode&gt; node.
 </para><variablelist role="params">
 <varlistentry><term><parameter>faultNode</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to &lt;Fault&gt; node.
+<listitem><simpara>the pointer to &lt;Fault&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>subCodeHref</parameter>&#160;:</term>
-<listitem><simpara>        the subcode href.
+<listitem><simpara>the subcode href.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>subCodeName</parameter>&#160;:</term>
-<listitem><simpara>        the subcode name.
+<listitem><simpara>the subcode name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a pointer to the newly created &lt;Subcode&gt; node or NULL if an error
 occurs.
@@ -567,21 +558,21 @@ occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap12AddFaultReasonText" role="function">
 <title>xmlSecSoap12AddFaultReasonText ()</title>
-<indexterm zone="xmlSecSoap12AddFaultReasonText"><primary sortas="xmlSecSoap12AddFaultReasonText">xmlSecSoap12AddFaultReasonText</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12AddFaultReasonText      (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *faultReasonText,
-                                                         const <link linkend="xmlChar">xmlChar</link> *faultReasonLang);</programlisting>
-<para>
-Adds a new Text node to the Fault/Reason node.</para>
+<indexterm zone="xmlSecSoap12AddFaultReasonText"><primary>xmlSecSoap12AddFaultReasonText</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecSoap12AddFaultReasonText      (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> faultNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *faultReasonText</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *faultReasonLang</parameter>);</programlisting>
 <para>
+Adds a new Text node to the Fault/Reason node.
 </para><variablelist role="params">
 <varlistentry><term><parameter>faultNode</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to &lt;Fault&gt; node.
+<listitem><simpara>the pointer to &lt;Fault&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>faultReasonText</parameter>&#160;:</term>
-<listitem><simpara>    the new reason text.
+<listitem><simpara>the new reason text.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>faultReasonLang</parameter>&#160;:</term>
-<listitem><simpara>    the new reason xml:lang attribute.
+<listitem><simpara>the new reason xml:lang attribute.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a pointer to the newly created &lt;Text&gt; node or NULL if an error
 occurs.
@@ -589,17 +580,17 @@ occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap12AddFaultDetailEntry" role="function">
 <title>xmlSecSoap12AddFaultDetailEntry ()</title>
-<indexterm zone="xmlSecSoap12AddFaultDetailEntry"><primary sortas="xmlSecSoap12AddFaultDetailEntry">xmlSecSoap12AddFaultDetailEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12AddFaultDetailEntry     (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> detailEntryNode);</programlisting>
-<para>
-Adds a new child to the Detail child element of <parameter>faultNode</parameter>.</para>
+<indexterm zone="xmlSecSoap12AddFaultDetailEntry"><primary>xmlSecSoap12AddFaultDetailEntry</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecSoap12AddFaultDetailEntry     (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> faultNode</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> detailEntryNode</parameter>);</programlisting>
 <para>
+Adds a new child to the Detail child element of <parameter>faultNode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>faultNode</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to &lt;Fault&gt; node.
+<listitem><simpara>the pointer to &lt;Fault&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>detailEntryNode</parameter>&#160;:</term>
-<listitem><simpara>    the pointer to detail entry node.
+<listitem><simpara>the pointer to detail entry node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the added child (<parameter>detailEntryNode</parameter>) or NULL if an error
 occurs.
@@ -607,13 +598,13 @@ occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap12CheckEnvelope" role="function">
 <title>xmlSecSoap12CheckEnvelope ()</title>
-<indexterm zone="xmlSecSoap12CheckEnvelope"><primary sortas="xmlSecSoap12CheckEnvelope">xmlSecSoap12CheckEnvelope</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecSoap12CheckEnvelope           (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
-<para>
-Validates &lt;soap:Envelope&gt; node structure.</para>
+<indexterm zone="xmlSecSoap12CheckEnvelope"><primary>xmlSecSoap12CheckEnvelope</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecSoap12CheckEnvelope           (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);</programlisting>
 <para>
+Validates &lt;soap:Envelope&gt; node structure.
 </para><variablelist role="params">
 <varlistentry><term><parameter>envNode</parameter>&#160;:</term>
-<listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
+<listitem><simpara>the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if <parameter>envNode</parameter> has a valid &lt;soap:Envelope&gt; element, 0 if it is
 not valid or a negative value if an error occurs.
@@ -621,69 +612,69 @@ not valid or a negative value if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap12GetHeader" role="function">
 <title>xmlSecSoap12GetHeader ()</title>
-<indexterm zone="xmlSecSoap12GetHeader"><primary sortas="xmlSecSoap12GetHeader">xmlSecSoap12GetHeader</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12GetHeader               (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
-<para>
-Gets pointer to the &lt;soap:Header&gt; node.</para>
+<indexterm zone="xmlSecSoap12GetHeader"><primary>xmlSecSoap12GetHeader</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecSoap12GetHeader               (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);</programlisting>
 <para>
+Gets pointer to the &lt;soap:Header&gt; node.
 </para><variablelist role="params">
 <varlistentry><term><parameter>envNode</parameter>&#160;:</term>
-<listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
+<listitem><simpara>the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to &lt;soap:Header&gt; node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap12GetBody" role="function">
 <title>xmlSecSoap12GetBody ()</title>
-<indexterm zone="xmlSecSoap12GetBody"><primary sortas="xmlSecSoap12GetBody">xmlSecSoap12GetBody</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12GetBody                 (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
-<para>
-Gets pointer to the &lt;soap:Body&gt; node.</para>
+<indexterm zone="xmlSecSoap12GetBody"><primary>xmlSecSoap12GetBody</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecSoap12GetBody                 (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);</programlisting>
 <para>
+Gets pointer to the &lt;soap:Body&gt; node.
 </para><variablelist role="params">
 <varlistentry><term><parameter>envNode</parameter>&#160;:</term>
-<listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
+<listitem><simpara>the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to &lt;soap:Body&gt; node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap12GetBodyEntriesNumber" role="function">
 <title>xmlSecSoap12GetBodyEntriesNumber ()</title>
-<indexterm zone="xmlSecSoap12GetBodyEntriesNumber"><primary sortas="xmlSecSoap12GetBodyEntriesNumber">xmlSecSoap12GetBodyEntriesNumber</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecSoap12GetBodyEntriesNumber    (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
-<para>
-Gets the number of body entries.</para>
+<indexterm zone="xmlSecSoap12GetBodyEntriesNumber"><primary>xmlSecSoap12GetBodyEntriesNumber</primary></indexterm>
+<programlisting><link linkend="xmlSecSize"><returnvalue>xmlSecSize</returnvalue></link>          xmlSecSoap12GetBodyEntriesNumber    (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);</programlisting>
 <para>
+Gets the number of body entries.
 </para><variablelist role="params">
 <varlistentry><term><parameter>envNode</parameter>&#160;:</term>
-<listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
+<listitem><simpara>the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the number of body entries.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap12GetBodyEntry" role="function">
 <title>xmlSecSoap12GetBodyEntry ()</title>
-<indexterm zone="xmlSecSoap12GetBodyEntry"><primary sortas="xmlSecSoap12GetBodyEntry">xmlSecSoap12GetBodyEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12GetBodyEntry            (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
-<para>
-Gets the body entry number <parameter>pos</parameter>.</para>
+<indexterm zone="xmlSecSoap12GetBodyEntry"><primary>xmlSecSoap12GetBodyEntry</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecSoap12GetBodyEntry            (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> pos</parameter>);</programlisting>
 <para>
+Gets the body entry number <parameter>pos</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>envNode</parameter>&#160;:</term>
-<listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
+<listitem><simpara>the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>pos</parameter>&#160;:</term>
-<listitem><simpara>        the body entry number.
+<listitem><simpara>the body entry number.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to body entry node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecSoap12GetFaultEntry" role="function">
 <title>xmlSecSoap12GetFaultEntry ()</title>
-<indexterm zone="xmlSecSoap12GetFaultEntry"><primary sortas="xmlSecSoap12GetFaultEntry">xmlSecSoap12GetFaultEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12GetFaultEntry           (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
-<para>
-Gets the Fault entry (if any).</para>
+<indexterm zone="xmlSecSoap12GetFaultEntry"><primary>xmlSecSoap12GetFaultEntry</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecSoap12GetFaultEntry           (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> envNode</parameter>);</programlisting>
 <para>
+Gets the Fault entry (if any).
 </para><variablelist role="params">
 <varlistentry><term><parameter>envNode</parameter>&#160;:</term>
-<listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
+<listitem><simpara>the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to Fault entry or NULL if it does not exist.
 </simpara></listitem></varlistentry>
@@ -691,7 +682,4 @@ Gets the Fault entry (if any).</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/templates.sgml b/docs/api/sgml/templates.sgml
index 5413f88..473bfea 100644
--- a/docs/api/sgml/templates.sgml
+++ b/docs/api/sgml/templates.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-templates.top_of_page">templates</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>templates</refname>
 <refpurpose>Dynamic templates creation functions.</refpurpose>
@@ -13,167 +14,157 @@
 <refsynopsisdiv id="xmlsec-templates.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplSignatureCreate">xmlSecTmplSignatureCreate</link>           (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> c14nMethodId,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> signMethodId,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplSignatureCreateNsPref">xmlSecTmplSignatureCreateNsPref</link>     (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> c14nMethodId,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> signMethodId,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id,
-                                                         const <link linkend="xmlChar">xmlChar</link> *nsPrefix);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplSignatureEnsureKeyInfo">xmlSecTmplSignatureEnsureKeyInfo</link>    (<link linkend="xmlNode">xmlNodePtr</link> signNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplSignatureAddReference">xmlSecTmplSignatureAddReference</link>     (<link linkend="xmlNode">xmlNodePtr</link> signNode,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> digestMethodId,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri,
-                                                         const <link linkend="xmlChar">xmlChar</link> *type);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplSignatureAddObject">xmlSecTmplSignatureAddObject</link>        (<link linkend="xmlNode">xmlNodePtr</link> signNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id,
-                                                         const <link linkend="xmlChar">xmlChar</link> *mimeType,
-                                                         const <link linkend="xmlChar">xmlChar</link> *encoding);
-<link linkend="xmlNode">xmlNodePtr</link>          <link linkend="xmlSecTmplSignatureGetSignMethodNode">xmlSecTmplSignatureGetSignMethodNode</link>
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> signNode);
-<link linkend="xmlNode">xmlNodePtr</link>          <link linkend="xmlSecTmplSignatureGetC14NMethodNode">xmlSecTmplSignatureGetC14NMethodNode</link>
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> signNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplReferenceAddTransform">xmlSecTmplReferenceAddTransform</link>     (<link linkend="xmlNode">xmlNodePtr</link> referenceNode,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplObjectAddSignProperties">xmlSecTmplObjectAddSignProperties</link>   (<link linkend="xmlNode">xmlNodePtr</link> objectNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id,
-                                                         const <link linkend="xmlChar">xmlChar</link> *target);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplObjectAddManifest">xmlSecTmplObjectAddManifest</link>         (<link linkend="xmlNode">xmlNodePtr</link> objectNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplManifestAddReference">xmlSecTmplManifestAddReference</link>      (<link linkend="xmlNode">xmlNodePtr</link> manifestNode,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> digestMethodId,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri,
-                                                         const <link linkend="xmlChar">xmlChar</link> *type);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplEncDataCreate">xmlSecTmplEncDataCreate</link>             (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> encMethodId,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id,
-                                                         const <link linkend="xmlChar">xmlChar</link> *type,
-                                                         const <link linkend="xmlChar">xmlChar</link> *mimeType,
-                                                         const <link linkend="xmlChar">xmlChar</link> *encoding);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplEncDataEnsureKeyInfo">xmlSecTmplEncDataEnsureKeyInfo</link>      (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id);
-<link linkend="xmlNode">xmlNodePtr</link>          <link linkend="xmlSecTmplEncDataEnsureEncProperties">xmlSecTmplEncDataEnsureEncProperties</link>
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplEncDataAddEncProperty">xmlSecTmplEncDataAddEncProperty</link>     (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id,
-                                                         const <link linkend="xmlChar">xmlChar</link> *target);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplEncDataEnsureCipherValue">xmlSecTmplEncDataEnsureCipherValue</link>  (<link linkend="xmlNode">xmlNodePtr</link> encNode);
-<link linkend="xmlNode">xmlNodePtr</link>          <link linkend="xmlSecTmplEncDataEnsureCipherReference">xmlSecTmplEncDataEnsureCipherReference</link>
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplEncDataGetEncMethodNode">xmlSecTmplEncDataGetEncMethodNode</link>   (<link linkend="xmlNode">xmlNodePtr</link> encNode);
-<link linkend="xmlNode">xmlNodePtr</link>          <link linkend="xmlSecTmplCipherReferenceAddTransform">xmlSecTmplCipherReferenceAddTransform</link>
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> cipherReferenceNode,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);
-<link linkend="xmlNode">xmlNodePtr</link>          <link linkend="xmlSecTmplReferenceListAddDataReference">xmlSecTmplReferenceListAddDataReference</link>
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri);
-<link linkend="xmlNode">xmlNodePtr</link>          <link linkend="xmlSecTmplReferenceListAddKeyReference">xmlSecTmplReferenceListAddKeyReference</link>
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplKeyInfoAddKeyName">xmlSecTmplKeyInfoAddKeyName</link>         (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplKeyInfoAddKeyValue">xmlSecTmplKeyInfoAddKeyValue</link>        (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplKeyInfoAddX509Data">xmlSecTmplKeyInfoAddX509Data</link>        (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplKeyInfoAddRetrievalMethod">xmlSecTmplKeyInfoAddRetrievalMethod</link> (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri,
-                                                         const <link linkend="xmlChar">xmlChar</link> *type);
-<link linkend="xmlNode">xmlNodePtr</link>          <link linkend="xmlSecTmplRetrievalMethodAddTransform">xmlSecTmplRetrievalMethodAddTransform</link>
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> retrMethodNode,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplKeyInfoAddEncryptedKey">xmlSecTmplKeyInfoAddEncryptedKey</link>    (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> encMethodId,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id,
-                                                         const <link linkend="xmlChar">xmlChar</link> *type,
-                                                         const <link linkend="xmlChar">xmlChar</link> *recipient);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplX509DataAddIssuerSerial">xmlSecTmplX509DataAddIssuerSerial</link>   (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);
-<link linkend="xmlNode">xmlNodePtr</link>          <link linkend="xmlSecTmplX509IssuerSerialAddIssuerName">xmlSecTmplX509IssuerSerialAddIssuerName</link>
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> x509IssuerSerialNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *issuerName);
-<link linkend="xmlNode">xmlNodePtr</link>          <link linkend="xmlSecTmplX509IssuerSerialAddSerialNumber">xmlSecTmplX509IssuerSerialAddSerialNumber</link>
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> x509IssuerSerialNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *serial);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplX509DataAddSubjectName">xmlSecTmplX509DataAddSubjectName</link>    (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplX509DataAddSKI">xmlSecTmplX509DataAddSKI</link>            (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplX509DataAddCertificate">xmlSecTmplX509DataAddCertificate</link>    (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplX509DataAddCRL">xmlSecTmplX509DataAddCRL</link>            (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);
-<link linkend="int">int</link>                 <link linkend="xmlSecTmplTransformAddHmacOutputLength">xmlSecTmplTransformAddHmacOutputLength</link>
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bitsLen);
-<link linkend="int">int</link>                 <link linkend="xmlSecTmplTransformAddRsaOaepParam">xmlSecTmplTransformAddRsaOaepParam</link>  (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="int">int</link>                 <link linkend="xmlSecTmplTransformAddXsltStylesheet">xmlSecTmplTransformAddXsltStylesheet</link>
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *xslt);
-<link linkend="int">int</link>                 <link linkend="xmlSecTmplTransformAddC14NInclNamespaces">xmlSecTmplTransformAddC14NInclNamespaces</link>
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *prefixList);
-<link linkend="int">int</link>                 <link linkend="xmlSecTmplTransformAddXPath">xmlSecTmplTransformAddXPath</link>         (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *expression,
-                                                         const <link linkend="xmlChar">xmlChar</link> **nsList);
-<link linkend="int">int</link>                 <link linkend="xmlSecTmplTransformAddXPath2">xmlSecTmplTransformAddXPath2</link>        (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *type,
-                                                         const <link linkend="xmlChar">xmlChar</link> *expression,
-                                                         const <link linkend="xmlChar">xmlChar</link> **nsList);
-<link linkend="int">int</link>                 <link linkend="xmlSecTmplTransformAddXPointer">xmlSecTmplTransformAddXPointer</link>      (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *expression,
-                                                         const <link linkend="xmlChar">xmlChar</link> **nsList);
+<synopsis><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplSignatureCreate">xmlSecTmplSignatureCreate</link>           (<parameter><link linkend="xmlDoc"><type>xmlDocPtr</type></link> doc</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> c14nMethodId</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> signMethodId</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplSignatureCreateNsPref">xmlSecTmplSignatureCreateNsPref</link>     (<parameter><link linkend="xmlDoc"><type>xmlDocPtr</type></link> doc</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> c14nMethodId</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> signMethodId</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *nsPrefix</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplSignatureEnsureKeyInfo">xmlSecTmplSignatureEnsureKeyInfo</link>    (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> signNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplSignatureAddReference">xmlSecTmplSignatureAddReference</link>     (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> signNode</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> digestMethodId</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *type</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplSignatureAddObject">xmlSecTmplSignatureAddObject</link>        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> signNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *mimeType</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *encoding</parameter>);
+<link linkend="xmlNode"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplSignatureGetSignMethodNode">xmlSecTmplSignatureGetSignMethodNode</link>
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> signNode</parameter>);
+<link linkend="xmlNode"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplSignatureGetC14NMethodNode">xmlSecTmplSignatureGetC14NMethodNode</link>
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> signNode</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplReferenceAddTransform">xmlSecTmplReferenceAddTransform</link>     (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> referenceNode</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> transformId</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplObjectAddSignProperties">xmlSecTmplObjectAddSignProperties</link>   (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> objectNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *target</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplObjectAddManifest">xmlSecTmplObjectAddManifest</link>         (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> objectNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplManifestAddReference">xmlSecTmplManifestAddReference</link>      (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> manifestNode</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> digestMethodId</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *type</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplEncDataCreate">xmlSecTmplEncDataCreate</link>             (<parameter><link linkend="xmlDoc"><type>xmlDocPtr</type></link> doc</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> encMethodId</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *type</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *mimeType</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *encoding</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplEncDataEnsureKeyInfo">xmlSecTmplEncDataEnsureKeyInfo</link>      (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> encNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>);
+<link linkend="xmlNode"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplEncDataEnsureEncProperties">xmlSecTmplEncDataEnsureEncProperties</link>
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> encNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplEncDataAddEncProperty">xmlSecTmplEncDataAddEncProperty</link>     (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> encNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *target</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplEncDataEnsureCipherValue">xmlSecTmplEncDataEnsureCipherValue</link>  (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> encNode</parameter>);
+<link linkend="xmlNode"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplEncDataEnsureCipherReference">xmlSecTmplEncDataEnsureCipherReference</link>
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> encNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplEncDataGetEncMethodNode">xmlSecTmplEncDataGetEncMethodNode</link>   (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> encNode</parameter>);
+<link linkend="xmlNode"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplCipherReferenceAddTransform">xmlSecTmplCipherReferenceAddTransform</link>
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> cipherReferenceNode</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> transformId</parameter>);
+<link linkend="xmlNode"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplReferenceListAddDataReference">xmlSecTmplReferenceListAddDataReference</link>
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> encNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>);
+<link linkend="xmlNode"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplReferenceListAddKeyReference">xmlSecTmplReferenceListAddKeyReference</link>
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> encNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplKeyInfoAddKeyName">xmlSecTmplKeyInfoAddKeyName</link>         (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> keyInfoNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplKeyInfoAddKeyValue">xmlSecTmplKeyInfoAddKeyValue</link>        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> keyInfoNode</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplKeyInfoAddX509Data">xmlSecTmplKeyInfoAddX509Data</link>        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> keyInfoNode</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplKeyInfoAddRetrievalMethod">xmlSecTmplKeyInfoAddRetrievalMethod</link> (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> keyInfoNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *type</parameter>);
+<link linkend="xmlNode"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplRetrievalMethodAddTransform">xmlSecTmplRetrievalMethodAddTransform</link>
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> retrMethodNode</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> transformId</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplKeyInfoAddEncryptedKey">xmlSecTmplKeyInfoAddEncryptedKey</link>    (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> keyInfoNode</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> encMethodId</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *type</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *recipient</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplX509DataAddIssuerSerial">xmlSecTmplX509DataAddIssuerSerial</link>   (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> x509DataNode</parameter>);
+<link linkend="xmlNode"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplX509IssuerSerialAddIssuerName">xmlSecTmplX509IssuerSerialAddIssuerName</link>
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> x509IssuerSerialNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *issuerName</parameter>);
+<link linkend="xmlNode"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplX509IssuerSerialAddSerialNumber">xmlSecTmplX509IssuerSerialAddSerialNumber</link>
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> x509IssuerSerialNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *serial</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplX509DataAddSubjectName">xmlSecTmplX509DataAddSubjectName</link>    (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> x509DataNode</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplX509DataAddSKI">xmlSecTmplX509DataAddSKI</link>            (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> x509DataNode</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplX509DataAddCertificate">xmlSecTmplX509DataAddCertificate</link>    (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> x509DataNode</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecTmplX509DataAddCRL">xmlSecTmplX509DataAddCRL</link>            (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> x509DataNode</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTmplTransformAddHmacOutputLength">xmlSecTmplTransformAddHmacOutputLength</link>
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> transformNode</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bitsLen</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTmplTransformAddRsaOaepParam">xmlSecTmplTransformAddRsaOaepParam</link>  (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> transformNode</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTmplTransformAddXsltStylesheet">xmlSecTmplTransformAddXsltStylesheet</link>
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> transformNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *xslt</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTmplTransformAddC14NInclNamespaces">xmlSecTmplTransformAddC14NInclNamespaces</link>
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> transformNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *prefixList</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTmplTransformAddXPath">xmlSecTmplTransformAddXPath</link>         (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> transformNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *expression</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> **nsList</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTmplTransformAddXPath2">xmlSecTmplTransformAddXPath2</link>        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> transformNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *type</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *expression</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> **nsList</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTmplTransformAddXPointer">xmlSecTmplTransformAddXPointer</link>      (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> transformNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *expression</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> **nsList</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-templates.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Dynamic templates creation functions.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-templates.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecTmplSignatureCreate" role="function">
 <title>xmlSecTmplSignatureCreate ()</title>
-<indexterm zone="xmlSecTmplSignatureCreate"><primary sortas="xmlSecTmplSignatureCreate">xmlSecTmplSignatureCreate</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplSignatureCreate           (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> c14nMethodId,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> signMethodId,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id);</programlisting>
+<indexterm zone="xmlSecTmplSignatureCreate"><primary>xmlSecTmplSignatureCreate</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplSignatureCreate           (<parameter><link linkend="xmlDoc"><type>xmlDocPtr</type></link> doc</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> c14nMethodId</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> signMethodId</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>);</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.
 The application is responsible for inserting the returned node
-in the XML document.</para>
-<para>
+in the XML document.
 </para><variablelist role="params">
 <varlistentry><term><parameter>doc</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to signature document or NULL; in the
+<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>&#160;:</term>
-<listitem><simpara>       the signature canonicalization method.
+<listitem><simpara>the signature canonicalization method.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>signMethodId</parameter>&#160;:</term>
-<listitem><simpara>       the signature  method.
+<listitem><simpara>the signature  method.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the node id (may be NULL).
+<listitem><simpara>the node id (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node or NULL if an
 error occurs.
@@ -181,11 +172,12 @@ error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplSignatureCreateNsPref" role="function">
 <title>xmlSecTmplSignatureCreateNsPref ()</title>
-<indexterm zone="xmlSecTmplSignatureCreateNsPref"><primary sortas="xmlSecTmplSignatureCreateNsPref">xmlSecTmplSignatureCreateNsPref</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplSignatureCreateNsPref     (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> c14nMethodId,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> signMethodId,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id,
-                                                         const <link linkend="xmlChar">xmlChar</link> *nsPrefix);</programlisting>
+<indexterm zone="xmlSecTmplSignatureCreateNsPref"><primary>xmlSecTmplSignatureCreateNsPref</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplSignatureCreateNsPref     (<parameter><link linkend="xmlDoc"><type>xmlDocPtr</type></link> doc</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> c14nMethodId</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> signMethodId</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *nsPrefix</parameter>);</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>,
@@ -194,26 +186,25 @@ 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>
+inserting the returned node in the XML document.
 </para><variablelist role="params">
 <varlistentry><term><parameter>doc</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to signature document or NULL; in the
+<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>&#160;:</term>
-<listitem><simpara>       the signature canonicalization method.
+<listitem><simpara>the signature canonicalization method.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>signMethodId</parameter>&#160;:</term>
-<listitem><simpara>       the signature  method.
+<listitem><simpara>the signature  method.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the node id (may be NULL).
+<listitem><simpara>the node id (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nsPrefix</parameter>&#160;:</term>
-<listitem><simpara>   the namespace prefix for the signature element (e.g. "dsig"), or NULL
+<listitem><simpara>the namespace prefix for the signature element (e.g. "dsig"), or NULL
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node or NULL if an
 error occurs.
@@ -221,18 +212,18 @@ error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplSignatureEnsureKeyInfo" role="function">
 <title>xmlSecTmplSignatureEnsureKeyInfo ()</title>
-<indexterm zone="xmlSecTmplSignatureEnsureKeyInfo"><primary sortas="xmlSecTmplSignatureEnsureKeyInfo">xmlSecTmplSignatureEnsureKeyInfo</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplSignatureEnsureKeyInfo    (<link linkend="xmlNode">xmlNodePtr</link> signNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id);</programlisting>
+<indexterm zone="xmlSecTmplSignatureEnsureKeyInfo"><primary>xmlSecTmplSignatureEnsureKeyInfo</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplSignatureEnsureKeyInfo    (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> signNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>);</programlisting>
 <para>
 Adds (if necessary) <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink>
-node <parameter>signNode</parameter>.</para>
-<para>
+node <parameter>signNode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>signNode</parameter>&#160;:</term>
-<listitem><simpara>           the  pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>                 the node id (may be NULL).
+<listitem><simpara>the node id (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node or NULL if an
 error occurs.
@@ -240,31 +231,31 @@ error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplSignatureAddReference" role="function">
 <title>xmlSecTmplSignatureAddReference ()</title>
-<indexterm zone="xmlSecTmplSignatureAddReference"><primary sortas="xmlSecTmplSignatureAddReference">xmlSecTmplSignatureAddReference</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplSignatureAddReference     (<link linkend="xmlNode">xmlNodePtr</link> signNode,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> digestMethodId,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri,
-                                                         const <link linkend="xmlChar">xmlChar</link> *type);</programlisting>
+<indexterm zone="xmlSecTmplSignatureAddReference"><primary>xmlSecTmplSignatureAddReference</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplSignatureAddReference     (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> signNode</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> digestMethodId</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *type</parameter>);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node with given URI (<parameter>uri</parameter>), Id (<parameter>id</parameter>) and
 Type (<parameter>type</parameter>) attributes and the required children <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestMethod";>&lt;dsig:DigestMethod/&gt;</ulink> and
-<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestValue";>&lt;dsig:DigestValue/&gt;</ulink> to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> child of <parameter>signNode</parameter>.</para>
-<para>
+<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><variablelist role="params">
 <varlistentry><term><parameter>signNode</parameter>&#160;:</term>
-<listitem><simpara>           the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>     the reference digest method.
+<listitem><simpara>the reference digest method.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the node id (may be NULL).
+<listitem><simpara>the node id (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>uri</parameter>&#160;:</term>
-<listitem><simpara>                the reference node uri (may be NULL).
+<listitem><simpara>the reference node uri (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the reference node type (may be NULL).
+<listitem><simpara>the reference node type (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node or NULL
 if an error occurs.
@@ -272,25 +263,25 @@ if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplSignatureAddObject" role="function">
 <title>xmlSecTmplSignatureAddObject ()</title>
-<indexterm zone="xmlSecTmplSignatureAddObject"><primary sortas="xmlSecTmplSignatureAddObject">xmlSecTmplSignatureAddObject</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplSignatureAddObject        (<link linkend="xmlNode">xmlNodePtr</link> signNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id,
-                                                         const <link linkend="xmlChar">xmlChar</link> *mimeType,
-                                                         const <link linkend="xmlChar">xmlChar</link> *encoding);</programlisting>
-<para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node <parameter>signNode</parameter>.</para>
+<indexterm zone="xmlSecTmplSignatureAddObject"><primary>xmlSecTmplSignatureAddObject</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplSignatureAddObject        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> signNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *mimeType</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *encoding</parameter>);</programlisting>
 <para>
+Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node <parameter>signNode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>signNode</parameter>&#160;:</term>
-<listitem><simpara>           the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>                 the node id (may be NULL).
+<listitem><simpara>the node id (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>mimeType</parameter>&#160;:</term>
-<listitem><simpara>           the object mime type (may be NULL).
+<listitem><simpara>the object mime type (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>encoding</parameter>&#160;:</term>
-<listitem><simpara>           the object encoding (may be NULL).
+<listitem><simpara>the object encoding (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink> node or NULL
 if an error occurs.
@@ -298,45 +289,45 @@ if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplSignatureGetSignMethodNode" role="function">
 <title>xmlSecTmplSignatureGetSignMethodNode ()</title>
-<indexterm zone="xmlSecTmplSignatureGetSignMethodNode"><primary sortas="xmlSecTmplSignatureGetSignMethodNode">xmlSecTmplSignatureGetSignMethodNode</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>          xmlSecTmplSignatureGetSignMethodNode
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> signNode);</programlisting>
-<para>
-Gets pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod";>&lt;dsig:SignatureMethod/&gt;</ulink> child of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.</para>
+<indexterm zone="xmlSecTmplSignatureGetSignMethodNode"><primary>xmlSecTmplSignatureGetSignMethodNode</primary></indexterm>
+<programlisting><link linkend="xmlNode"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplSignatureGetSignMethodNode
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> signNode</parameter>);</programlisting>
 <para>
+Gets pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod";>&lt;dsig:SignatureMethod/&gt;</ulink> child of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
 </para><variablelist role="params">
 <varlistentry><term><parameter>signNode</parameter>&#160;:</term>
-<listitem><simpara>           the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature ">&lt;dsig:Signature /&gt;</ulink> node.
+<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>&#160;:</term><listitem><simpara> pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod ">&lt;dsig:SignatureMethod /&gt;</ulink> node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplSignatureGetC14NMethodNode" role="function">
 <title>xmlSecTmplSignatureGetC14NMethodNode ()</title>
-<indexterm zone="xmlSecTmplSignatureGetC14NMethodNode"><primary sortas="xmlSecTmplSignatureGetC14NMethodNode">xmlSecTmplSignatureGetC14NMethodNode</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>          xmlSecTmplSignatureGetC14NMethodNode
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> signNode);</programlisting>
-<para>
-Gets pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod";>&lt;dsig:CanonicalizationMethod/&gt;</ulink> child of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.</para>
+<indexterm zone="xmlSecTmplSignatureGetC14NMethodNode"><primary>xmlSecTmplSignatureGetC14NMethodNode</primary></indexterm>
+<programlisting><link linkend="xmlNode"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplSignatureGetC14NMethodNode
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> signNode</parameter>);</programlisting>
 <para>
+Gets pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod";>&lt;dsig:CanonicalizationMethod/&gt;</ulink> child of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
 </para><variablelist role="params">
 <varlistentry><term><parameter>signNode</parameter>&#160;:</term>
-<listitem><simpara>           the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature ">&lt;dsig:Signature /&gt;</ulink> node.
+<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>&#160;:</term><listitem><simpara> pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod ">&lt;dsig:CanonicalizationMethod /&gt;</ulink> node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplReferenceAddTransform" role="function">
 <title>xmlSecTmplReferenceAddTransform ()</title>
-<indexterm zone="xmlSecTmplReferenceAddTransform"><primary sortas="xmlSecTmplReferenceAddTransform">xmlSecTmplReferenceAddTransform</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplReferenceAddTransform     (<link linkend="xmlNode">xmlNodePtr</link> referenceNode,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);</programlisting>
-<para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node <parameter>referenceNode</parameter>.</para>
+<indexterm zone="xmlSecTmplReferenceAddTransform"><primary>xmlSecTmplReferenceAddTransform</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplReferenceAddTransform     (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> referenceNode</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> transformId</parameter>);</programlisting>
 <para>
+Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node <parameter>referenceNode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>referenceNode</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>                the transform method id.
+<listitem><simpara>the transform method id.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node or NULL if an
 error occurs.
@@ -344,21 +335,21 @@ error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplObjectAddSignProperties" role="function">
 <title>xmlSecTmplObjectAddSignProperties ()</title>
-<indexterm zone="xmlSecTmplObjectAddSignProperties"><primary sortas="xmlSecTmplObjectAddSignProperties">xmlSecTmplObjectAddSignProperties</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplObjectAddSignProperties   (<link linkend="xmlNode">xmlNodePtr</link> objectNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id,
-                                                         const <link linkend="xmlChar">xmlChar</link> *target);</programlisting>
-<para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureProperties";>&lt;dsig:SignatureProperties/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink> node <parameter>objectNode</parameter>.</para>
+<indexterm zone="xmlSecTmplObjectAddSignProperties"><primary>xmlSecTmplObjectAddSignProperties</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplObjectAddSignProperties   (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> objectNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *target</parameter>);</programlisting>
 <para>
+Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureProperties";>&lt;dsig:SignatureProperties/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink> node <parameter>objectNode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>objectNode</parameter>&#160;:</term>
-<listitem><simpara>         the  pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>                 the node id (may be NULL).
+<listitem><simpara>the node id (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>target</parameter>&#160;:</term>
-<listitem><simpara>             the Target  (may be NULL).
+<listitem><simpara>the Target  (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureProperties";>&lt;dsig:SignatureProperties/&gt;</ulink> node or NULL
 if an error occurs.
@@ -366,17 +357,17 @@ if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplObjectAddManifest" role="function">
 <title>xmlSecTmplObjectAddManifest ()</title>
-<indexterm zone="xmlSecTmplObjectAddManifest"><primary sortas="xmlSecTmplObjectAddManifest">xmlSecTmplObjectAddManifest</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplObjectAddManifest         (<link linkend="xmlNode">xmlNodePtr</link> objectNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id);</programlisting>
-<para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink> node <parameter>objectNode</parameter>.</para>
+<indexterm zone="xmlSecTmplObjectAddManifest"><primary>xmlSecTmplObjectAddManifest</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplObjectAddManifest         (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> objectNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>);</programlisting>
 <para>
+Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink> node <parameter>objectNode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>objectNode</parameter>&#160;:</term>
-<listitem><simpara>         the  pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>                 the node id (may be NULL).
+<listitem><simpara>the node id (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink> node or NULL
 if an error occurs.
@@ -384,31 +375,31 @@ if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplManifestAddReference" role="function">
 <title>xmlSecTmplManifestAddReference ()</title>
-<indexterm zone="xmlSecTmplManifestAddReference"><primary sortas="xmlSecTmplManifestAddReference">xmlSecTmplManifestAddReference</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplManifestAddReference      (<link linkend="xmlNode">xmlNodePtr</link> manifestNode,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> digestMethodId,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri,
-                                                         const <link linkend="xmlChar">xmlChar</link> *type);</programlisting>
+<indexterm zone="xmlSecTmplManifestAddReference"><primary>xmlSecTmplManifestAddReference</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplManifestAddReference      (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> manifestNode</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> digestMethodId</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *type</parameter>);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node with specified URI (<parameter>uri</parameter>), Id (<parameter>id</parameter>) and
 Type (<parameter>type</parameter>) attributes and the required children <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestMethod";>&lt;dsig:DigestMethod/&gt;</ulink> and
-<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestValue";>&lt;dsig:DigestValue/&gt;</ulink> to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink> node <parameter>manifestNode</parameter>.</para>
-<para>
+<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><variablelist role="params">
 <varlistentry><term><parameter>manifestNode</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>     the reference digest method.
+<listitem><simpara>the reference digest method.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the node id (may be NULL).
+<listitem><simpara>the node id (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>uri</parameter>&#160;:</term>
-<listitem><simpara>                the reference node uri (may be NULL).
+<listitem><simpara>the reference node uri (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the reference node type (may be NULL).
+<listitem><simpara>the reference node type (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node or NULL
 if an error occurs.
@@ -416,35 +407,35 @@ if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplEncDataCreate" role="function">
 <title>xmlSecTmplEncDataCreate ()</title>
-<indexterm zone="xmlSecTmplEncDataCreate"><primary sortas="xmlSecTmplEncDataCreate">xmlSecTmplEncDataCreate</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplEncDataCreate             (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> encMethodId,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id,
-                                                         const <link linkend="xmlChar">xmlChar</link> *type,
-                                                         const <link linkend="xmlChar">xmlChar</link> *mimeType,
-                                                         const <link linkend="xmlChar">xmlChar</link> *encoding);</programlisting>
-<para>
-Creates new <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData ">&lt;enc:EncryptedData /&gt;</ulink> node for encryption template.</para>
+<indexterm zone="xmlSecTmplEncDataCreate"><primary>xmlSecTmplEncDataCreate</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplEncDataCreate             (<parameter><link linkend="xmlDoc"><type>xmlDocPtr</type></link> doc</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> encMethodId</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *type</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *mimeType</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *encoding</parameter>);</programlisting>
 <para>
+Creates new <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData ">&lt;enc:EncryptedData /&gt;</ulink> node for encryption template.
 </para><variablelist role="params">
 <varlistentry><term><parameter>doc</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to signature document or NULL; in the later
+<listitem><simpara>the pointer to signature document or NULL; in the later
                      case, application must later call <parameter>xmlSetTreeDoc</parameter> to ensure
                      that all the children nodes have correct pointer to XML document.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>encMethodId</parameter>&#160;:</term>
-<listitem><simpara>        the encryption method (may be NULL).
+<listitem><simpara>the encryption method (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the Id attribute (optional).
+<listitem><simpara>the Id attribute (optional).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the Type attribute (optional)
+<listitem><simpara>the Type attribute (optional)
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>mimeType</parameter>&#160;:</term>
-<listitem><simpara>           the MimeType attribute (optional)
+<listitem><simpara>the MimeType attribute (optional)
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>encoding</parameter>&#160;:</term>
-<listitem><simpara>           the Encoding attribute (optional)
+<listitem><simpara>the Encoding attribute (optional)
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer newly created  <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node or NULL
 if an error occurs.
@@ -452,17 +443,17 @@ if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplEncDataEnsureKeyInfo" role="function">
 <title>xmlSecTmplEncDataEnsureKeyInfo ()</title>
-<indexterm zone="xmlSecTmplEncDataEnsureKeyInfo"><primary sortas="xmlSecTmplEncDataEnsureKeyInfo">xmlSecTmplEncDataEnsureKeyInfo</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplEncDataEnsureKeyInfo      (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id);</programlisting>
-<para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> to the  <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node <parameter>encNode</parameter>.</para>
+<indexterm zone="xmlSecTmplEncDataEnsureKeyInfo"><primary>xmlSecTmplEncDataEnsureKeyInfo</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplEncDataEnsureKeyInfo      (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> encNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>);</programlisting>
 <para>
+Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> to the  <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node <parameter>encNode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>encNode</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>                 the Id attrbibute (optional).
+<listitem><simpara>the Id attrbibute (optional).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node or
 NULL if an error occurs.
@@ -470,19 +461,19 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplEncDataEnsureEncProperties" role="function">
 <title>xmlSecTmplEncDataEnsureEncProperties ()</title>
-<indexterm zone="xmlSecTmplEncDataEnsureEncProperties"><primary sortas="xmlSecTmplEncDataEnsureEncProperties">xmlSecTmplEncDataEnsureEncProperties</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>          xmlSecTmplEncDataEnsureEncProperties
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id);</programlisting>
+<indexterm zone="xmlSecTmplEncDataEnsureEncProperties"><primary>xmlSecTmplEncDataEnsureEncProperties</primary></indexterm>
+<programlisting><link linkend="xmlNode"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplEncDataEnsureEncProperties
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> encNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties";>&lt;enc:EncryptionProperties/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink>
-node <parameter>encNode</parameter>.</para>
-<para>
+node <parameter>encNode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>encNode</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>                 the Id attribute (optional).
+<listitem><simpara>the Id attribute (optional).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties";>&lt;enc:EncryptionProperties/&gt;</ulink> node or
 NULL if an error occurs.
@@ -490,23 +481,23 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplEncDataAddEncProperty" role="function">
 <title>xmlSecTmplEncDataAddEncProperty ()</title>
-<indexterm zone="xmlSecTmplEncDataAddEncProperty"><primary sortas="xmlSecTmplEncDataAddEncProperty">xmlSecTmplEncDataAddEncProperty</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplEncDataAddEncProperty     (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id,
-                                                         const <link linkend="xmlChar">xmlChar</link> *target);</programlisting>
+<indexterm zone="xmlSecTmplEncDataAddEncProperty"><primary>xmlSecTmplEncDataAddEncProperty</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplEncDataAddEncProperty     (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> encNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *target</parameter>);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperty";>&lt;enc:EncryptionProperty/&gt;</ulink> node (and the parent
 <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties";>&lt;enc:EncryptionProperties/&gt;</ulink> node if required) to the
-<ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node <parameter>encNode</parameter>.</para>
-<para>
+<ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node <parameter>encNode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>encNode</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>                 the Id attribute (optional).
+<listitem><simpara>the Id attribute (optional).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>target</parameter>&#160;:</term>
-<listitem><simpara>             the Target attribute (optional).
+<listitem><simpara>the Target attribute (optional).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperty";>&lt;enc:EncryptionProperty/&gt;</ulink> node or
 NULL if an error occurs.
@@ -514,13 +505,13 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplEncDataEnsureCipherValue" role="function">
 <title>xmlSecTmplEncDataEnsureCipherValue ()</title>
-<indexterm zone="xmlSecTmplEncDataEnsureCipherValue"><primary sortas="xmlSecTmplEncDataEnsureCipherValue">xmlSecTmplEncDataEnsureCipherValue</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplEncDataEnsureCipherValue  (<link linkend="xmlNode">xmlNodePtr</link> encNode);</programlisting>
-<para>
-Adds <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue";>&lt;enc:CipherValue/&gt;</ulink> to the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node <parameter>encNode</parameter>.</para>
+<indexterm zone="xmlSecTmplEncDataEnsureCipherValue"><primary>xmlSecTmplEncDataEnsureCipherValue</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplEncDataEnsureCipherValue  (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> encNode</parameter>);</programlisting>
 <para>
+Adds <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue";>&lt;enc:CipherValue/&gt;</ulink> to the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node <parameter>encNode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>encNode</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node.
+<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>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue";>&lt;enc:CipherValue/&gt;</ulink> node or
 NULL if an error occurs.
@@ -528,19 +519,19 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplEncDataEnsureCipherReference" role="function">
 <title>xmlSecTmplEncDataEnsureCipherReference ()</title>
-<indexterm zone="xmlSecTmplEncDataEnsureCipherReference"><primary sortas="xmlSecTmplEncDataEnsureCipherReference">xmlSecTmplEncDataEnsureCipherReference</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>          xmlSecTmplEncDataEnsureCipherReference
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
+<indexterm zone="xmlSecTmplEncDataEnsureCipherReference"><primary>xmlSecTmplEncDataEnsureCipherReference</primary></indexterm>
+<programlisting><link linkend="xmlNode"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplEncDataEnsureCipherReference
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> encNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";>&lt;enc:CipherReference/&gt;</ulink> node with specified URI attribute <parameter>uri</parameter>
-to the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node <parameter>encNode</parameter>.</para>
-<para>
+to the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node <parameter>encNode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>encNode</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>                the URI attribute (may be NULL).
+<listitem><simpara>the URI attribute (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";>&lt;enc:CipherReference/&gt;</ulink> node or
 NULL if an error occurs.
@@ -548,33 +539,33 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplEncDataGetEncMethodNode" role="function">
 <title>xmlSecTmplEncDataGetEncMethodNode ()</title>
-<indexterm zone="xmlSecTmplEncDataGetEncMethodNode"><primary sortas="xmlSecTmplEncDataGetEncMethodNode">xmlSecTmplEncDataGetEncMethodNode</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplEncDataGetEncMethodNode   (<link linkend="xmlNode">xmlNodePtr</link> encNode);</programlisting>
-<para>
-Gets pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncrytpionMethod";>&lt;enc:EncrytpionMethod/&gt;</ulink> node.</para>
+<indexterm zone="xmlSecTmplEncDataGetEncMethodNode"><primary>xmlSecTmplEncDataGetEncMethodNode</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplEncDataGetEncMethodNode   (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> encNode</parameter>);</programlisting>
 <para>
+Gets pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncrytpionMethod";>&lt;enc:EncrytpionMethod/&gt;</ulink> node.
 </para><variablelist role="params">
 <varlistentry><term><parameter>encNode</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EcnryptedData ">&lt;enc:EcnryptedData /&gt;</ulink> node.
+<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>&#160;:</term><listitem><simpara> pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod ">&lt;enc:EncryptionMethod /&gt;</ulink> node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplCipherReferenceAddTransform" role="function">
 <title>xmlSecTmplCipherReferenceAddTransform ()</title>
-<indexterm zone="xmlSecTmplCipherReferenceAddTransform"><primary sortas="xmlSecTmplCipherReferenceAddTransform">xmlSecTmplCipherReferenceAddTransform</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>          xmlSecTmplCipherReferenceAddTransform
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> cipherReferenceNode,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);</programlisting>
+<indexterm zone="xmlSecTmplCipherReferenceAddTransform"><primary>xmlSecTmplCipherReferenceAddTransform</primary></indexterm>
+<programlisting><link linkend="xmlNode"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplCipherReferenceAddTransform
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> cipherReferenceNode</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> transformId</parameter>);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node (and the parent <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transforms";>&lt;dsig:Transforms/&gt;</ulink> node)
 with specified transform methods <parameter>transform</parameter> to the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";>&lt;enc:CipherReference/&gt;</ulink>
-child node of the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node <parameter>encNode</parameter>.</para>
-<para>
+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><variablelist role="params">
 <varlistentry><term><parameter>cipherReferenceNode</parameter>&#160;:</term>
-<listitem><simpara>        the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";>&lt;enc:CipherReference/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>                the transform id.
+<listitem><simpara>the transform id.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node or
 NULL if an error occurs.
@@ -582,18 +573,18 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplReferenceListAddDataReference" role="function">
 <title>xmlSecTmplReferenceListAddDataReference ()</title>
-<indexterm zone="xmlSecTmplReferenceListAddDataReference"><primary sortas="xmlSecTmplReferenceListAddDataReference">xmlSecTmplReferenceListAddDataReference</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>          xmlSecTmplReferenceListAddDataReference
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
-<para>
-Adds <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-DataReference";>&lt;enc:DataReference/&gt;</ulink> and the parent <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-ReferenceList";>&lt;enc:ReferenceList/&gt;</ulink> node (if needed).</para>
+<indexterm zone="xmlSecTmplReferenceListAddDataReference"><primary>xmlSecTmplReferenceListAddDataReference</primary></indexterm>
+<programlisting><link linkend="xmlNode"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplReferenceListAddDataReference
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> encNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>);</programlisting>
 <para>
+Adds <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-DataReference";>&lt;enc:DataReference/&gt;</ulink> and the parent <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-ReferenceList";>&lt;enc:ReferenceList/&gt;</ulink> node (if needed).
 </para><variablelist role="params">
 <varlistentry><term><parameter>encNode</parameter>&#160;:</term>
-<listitem><simpara>                    the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>                        uri to reference (optional)
+<listitem><simpara>uri to reference (optional)
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-DataReference";>&lt;enc:DataReference/&gt;</ulink> node or
 NULL if an error occurs.
@@ -601,18 +592,18 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplReferenceListAddKeyReference" role="function">
 <title>xmlSecTmplReferenceListAddKeyReference ()</title>
-<indexterm zone="xmlSecTmplReferenceListAddKeyReference"><primary sortas="xmlSecTmplReferenceListAddKeyReference">xmlSecTmplReferenceListAddKeyReference</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>          xmlSecTmplReferenceListAddKeyReference
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
-<para>
-Adds <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-KeyReference";>&lt;enc:KeyReference/&gt;</ulink> and the parent <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-ReferenceList";>&lt;enc:ReferenceList/&gt;</ulink> node (if needed).</para>
+<indexterm zone="xmlSecTmplReferenceListAddKeyReference"><primary>xmlSecTmplReferenceListAddKeyReference</primary></indexterm>
+<programlisting><link linkend="xmlNode"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplReferenceListAddKeyReference
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> encNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>);</programlisting>
 <para>
+Adds <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-KeyReference";>&lt;enc:KeyReference/&gt;</ulink> and the parent <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-ReferenceList";>&lt;enc:ReferenceList/&gt;</ulink> node (if needed).
 </para><variablelist role="params">
 <varlistentry><term><parameter>encNode</parameter>&#160;:</term>
-<listitem><simpara>                    the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>                        uri to reference (optional)
+<listitem><simpara>uri to reference (optional)
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-KeyReference";>&lt;enc:KeyReference/&gt;</ulink> node or
 NULL if an error occurs.
@@ -620,17 +611,17 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplKeyInfoAddKeyName" role="function">
 <title>xmlSecTmplKeyInfoAddKeyName ()</title>
-<indexterm zone="xmlSecTmplKeyInfoAddKeyName"><primary sortas="xmlSecTmplKeyInfoAddKeyName">xmlSecTmplKeyInfoAddKeyName</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplKeyInfoAddKeyName         (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name);</programlisting>
-<para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";>&lt;dsig:KeyName/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter>.</para>
+<indexterm zone="xmlSecTmplKeyInfoAddKeyName"><primary>xmlSecTmplKeyInfoAddKeyName</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplKeyInfoAddKeyName         (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> keyInfoNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>);</programlisting>
 <para>
+Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";>&lt;dsig:KeyName/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoNode</parameter>&#160;:</term>
-<listitem><simpara>        the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>               the key name (optional).
+<listitem><simpara>the key name (optional).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";>&lt;dsig:KeyName/&gt;</ulink> node or
 NULL if an error occurs.
@@ -638,13 +629,13 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplKeyInfoAddKeyValue" role="function">
 <title>xmlSecTmplKeyInfoAddKeyValue ()</title>
-<indexterm zone="xmlSecTmplKeyInfoAddKeyValue"><primary sortas="xmlSecTmplKeyInfoAddKeyValue">xmlSecTmplKeyInfoAddKeyValue</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplKeyInfoAddKeyValue        (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode);</programlisting>
-<para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";>&lt;dsig:KeyValue/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter>.</para>
+<indexterm zone="xmlSecTmplKeyInfoAddKeyValue"><primary>xmlSecTmplKeyInfoAddKeyValue</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplKeyInfoAddKeyValue        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> keyInfoNode</parameter>);</programlisting>
 <para>
+Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";>&lt;dsig:KeyValue/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoNode</parameter>&#160;:</term>
-<listitem><simpara>        the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
+<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>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";>&lt;dsig:KeyValue/&gt;</ulink> node or
 NULL if an error occurs.
@@ -652,13 +643,13 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplKeyInfoAddX509Data" role="function">
 <title>xmlSecTmplKeyInfoAddX509Data ()</title>
-<indexterm zone="xmlSecTmplKeyInfoAddX509Data"><primary sortas="xmlSecTmplKeyInfoAddX509Data">xmlSecTmplKeyInfoAddX509Data</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplKeyInfoAddX509Data        (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode);</programlisting>
-<para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter>.</para>
+<indexterm zone="xmlSecTmplKeyInfoAddX509Data"><primary>xmlSecTmplKeyInfoAddX509Data</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplKeyInfoAddX509Data        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> keyInfoNode</parameter>);</programlisting>
 <para>
+Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoNode</parameter>&#160;:</term>
-<listitem><simpara>        the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
+<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>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node or
 NULL if an error occurs.
@@ -666,21 +657,21 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplKeyInfoAddRetrievalMethod" role="function">
 <title>xmlSecTmplKeyInfoAddRetrievalMethod ()</title>
-<indexterm zone="xmlSecTmplKeyInfoAddRetrievalMethod"><primary sortas="xmlSecTmplKeyInfoAddRetrievalMethod">xmlSecTmplKeyInfoAddRetrievalMethod</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplKeyInfoAddRetrievalMethod (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri,
-                                                         const <link linkend="xmlChar">xmlChar</link> *type);</programlisting>
-<para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter>.</para>
+<indexterm zone="xmlSecTmplKeyInfoAddRetrievalMethod"><primary>xmlSecTmplKeyInfoAddRetrievalMethod</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplKeyInfoAddRetrievalMethod (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> keyInfoNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *type</parameter>);</programlisting>
 <para>
+Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoNode</parameter>&#160;:</term>
-<listitem><simpara>        the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>                the URI attribute (optional).
+<listitem><simpara>the URI attribute (optional).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the Type attribute(optional).
+<listitem><simpara>the Type attribute(optional).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink> node or
 NULL if an error occurs.
@@ -688,19 +679,19 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplRetrievalMethodAddTransform" role="function">
 <title>xmlSecTmplRetrievalMethodAddTransform ()</title>
-<indexterm zone="xmlSecTmplRetrievalMethodAddTransform"><primary sortas="xmlSecTmplRetrievalMethodAddTransform">xmlSecTmplRetrievalMethodAddTransform</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>          xmlSecTmplRetrievalMethodAddTransform
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> retrMethodNode,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);</programlisting>
+<indexterm zone="xmlSecTmplRetrievalMethodAddTransform"><primary>xmlSecTmplRetrievalMethodAddTransform</primary></indexterm>
+<programlisting><link linkend="xmlNode"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplRetrievalMethodAddTransform
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> retrMethodNode</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> transformId</parameter>);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node (and the parent <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transforms";>&lt;dsig:Transforms/&gt;</ulink> node
-if required) to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink> node <parameter>retrMethod</parameter>.</para>
-<para>
+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><variablelist role="params">
 <varlistentry><term><parameter>retrMethodNode</parameter>&#160;:</term>
-<listitem><simpara>     the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>        the transform id.
+<listitem><simpara>the transform id.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transforms";>&lt;dsig:Transforms/&gt;</ulink> node or
 NULL if an error occurs.
@@ -708,30 +699,30 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplKeyInfoAddEncryptedKey" role="function">
 <title>xmlSecTmplKeyInfoAddEncryptedKey ()</title>
-<indexterm zone="xmlSecTmplKeyInfoAddEncryptedKey"><primary sortas="xmlSecTmplKeyInfoAddEncryptedKey">xmlSecTmplKeyInfoAddEncryptedKey</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplKeyInfoAddEncryptedKey    (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> encMethodId,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id,
-                                                         const <link linkend="xmlChar">xmlChar</link> *type,
-                                                         const <link linkend="xmlChar">xmlChar</link> *recipient);</programlisting>
+<indexterm zone="xmlSecTmplKeyInfoAddEncryptedKey"><primary>xmlSecTmplKeyInfoAddEncryptedKey</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplKeyInfoAddEncryptedKey    (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> keyInfoNode</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> encMethodId</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *type</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *recipient</parameter>);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node with given attributes to
-the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter>.</para>
-<para>
+the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keyInfoNode</parameter>&#160;:</term>
-<listitem><simpara>        the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>        the encryption method (optional).
+<listitem><simpara>the encryption method (optional).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the Id attribute (optional).
+<listitem><simpara>the Id attribute (optional).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the Type attribute (optional).
+<listitem><simpara>the Type attribute (optional).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>recipient</parameter>&#160;:</term>
-<listitem><simpara>          the Recipient attribute (optional).
+<listitem><simpara>the Recipient attribute (optional).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node or
 NULL if an error occurs.
@@ -739,13 +730,13 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplX509DataAddIssuerSerial" role="function">
 <title>xmlSecTmplX509DataAddIssuerSerial ()</title>
-<indexterm zone="xmlSecTmplX509DataAddIssuerSerial"><primary sortas="xmlSecTmplX509DataAddIssuerSerial">xmlSecTmplX509DataAddIssuerSerial</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplX509DataAddIssuerSerial   (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);</programlisting>
-<para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial";>&lt;dsig:X509IssuerSerial/&gt;</ulink> node to the given <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.</para>
+<indexterm zone="xmlSecTmplX509DataAddIssuerSerial"><primary>xmlSecTmplX509DataAddIssuerSerial</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplX509DataAddIssuerSerial   (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> x509DataNode</parameter>);</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><variablelist role="params">
 <varlistentry><term><parameter>x509DataNode</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.
+<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>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial";>&lt;dsig:X509IssuerSerial/&gt;</ulink> node or
 NULL if an error occurs.
@@ -753,18 +744,18 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplX509IssuerSerialAddIssuerName" role="function">
 <title>xmlSecTmplX509IssuerSerialAddIssuerName ()</title>
-<indexterm zone="xmlSecTmplX509IssuerSerialAddIssuerName"><primary sortas="xmlSecTmplX509IssuerSerialAddIssuerName">xmlSecTmplX509IssuerSerialAddIssuerName</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>          xmlSecTmplX509IssuerSerialAddIssuerName
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> x509IssuerSerialNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *issuerName);</programlisting>
-<para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerName";>&lt;dsig:X509IssuerName/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial";>&lt;dsig:X509IssuerSerial/&gt;</ulink> node <parameter>x509IssuerSerialNode</parameter>.</para>
+<indexterm zone="xmlSecTmplX509IssuerSerialAddIssuerName"><primary>xmlSecTmplX509IssuerSerialAddIssuerName</primary></indexterm>
+<programlisting><link linkend="xmlNode"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplX509IssuerSerialAddIssuerName
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> x509IssuerSerialNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *issuerName</parameter>);</programlisting>
 <para>
+Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerName";>&lt;dsig:X509IssuerName/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial";>&lt;dsig:X509IssuerSerial/&gt;</ulink> node <parameter>x509IssuerSerialNode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>x509IssuerSerialNode</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial";>&lt;dsig:X509IssuerSerial/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>         the issuer name (optional).
+<listitem><simpara>the issuer name (optional).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerName";>&lt;dsig:X509IssuerName/&gt;</ulink> node or
 NULL if an error occurs.
@@ -772,18 +763,18 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplX509IssuerSerialAddSerialNumber" role="function">
 <title>xmlSecTmplX509IssuerSerialAddSerialNumber ()</title>
-<indexterm zone="xmlSecTmplX509IssuerSerialAddSerialNumber"><primary sortas="xmlSecTmplX509IssuerSerialAddSerialNumber">xmlSecTmplX509IssuerSerialAddSerialNumber</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>          xmlSecTmplX509IssuerSerialAddSerialNumber
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> x509IssuerSerialNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *serial);</programlisting>
-<para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SerialNumber";>&lt;dsig:X509SerialNumber/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial";>&lt;dsig:X509IssuerSerial/&gt;</ulink> node <parameter>x509IssuerSerialNode</parameter>.</para>
+<indexterm zone="xmlSecTmplX509IssuerSerialAddSerialNumber"><primary>xmlSecTmplX509IssuerSerialAddSerialNumber</primary></indexterm>
+<programlisting><link linkend="xmlNode"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplX509IssuerSerialAddSerialNumber
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> x509IssuerSerialNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *serial</parameter>);</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><variablelist role="params">
 <varlistentry><term><parameter>x509IssuerSerialNode</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial";>&lt;dsig:X509IssuerSerial/&gt;</ulink> node.
+<listitem><simpara>the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial";>&lt;dsig:X509IssuerSerial/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>serial</parameter>&#160;:</term>
-<listitem><simpara>             the serial number (optional).
+<listitem><simpara>the serial number (optional).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SerialNumber";>&lt;dsig:X509SerialNumber/&gt;</ulink> node or
 NULL if an error occurs.
@@ -791,13 +782,13 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplX509DataAddSubjectName" role="function">
 <title>xmlSecTmplX509DataAddSubjectName ()</title>
-<indexterm zone="xmlSecTmplX509DataAddSubjectName"><primary sortas="xmlSecTmplX509DataAddSubjectName">xmlSecTmplX509DataAddSubjectName</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplX509DataAddSubjectName    (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);</programlisting>
-<para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName";>&lt;dsig:X509SubjectName/&gt;</ulink> node to the given <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.</para>
+<indexterm zone="xmlSecTmplX509DataAddSubjectName"><primary>xmlSecTmplX509DataAddSubjectName</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplX509DataAddSubjectName    (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> x509DataNode</parameter>);</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><variablelist role="params">
 <varlistentry><term><parameter>x509DataNode</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.
+<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>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName";>&lt;dsig:X509SubjectName/&gt;</ulink> node or
 NULL if an error occurs.
@@ -805,13 +796,13 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplX509DataAddSKI" role="function">
 <title>xmlSecTmplX509DataAddSKI ()</title>
-<indexterm zone="xmlSecTmplX509DataAddSKI"><primary sortas="xmlSecTmplX509DataAddSKI">xmlSecTmplX509DataAddSKI</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplX509DataAddSKI            (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);</programlisting>
-<para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SKI";>&lt;dsig:X509SKI/&gt;</ulink> node to the given <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.</para>
+<indexterm zone="xmlSecTmplX509DataAddSKI"><primary>xmlSecTmplX509DataAddSKI</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplX509DataAddSKI            (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> x509DataNode</parameter>);</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><variablelist role="params">
 <varlistentry><term><parameter>x509DataNode</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.
+<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>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SKI";>&lt;dsig:X509SKI/&gt;</ulink> node or
 NULL if an error occurs.
@@ -819,13 +810,13 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplX509DataAddCertificate" role="function">
 <title>xmlSecTmplX509DataAddCertificate ()</title>
-<indexterm zone="xmlSecTmplX509DataAddCertificate"><primary sortas="xmlSecTmplX509DataAddCertificate">xmlSecTmplX509DataAddCertificate</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplX509DataAddCertificate    (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);</programlisting>
-<para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate";>&lt;dsig:X509Certificate/&gt;</ulink> node to the given <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.</para>
+<indexterm zone="xmlSecTmplX509DataAddCertificate"><primary>xmlSecTmplX509DataAddCertificate</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplX509DataAddCertificate    (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> x509DataNode</parameter>);</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><variablelist role="params">
 <varlistentry><term><parameter>x509DataNode</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.
+<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>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate";>&lt;dsig:X509Certificate/&gt;</ulink> node or
 NULL if an error occurs.
@@ -833,13 +824,13 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplX509DataAddCRL" role="function">
 <title>xmlSecTmplX509DataAddCRL ()</title>
-<indexterm zone="xmlSecTmplX509DataAddCRL"><primary sortas="xmlSecTmplX509DataAddCRL">xmlSecTmplX509DataAddCRL</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplX509DataAddCRL            (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);</programlisting>
-<para>
-Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509CRL";>&lt;dsig:X509CRL/&gt;</ulink> node to the given <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.</para>
+<indexterm zone="xmlSecTmplX509DataAddCRL"><primary>xmlSecTmplX509DataAddCRL</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecTmplX509DataAddCRL            (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> x509DataNode</parameter>);</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><variablelist role="params">
 <varlistentry><term><parameter>x509DataNode</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.
+<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>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509CRL";>&lt;dsig:X509CRL/&gt;</ulink> node or
 NULL if an error occurs.
@@ -847,76 +838,76 @@ NULL if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplTransformAddHmacOutputLength" role="function">
 <title>xmlSecTmplTransformAddHmacOutputLength ()</title>
-<indexterm zone="xmlSecTmplTransformAddHmacOutputLength"><primary sortas="xmlSecTmplTransformAddHmacOutputLength">xmlSecTmplTransformAddHmacOutputLength</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTmplTransformAddHmacOutputLength
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> bitsLen);</programlisting>
+<indexterm zone="xmlSecTmplTransformAddHmacOutputLength"><primary>xmlSecTmplTransformAddHmacOutputLength</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTmplTransformAddHmacOutputLength
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> transformNode</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> bitsLen</parameter>);</programlisting>
 <para>
 Creates <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-HMACOutputLength";>&lt;dsig:HMACOutputLength/&gt;</ulink> child for the HMAC transform
-node <parameter>node</parameter>.</para>
-<para>
+node <parameter>node</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transformNode</parameter>&#160;:</term>
-<listitem><simpara>      the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node
+<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>&#160;:</term>
-<listitem><simpara>            the required length in bits
+<listitem><simpara>the required length in bits
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success and a negatie value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplTransformAddRsaOaepParam" role="function">
 <title>xmlSecTmplTransformAddRsaOaepParam ()</title>
-<indexterm zone="xmlSecTmplTransformAddRsaOaepParam"><primary sortas="xmlSecTmplTransformAddRsaOaepParam">xmlSecTmplTransformAddRsaOaepParam</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTmplTransformAddRsaOaepParam  (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
-<para>
-Creates <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-OAEPParam";>&lt;enc:OAEPParam/&gt;</ulink> child node in the <parameter>node</parameter>.</para>
+<indexterm zone="xmlSecTmplTransformAddRsaOaepParam"><primary>xmlSecTmplTransformAddRsaOaepParam</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTmplTransformAddRsaOaepParam  (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> transformNode</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buf</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);</programlisting>
 <para>
+Creates <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-OAEPParam";>&lt;enc:OAEPParam/&gt;</ulink> child node in the <parameter>node</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transformNode</parameter>&#160;:</term>
-<listitem><simpara>      the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>                the OAEP param buffer.
+<listitem><simpara>the OAEP param buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the OAEP param buffer size.
+<listitem><simpara>the OAEP param buffer size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplTransformAddXsltStylesheet" role="function">
 <title>xmlSecTmplTransformAddXsltStylesheet ()</title>
-<indexterm zone="xmlSecTmplTransformAddXsltStylesheet"><primary sortas="xmlSecTmplTransformAddXsltStylesheet">xmlSecTmplTransformAddXsltStylesheet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTmplTransformAddXsltStylesheet
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *xslt);</programlisting>
-<para>
-Writes the XSLT transform expression to the <parameter>node</parameter>.</para>
+<indexterm zone="xmlSecTmplTransformAddXsltStylesheet"><primary>xmlSecTmplTransformAddXsltStylesheet</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTmplTransformAddXsltStylesheet
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> transformNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *xslt</parameter>);</programlisting>
 <para>
+Writes the XSLT transform expression to the <parameter>node</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transformNode</parameter>&#160;:</term>
-<listitem><simpara>      the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>               the XSLT transform exspression.
+<listitem><simpara>the XSLT transform exspression.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplTransformAddC14NInclNamespaces" role="function">
 <title>xmlSecTmplTransformAddC14NInclNamespaces ()</title>
-<indexterm zone="xmlSecTmplTransformAddC14NInclNamespaces"><primary sortas="xmlSecTmplTransformAddC14NInclNamespaces">xmlSecTmplTransformAddC14NInclNamespaces</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTmplTransformAddC14NInclNamespaces
-                                                        (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *prefixList);</programlisting>
-<para>
-Adds "inclusive" namespaces to the ExcC14N transform node <parameter>node</parameter>.</para>
+<indexterm zone="xmlSecTmplTransformAddC14NInclNamespaces"><primary>xmlSecTmplTransformAddC14NInclNamespaces</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTmplTransformAddC14NInclNamespaces
+                                                        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> transformNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *prefixList</parameter>);</programlisting>
 <para>
+Adds "inclusive" namespaces to the ExcC14N transform node <parameter>node</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transformNode</parameter>&#160;:</term>
-<listitem><simpara>      the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>         the white space delimited  list of namespace prefixes,
+<listitem><simpara>the white space delimited  list of namespace prefixes,
                      where "<link linkend="default"><type>default</type></link>" indicates the default namespace
                      (optional).
 </simpara></listitem></varlistentry>
@@ -925,22 +916,22 @@ Adds "inclusive" namespaces to the ExcC14N transform node <parameter>node</param
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplTransformAddXPath" role="function">
 <title>xmlSecTmplTransformAddXPath ()</title>
-<indexterm zone="xmlSecTmplTransformAddXPath"><primary sortas="xmlSecTmplTransformAddXPath">xmlSecTmplTransformAddXPath</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTmplTransformAddXPath         (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *expression,
-                                                         const <link linkend="xmlChar">xmlChar</link> **nsList);</programlisting>
+<indexterm zone="xmlSecTmplTransformAddXPath"><primary>xmlSecTmplTransformAddXPath</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTmplTransformAddXPath         (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> transformNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *expression</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> **nsList</parameter>);</programlisting>
 <para>
 Writes XPath transform infromation to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node
-<parameter>node</parameter>.</para>
-<para>
+<parameter>node</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transformNode</parameter>&#160;:</term>
-<listitem><simpara>      the pointer to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>         the XPath expression.
+<listitem><simpara>the XPath expression.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nsList</parameter>&#160;:</term>
-<listitem><simpara>             the NULL terminated list of namespace prefix/href pairs
+<listitem><simpara>the NULL terminated list of namespace prefix/href pairs
                      (optional).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 for success or a negative value otherwise.
@@ -948,26 +939,26 @@ Writes XPath transform infromation to the <ulink URL="http://www.w3.org/TR/xmlds
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplTransformAddXPath2" role="function">
 <title>xmlSecTmplTransformAddXPath2 ()</title>
-<indexterm zone="xmlSecTmplTransformAddXPath2"><primary sortas="xmlSecTmplTransformAddXPath2">xmlSecTmplTransformAddXPath2</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTmplTransformAddXPath2        (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *type,
-                                                         const <link linkend="xmlChar">xmlChar</link> *expression,
-                                                         const <link linkend="xmlChar">xmlChar</link> **nsList);</programlisting>
+<indexterm zone="xmlSecTmplTransformAddXPath2"><primary>xmlSecTmplTransformAddXPath2</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTmplTransformAddXPath2        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> transformNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *type</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *expression</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> **nsList</parameter>);</programlisting>
 <para>
 Writes XPath2 transform infromation to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node
-<parameter>node</parameter>.</para>
-<para>
+<parameter>node</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transformNode</parameter>&#160;:</term>
-<listitem><simpara>      the pointer to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>               the XPath2 transform type ("union", "intersect" or "subtract").
+<listitem><simpara>the XPath2 transform type ("union", "intersect" or "subtract").
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>expression</parameter>&#160;:</term>
-<listitem><simpara>         the XPath expression.
+<listitem><simpara>the XPath expression.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nsList</parameter>&#160;:</term>
-<listitem><simpara>             the NULL terminated list of namespace prefix/href pairs.
+<listitem><simpara>the NULL terminated list of namespace prefix/href pairs.
                      (optional).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 for success or a negative value otherwise.
@@ -975,22 +966,22 @@ Writes XPath2 transform infromation to the <ulink URL="http://www.w3.org/TR/xmld
 </variablelist></refsect2>
 <refsect2 id="xmlSecTmplTransformAddXPointer" role="function">
 <title>xmlSecTmplTransformAddXPointer ()</title>
-<indexterm zone="xmlSecTmplTransformAddXPointer"><primary sortas="xmlSecTmplTransformAddXPointer">xmlSecTmplTransformAddXPointer</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTmplTransformAddXPointer      (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                                         const <link linkend="xmlChar">xmlChar</link> *expression,
-                                                         const <link linkend="xmlChar">xmlChar</link> **nsList);</programlisting>
+<indexterm zone="xmlSecTmplTransformAddXPointer"><primary>xmlSecTmplTransformAddXPointer</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTmplTransformAddXPointer      (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> transformNode</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *expression</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> **nsList</parameter>);</programlisting>
 <para>
 Writes XPoniter transform infromation to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node
-<parameter>node</parameter>.</para>
-<para>
+<parameter>node</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transformNode</parameter>&#160;:</term>
-<listitem><simpara>      the pointer to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>         the XPath expression.
+<listitem><simpara>the XPath expression.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nsList</parameter>&#160;:</term>
-<listitem><simpara>             the NULL terminated list of namespace prefix/href pairs.
+<listitem><simpara>the NULL terminated list of namespace prefix/href pairs.
                      (optional).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 for success or a negative value otherwise.
@@ -999,7 +990,4 @@ Writes XPoniter transform infromation to the <ulink URL="http://www.w3.org/TR/xm
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/transforms.sgml b/docs/api/sgml/transforms.sgml
index 788c725..e19bf3e 100644
--- a/docs/api/sgml/transforms.sgml
+++ b/docs/api/sgml/transforms.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-transforms.top_of_page">transforms</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>transforms</refname>
 <refpurpose>Transform object definition.</refpurpose>
@@ -13,13 +14,12 @@
 <refsynopsisdiv id="xmlsec-transforms.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-#define             <link linkend="XMLSEC-TRANSFORM-BINARY-CHUNK--CAPS">XMLSEC_TRANSFORM_BINARY_CHUNK</link>
-<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link>    <link linkend="xmlSecTransformIdsGet">xmlSecTransformIdsGet</link>               (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformIdsInit">xmlSecTransformIdsInit</link>              (void);
-<link linkend="void">void</link>                <link linkend="xmlSecTransformIdsShutdown">xmlSecTransformIdsShutdown</link>          (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformIdsRegisterDefault">xmlSecTransformIdsRegisterDefault</link>   (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformIdsRegister">xmlSecTransformIdsRegister</link>          (<link linkend="xmlSecTransformId">xmlSecTransformId</link> id);
+<synopsis>#define             <link linkend="XMLSEC-TRANSFORM-BINARY-CHUNK:CAPS">XMLSEC_TRANSFORM_BINARY_CHUNK</link>
+<link linkend="xmlSecPtrList"><returnvalue>xmlSecPtrListPtr</returnvalue></link>    <link linkend="xmlSecTransformIdsGet">xmlSecTransformIdsGet</link>               (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformIdsInit">xmlSecTransformIdsInit</link>              (<parameter><type>void</type></parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecTransformIdsShutdown">xmlSecTransformIdsShutdown</link>          (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformIdsRegisterDefault">xmlSecTransformIdsRegisterDefault</link>   (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformIdsRegister">xmlSecTransformIdsRegister</link>          (<parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> id</parameter>);
 enum                <link linkend="xmlSecTransformStatus">xmlSecTransformStatus</link>;
 enum                <link linkend="xmlSecTransformMode">xmlSecTransformMode</link>;
 enum                <link linkend="xmlSecTransformOperation">xmlSecTransformOperation</link>;
@@ -30,8 +30,8 @@ typedef             <link linkend="xmlSecTransformUriType">xmlSecTransformUriTyp
 #define             <link linkend="xmlSecTransformUriTypeLocal">xmlSecTransformUriTypeLocal</link>
 #define             <link linkend="xmlSecTransformUriTypeRemote">xmlSecTransformUriTypeRemote</link>
 #define             <link linkend="xmlSecTransformUriTypeAny">xmlSecTransformUriTypeAny</link>
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformUriTypeCheck">xmlSecTransformUriTypeCheck</link>         (<link linkend="xmlSecTransformUriType">xmlSecTransformUriType</link> type,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformUriTypeCheck">xmlSecTransformUriTypeCheck</link>         (<parameter><link linkend="xmlSecTransformUriType"><type>xmlSecTransformUriType</type></link> type</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>);
 typedef             <link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link>;
 #define             <link linkend="xmlSecTransformDataTypeUnknown">xmlSecTransformDataTypeUnknown</link>
 #define             <link linkend="xmlSecTransformDataTypeBin">xmlSecTransformDataTypeBin</link>
@@ -44,311 +44,306 @@ typedef             <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</l
 #define             <link linkend="xmlSecTransformUsageSignatureMethod">xmlSecTransformUsageSignatureMethod</link>
 #define             <link linkend="xmlSecTransformUsageEncryptionMethod">xmlSecTransformUsageEncryptionMethod</link>
 #define             <link linkend="xmlSecTransformUsageAny">xmlSecTransformUsageAny</link>
-<link linkend="int">int</link>                 (<link linkend="xmlSecTransformCtxPreExecuteCallback">*xmlSecTransformCtxPreExecuteCallback</link>)
-                                                        (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-#define             <link linkend="XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK--CAPS">XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK</link>
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecTransformCtxPreExecuteCallback">*xmlSecTransformCtxPreExecuteCallback</link>)
+                                                        (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+#define             <link linkend="XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK:CAPS">XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK</link>
 struct              <link linkend="xmlSecTransformCtx">xmlSecTransformCtx</link>;
-<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link>  <link linkend="xmlSecTransformCtxCreate">xmlSecTransformCtxCreate</link>         (void);
-<link linkend="void">void</link>                <link linkend="xmlSecTransformCtxDestroy">xmlSecTransformCtxDestroy</link>           (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxInitialize">xmlSecTransformCtxInitialize</link>        (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);
-<link linkend="void">void</link>                <link linkend="xmlSecTransformCtxFinalize">xmlSecTransformCtxFinalize</link>          (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);
-<link linkend="void">void</link>                <link linkend="xmlSecTransformCtxReset">xmlSecTransformCtxReset</link>             (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxCopyUserPref">xmlSecTransformCtxCopyUserPref</link>      (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> dst,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> src);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxSetUri">xmlSecTransformCtxSetUri</link>            (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> hereNode);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxAppend">xmlSecTransformCtxAppend</link>            (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxPrepend">xmlSecTransformCtxPrepend</link>           (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
-<link linkend="xmlSecTransformPtr">xmlSecTransformPtr</link>  <link linkend="xmlSecTransformCtxCreateAndAppend">xmlSecTransformCtxCreateAndAppend</link>   (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> id);
-<link linkend="xmlSecTransformPtr">xmlSecTransformPtr</link>  <link linkend="xmlSecTransformCtxCreateAndPrepend">xmlSecTransformCtxCreateAndPrepend</link>  (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> id);
-<link linkend="xmlSecTransformPtr">xmlSecTransformPtr</link>  <link linkend="xmlSecTransformCtxNodeRead">xmlSecTransformCtxNodeRead</link>          (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxNodesListRead">xmlSecTransformCtxNodesListRead</link>     (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxPrepare">xmlSecTransformCtxPrepare</link>           (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link> inputDataType);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxBinaryExecute">xmlSecTransformCtxBinaryExecute</link>     (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxUriExecute">xmlSecTransformCtxUriExecute</link>        (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxXmlExecute">xmlSecTransformCtxXmlExecute</link>        (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxExecute">xmlSecTransformCtxExecute</link>           (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="xmlDoc">xmlDocPtr</link> doc);
-<link linkend="void">void</link>                <link linkend="xmlSecTransformCtxDebugDump">xmlSecTransformCtxDebugDump</link>         (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
-<link linkend="void">void</link>                <link linkend="xmlSecTransformCtxDebugXmlDump">xmlSecTransformCtxDebugXmlDump</link>      (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="xmlSecTransformCtx"><returnvalue>xmlSecTransformCtxPtr</returnvalue></link>  <link linkend="xmlSecTransformCtxCreate">xmlSecTransformCtxCreate</link>         (<parameter><type>void</type></parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecTransformCtxDestroy">xmlSecTransformCtxDestroy</link>           (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformCtxInitialize">xmlSecTransformCtxInitialize</link>        (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecTransformCtxFinalize">xmlSecTransformCtxFinalize</link>          (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecTransformCtxReset">xmlSecTransformCtxReset</link>             (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformCtxCopyUserPref">xmlSecTransformCtxCopyUserPref</link>      (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> dst</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> src</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformCtxSetUri">xmlSecTransformCtxSetUri</link>            (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> hereNode</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformCtxAppend">xmlSecTransformCtxAppend</link>            (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformCtxPrepend">xmlSecTransformCtxPrepend</link>           (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>);
+<link linkend="xmlSecTransformPtr"><returnvalue>xmlSecTransformPtr</returnvalue></link>  <link linkend="xmlSecTransformCtxCreateAndAppend">xmlSecTransformCtxCreateAndAppend</link>   (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> id</parameter>);
+<link linkend="xmlSecTransformPtr"><returnvalue>xmlSecTransformPtr</returnvalue></link>  <link linkend="xmlSecTransformCtxCreateAndPrepend">xmlSecTransformCtxCreateAndPrepend</link>  (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> id</parameter>);
+<link linkend="xmlSecTransformPtr"><returnvalue>xmlSecTransformPtr</returnvalue></link>  <link linkend="xmlSecTransformCtxNodeRead">xmlSecTransformCtxNodeRead</link>          (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformUsage"><type>xmlSecTransformUsage</type></link> usage</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformCtxNodesListRead">xmlSecTransformCtxNodesListRead</link>     (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformUsage"><type>xmlSecTransformUsage</type></link> usage</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformCtxPrepare">xmlSecTransformCtxPrepare</link>           (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformDataType"><type>xmlSecTransformDataType</type></link> inputDataType</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformCtxBinaryExecute">xmlSecTransformCtxBinaryExecute</link>     (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformCtxUriExecute">xmlSecTransformCtxUriExecute</link>        (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformCtxXmlExecute">xmlSecTransformCtxXmlExecute</link>        (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nodes</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformCtxExecute">xmlSecTransformCtxExecute</link>           (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="xmlDoc"><type>xmlDocPtr</type></link> doc</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecTransformCtxDebugDump">xmlSecTransformCtxDebugDump</link>         (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecTransformCtxDebugXmlDump">xmlSecTransformCtxDebugXmlDump</link>      (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
 struct              <link linkend="xmlSecTransform">xmlSecTransform</link>;
-<link linkend="xmlSecTransform">xmlSecTransformPtr</link>  <link linkend="xmlSecTransformCreate">xmlSecTransformCreate</link>               (<link linkend="xmlSecTransformId">xmlSecTransformId</link> id);
-<link linkend="void">void</link>                <link linkend="xmlSecTransformDestroy">xmlSecTransformDestroy</link>              (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
-<link linkend="xmlSecTransformPtr">xmlSecTransformPtr</link>  <link linkend="xmlSecTransformNodeRead">xmlSecTransformNodeRead</link>             (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformPump">xmlSecTransformPump</link>                 (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> left,
-                                                         <link linkend="xmlSecTransform">xmlSecTransformPtr</link> right,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformSetKey">xmlSecTransformSetKey</link>               (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformSetKeyReq">xmlSecTransformSetKeyReq</link>            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformVerify">xmlSecTransformVerify</link>               (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformVerifyNodeContent">xmlSecTransformVerifyNodeContent</link>    (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link>  <link linkend="xmlSecTransformGetDataType">xmlSecTransformGetDataType</link>     (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecTransformMode">xmlSecTransformMode</link> mode,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformPushBin">xmlSecTransformPushBin</link>              (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="int">int</link> final,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformPopBin">xmlSecTransformPopBin</link>               (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> maxDataSize,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> *dataSize,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformPushXml">xmlSecTransformPushXml</link>              (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformPopXml">xmlSecTransformPopXml</link>               (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> *nodes,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformExecute">xmlSecTransformExecute</link>              (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="int">int</link> last,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="void">void</link>                <link linkend="xmlSecTransformDebugDump">xmlSecTransformDebugDump</link>            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
-<link linkend="void">void</link>                <link linkend="xmlSecTransformDebugXmlDump">xmlSecTransformDebugXmlDump</link>         (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="xmlSecTransform"><returnvalue>xmlSecTransformPtr</returnvalue></link>  <link linkend="xmlSecTransformCreate">xmlSecTransformCreate</link>               (<parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> id</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecTransformDestroy">xmlSecTransformDestroy</link>              (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>);
+<link linkend="xmlSecTransformPtr"><returnvalue>xmlSecTransformPtr</returnvalue></link>  <link linkend="xmlSecTransformNodeRead">xmlSecTransformNodeRead</link>             (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformUsage"><type>xmlSecTransformUsage</type></link> usage</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformPump">xmlSecTransformPump</link>                 (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> left</parameter>,
+                                                         <parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> right</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformSetKey">xmlSecTransformSetKey</link>               (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformSetKeyReq">xmlSecTransformSetKeyReq</link>            (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> keyReq</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformVerify">xmlSecTransformVerify</link>               (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformVerifyNodeContent">xmlSecTransformVerifyNodeContent</link>    (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="xmlSecTransformDataType"><returnvalue>xmlSecTransformDataType</returnvalue></link>  <link linkend="xmlSecTransformGetDataType">xmlSecTransformGetDataType</link>     (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformMode"><type>xmlSecTransformMode</type></link> mode</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformPushBin">xmlSecTransformPushBin</link>              (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> final</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformPopBin">xmlSecTransformPopBin</link>               (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> maxDataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> *dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformPushXml">xmlSecTransformPushXml</link>              (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nodes</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformPopXml">xmlSecTransformPopXml</link>               (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> *nodes</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformExecute">xmlSecTransformExecute</link>              (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> last</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecTransformDebugDump">xmlSecTransformDebugDump</link>            (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecTransformDebugXmlDump">xmlSecTransformDebugXmlDump</link>         (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
 #define             <link linkend="xmlSecTransformGetName">xmlSecTransformGetName</link>              (transform)
 #define             <link linkend="xmlSecTransformIsValid">xmlSecTransformIsValid</link>              (transform)
-#define             <link linkend="xmlSecTransformCheckType">xmlSecTransformCheckType</link>            (transform, t)
-#define             <link linkend="xmlSecTransformCheckId">xmlSecTransformCheckId</link>              (transform, i)
-#define             <link linkend="xmlSecTransformCheckSize">xmlSecTransformCheckSize</link>            (transform, size)
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformConnect">xmlSecTransformConnect</link>              (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> left,
-                                                         <link linkend="xmlSecTransform">xmlSecTransformPtr</link> right,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="void">void</link>                <link linkend="xmlSecTransformRemove">xmlSecTransformRemove</link>               (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
-<link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link>  <link linkend="xmlSecTransformDefaultGetDataType">xmlSecTransformDefaultGetDataType</link>
-                                                        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecTransformMode">xmlSecTransformMode</link> mode,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformDefaultPushBin">xmlSecTransformDefaultPushBin</link>       (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="int">int</link> final,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformDefaultPopBin">xmlSecTransformDefaultPopBin</link>        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> maxDataSize,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> *dataSize,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformDefaultPushXml">xmlSecTransformDefaultPushXml</link>       (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformDefaultPopXml">xmlSecTransformDefaultPopXml</link>        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> *nodes,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="xmlOutputBufferPtr">xmlOutputBufferPtr</link>  <link linkend="xmlSecTransformCreateOutputBuffer">xmlSecTransformCreateOutputBuffer</link>   (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="xmlParserInputBuffer">xmlParserInputBufferPtr</link>  <link linkend="xmlSecTransformCreateInputBuffer">xmlSecTransformCreateInputBuffer</link>
-                                                        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 (<link linkend="xmlSecTransformInitializeMethod">*xmlSecTransformInitializeMethod</link>)  (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
-<link linkend="void">void</link>                (<link linkend="xmlSecTransformFinalizeMethod">*xmlSecTransformFinalizeMethod</link>)    (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
-<link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link>  (<link linkend="xmlSecTransformGetDataTypeMethod">*xmlSecTransformGetDataTypeMethod</link>)
-                                                        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecTransformMode">xmlSecTransformMode</link> mode,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 (<link linkend="xmlSecTransformNodeReadMethod">*xmlSecTransformNodeReadMethod</link>)    (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 (<link linkend="xmlSecTransformNodeWriteMethod">*xmlSecTransformNodeWriteMethod</link>)   (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 (<link linkend="xmlSecTransformSetKeyRequirementsMethod">*xmlSecTransformSetKeyRequirementsMethod</link>)
-                                                        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);
-<link linkend="int">int</link>                 (<link linkend="xmlSecTransformSetKeyMethod">*xmlSecTransformSetKeyMethod</link>)      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>                 (<link linkend="xmlSecTransformVerifyMethod">*xmlSecTransformVerifyMethod</link>)      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 (<link linkend="xmlSecTransformPushBinMethod">*xmlSecTransformPushBinMethod</link>)     (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="int">int</link> final,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 (<link linkend="xmlSecTransformPopBinMethod">*xmlSecTransformPopBinMethod</link>)      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> maxDataSize,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> *dataSize,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 (<link linkend="xmlSecTransformPushXmlMethod">*xmlSecTransformPushXmlMethod</link>)     (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 (<link linkend="xmlSecTransformPopXmlMethod">*xmlSecTransformPopXmlMethod</link>)      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> *nodes,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>                 (<link linkend="xmlSecTransformExecuteMethod">*xmlSecTransformExecuteMethod</link>)     (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="int">int</link> last,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+#define             <link linkend="xmlSecTransformCheckType">xmlSecTransformCheckType</link>            (transform,
+                                                         t)
+#define             <link linkend="xmlSecTransformCheckId">xmlSecTransformCheckId</link>              (transform,
+                                                         i)
+#define             <link linkend="xmlSecTransformCheckSize">xmlSecTransformCheckSize</link>            (transform,
+                                                         size)
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformConnect">xmlSecTransformConnect</link>              (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> left</parameter>,
+                                                         <parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> right</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecTransformRemove">xmlSecTransformRemove</link>               (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>);
+<link linkend="xmlSecTransformDataType"><returnvalue>xmlSecTransformDataType</returnvalue></link>  <link linkend="xmlSecTransformDefaultGetDataType">xmlSecTransformDefaultGetDataType</link>
+                                                        (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformMode"><type>xmlSecTransformMode</type></link> mode</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformDefaultPushBin">xmlSecTransformDefaultPushBin</link>       (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> final</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformDefaultPopBin">xmlSecTransformDefaultPopBin</link>        (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> maxDataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> *dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformDefaultPushXml">xmlSecTransformDefaultPushXml</link>       (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nodes</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformDefaultPopXml">xmlSecTransformDefaultPopXml</link>        (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> *nodes</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="xmlOutputBufferPtr"><returnvalue>xmlOutputBufferPtr</returnvalue></link>  <link linkend="xmlSecTransformCreateOutputBuffer">xmlSecTransformCreateOutputBuffer</link>   (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="xmlParserInputBuffer"><returnvalue>xmlParserInputBufferPtr</returnvalue></link>  <link linkend="xmlSecTransformCreateInputBuffer">xmlSecTransformCreateInputBuffer</link>
+                                                        (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecTransformInitializeMethod">*xmlSecTransformInitializeMethod</link>)  (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="xmlSecTransformFinalizeMethod">*xmlSecTransformFinalizeMethod</link>)    (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>);
+<link linkend="xmlSecTransformDataType"><returnvalue>xmlSecTransformDataType</returnvalue></link>  (<link linkend="xmlSecTransformGetDataTypeMethod">*xmlSecTransformGetDataTypeMethod</link>)
+                                                        (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformMode"><type>xmlSecTransformMode</type></link> mode</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecTransformNodeReadMethod">*xmlSecTransformNodeReadMethod</link>)    (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecTransformNodeWriteMethod">*xmlSecTransformNodeWriteMethod</link>)   (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecTransformSetKeyRequirementsMethod">*xmlSecTransformSetKeyRequirementsMethod</link>)
+                                                        (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> keyReq</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecTransformSetKeyMethod">*xmlSecTransformSetKeyMethod</link>)      (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecTransformVerifyMethod">*xmlSecTransformVerifyMethod</link>)      (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecTransformPushBinMethod">*xmlSecTransformPushBinMethod</link>)     (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> final</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecTransformPopBinMethod">*xmlSecTransformPopBinMethod</link>)      (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> maxDataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> *dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecTransformPushXmlMethod">*xmlSecTransformPushXmlMethod</link>)     (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nodes</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecTransformPopXmlMethod">*xmlSecTransformPopXmlMethod</link>)      (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> *nodes</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 (<link linkend="xmlSecTransformExecuteMethod">*xmlSecTransformExecuteMethod</link>)     (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> last</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);
 struct              <link linkend="xmlSecTransformKlass">xmlSecTransformKlass</link>;
 #define             <link linkend="xmlSecTransformKlassGetName">xmlSecTransformKlassGetName</link>         (klass)
 #define             <link linkend="xmlSecTransformIdListId">xmlSecTransformIdListId</link>
-<link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     <link linkend="xmlSecTransformIdListGetKlass">xmlSecTransformIdListGetKlass</link>       (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformIdListFind">xmlSecTransformIdListFind</link>           (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformIdListFindByHref">xmlSecTransformIdListFindByHref</link>     (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         const <link linkend="xmlChar">xmlChar</link> *href,
-                                                         <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformIdListFindByName">xmlSecTransformIdListFindByName</link>     (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);
-<link linkend="void">void</link>                <link linkend="xmlSecTransformIdListDebugDump">xmlSecTransformIdListDebugDump</link>      (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
-<link linkend="void">void</link>                <link linkend="xmlSecTransformIdListDebugXmlDump">xmlSecTransformIdListDebugXmlDump</link>   (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="xmlSecPtrListId"><returnvalue>xmlSecPtrListId</returnvalue></link>     <link linkend="xmlSecTransformIdListGetKlass">xmlSecTransformIdListGetKlass</link>       (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformIdListFind">xmlSecTransformIdListFind</link>           (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> transformId</parameter>);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformIdListFindByHref">xmlSecTransformIdListFindByHref</link>     (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *href</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformUsage"><type>xmlSecTransformUsage</type></link> usage</parameter>);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformIdListFindByName">xmlSecTransformIdListFindByName</link>     (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformUsage"><type>xmlSecTransformUsage</type></link> usage</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecTransformIdListDebugDump">xmlSecTransformIdListDebugDump</link>      (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecTransformIdListDebugXmlDump">xmlSecTransformIdListDebugXmlDump</link>   (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
 #define             <link linkend="xmlSecTransformIdUnknown">xmlSecTransformIdUnknown</link>
 #define             <link linkend="xmlSecTransformBase64Id">xmlSecTransformBase64Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformBase64GetKlass">xmlSecTransformBase64GetKlass</link>       (void);
-<link linkend="void">void</link>                <link linkend="xmlSecTransformBase64SetLineSize">xmlSecTransformBase64SetLineSize</link>    (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> lineSize);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformBase64GetKlass">xmlSecTransformBase64GetKlass</link>       (<parameter><type>void</type></parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecTransformBase64SetLineSize">xmlSecTransformBase64SetLineSize</link>    (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> lineSize</parameter>);
 #define             <link linkend="xmlSecTransformInclC14NId">xmlSecTransformInclC14NId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformInclC14NGetKlass">xmlSecTransformInclC14NGetKlass</link>     (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformInclC14NGetKlass">xmlSecTransformInclC14NGetKlass</link>     (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformInclC14NWithCommentsId">xmlSecTransformInclC14NWithCommentsId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformInclC14NWithCommentsGetKlass">xmlSecTransformInclC14NWithCommentsGetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformInclC14NWithCommentsGetKlass">xmlSecTransformInclC14NWithCommentsGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformInclC14N11Id">xmlSecTransformInclC14N11Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformInclC14N11GetKlass">xmlSecTransformInclC14N11GetKlass</link>   (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformInclC14N11GetKlass">xmlSecTransformInclC14N11GetKlass</link>   (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformInclC14N11WithCommentsId">xmlSecTransformInclC14N11WithCommentsId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformInclC14N11WithCommentsGetKlass">xmlSecTransformInclC14N11WithCommentsGetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformInclC14N11WithCommentsGetKlass">xmlSecTransformInclC14N11WithCommentsGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformExclC14NId">xmlSecTransformExclC14NId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformExclC14NGetKlass">xmlSecTransformExclC14NGetKlass</link>     (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformExclC14NGetKlass">xmlSecTransformExclC14NGetKlass</link>     (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformExclC14NWithCommentsId">xmlSecTransformExclC14NWithCommentsId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformExclC14NWithCommentsGetKlass">xmlSecTransformExclC14NWithCommentsGetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformExclC14NWithCommentsGetKlass">xmlSecTransformExclC14NWithCommentsGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformEnvelopedId">xmlSecTransformEnvelopedId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformEnvelopedGetKlass">xmlSecTransformEnvelopedGetKlass</link>    (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformEnvelopedGetKlass">xmlSecTransformEnvelopedGetKlass</link>    (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformXPathId">xmlSecTransformXPathId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformXPathGetKlass">xmlSecTransformXPathGetKlass</link>        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformXPathGetKlass">xmlSecTransformXPathGetKlass</link>        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformXPath2Id">xmlSecTransformXPath2Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformXPath2GetKlass">xmlSecTransformXPath2GetKlass</link>       (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformXPath2GetKlass">xmlSecTransformXPath2GetKlass</link>       (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformXPointerId">xmlSecTransformXPointerId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformXPointerGetKlass">xmlSecTransformXPointerGetKlass</link>     (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformXPointerSetExpr">xmlSecTransformXPointerSetExpr</link>      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         const <link linkend="xmlChar">xmlChar</link> *expr,
-                                                         <link linkend="xmlSecNodeSetType">xmlSecNodeSetType</link> nodeSetType,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> hereNode);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformXPointerGetKlass">xmlSecTransformXPointerGetKlass</link>     (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformXPointerSetExpr">xmlSecTransformXPointerSetExpr</link>      (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *expr</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSetType"><type>xmlSecNodeSetType</type></link> nodeSetType</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> hereNode</parameter>);
 #define             <link linkend="xmlSecTransformXsltId">xmlSecTransformXsltId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformXsltGetKlass">xmlSecTransformXsltGetKlass</link>         (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformXsltGetKlass">xmlSecTransformXsltGetKlass</link>         (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformRemoveXmlTagsC14NId">xmlSecTransformRemoveXmlTagsC14NId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRemoveXmlTagsC14NGetKlass">xmlSecTransformRemoveXmlTagsC14NGetKlass</link>
-                                                        (void);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformRemoveXmlTagsC14NGetKlass">xmlSecTransformRemoveXmlTagsC14NGetKlass</link>
+                                                        (<parameter><type>void</type></parameter>);
 #define             <link linkend="xmlSecTransformVisa3DHackId">xmlSecTransformVisa3DHackId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformVisa3DHackGetKlass">xmlSecTransformVisa3DHackGetKlass</link>   (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecTransformVisa3DHackSetID">xmlSecTransformVisa3DHackSetID</link>      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id);
+<link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   <link linkend="xmlSecTransformVisa3DHackGetKlass">xmlSecTransformVisa3DHackGetKlass</link>   (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecTransformVisa3DHackSetID">xmlSecTransformVisa3DHackSetID</link>      (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-transforms.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Transform object definition.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-transforms.details" role="details">
 <title role="details.title">Details</title>
-<refsect2 id="XMLSEC-TRANSFORM-BINARY-CHUNK--CAPS" role="macro">
+<refsect2 id="XMLSEC-TRANSFORM-BINARY-CHUNK:CAPS" role="macro">
 <title>XMLSEC_TRANSFORM_BINARY_CHUNK</title>
-<indexterm zone="XMLSEC-TRANSFORM-BINARY-CHUNK--CAPS"><primary sortas="XMLSEC_TRANSFORM_BINARY_CHUNK">XMLSEC_TRANSFORM_BINARY_CHUNK</primary></indexterm><programlisting>#define XMLSEC_TRANSFORM_BINARY_CHUNK                   64
+<indexterm zone="XMLSEC-TRANSFORM-BINARY-CHUNK:CAPS"><primary>XMLSEC_TRANSFORM_BINARY_CHUNK</primary></indexterm>
+<programlisting>#define XMLSEC_TRANSFORM_BINARY_CHUNK                   64
 </programlisting>
 <para>
 The binary data chunks size. XMLSec processes binary data one chunk
-at a time. Changing this impacts xmlsec memory usage and performance.</para>
-<para>
+at a time. Changing this impacts xmlsec memory usage and performance.
 </para></refsect2>
 <refsect2 id="xmlSecTransformIdsGet" role="function">
 <title>xmlSecTransformIdsGet ()</title>
-<indexterm zone="xmlSecTransformIdsGet"><primary sortas="xmlSecTransformIdsGet">xmlSecTransformIdsGet</primary></indexterm><programlisting><link linkend="xmlSecPtrList">xmlSecPtrListPtr</link>    xmlSecTransformIdsGet               (void);</programlisting>
-<para>
-Gets global registered transform klasses list.</para>
+<indexterm zone="xmlSecTransformIdsGet"><primary>xmlSecTransformIdsGet</primary></indexterm>
+<programlisting><link linkend="xmlSecPtrList"><returnvalue>xmlSecPtrListPtr</returnvalue></link>    xmlSecTransformIdsGet               (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Gets global registered transform klasses list.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to list of all registered transform klasses.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformIdsInit" role="function">
 <title>xmlSecTransformIdsInit ()</title>
-<indexterm zone="xmlSecTransformIdsInit"><primary sortas="xmlSecTransformIdsInit">xmlSecTransformIdsInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformIdsInit              (void);</programlisting>
+<indexterm zone="xmlSecTransformIdsInit"><primary>xmlSecTransformIdsInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformIdsInit              (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 Initializes the transform klasses. This function is called from the
-<link linkend="xmlSecInit"><type>xmlSecInit</type></link> function and the application should not call it directly.</para>
-<para>
+<link linkend="xmlSecInit"><type>xmlSecInit</type></link> function and the application should not call it directly.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformIdsShutdown" role="function">
 <title>xmlSecTransformIdsShutdown ()</title>
-<indexterm zone="xmlSecTransformIdsShutdown"><primary sortas="xmlSecTransformIdsShutdown">xmlSecTransformIdsShutdown</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformIdsShutdown          (void);</programlisting>
+<indexterm zone="xmlSecTransformIdsShutdown"><primary>xmlSecTransformIdsShutdown</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecTransformIdsShutdown          (<parameter><type>void</type></parameter>);</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>
+<link linkend="xmlSecShutdown"><type>xmlSecShutdown</type></link> function and the application should not call it directly.
 </para></refsect2>
 <refsect2 id="xmlSecTransformIdsRegisterDefault" role="function">
 <title>xmlSecTransformIdsRegisterDefault ()</title>
-<indexterm zone="xmlSecTransformIdsRegisterDefault"><primary sortas="xmlSecTransformIdsRegisterDefault">xmlSecTransformIdsRegisterDefault</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformIdsRegisterDefault   (void);</programlisting>
+<indexterm zone="xmlSecTransformIdsRegisterDefault"><primary>xmlSecTransformIdsRegisterDefault</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformIdsRegisterDefault   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 Registers default (implemented by XML Security Library)
-transform klasses: XPath transform, Base64 transform, ...</para>
-<para>
+transform klasses: XPath transform, Base64 transform, ...
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformIdsRegister" role="function">
 <title>xmlSecTransformIdsRegister ()</title>
-<indexterm zone="xmlSecTransformIdsRegister"><primary sortas="xmlSecTransformIdsRegister">xmlSecTransformIdsRegister</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformIdsRegister          (<link linkend="xmlSecTransformId">xmlSecTransformId</link> id);</programlisting>
-<para>
-Registers <parameter>id</parameter> in the global list of transform klasses.</para>
+<indexterm zone="xmlSecTransformIdsRegister"><primary>xmlSecTransformIdsRegister</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformIdsRegister          (<parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> id</parameter>);</programlisting>
 <para>
+Registers <parameter>id</parameter> in the global list of transform klasses.
 </para><variablelist role="params">
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the transform klass.
+<listitem><simpara>the transform klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformStatus" role="enum">
 <title>enum xmlSecTransformStatus</title>
-<indexterm zone="xmlSecTransformStatus"><primary sortas="xmlSecTransformStatus">xmlSecTransformStatus</primary></indexterm><programlisting>typedef enum  {
+<indexterm zone="xmlSecTransformStatus"><primary>xmlSecTransformStatus</primary></indexterm>
+<programlisting>typedef enum  {
     xmlSecTransformStatusNone = 0,
     xmlSecTransformStatusWorking,
     xmlSecTransformStatusFinished,
@@ -357,66 +352,66 @@ Registers <parameter>id</parameter> in the global list of transform klasses.</pa
 } xmlSecTransformStatus;
 </programlisting>
 <para>
-The transform execution status.</para>
-<para>
+The transform execution status.
 </para><variablelist role="enum">
 <varlistentry id="xmlSecTransformStatusNone" role="constant">
 <term><literal>xmlSecTransformStatusNone</literal></term>
-<listitem><simpara>          the status unknown.
+<listitem><simpara>the status unknown.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecTransformStatusWorking" role="constant">
 <term><literal>xmlSecTransformStatusWorking</literal></term>
-<listitem><simpara>       the transform is executed.
+<listitem><simpara>the transform is executed.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecTransformStatusFinished" role="constant">
 <term><literal>xmlSecTransformStatusFinished</literal></term>
-<listitem><simpara>      the transform finished
+<listitem><simpara>the transform finished
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecTransformStatusOk" role="constant">
 <term><literal>xmlSecTransformStatusOk</literal></term>
-<listitem><simpara>            the transform succeeded.
+<listitem><simpara>the transform succeeded.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecTransformStatusFail" role="constant">
 <term><literal>xmlSecTransformStatusFail</literal></term>
-<listitem><simpara>          the transform failed (an error occur).
+<listitem><simpara>the transform failed (an error occur).
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformMode" role="enum">
 <title>enum xmlSecTransformMode</title>
-<indexterm zone="xmlSecTransformMode"><primary sortas="xmlSecTransformMode">xmlSecTransformMode</primary></indexterm><programlisting>typedef enum  {
+<indexterm zone="xmlSecTransformMode"><primary>xmlSecTransformMode</primary></indexterm>
+<programlisting>typedef enum  {
     xmlSecTransformModeNone = 0,
     xmlSecTransformModePush,
     xmlSecTransformModePop
 } xmlSecTransformMode;
 </programlisting>
 <para>
-The transform operation mode</para>
-<para>
+The transform operation mode
 </para><variablelist role="enum">
 <varlistentry id="xmlSecTransformModeNone" role="constant">
 <term><literal>xmlSecTransformModeNone</literal></term>
-<listitem><simpara>            the mode is unknown.
+<listitem><simpara>the mode is unknown.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecTransformModePush" role="constant">
 <term><literal>xmlSecTransformModePush</literal></term>
-<listitem><simpara>            pushing data thru transform.
+<listitem><simpara>pushing data thru transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecTransformModePop" role="constant">
 <term><literal>xmlSecTransformModePop</literal></term>
-<listitem><simpara>             popping data from transform.
+<listitem><simpara>popping data from transform.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformOperation" role="enum">
 <title>enum xmlSecTransformOperation</title>
-<indexterm zone="xmlSecTransformOperation"><primary sortas="xmlSecTransformOperation">xmlSecTransformOperation</primary></indexterm><programlisting>typedef enum  {
+<indexterm zone="xmlSecTransformOperation"><primary>xmlSecTransformOperation</primary></indexterm>
+<programlisting>typedef enum  {
     xmlSecTransformOperationNone = 0,
     xmlSecTransformOperationEncode,
     xmlSecTransformOperationDecode,
@@ -427,114 +422,113 @@ The transform operation mode</para>
 } xmlSecTransformOperation;
 </programlisting>
 <para>
-The transform operation.</para>
-<para>
+The transform operation.
 </para><variablelist role="enum">
 <varlistentry id="xmlSecTransformOperationNone" role="constant">
 <term><literal>xmlSecTransformOperationNone</literal></term>
-<listitem><simpara>       the operation is unknown.
+<listitem><simpara>the operation is unknown.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecTransformOperationEncode" role="constant">
 <term><literal>xmlSecTransformOperationEncode</literal></term>
-<listitem><simpara>     the encode operation (for base64 transform).
+<listitem><simpara>the encode operation (for base64 transform).
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecTransformOperationDecode" role="constant">
 <term><literal>xmlSecTransformOperationDecode</literal></term>
-<listitem><simpara>     the decode operation (for base64 transform).
+<listitem><simpara>the decode operation (for base64 transform).
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecTransformOperationSign" role="constant">
 <term><literal>xmlSecTransformOperationSign</literal></term>
-<listitem><simpara>       the sign or digest operation.
+<listitem><simpara>the sign or digest operation.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecTransformOperationVerify" role="constant">
 <term><literal>xmlSecTransformOperationVerify</literal></term>
-<listitem><simpara>     the verification of signature or digest operation.
+<listitem><simpara>the verification of signature or digest operation.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecTransformOperationEncrypt" role="constant">
 <term><literal>xmlSecTransformOperationEncrypt</literal></term>
-<listitem><simpara>    the encryption operation.
+<listitem><simpara>the encryption operation.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecTransformOperationDecrypt" role="constant">
 <term><literal>xmlSecTransformOperationDecrypt</literal></term>
-<listitem><simpara>    the decryption operation.
+<listitem><simpara>the decryption operation.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformUriType" role="typedef">
 <title>xmlSecTransformUriType</title>
-<indexterm zone="xmlSecTransformUriType"><primary sortas="xmlSecTransformUriType">xmlSecTransformUriType</primary></indexterm><programlisting>typedef unsigned int                            xmlSecTransformUriType;
+<indexterm zone="xmlSecTransformUriType"><primary>xmlSecTransformUriType</primary></indexterm>
+<programlisting>typedef unsigned int                            xmlSecTransformUriType;
 </programlisting>
 <para>
-URI transform type bit mask.</para>
-<para>
+URI transform type bit mask.
 </para></refsect2>
 <refsect2 id="xmlSecTransformUriTypeNone" role="macro">
 <title>xmlSecTransformUriTypeNone</title>
-<indexterm zone="xmlSecTransformUriTypeNone"><primary sortas="xmlSecTransformUriTypeNone">xmlSecTransformUriTypeNone</primary></indexterm><programlisting>#define xmlSecTransformUriTypeNone              0x0000
+<indexterm zone="xmlSecTransformUriTypeNone"><primary>xmlSecTransformUriTypeNone</primary></indexterm>
+<programlisting>#define xmlSecTransformUriTypeNone              0x0000
 </programlisting>
 <para>
-The URI type is unknown or not set.</para>
-<para>
+The URI type is unknown or not set.
 </para></refsect2>
 <refsect2 id="xmlSecTransformUriTypeEmpty" role="macro">
 <title>xmlSecTransformUriTypeEmpty</title>
-<indexterm zone="xmlSecTransformUriTypeEmpty"><primary sortas="xmlSecTransformUriTypeEmpty">xmlSecTransformUriTypeEmpty</primary></indexterm><programlisting>#define xmlSecTransformUriTypeEmpty             0x0001
+<indexterm zone="xmlSecTransformUriTypeEmpty"><primary>xmlSecTransformUriTypeEmpty</primary></indexterm>
+<programlisting>#define xmlSecTransformUriTypeEmpty             0x0001
 </programlisting>
 <para>
-The empty URI ("") type.</para>
-<para>
+The empty URI ("") type.
 </para></refsect2>
 <refsect2 id="xmlSecTransformUriTypeSameDocument" role="macro">
 <title>xmlSecTransformUriTypeSameDocument</title>
-<indexterm zone="xmlSecTransformUriTypeSameDocument"><primary sortas="xmlSecTransformUriTypeSameDocument">xmlSecTransformUriTypeSameDocument</primary></indexterm><programlisting>#define xmlSecTransformUriTypeSameDocument      0x0002
+<indexterm zone="xmlSecTransformUriTypeSameDocument"><primary>xmlSecTransformUriTypeSameDocument</primary></indexterm>
+<programlisting>#define xmlSecTransformUriTypeSameDocument      0x0002
 </programlisting>
 <para>
-The smae document ("#...") but not empty ("") URI type.</para>
-<para>
+The smae document ("#...") but not empty ("") URI type.
 </para></refsect2>
 <refsect2 id="xmlSecTransformUriTypeLocal" role="macro">
 <title>xmlSecTransformUriTypeLocal</title>
-<indexterm zone="xmlSecTransformUriTypeLocal"><primary sortas="xmlSecTransformUriTypeLocal">xmlSecTransformUriTypeLocal</primary></indexterm><programlisting>#define xmlSecTransformUriTypeLocal             0x0004
+<indexterm zone="xmlSecTransformUriTypeLocal"><primary>xmlSecTransformUriTypeLocal</primary></indexterm>
+<programlisting>#define xmlSecTransformUriTypeLocal             0x0004
 </programlisting>
 <para>
-The local URI ("file:///....") type.</para>
-<para>
+The local URI ("file:///....") type.
 </para></refsect2>
 <refsect2 id="xmlSecTransformUriTypeRemote" role="macro">
 <title>xmlSecTransformUriTypeRemote</title>
-<indexterm zone="xmlSecTransformUriTypeRemote"><primary sortas="xmlSecTransformUriTypeRemote">xmlSecTransformUriTypeRemote</primary></indexterm><programlisting>#define xmlSecTransformUriTypeRemote            0x0008
+<indexterm zone="xmlSecTransformUriTypeRemote"><primary>xmlSecTransformUriTypeRemote</primary></indexterm>
+<programlisting>#define xmlSecTransformUriTypeRemote            0x0008
 </programlisting>
 <para>
-The remote URI type.</para>
-<para>
+The remote URI type.
 </para></refsect2>
 <refsect2 id="xmlSecTransformUriTypeAny" role="macro">
 <title>xmlSecTransformUriTypeAny</title>
-<indexterm zone="xmlSecTransformUriTypeAny"><primary sortas="xmlSecTransformUriTypeAny">xmlSecTransformUriTypeAny</primary></indexterm><programlisting>#define xmlSecTransformUriTypeAny               0xFFFF
+<indexterm zone="xmlSecTransformUriTypeAny"><primary>xmlSecTransformUriTypeAny</primary></indexterm>
+<programlisting>#define xmlSecTransformUriTypeAny               0xFFFF
 </programlisting>
 <para>
-Any URI type.</para>
-<para>
+Any URI type.
 </para></refsect2>
 <refsect2 id="xmlSecTransformUriTypeCheck" role="function">
 <title>xmlSecTransformUriTypeCheck ()</title>
-<indexterm zone="xmlSecTransformUriTypeCheck"><primary sortas="xmlSecTransformUriTypeCheck">xmlSecTransformUriTypeCheck</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformUriTypeCheck         (<link linkend="xmlSecTransformUriType">xmlSecTransformUriType</link> type,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
-<para>
-Checks if <parameter>uri</parameter> matches expected type <parameter>type</parameter>.</para>
+<indexterm zone="xmlSecTransformUriTypeCheck"><primary>xmlSecTransformUriTypeCheck</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformUriTypeCheck         (<parameter><link linkend="xmlSecTransformUriType"><type>xmlSecTransformUriType</type></link> type</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>);</programlisting>
 <para>
+Checks if <parameter>uri</parameter> matches expected type <parameter>type</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>type</parameter>&#160;:</term>
-<listitem><simpara>               the expected URI type.
+<listitem><simpara>the expected URI type.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>uri</parameter>&#160;:</term>
-<listitem><simpara>                the uri for checking.
+<listitem><simpara>the uri for checking.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if <parameter>uri</parameter> matches <parameter>type</parameter>, 0 if not or a negative value
 if an error occurs.
@@ -542,131 +536,132 @@ if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformDataType" role="typedef">
 <title>xmlSecTransformDataType</title>
-<indexterm zone="xmlSecTransformDataType"><primary sortas="xmlSecTransformDataType">xmlSecTransformDataType</primary></indexterm><programlisting>typedef xmlSecByte                              xmlSecTransformDataType;
+<indexterm zone="xmlSecTransformDataType"><primary>xmlSecTransformDataType</primary></indexterm>
+<programlisting>typedef xmlSecByte                              xmlSecTransformDataType;
 </programlisting>
 <para>
-Transform data type bit mask.</para>
-<para>
+Transform data type bit mask.
 </para></refsect2>
 <refsect2 id="xmlSecTransformDataTypeUnknown" role="macro">
 <title>xmlSecTransformDataTypeUnknown</title>
-<indexterm zone="xmlSecTransformDataTypeUnknown"><primary sortas="xmlSecTransformDataTypeUnknown">xmlSecTransformDataTypeUnknown</primary></indexterm><programlisting>#define xmlSecTransformDataTypeUnknown          0x0000
+<indexterm zone="xmlSecTransformDataTypeUnknown"><primary>xmlSecTransformDataTypeUnknown</primary></indexterm>
+<programlisting>#define xmlSecTransformDataTypeUnknown          0x0000
 </programlisting>
 <para>
-The transform data type is unknown or nor data expected.</para>
-<para>
+The transform data type is unknown or nor data expected.
 </para></refsect2>
 <refsect2 id="xmlSecTransformDataTypeBin" role="macro">
 <title>xmlSecTransformDataTypeBin</title>
-<indexterm zone="xmlSecTransformDataTypeBin"><primary sortas="xmlSecTransformDataTypeBin">xmlSecTransformDataTypeBin</primary></indexterm><programlisting>#define xmlSecTransformDataTypeBin              0x0001
+<indexterm zone="xmlSecTransformDataTypeBin"><primary>xmlSecTransformDataTypeBin</primary></indexterm>
+<programlisting>#define xmlSecTransformDataTypeBin              0x0001
 </programlisting>
 <para>
-The binary transform data.</para>
-<para>
+The binary transform data.
 </para></refsect2>
 <refsect2 id="xmlSecTransformDataTypeXml" role="macro">
 <title>xmlSecTransformDataTypeXml</title>
-<indexterm zone="xmlSecTransformDataTypeXml"><primary sortas="xmlSecTransformDataTypeXml">xmlSecTransformDataTypeXml</primary></indexterm><programlisting>#define xmlSecTransformDataTypeXml              0x0002
+<indexterm zone="xmlSecTransformDataTypeXml"><primary>xmlSecTransformDataTypeXml</primary></indexterm>
+<programlisting>#define xmlSecTransformDataTypeXml              0x0002
 </programlisting>
 <para>
-The xml transform data.</para>
-<para>
+The xml transform data.
 </para></refsect2>
 <refsect2 id="xmlSecTransformUsage" role="typedef">
 <title>xmlSecTransformUsage</title>
-<indexterm zone="xmlSecTransformUsage"><primary sortas="xmlSecTransformUsage">xmlSecTransformUsage</primary></indexterm><programlisting>typedef unsigned int                            xmlSecTransformUsage;
+<indexterm zone="xmlSecTransformUsage"><primary>xmlSecTransformUsage</primary></indexterm>
+<programlisting>typedef unsigned int                            xmlSecTransformUsage;
 </programlisting>
 <para>
-The transform usage bit mask.</para>
-<para>
+The transform usage bit mask.
 </para></refsect2>
 <refsect2 id="xmlSecTransformUsageUnknown" role="macro">
 <title>xmlSecTransformUsageUnknown</title>
-<indexterm zone="xmlSecTransformUsageUnknown"><primary sortas="xmlSecTransformUsageUnknown">xmlSecTransformUsageUnknown</primary></indexterm><programlisting>#define xmlSecTransformUsageUnknown             0x0000
+<indexterm zone="xmlSecTransformUsageUnknown"><primary>xmlSecTransformUsageUnknown</primary></indexterm>
+<programlisting>#define xmlSecTransformUsageUnknown             0x0000
 </programlisting>
 <para>
-Transforms usage is unknown or undefined.</para>
-<para>
+Transforms usage is unknown or undefined.
 </para></refsect2>
 <refsect2 id="xmlSecTransformUsageDSigTransform" role="macro">
 <title>xmlSecTransformUsageDSigTransform</title>
-<indexterm zone="xmlSecTransformUsageDSigTransform"><primary sortas="xmlSecTransformUsageDSigTransform">xmlSecTransformUsageDSigTransform</primary></indexterm><programlisting>#define xmlSecTransformUsageDSigTransform       0x0001
+<indexterm zone="xmlSecTransformUsageDSigTransform"><primary>xmlSecTransformUsageDSigTransform</primary></indexterm>
+<programlisting>#define xmlSecTransformUsageDSigTransform       0x0001
 </programlisting>
 <para>
-Transform could be used in &lt;dsig:Transform&gt;.</para>
-<para>
+Transform could be used in &lt;dsig:Transform&gt;.
 </para></refsect2>
 <refsect2 id="xmlSecTransformUsageC14NMethod" role="macro">
 <title>xmlSecTransformUsageC14NMethod</title>
-<indexterm zone="xmlSecTransformUsageC14NMethod"><primary sortas="xmlSecTransformUsageC14NMethod">xmlSecTransformUsageC14NMethod</primary></indexterm><programlisting>#define xmlSecTransformUsageC14NMethod          0x0002
+<indexterm zone="xmlSecTransformUsageC14NMethod"><primary>xmlSecTransformUsageC14NMethod</primary></indexterm>
+<programlisting>#define xmlSecTransformUsageC14NMethod          0x0002
 </programlisting>
 <para>
-Transform could be used in &lt;dsig:CanonicalizationMethod&gt;.</para>
-<para>
+Transform could be used in &lt;dsig:CanonicalizationMethod&gt;.
 </para></refsect2>
 <refsect2 id="xmlSecTransformUsageDigestMethod" role="macro">
 <title>xmlSecTransformUsageDigestMethod</title>
-<indexterm zone="xmlSecTransformUsageDigestMethod"><primary sortas="xmlSecTransformUsageDigestMethod">xmlSecTransformUsageDigestMethod</primary></indexterm><programlisting>#define xmlSecTransformUsageDigestMethod        0x0004
+<indexterm zone="xmlSecTransformUsageDigestMethod"><primary>xmlSecTransformUsageDigestMethod</primary></indexterm>
+<programlisting>#define xmlSecTransformUsageDigestMethod        0x0004
 </programlisting>
 <para>
-Transform could be used in &lt;dsig:DigestMethod&gt;.</para>
-<para>
+Transform could be used in &lt;dsig:DigestMethod&gt;.
 </para></refsect2>
 <refsect2 id="xmlSecTransformUsageSignatureMethod" role="macro">
 <title>xmlSecTransformUsageSignatureMethod</title>
-<indexterm zone="xmlSecTransformUsageSignatureMethod"><primary sortas="xmlSecTransformUsageSignatureMethod">xmlSecTransformUsageSignatureMethod</primary></indexterm><programlisting>#define xmlSecTransformUsageSignatureMethod     0x0008
+<indexterm zone="xmlSecTransformUsageSignatureMethod"><primary>xmlSecTransformUsageSignatureMethod</primary></indexterm>
+<programlisting>#define xmlSecTransformUsageSignatureMethod     0x0008
 </programlisting>
 <para>
-Transform could be used in &lt;dsig:SignatureMethod&gt;.</para>
-<para>
+Transform could be used in &lt;dsig:SignatureMethod&gt;.
 </para></refsect2>
 <refsect2 id="xmlSecTransformUsageEncryptionMethod" role="macro">
 <title>xmlSecTransformUsageEncryptionMethod</title>
-<indexterm zone="xmlSecTransformUsageEncryptionMethod"><primary sortas="xmlSecTransformUsageEncryptionMethod">xmlSecTransformUsageEncryptionMethod</primary></indexterm><programlisting>#define xmlSecTransformUsageEncryptionMethod    0x0010
+<indexterm zone="xmlSecTransformUsageEncryptionMethod"><primary>xmlSecTransformUsageEncryptionMethod</primary></indexterm>
+<programlisting>#define xmlSecTransformUsageEncryptionMethod    0x0010
 </programlisting>
 <para>
-Transform could be used in &lt;enc:EncryptionMethod&gt;.</para>
-<para>
+Transform could be used in &lt;enc:EncryptionMethod&gt;.
 </para></refsect2>
 <refsect2 id="xmlSecTransformUsageAny" role="macro">
 <title>xmlSecTransformUsageAny</title>
-<indexterm zone="xmlSecTransformUsageAny"><primary sortas="xmlSecTransformUsageAny">xmlSecTransformUsageAny</primary></indexterm><programlisting>#define xmlSecTransformUsageAny                 0xFFFF
+<indexterm zone="xmlSecTransformUsageAny"><primary>xmlSecTransformUsageAny</primary></indexterm>
+<programlisting>#define xmlSecTransformUsageAny                 0xFFFF
 </programlisting>
 <para>
-Transform could be used for operation.</para>
-<para>
+Transform could be used for operation.
 </para></refsect2>
 <refsect2 id="xmlSecTransformCtxPreExecuteCallback" role="function">
 <title>xmlSecTransformCtxPreExecuteCallback ()</title>
-<indexterm zone="xmlSecTransformCtxPreExecuteCallback"><primary sortas="xmlSecTransformCtxPreExecuteCallback">xmlSecTransformCtxPreExecuteCallback</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformCtxPreExecuteCallback)
-                                                        (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformCtxPreExecuteCallback"><primary>xmlSecTransformCtxPreExecuteCallback</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecTransformCtxPreExecuteCallback)
+                                                        (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 The callback called after creating transforms chain but before
 starting data processing. Application can use this callback to
 do additional transforms chain verification or modification and
-aborting transforms execution (if necessary).</para>
-<para>
+aborting transforms execution (if necessary).
 </para><variablelist role="params">
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to transform's context.
+<listitem><simpara>the pointer to transform's context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success and a negative value otherwise (in this case,
 transforms chain will not be executed and xmlsec processing stops).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK--CAPS" role="macro">
+<refsect2 id="XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK:CAPS" role="macro">
 <title>XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK</title>
-<indexterm zone="XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK--CAPS"><primary sortas="XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK">XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK</primary></indexterm><programlisting>#define XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK               0x00000001
+<indexterm zone="XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK:CAPS"><primary>XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK</primary></indexterm>
+<programlisting>#define XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK               0x00000001
 </programlisting>
 <para>
 If this flag is set then URI ID references are resolved directly
 without using XPointers. This allows one to sign/verify Visa3D
-documents that don't follow XML, XPointer and XML DSig specifications.</para>
-<para>
+documents that don't follow XML, XPointer and XML DSig specifications.
 </para></refsect2>
 <refsect2 id="xmlSecTransformCtx" role="struct">
 <title>struct xmlSecTransformCtx</title>
-<indexterm zone="xmlSecTransformCtx"><primary sortas="xmlSecTransformCtx">xmlSecTransformCtx</primary></indexterm><programlisting>struct xmlSecTransformCtx {
+<indexterm zone="xmlSecTransformCtx"><primary>xmlSecTransformCtx</primary></indexterm>
+<programlisting>struct xmlSecTransformCtx {
     /* user settings */
     void*                                       userData;
     unsigned int                                flags;
@@ -689,41 +684,34 @@ documents that don't follow XML, XPointer and XML DSig specifications.</para>
 };
 </programlisting>
 <para>
-The transform execution context.</para>
-<para>
+The transform execution context.
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>userData</structfield>;</term>
-<listitem><simpara>           the pointer to user data (xmlsec and xmlsec-crypto never
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecTransformCtx.userData">userData</structfield>;</term>
+<listitem><simpara>the pointer to user data (xmlsec and xmlsec-crypto never
                      touch this).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term>unsigned&#160;<link linkend="int">int</link>&#160;<structfield>flags</structfield>;</term>
-<listitem><simpara>              the bit mask flags to control transforms execution
+<varlistentry><term>unsigned&#160;<link linkend="int"><type>int</type></link>&#160;<structfield id="xmlSecTransformCtx.flags">flags</structfield>;</term>
+<listitem><simpara>the bit mask flags to control transforms execution
                      (reserved for the future).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term>unsigned&#160;<link linkend="int">int</link>&#160;<structfield>flags2</structfield>;</term>
-<listitem><simpara>             the bit mask flags to control transforms execution
+<varlistentry><term>unsigned&#160;<link linkend="int"><type>int</type></link>&#160;<structfield id="xmlSecTransformCtx.flags2">flags2</structfield>;</term>
+<listitem><simpara>the bit mask flags to control transforms execution
                      (reserved for the future).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformUriType">xmlSecTransformUriType</link>&#160;<structfield>enabledUris</structfield>;</term>
-<listitem><simpara>        the allowed transform data source uri types.
+<varlistentry><term><link linkend="xmlSecTransformUriType"><type>xmlSecTransformUriType</type></link>&#160;<structfield id="xmlSecTransformCtx.enabledUris">enabledUris</structfield>;</term>
+<listitem><simpara>the allowed transform data source uri types.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrList</link>&#160;<structfield>enabledTransforms</structfield>;</term>
-<listitem><simpara>  the list of enabled transforms; if list is empty (default)
+<varlistentry><term><link linkend="xmlSecPtrList"><type>xmlSecPtrList</type></link>&#160;<structfield id="xmlSecTransformCtx.enabledTransforms">enabledTransforms</structfield>;</term>
+<listitem><simpara>the list of enabled transforms; if list is empty (default)
                      then all registered transforms are enabled.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformCtxPreExecuteCallback">xmlSecTransformCtxPreExecuteCallback</link>&#160;<structfield>preExecCallback</structfield>;</term>
-<listitem><simpara>    the callback called after preparing transform chain
+<varlistentry><term><link linkend="xmlSecTransformCtxPreExecuteCallback"><type>xmlSecTransformCtxPreExecuteCallback</type></link>&#160;<structfield id="xmlSecTransformCtx.preExecCallback">preExecCallback</structfield>;</term>
+<listitem><simpara>the callback called after preparing transform chain
                      and right before actual data processing; application
                      can use this callback to change transforms parameters,
                      insert additional transforms in the chain or do
@@ -731,55 +719,47 @@ The transform execution context.</para>
                      if needed).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecBuffer">xmlSecBufferPtr</link>&#160;<structfield>result</structfield>;</term>
-<listitem><simpara>             the pointer to transforms result buffer.
+<varlistentry><term><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link>&#160;<structfield id="xmlSecTransformCtx.result">result</structfield>;</term>
+<listitem><simpara>the pointer to transforms result buffer.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformStatus">xmlSecTransformStatus</link>&#160;<structfield>status</structfield>;</term>
-<listitem><simpara>             the transforms chain processng status.
+<varlistentry><term><link linkend="xmlSecTransformStatus"><type>xmlSecTransformStatus</type></link>&#160;<structfield id="xmlSecTransformCtx.status">status</structfield>;</term>
+<listitem><simpara>the transforms chain processng status.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>uri</structfield>;</term>
-<listitem><simpara>                the data source URI without xpointer expression.
+<varlistentry><term><link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecTransformCtx.uri">uri</structfield>;</term>
+<listitem><simpara>the data source URI without xpointer expression.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>xptrExpr</structfield>;</term>
-<listitem><simpara>           the xpointer expression from data source URI (if any).
+<varlistentry><term><link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecTransformCtx.xptrExpr">xptrExpr</structfield>;</term>
+<listitem><simpara>the xpointer expression from data source URI (if any).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link>&#160;<structfield>first</structfield>;</term>
-<listitem><simpara>              the first transform in the chain.
+<varlistentry><term><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link>&#160;<structfield id="xmlSecTransformCtx.first">first</structfield>;</term>
+<listitem><simpara>the first transform in the chain.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link>&#160;<structfield>last</structfield>;</term>
-<listitem><simpara>               the last transform in the chain.
+<varlistentry><term><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link>&#160;<structfield id="xmlSecTransformCtx.last">last</structfield>;</term>
+<listitem><simpara>the last transform in the chain.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
-<listitem><simpara>          reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecTransformCtx.reserved0">reserved0</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
-<listitem><simpara>          reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecTransformCtx.reserved1">reserved1</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCtxCreate" role="function">
 <title>xmlSecTransformCtxCreate ()</title>
-<indexterm zone="xmlSecTransformCtxCreate"><primary sortas="xmlSecTransformCtxCreate">xmlSecTransformCtxCreate</primary></indexterm><programlisting><link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link>  xmlSecTransformCtxCreate         (void);</programlisting>
+<indexterm zone="xmlSecTransformCtxCreate"><primary>xmlSecTransformCtxCreate</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformCtx"><returnvalue>xmlSecTransformCtxPtr</returnvalue></link>  xmlSecTransformCtxCreate         (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 Creates transforms chain processing context.
 The caller is responsible for destroying returend object by calling
-<link linkend="xmlSecTransformCtxDestroy"><type>xmlSecTransformCtxDestroy</type></link> function.</para>
-<para>
+<link linkend="xmlSecTransformCtxDestroy"><type>xmlSecTransformCtxDestroy</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated context object or NULL if an error
 occurs.
@@ -787,74 +767,75 @@ occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCtxDestroy" role="function">
 <title>xmlSecTransformCtxDestroy ()</title>
-<indexterm zone="xmlSecTransformCtxDestroy"><primary sortas="xmlSecTransformCtxDestroy">xmlSecTransformCtxDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformCtxDestroy           (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);</programlisting>
-<para>
-Destroy context object created with <link linkend="xmlSecTransformCtxCreate"><type>xmlSecTransformCtxCreate</type></link> function.</para>
+<indexterm zone="xmlSecTransformCtxDestroy"><primary>xmlSecTransformCtxDestroy</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecTransformCtxDestroy           (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>);</programlisting>
 <para>
+Destroy context object created with <link linkend="xmlSecTransformCtxCreate"><type>xmlSecTransformCtxCreate</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to transforms chain processing context.
+<listitem><simpara>the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCtxInitialize" role="function">
 <title>xmlSecTransformCtxInitialize ()</title>
-<indexterm zone="xmlSecTransformCtxInitialize"><primary sortas="xmlSecTransformCtxInitialize">xmlSecTransformCtxInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxInitialize        (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);</programlisting>
+<indexterm zone="xmlSecTransformCtxInitialize"><primary>xmlSecTransformCtxInitialize</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformCtxInitialize        (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>);</programlisting>
 <para>
 Initializes transforms chain processing context.
 The caller is responsible for cleaing up returend object by calling
-<link linkend="xmlSecTransformCtxFinalize"><type>xmlSecTransformCtxFinalize</type></link> function.</para>
-<para>
+<link linkend="xmlSecTransformCtxFinalize"><type>xmlSecTransformCtxFinalize</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to transforms chain processing context.
+<listitem><simpara>the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCtxFinalize" role="function">
 <title>xmlSecTransformCtxFinalize ()</title>
-<indexterm zone="xmlSecTransformCtxFinalize"><primary sortas="xmlSecTransformCtxFinalize">xmlSecTransformCtxFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformCtxFinalize          (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);</programlisting>
-<para>
-Cleans up <parameter>ctx</parameter> object initialized with <link linkend="xmlSecTransformCtxInitialize"><type>xmlSecTransformCtxInitialize</type></link> function.</para>
+<indexterm zone="xmlSecTransformCtxFinalize"><primary>xmlSecTransformCtxFinalize</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecTransformCtxFinalize          (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>);</programlisting>
 <para>
+Cleans up <parameter>ctx</parameter> object initialized with <link linkend="xmlSecTransformCtxInitialize"><type>xmlSecTransformCtxInitialize</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to transforms chain processing context.
+<listitem><simpara>the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCtxReset" role="function">
 <title>xmlSecTransformCtxReset ()</title>
-<indexterm zone="xmlSecTransformCtxReset"><primary sortas="xmlSecTransformCtxReset">xmlSecTransformCtxReset</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformCtxReset             (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);</programlisting>
-<para>
-Resets transfroms context for new processing.</para>
+<indexterm zone="xmlSecTransformCtxReset"><primary>xmlSecTransformCtxReset</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecTransformCtxReset             (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>);</programlisting>
 <para>
+Resets transfroms context for new processing.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to transforms chain processing context.
+<listitem><simpara>the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCtxCopyUserPref" role="function">
 <title>xmlSecTransformCtxCopyUserPref ()</title>
-<indexterm zone="xmlSecTransformCtxCopyUserPref"><primary sortas="xmlSecTransformCtxCopyUserPref">xmlSecTransformCtxCopyUserPref</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxCopyUserPref      (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> dst,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> src);</programlisting>
-<para>
-Copies user settings from <parameter>src</parameter> context to <parameter>dst</parameter>.</para>
+<indexterm zone="xmlSecTransformCtxCopyUserPref"><primary>xmlSecTransformCtxCopyUserPref</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformCtxCopyUserPref      (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> dst</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> src</parameter>);</programlisting>
 <para>
+Copies user settings from <parameter>src</parameter> context to <parameter>dst</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dst</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to destination transforms chain processing context.
+<listitem><simpara>the pointer to destination transforms chain processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>src</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to source transforms chain processing context.
+<listitem><simpara>the pointer to source transforms chain processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCtxSetUri" role="function">
 <title>xmlSecTransformCtxSetUri ()</title>
-<indexterm zone="xmlSecTransformCtxSetUri"><primary sortas="xmlSecTransformCtxSetUri">xmlSecTransformCtxSetUri</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxSetUri            (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> hereNode);</programlisting>
+<indexterm zone="xmlSecTransformCtxSetUri"><primary>xmlSecTransformCtxSetUri</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformCtxSetUri            (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> hereNode</parameter>);</programlisting>
 <para>
 Parses uri and adds xpointer transforms if required.
 </para>
@@ -888,17 +869,16 @@ containing the signature
 identifies a node-set containing the element with ID attribute value
 'chapter1' of the XML resource containing the signature. XML Signature
 (and its applications) modify this node-set to include the element plus
-all descendents including namespaces and attributes -- but not comments.</para>
-<para>
+all descendents including namespaces and attributes -- but not comments.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to transforms chain processing context.
+<listitem><simpara>the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>uri</parameter>&#160;:</term>
-<listitem><simpara>                the URI.
+<listitem><simpara>the URI.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>hereNode</parameter>&#160;:</term>
-<listitem><simpara>           the pointer to "here" node required by some
+<listitem><simpara>the pointer to "here" node required by some
                      XML transforms (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
@@ -906,242 +886,243 @@ all descendents including namespaces and attributes -- but not comments.</para>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCtxAppend" role="function">
 <title>xmlSecTransformCtxAppend ()</title>
-<indexterm zone="xmlSecTransformCtxAppend"><primary sortas="xmlSecTransformCtxAppend">xmlSecTransformCtxAppend</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxAppend            (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
+<indexterm zone="xmlSecTransformCtxAppend"><primary>xmlSecTransformCtxAppend</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformCtxAppend            (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>);</programlisting>
 <para>
 Connects the <parameter>transform</parameter> to the end of the chain of transforms in the <parameter>ctx</parameter>
-(see <link linkend="xmlSecTransformConnect"><type>xmlSecTransformConnect</type></link> function for details).</para>
-<para>
+(see <link linkend="xmlSecTransformConnect"><type>xmlSecTransformConnect</type></link> function for details).
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to transforms chain processing context.
+<listitem><simpara>the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to new transform.
+<listitem><simpara>the pointer to new transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCtxPrepend" role="function">
 <title>xmlSecTransformCtxPrepend ()</title>
-<indexterm zone="xmlSecTransformCtxPrepend"><primary sortas="xmlSecTransformCtxPrepend">xmlSecTransformCtxPrepend</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxPrepend           (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
+<indexterm zone="xmlSecTransformCtxPrepend"><primary>xmlSecTransformCtxPrepend</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformCtxPrepend           (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>);</programlisting>
 <para>
 Connects the <parameter>transform</parameter> to the beggining of the chain of transforms in the <parameter>ctx</parameter>
-(see <link linkend="xmlSecTransformConnect"><type>xmlSecTransformConnect</type></link> function for details).</para>
-<para>
+(see <link linkend="xmlSecTransformConnect"><type>xmlSecTransformConnect</type></link> function for details).
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to transforms chain processing context.
+<listitem><simpara>the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to new transform.
+<listitem><simpara>the pointer to new transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCtxCreateAndAppend" role="function">
 <title>xmlSecTransformCtxCreateAndAppend ()</title>
-<indexterm zone="xmlSecTransformCtxCreateAndAppend"><primary sortas="xmlSecTransformCtxCreateAndAppend">xmlSecTransformCtxCreateAndAppend</primary></indexterm><programlisting><link linkend="xmlSecTransformPtr">xmlSecTransformPtr</link>  xmlSecTransformCtxCreateAndAppend   (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> id);</programlisting>
+<indexterm zone="xmlSecTransformCtxCreateAndAppend"><primary>xmlSecTransformCtxCreateAndAppend</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformPtr"><returnvalue>xmlSecTransformPtr</returnvalue></link>  xmlSecTransformCtxCreateAndAppend   (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> id</parameter>);</programlisting>
 <para>
 Creaeates new transform and connects it to the end of the chain of
-transforms in the <parameter>ctx</parameter> (see <link linkend="xmlSecTransformConnect"><type>xmlSecTransformConnect</type></link> function for details).</para>
-<para>
+transforms in the <parameter>ctx</parameter> (see <link linkend="xmlSecTransformConnect"><type>xmlSecTransformConnect</type></link> function for details).
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to transforms chain processing context.
+<listitem><simpara>the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the new transform klass.
+<listitem><simpara>the new transform klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created transform or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCtxCreateAndPrepend" role="function">
 <title>xmlSecTransformCtxCreateAndPrepend ()</title>
-<indexterm zone="xmlSecTransformCtxCreateAndPrepend"><primary sortas="xmlSecTransformCtxCreateAndPrepend">xmlSecTransformCtxCreateAndPrepend</primary></indexterm><programlisting><link linkend="xmlSecTransformPtr">xmlSecTransformPtr</link>  xmlSecTransformCtxCreateAndPrepend  (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> id);</programlisting>
+<indexterm zone="xmlSecTransformCtxCreateAndPrepend"><primary>xmlSecTransformCtxCreateAndPrepend</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformPtr"><returnvalue>xmlSecTransformPtr</returnvalue></link>  xmlSecTransformCtxCreateAndPrepend  (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> id</parameter>);</programlisting>
 <para>
 Creaeates new transform and connects it to the end of the chain of
-transforms in the <parameter>ctx</parameter> (see <link linkend="xmlSecTransformConnect"><type>xmlSecTransformConnect</type></link> function for details).</para>
-<para>
+transforms in the <parameter>ctx</parameter> (see <link linkend="xmlSecTransformConnect"><type>xmlSecTransformConnect</type></link> function for details).
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to transforms chain processing context.
+<listitem><simpara>the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the new transform klass.
+<listitem><simpara>the new transform klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created transform or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCtxNodeRead" role="function">
 <title>xmlSecTransformCtxNodeRead ()</title>
-<indexterm zone="xmlSecTransformCtxNodeRead"><primary sortas="xmlSecTransformCtxNodeRead">xmlSecTransformCtxNodeRead</primary></indexterm><programlisting><link linkend="xmlSecTransformPtr">xmlSecTransformPtr</link>  xmlSecTransformCtxNodeRead          (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);</programlisting>
+<indexterm zone="xmlSecTransformCtxNodeRead"><primary>xmlSecTransformCtxNodeRead</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformPtr"><returnvalue>xmlSecTransformPtr</returnvalue></link>  xmlSecTransformCtxNodeRead          (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformUsage"><type>xmlSecTransformUsage</type></link> usage</parameter>);</programlisting>
 <para>
 Reads the transform from the <parameter>node</parameter> and appends it to the current chain
-of transforms in <parameter>ctx</parameter>.</para>
-<para>
+of transforms in <parameter>ctx</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to transforms chain processing context.
+<listitem><simpara>the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to transform's node.
+<listitem><simpara>the pointer to transform's node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>usage</parameter>&#160;:</term>
-<listitem><simpara>              the transform's usage (signature, encryption, etc.).
+<listitem><simpara>the transform's usage (signature, encryption, etc.).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created transform or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCtxNodesListRead" role="function">
 <title>xmlSecTransformCtxNodesListRead ()</title>
-<indexterm zone="xmlSecTransformCtxNodesListRead"><primary sortas="xmlSecTransformCtxNodesListRead">xmlSecTransformCtxNodesListRead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxNodesListRead     (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);</programlisting>
+<indexterm zone="xmlSecTransformCtxNodesListRead"><primary>xmlSecTransformCtxNodesListRead</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformCtxNodesListRead     (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformUsage"><type>xmlSecTransformUsage</type></link> usage</parameter>);</programlisting>
 <para>
 Reads transforms from the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> children of the <parameter>node</parameter> and
-appends them to the current transforms chain in <parameter>ctx</parameter> object.</para>
-<para>
+appends them to the current transforms chain in <parameter>ctx</parameter> object.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to transforms chain processing context.
+<listitem><simpara>the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> nodes parent node.
+<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>&#160;:</term>
-<listitem><simpara>              the transform's usage (signature, encryption, etc.).
+<listitem><simpara>the transform's usage (signature, encryption, etc.).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCtxPrepare" role="function">
 <title>xmlSecTransformCtxPrepare ()</title>
-<indexterm zone="xmlSecTransformCtxPrepare"><primary sortas="xmlSecTransformCtxPrepare">xmlSecTransformCtxPrepare</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxPrepare           (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link> inputDataType);</programlisting>
-<para>
-Prepares the transform context for processing data of <parameter>inputDataType</parameter>.</para>
+<indexterm zone="xmlSecTransformCtxPrepare"><primary>xmlSecTransformCtxPrepare</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformCtxPrepare           (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformDataType"><type>xmlSecTransformDataType</type></link> inputDataType</parameter>);</programlisting>
 <para>
+Prepares the transform context for processing data of <parameter>inputDataType</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to transforms chain processing context.
+<listitem><simpara>the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>inputDataType</parameter>&#160;:</term>
-<listitem><simpara>      the expected input type.
+<listitem><simpara>the expected input type.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCtxBinaryExecute" role="function">
 <title>xmlSecTransformCtxBinaryExecute ()</title>
-<indexterm zone="xmlSecTransformCtxBinaryExecute"><primary sortas="xmlSecTransformCtxBinaryExecute">xmlSecTransformCtxBinaryExecute</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxBinaryExecute     (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize);</programlisting>
-<para>
-Processes binary data using transforms chain in the <parameter>ctx</parameter>.</para>
+<indexterm zone="xmlSecTransformCtxBinaryExecute"><primary>xmlSecTransformCtxBinaryExecute</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformCtxBinaryExecute     (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>);</programlisting>
 <para>
+Processes binary data using transforms chain in the <parameter>ctx</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to transforms chain processing context.
+<listitem><simpara>the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the input binary data buffer.
+<listitem><simpara>the input binary data buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the input data size.
+<listitem><simpara>the input data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCtxUriExecute" role="function">
 <title>xmlSecTransformCtxUriExecute ()</title>
-<indexterm zone="xmlSecTransformCtxUriExecute"><primary sortas="xmlSecTransformCtxUriExecute">xmlSecTransformCtxUriExecute</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxUriExecute        (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
-<para>
-Process binary data from the URI using transforms chain in <parameter>ctx</parameter>.</para>
+<indexterm zone="xmlSecTransformCtxUriExecute"><primary>xmlSecTransformCtxUriExecute</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformCtxUriExecute        (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>);</programlisting>
 <para>
+Process binary data from the URI using transforms chain in <parameter>ctx</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to transforms chain processing context.
+<listitem><simpara>the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>uri</parameter>&#160;:</term>
-<listitem><simpara>                the URI.
+<listitem><simpara>the URI.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCtxXmlExecute" role="function">
 <title>xmlSecTransformCtxXmlExecute ()</title>
-<indexterm zone="xmlSecTransformCtxXmlExecute"><primary sortas="xmlSecTransformCtxXmlExecute">xmlSecTransformCtxXmlExecute</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxXmlExecute        (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes);</programlisting>
-<para>
-Process <parameter>nodes</parameter> using transforms in the transforms chain in <parameter>ctx</parameter>.</para>
+<indexterm zone="xmlSecTransformCtxXmlExecute"><primary>xmlSecTransformCtxXmlExecute</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformCtxXmlExecute        (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nodes</parameter>);</programlisting>
 <para>
+Process <parameter>nodes</parameter> using transforms in the transforms chain in <parameter>ctx</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to transforms chain processing context.
+<listitem><simpara>the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nodes</parameter>&#160;:</term>
-<listitem><simpara>              the input node set.
+<listitem><simpara>the input node set.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCtxExecute" role="function">
 <title>xmlSecTransformCtxExecute ()</title>
-<indexterm zone="xmlSecTransformCtxExecute"><primary sortas="xmlSecTransformCtxExecute">xmlSecTransformCtxExecute</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxExecute           (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="xmlDoc">xmlDocPtr</link> doc);</programlisting>
-<para>
-Executes transforms chain in <parameter>ctx</parameter>.</para>
+<indexterm zone="xmlSecTransformCtxExecute"><primary>xmlSecTransformCtxExecute</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformCtxExecute           (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="xmlDoc"><type>xmlDocPtr</type></link> doc</parameter>);</programlisting>
 <para>
+Executes transforms chain in <parameter>ctx</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to transforms chain processing context.
+<listitem><simpara>the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>doc</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to input document.
+<listitem><simpara>the pointer to input document.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCtxDebugDump" role="function">
 <title>xmlSecTransformCtxDebugDump ()</title>
-<indexterm zone="xmlSecTransformCtxDebugDump"><primary sortas="xmlSecTransformCtxDebugDump">xmlSecTransformCtxDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformCtxDebugDump         (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints transforms context debug information to <parameter>output</parameter>.</para>
+<indexterm zone="xmlSecTransformCtxDebugDump"><primary>xmlSecTransformCtxDebugDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecTransformCtxDebugDump         (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints transforms context debug information to <parameter>output</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to transforms chain processing context.
+<listitem><simpara>the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCtxDebugXmlDump" role="function">
 <title>xmlSecTransformCtxDebugXmlDump ()</title>
-<indexterm zone="xmlSecTransformCtxDebugXmlDump"><primary sortas="xmlSecTransformCtxDebugXmlDump">xmlSecTransformCtxDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformCtxDebugXmlDump      (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints transforms context debug information to <parameter>output</parameter> in XML format.</para>
+<indexterm zone="xmlSecTransformCtxDebugXmlDump"><primary>xmlSecTransformCtxDebugXmlDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecTransformCtxDebugXmlDump      (<parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> ctx</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints transforms context debug information to <parameter>output</parameter> in XML format.
 </para><variablelist role="params">
 <varlistentry><term><parameter>ctx</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to transforms chain processing context.
+<listitem><simpara>the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransform" role="struct">
 <title>struct xmlSecTransform</title>
-<indexterm zone="xmlSecTransform"><primary sortas="xmlSecTransform">xmlSecTransform</primary></indexterm><programlisting>struct xmlSecTransform {
+<indexterm zone="xmlSecTransform"><primary>xmlSecTransform</primary></indexterm>
+<programlisting>struct xmlSecTransform {
     xmlSecTransformId                   id;
     xmlSecTransformOperation            operation;
     xmlSecTransformStatus               status;
@@ -1165,100 +1146,88 @@ Prints transforms context debug information to <parameter>output</parameter> in
 };
 </programlisting>
 <para>
-The transform structure.</para>
-<para>
+The transform structure.
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="xmlSecTransformId">xmlSecTransformId</link>&#160;<structfield>id</structfield>;</term>
-<listitem><simpara>                 the transform id (pointer to <link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link>).
+<varlistentry><term><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link>&#160;<structfield id="xmlSecTransform.id">id</structfield>;</term>
+<listitem><simpara>the transform id (pointer to <link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link>).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformOperation">xmlSecTransformOperation</link>&#160;<structfield>operation</structfield>;</term>
-<listitem><simpara>          the transform's opertaion.
+<varlistentry><term><link linkend="xmlSecTransformOperation"><type>xmlSecTransformOperation</type></link>&#160;<structfield id="xmlSecTransform.operation">operation</structfield>;</term>
+<listitem><simpara>the transform's opertaion.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformStatus">xmlSecTransformStatus</link>&#160;<structfield>status</structfield>;</term>
-<listitem><simpara>             the current status.
+<varlistentry><term><link linkend="xmlSecTransformStatus"><type>xmlSecTransformStatus</type></link>&#160;<structfield id="xmlSecTransform.status">status</structfield>;</term>
+<listitem><simpara>the current status.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlNode">xmlNodePtr</link>&#160;<structfield>hereNode</structfield>;</term>
-<listitem><simpara>           the pointer to transform's <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform ">&lt;dsig:Transform /&gt;</ulink> node.
+<varlistentry><term><link linkend="xmlNode"><type>xmlNodePtr</type></link>&#160;<structfield id="xmlSecTransform.hereNode">hereNode</structfield>;</term>
+<listitem><simpara>the pointer to transform's <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform ">&lt;dsig:Transform /&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link>&#160;<structfield>next</structfield>;</term>
-<listitem><simpara>               the pointer to next transform in the chain.
+<varlistentry><term><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link>&#160;<structfield id="xmlSecTransform.next">next</structfield>;</term>
+<listitem><simpara>the pointer to next transform in the chain.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link>&#160;<structfield>prev</structfield>;</term>
-<listitem><simpara>               the pointer to previous transform in the chain.
+<varlistentry><term><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link>&#160;<structfield id="xmlSecTransform.prev">prev</structfield>;</term>
+<listitem><simpara>the pointer to previous transform in the chain.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecBuffer">xmlSecBuffer</link>&#160;<structfield>inBuf</structfield>;</term>
-<listitem><simpara>              the input binary data buffer.
+<varlistentry><term><link linkend="xmlSecBuffer"><type>xmlSecBuffer</type></link>&#160;<structfield id="xmlSecTransform.inBuf">inBuf</structfield>;</term>
+<listitem><simpara>the input binary data buffer.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecBuffer">xmlSecBuffer</link>&#160;<structfield>outBuf</structfield>;</term>
-<listitem><simpara>             the output binary data buffer.
+<varlistentry><term><link linkend="xmlSecBuffer"><type>xmlSecBuffer</type></link>&#160;<structfield id="xmlSecTransform.outBuf">outBuf</structfield>;</term>
+<listitem><simpara>the output binary data buffer.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link>&#160;<structfield>inNodes</structfield>;</term>
-<listitem><simpara>            the input XML nodes.
+<varlistentry><term><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link>&#160;<structfield id="xmlSecTransform.inNodes">inNodes</structfield>;</term>
+<listitem><simpara>the input XML nodes.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link>&#160;<structfield>outNodes</structfield>;</term>
-<listitem><simpara>           the output XML nodes.
+<varlistentry><term><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link>&#160;<structfield id="xmlSecTransform.outNodes">outNodes</structfield>;</term>
+<listitem><simpara>the output XML nodes.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
-<listitem><simpara>          reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecTransform.reserved0">reserved0</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
-<listitem><simpara>          reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecTransform.reserved1">reserved1</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCreate" role="function">
 <title>xmlSecTransformCreate ()</title>
-<indexterm zone="xmlSecTransformCreate"><primary sortas="xmlSecTransformCreate">xmlSecTransformCreate</primary></indexterm><programlisting><link linkend="xmlSecTransform">xmlSecTransformPtr</link>  xmlSecTransformCreate               (<link linkend="xmlSecTransformId">xmlSecTransformId</link> id);</programlisting>
+<indexterm zone="xmlSecTransformCreate"><primary>xmlSecTransformCreate</primary></indexterm>
+<programlisting><link linkend="xmlSecTransform"><returnvalue>xmlSecTransformPtr</returnvalue></link>  xmlSecTransformCreate               (<parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> id</parameter>);</programlisting>
 <para>
 Creates new transform of the <parameter>id</parameter> klass. The caller is responsible for
-destroying returned tansform using <link linkend="xmlSecTransformDestroy"><type>xmlSecTransformDestroy</type></link> function.</para>
-<para>
+destroying returned tansform using <link linkend="xmlSecTransformDestroy"><type>xmlSecTransformDestroy</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the transform id to create.
+<listitem><simpara>the transform id to create.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created transform or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformDestroy" role="function">
 <title>xmlSecTransformDestroy ()</title>
-<indexterm zone="xmlSecTransformDestroy"><primary sortas="xmlSecTransformDestroy">xmlSecTransformDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformDestroy              (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
-<para>
-Destroys transform created with <link linkend="xmlSecTransformCreate"><type>xmlSecTransformCreate</type></link> function.</para>
+<indexterm zone="xmlSecTransformDestroy"><primary>xmlSecTransformDestroy</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecTransformDestroy              (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>);</programlisting>
 <para>
+Destroys transform created with <link linkend="xmlSecTransformCreate"><type>xmlSecTransformCreate</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform.
+<listitem><simpara>the pointer to transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformNodeRead" role="function">
 <title>xmlSecTransformNodeRead ()</title>
-<indexterm zone="xmlSecTransformNodeRead"><primary sortas="xmlSecTransformNodeRead">xmlSecTransformNodeRead</primary></indexterm><programlisting><link linkend="xmlSecTransformPtr">xmlSecTransformPtr</link>  xmlSecTransformNodeRead             (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformNodeRead"><primary>xmlSecTransformNodeRead</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformPtr"><returnvalue>xmlSecTransformPtr</returnvalue></link>  xmlSecTransformNodeRead             (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformUsage"><type>xmlSecTransformUsage</type></link> usage</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 Reads transform from the <parameter>node</parameter> as follows:
 </para>
@@ -1272,375 +1241,375 @@ Reads transform from the <parameter>node</parameter> as follows:
    3) calls transform's create method;
 </para>
 <para>
-   4) calls transform's read transform node method.</para>
-<para>
+   4) calls transform's read transform node method.
 </para><variablelist role="params">
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to the transform's node.
+<listitem><simpara>the pointer to the transform's node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>usage</parameter>&#160;:</term>
-<listitem><simpara>              the transform usage (signature, encryption, ...).
+<listitem><simpara>the transform usage (signature, encryption, ...).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>       the transform's chaing processing context.
+<listitem><simpara>the transform's chaing processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created transform or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformPump" role="function">
 <title>xmlSecTransformPump ()</title>
-<indexterm zone="xmlSecTransformPump"><primary sortas="xmlSecTransformPump">xmlSecTransformPump</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformPump                 (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> left,
-                                                         <link linkend="xmlSecTransform">xmlSecTransformPtr</link> right,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformPump"><primary>xmlSecTransformPump</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformPump                 (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> left</parameter>,
+                                                         <parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> right</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 Pops data from <parameter>left</parameter> transform and pushes to <parameter>right</parameter> transform until
-no more data is available.</para>
-<para>
+no more data is available.
 </para><variablelist role="params">
 <varlistentry><term><parameter>left</parameter>&#160;:</term>
-<listitem><simpara>               the source pumping transform.
+<listitem><simpara>the source pumping transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>right</parameter>&#160;:</term>
-<listitem><simpara>              the destination pumping transform.
+<listitem><simpara>the destination pumping transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>       the transform's chaing processing context.
+<listitem><simpara>the transform's chaing processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformSetKey" role="function">
 <title>xmlSecTransformSetKey ()</title>
-<indexterm zone="xmlSecTransformSetKey"><primary sortas="xmlSecTransformSetKey">xmlSecTransformSetKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformSetKey               (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
-<para>
-Sets the transform's key.</para>
+<indexterm zone="xmlSecTransformSetKey"><primary>xmlSecTransformSetKey</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformSetKey               (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);</programlisting>
 <para>
+Sets the transform's key.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform.
+<listitem><simpara>the pointer to transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformSetKeyReq" role="function">
 <title>xmlSecTransformSetKeyReq ()</title>
-<indexterm zone="xmlSecTransformSetKeyReq"><primary sortas="xmlSecTransformSetKeyReq">xmlSecTransformSetKeyReq</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformSetKeyReq            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);</programlisting>
-<para>
-Sets the key requirements for <parameter>transform</parameter> in the <parameter>keyReq</parameter>.</para>
+<indexterm zone="xmlSecTransformSetKeyReq"><primary>xmlSecTransformSetKeyReq</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformSetKeyReq            (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> keyReq</parameter>);</programlisting>
 <para>
+Sets the key requirements for <parameter>transform</parameter> in the <parameter>keyReq</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform.
+<listitem><simpara>the pointer to transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyReq</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to keys requirements object.
+<listitem><simpara>the pointer to keys requirements object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformVerify" role="function">
 <title>xmlSecTransformVerify ()</title>
-<indexterm zone="xmlSecTransformVerify"><primary sortas="xmlSecTransformVerify">xmlSecTransformVerify</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformVerify               (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformVerify"><primary>xmlSecTransformVerify</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformVerify               (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 Verifies the data with transform's processing results
 (for digest, HMAC and signature transforms). The verification
-result is stored in the <link linkend="status"><type>status</type></link> member of <link linkend="xmlSecTransform"><type>xmlSecTransform</type></link> object.</para>
-<para>
+result is stored in the <link linkend="status"><type>status</type></link> member of <link linkend="xmlSecTransform"><type>xmlSecTransform</type></link> object.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform.
+<listitem><simpara>the pointer to transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the binary data for verification.
+<listitem><simpara>the binary data for verification.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the data size.
+<listitem><simpara>the data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>       the transform's chaing processing context.
+<listitem><simpara>the transform's chaing processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformVerifyNodeContent" role="function">
 <title>xmlSecTransformVerifyNodeContent ()</title>
-<indexterm zone="xmlSecTransformVerifyNodeContent"><primary sortas="xmlSecTransformVerifyNodeContent">xmlSecTransformVerifyNodeContent</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformVerifyNodeContent    (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformVerifyNodeContent"><primary>xmlSecTransformVerifyNodeContent</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformVerifyNodeContent    (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 Gets the <parameter>node</parameter> content, base64 decodes it and calls <link linkend="xmlSecTransformVerify"><type>xmlSecTransformVerify</type></link>
-function to verify binary results.</para>
-<para>
+function to verify binary results.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform.
+<listitem><simpara>the pointer to transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to node.
+<listitem><simpara>the pointer to node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>       the transform's chaing processing context.
+<listitem><simpara>the transform's chaing processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformGetDataType" role="function">
 <title>xmlSecTransformGetDataType ()</title>
-<indexterm zone="xmlSecTransformGetDataType"><primary sortas="xmlSecTransformGetDataType">xmlSecTransformGetDataType</primary></indexterm><programlisting><link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link>  xmlSecTransformGetDataType     (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecTransformMode">xmlSecTransformMode</link> mode,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformGetDataType"><primary>xmlSecTransformGetDataType</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformDataType"><returnvalue>xmlSecTransformDataType</returnvalue></link>  xmlSecTransformGetDataType     (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformMode"><type>xmlSecTransformMode</type></link> mode</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 Gets transform input (<parameter>mode</parameter> is "push") or output (<parameter>mode</parameter> is "pop") data
-type (binary or XML).</para>
-<para>
+type (binary or XML).
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform.
+<listitem><simpara>the pointer to transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>mode</parameter>&#160;:</term>
-<listitem><simpara>               the data mode (push or pop).
+<listitem><simpara>the data mode (push or pop).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>       the transform's chaing processing context.
+<listitem><simpara>the transform's chaing processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the transform's data type for the <parameter>mode</parameter> operation.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformPushBin" role="function">
 <title>xmlSecTransformPushBin ()</title>
-<indexterm zone="xmlSecTransformPushBin"><primary sortas="xmlSecTransformPushBin">xmlSecTransformPushBin</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformPushBin              (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="int">int</link> final,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
-<para>
-Process binary <parameter>data</parameter> and pushes results to next transform.</para>
+<indexterm zone="xmlSecTransformPushBin"><primary>xmlSecTransformPushBin</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformPushBin              (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> final</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
+Process binary <parameter>data</parameter> and pushes results to next transform.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the input binary data,
+<listitem><simpara>the input binary data,
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the input data size.
+<listitem><simpara>the input data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>final</parameter>&#160;:</term>
-<listitem><simpara>              the flag: if set to 1 then it's the last
+<listitem><simpara>the flag: if set to 1 then it's the last
                      data chunk.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to transform context object.
+<listitem><simpara>the pointer to transform context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformPopBin" role="function">
 <title>xmlSecTransformPopBin ()</title>
-<indexterm zone="xmlSecTransformPopBin"><primary sortas="xmlSecTransformPopBin">xmlSecTransformPopBin</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformPopBin               (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> maxDataSize,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> *dataSize,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformPopBin"><primary>xmlSecTransformPopBin</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformPopBin               (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> maxDataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> *dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 Pops data from previous transform in the chain, processes data and
 returns result in the <parameter>data</parameter> buffer. The size of returned data is
-placed in the <parameter>dataSize</parameter>.</para>
-<para>
+placed in the <parameter>dataSize</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the buffer to store result data.
+<listitem><simpara>the buffer to store result data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>maxDataSize</parameter>&#160;:</term>
-<listitem><simpara>        the size of the buffer <link linkend="data"><type>data</type></link>.
+<listitem><simpara>the size of the buffer <link linkend="data"><type>data</type></link>.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the pointer to returned data size.
+<listitem><simpara>the pointer to returned data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to transform context object.
+<listitem><simpara>the pointer to transform context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformPushXml" role="function">
 <title>xmlSecTransformPushXml ()</title>
-<indexterm zone="xmlSecTransformPushXml"><primary sortas="xmlSecTransformPushXml">xmlSecTransformPushXml</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformPushXml              (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
-<para>
-Processes <parameter>nodes</parameter> and pushes result to the next transform in the chain.</para>
+<indexterm zone="xmlSecTransformPushXml"><primary>xmlSecTransformPushXml</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformPushXml              (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nodes</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
+Processes <parameter>nodes</parameter> and pushes result to the next transform in the chain.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nodes</parameter>&#160;:</term>
-<listitem><simpara>              the input nodes.
+<listitem><simpara>the input nodes.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to transform context object.
+<listitem><simpara>the pointer to transform context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformPopXml" role="function">
 <title>xmlSecTransformPopXml ()</title>
-<indexterm zone="xmlSecTransformPopXml"><primary sortas="xmlSecTransformPopXml">xmlSecTransformPopXml</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformPopXml               (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> *nodes,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformPopXml"><primary>xmlSecTransformPopXml</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformPopXml               (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> *nodes</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 Pops data from previous transform in the chain, processes the data and
-returns result in <parameter>nodes</parameter>.</para>
-<para>
+returns result in <parameter>nodes</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nodes</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to store popinter to result nodes.
+<listitem><simpara>the pointer to store popinter to result nodes.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to transform context object.
+<listitem><simpara>the pointer to transform context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformExecute" role="function">
 <title>xmlSecTransformExecute ()</title>
-<indexterm zone="xmlSecTransformExecute"><primary sortas="xmlSecTransformExecute">xmlSecTransformExecute</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformExecute              (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="int">int</link> last,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
-<para>
-Executes transform (used by default popBin/pushBin/popXml/pushXml methods).</para>
+<indexterm zone="xmlSecTransformExecute"><primary>xmlSecTransformExecute</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformExecute              (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> last</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
+Executes transform (used by default popBin/pushBin/popXml/pushXml methods).
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform.
+<listitem><simpara>the pointer to transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>last</parameter>&#160;:</term>
-<listitem><simpara>               the flag: if set to 1 then it's the last data chunk.
+<listitem><simpara>the flag: if set to 1 then it's the last data chunk.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>       the transform's chaing processing context.
+<listitem><simpara>the transform's chaing processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformDebugDump" role="function">
 <title>xmlSecTransformDebugDump ()</title>
-<indexterm zone="xmlSecTransformDebugDump"><primary sortas="xmlSecTransformDebugDump">xmlSecTransformDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformDebugDump            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints transform's debug information to <parameter>output</parameter>.</para>
+<indexterm zone="xmlSecTransformDebugDump"><primary>xmlSecTransformDebugDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecTransformDebugDump            (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints transform's debug information to <parameter>output</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform.
+<listitem><simpara>the pointer to transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformDebugXmlDump" role="function">
 <title>xmlSecTransformDebugXmlDump ()</title>
-<indexterm zone="xmlSecTransformDebugXmlDump"><primary sortas="xmlSecTransformDebugXmlDump">xmlSecTransformDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformDebugXmlDump         (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints transform's debug information to <parameter>output</parameter> in XML format.</para>
+<indexterm zone="xmlSecTransformDebugXmlDump"><primary>xmlSecTransformDebugXmlDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecTransformDebugXmlDump         (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints transform's debug information to <parameter>output</parameter> in XML format.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform.
+<listitem><simpara>the pointer to transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformGetName" role="macro">
 <title>xmlSecTransformGetName()</title>
-<indexterm zone="xmlSecTransformGetName"><primary sortas="xmlSecTransformGetName">xmlSecTransformGetName</primary></indexterm><programlisting>#define             xmlSecTransformGetName(transform)</programlisting>
-<para>
-Macro. Returns transform name.</para>
+<indexterm zone="xmlSecTransformGetName"><primary>xmlSecTransformGetName</primary></indexterm>
+<programlisting>#define             xmlSecTransformGetName(transform)</programlisting>
 <para>
+Macro. Returns transform name.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform.
+<listitem><simpara>the pointer to transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformIsValid" role="macro">
 <title>xmlSecTransformIsValid()</title>
-<indexterm zone="xmlSecTransformIsValid"><primary sortas="xmlSecTransformIsValid">xmlSecTransformIsValid</primary></indexterm><programlisting>#define             xmlSecTransformIsValid(transform)</programlisting>
-<para>
-Macro. Returns 1 if the <parameter>transform</parameter> is valid or 0 otherwise.</para>
+<indexterm zone="xmlSecTransformIsValid"><primary>xmlSecTransformIsValid</primary></indexterm>
+<programlisting>#define             xmlSecTransformIsValid(transform)</programlisting>
 <para>
+Macro. Returns 1 if the <parameter>transform</parameter> is valid or 0 otherwise.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform.
+<listitem><simpara>the pointer to transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCheckType" role="macro">
 <title>xmlSecTransformCheckType()</title>
-<indexterm zone="xmlSecTransformCheckType"><primary sortas="xmlSecTransformCheckType">xmlSecTransformCheckType</primary></indexterm><programlisting>#define             xmlSecTransformCheckType(transform, t)</programlisting>
+<indexterm zone="xmlSecTransformCheckType"><primary>xmlSecTransformCheckType</primary></indexterm>
+<programlisting>#define             xmlSecTransformCheckType(transform, t)</programlisting>
 <para>
 Macro. Returns 1 if the <parameter>transform</parameter> is valid and has specified type <parameter>t</parameter>
-or 0 otherwise.</para>
-<para>
+or 0 otherwise.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform.
+<listitem><simpara>the pointer to transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>t</parameter>&#160;:</term>
-<listitem><simpara>                  the transform type.
+<listitem><simpara>the transform type.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCheckId" role="macro">
 <title>xmlSecTransformCheckId()</title>
-<indexterm zone="xmlSecTransformCheckId"><primary sortas="xmlSecTransformCheckId">xmlSecTransformCheckId</primary></indexterm><programlisting>#define             xmlSecTransformCheckId(transform, i)</programlisting>
+<indexterm zone="xmlSecTransformCheckId"><primary>xmlSecTransformCheckId</primary></indexterm>
+<programlisting>#define             xmlSecTransformCheckId(transform, i)</programlisting>
 <para>
 Macro. Returns 1 if the <parameter>transform</parameter> is valid and has specified id <parameter>i</parameter>
-or 0 otherwise.</para>
-<para>
+or 0 otherwise.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform.
+<listitem><simpara>the pointer to transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>i</parameter>&#160;:</term>
-<listitem><simpara>                  the transform id.
+<listitem><simpara>the transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCheckSize" role="macro">
 <title>xmlSecTransformCheckSize()</title>
-<indexterm zone="xmlSecTransformCheckSize"><primary sortas="xmlSecTransformCheckSize">xmlSecTransformCheckSize</primary></indexterm><programlisting>#define             xmlSecTransformCheckSize(transform, size)</programlisting>
+<indexterm zone="xmlSecTransformCheckSize"><primary>xmlSecTransformCheckSize</primary></indexterm>
+<programlisting>#define             xmlSecTransformCheckSize(transform, size)</programlisting>
 <para>
 Macro. Returns 1 if the <parameter>transform</parameter> is valid and has at least <parameter>size</parameter>
-bytes or 0 otherwise.</para>
-<para>
+bytes or 0 otherwise.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform.
+<listitem><simpara>the pointer to transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the transform object size.
+<listitem><simpara>the transform object size.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformConnect" role="function">
 <title>xmlSecTransformConnect ()</title>
-<indexterm zone="xmlSecTransformConnect"><primary sortas="xmlSecTransformConnect">xmlSecTransformConnect</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformConnect              (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> left,
-                                                         <link linkend="xmlSecTransform">xmlSecTransformPtr</link> right,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformConnect"><primary>xmlSecTransformConnect</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformConnect              (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> left</parameter>,
+                                                         <parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> right</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 If the data object is a node-set and the next transform requires octets,
 the signature application MUST attempt to convert the node-set to an octet
@@ -1660,480 +1629,480 @@ identified by a barename XPointer in the Reference URI, and its content
 consists solely of base64 encoded character data, then this transform
 automatically strips away the start and end tags of the identified element
 and any of its descendant elements as well as any descendant comments and
-processing instructions. The output of this transform is an octet stream.</para>
-<para>
+processing instructions. The output of this transform is an octet stream.
 </para><variablelist role="params">
 <varlistentry><term><parameter>left</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to left (prev) transform.
+<listitem><simpara>the pointer to left (prev) transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>right</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to right (next) transform.
+<listitem><simpara>the pointer to right (next) transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>       the transform's chaing processing context.
+<listitem><simpara>the transform's chaing processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformRemove" role="function">
 <title>xmlSecTransformRemove ()</title>
-<indexterm zone="xmlSecTransformRemove"><primary sortas="xmlSecTransformRemove">xmlSecTransformRemove</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformRemove               (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
-<para>
-Removes <parameter>transform</parameter> from the chain.</para>
+<indexterm zone="xmlSecTransformRemove"><primary>xmlSecTransformRemove</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecTransformRemove               (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>);</programlisting>
 <para>
+Removes <parameter>transform</parameter> from the chain.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara> the pointer to <link linkend="xmlSecTransform"><type>xmlSecTransform</type></link> structure.
+<listitem><simpara>the pointer to <link linkend="xmlSecTransform"><type>xmlSecTransform</type></link> structure.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformDefaultGetDataType" role="function">
 <title>xmlSecTransformDefaultGetDataType ()</title>
-<indexterm zone="xmlSecTransformDefaultGetDataType"><primary sortas="xmlSecTransformDefaultGetDataType">xmlSecTransformDefaultGetDataType</primary></indexterm><programlisting><link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link>  xmlSecTransformDefaultGetDataType
-                                                        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecTransformMode">xmlSecTransformMode</link> mode,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformDefaultGetDataType"><primary>xmlSecTransformDefaultGetDataType</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformDataType"><returnvalue>xmlSecTransformDataType</returnvalue></link>  xmlSecTransformDefaultGetDataType
+                                                        (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformMode"><type>xmlSecTransformMode</type></link> mode</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 Gets transform input (<parameter>mode</parameter> is "push") or output (<parameter>mode</parameter> is "pop") data
 type (binary or XML) by analyzing available pushBin/popBin/pushXml/popXml
-methods.</para>
-<para>
+methods.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform.
+<listitem><simpara>the pointer to transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>mode</parameter>&#160;:</term>
-<listitem><simpara>               the data mode (push or pop).
+<listitem><simpara>the data mode (push or pop).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>       the transform's chaing processing context.
+<listitem><simpara>the transform's chaing processing context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the transform's data type for the <parameter>mode</parameter> operation.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformDefaultPushBin" role="function">
 <title>xmlSecTransformDefaultPushBin ()</title>
-<indexterm zone="xmlSecTransformDefaultPushBin"><primary sortas="xmlSecTransformDefaultPushBin">xmlSecTransformDefaultPushBin</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformDefaultPushBin       (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="int">int</link> final,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformDefaultPushBin"><primary>xmlSecTransformDefaultPushBin</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformDefaultPushBin       (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> final</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 Process binary <parameter>data</parameter> by calling transform's execute method and pushes
-results to next transform.</para>
-<para>
+results to next transform.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the input binary data,
+<listitem><simpara>the input binary data,
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the input data size.
+<listitem><simpara>the input data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>final</parameter>&#160;:</term>
-<listitem><simpara>              the flag: if set to 1 then it's the last
+<listitem><simpara>the flag: if set to 1 then it's the last
                      data chunk.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to transform context object.
+<listitem><simpara>the pointer to transform context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformDefaultPopBin" role="function">
 <title>xmlSecTransformDefaultPopBin ()</title>
-<indexterm zone="xmlSecTransformDefaultPopBin"><primary sortas="xmlSecTransformDefaultPopBin">xmlSecTransformDefaultPopBin</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformDefaultPopBin        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> maxDataSize,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> *dataSize,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformDefaultPopBin"><primary>xmlSecTransformDefaultPopBin</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformDefaultPopBin        (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> maxDataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> *dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 Pops data from previous transform in the chain, processes data by calling
 transform's execute method and returns result in the <parameter>data</parameter> buffer. The
-size of returned data is placed in the <parameter>dataSize</parameter>.</para>
-<para>
+size of returned data is placed in the <parameter>dataSize</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>               the buffer to store result data.
+<listitem><simpara>the buffer to store result data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>maxDataSize</parameter>&#160;:</term>
-<listitem><simpara>        the size of the buffer <link linkend="data"><type>data</type></link>.
+<listitem><simpara>the size of the buffer <link linkend="data"><type>data</type></link>.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the pointer to returned data size.
+<listitem><simpara>the pointer to returned data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to transform context object.
+<listitem><simpara>the pointer to transform context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformDefaultPushXml" role="function">
 <title>xmlSecTransformDefaultPushXml ()</title>
-<indexterm zone="xmlSecTransformDefaultPushXml"><primary sortas="xmlSecTransformDefaultPushXml">xmlSecTransformDefaultPushXml</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformDefaultPushXml       (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformDefaultPushXml"><primary>xmlSecTransformDefaultPushXml</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformDefaultPushXml       (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nodes</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 Processes <parameter>nodes</parameter> by calling transform's execute method and pushes
-result to the next transform in the chain.</para>
-<para>
+result to the next transform in the chain.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nodes</parameter>&#160;:</term>
-<listitem><simpara>              the input nodes.
+<listitem><simpara>the input nodes.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to transform context object.
+<listitem><simpara>the pointer to transform context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformDefaultPopXml" role="function">
 <title>xmlSecTransformDefaultPopXml ()</title>
-<indexterm zone="xmlSecTransformDefaultPopXml"><primary sortas="xmlSecTransformDefaultPopXml">xmlSecTransformDefaultPopXml</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformDefaultPopXml        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> *nodes,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformDefaultPopXml"><primary>xmlSecTransformDefaultPopXml</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformDefaultPopXml        (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> *nodes</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 Pops data from previous transform in the chain, processes the data
-by calling transform's execute method and returns result in <parameter>nodes</parameter>.</para>
-<para>
+by calling transform's execute method and returns result in <parameter>nodes</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nodes</parameter>&#160;:</term>
-<listitem><simpara>              the pointer to store popinter to result nodes.
+<listitem><simpara>the pointer to store popinter to result nodes.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to transform context object.
+<listitem><simpara>the pointer to transform context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCreateOutputBuffer" role="function">
 <title>xmlSecTransformCreateOutputBuffer ()</title>
-<indexterm zone="xmlSecTransformCreateOutputBuffer"><primary sortas="xmlSecTransformCreateOutputBuffer">xmlSecTransformCreateOutputBuffer</primary></indexterm><programlisting><link linkend="xmlOutputBufferPtr">xmlOutputBufferPtr</link>  xmlSecTransformCreateOutputBuffer   (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
-<para>
-Creates output buffer to write data to <parameter>transform</parameter>.</para>
+<indexterm zone="xmlSecTransformCreateOutputBuffer"><primary>xmlSecTransformCreateOutputBuffer</primary></indexterm>
+<programlisting><link linkend="xmlOutputBufferPtr"><returnvalue>xmlOutputBufferPtr</returnvalue></link>  xmlSecTransformCreateOutputBuffer   (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
+Creates output buffer to write data to <parameter>transform</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform.
+<listitem><simpara>the pointer to transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to transform context object.
+<listitem><simpara>the pointer to transform context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to new output buffer or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformCreateInputBuffer" role="function">
 <title>xmlSecTransformCreateInputBuffer ()</title>
-<indexterm zone="xmlSecTransformCreateInputBuffer"><primary sortas="xmlSecTransformCreateInputBuffer">xmlSecTransformCreateInputBuffer</primary></indexterm><programlisting><link linkend="xmlParserInputBuffer">xmlParserInputBufferPtr</link>  xmlSecTransformCreateInputBuffer
-                                                        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
-<para>
-Creates input buffer to read data from <parameter>transform</parameter>.</para>
+<indexterm zone="xmlSecTransformCreateInputBuffer"><primary>xmlSecTransformCreateInputBuffer</primary></indexterm>
+<programlisting><link linkend="xmlParserInputBuffer"><returnvalue>xmlParserInputBufferPtr</returnvalue></link>  xmlSecTransformCreateInputBuffer
+                                                        (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
+Creates input buffer to read data from <parameter>transform</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to transform.
+<listitem><simpara>the pointer to transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>       the pointer to transform context object.
+<listitem><simpara>the pointer to transform context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to new input buffer or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformInitializeMethod" role="function">
 <title>xmlSecTransformInitializeMethod ()</title>
-<indexterm zone="xmlSecTransformInitializeMethod"><primary sortas="xmlSecTransformInitializeMethod">xmlSecTransformInitializeMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformInitializeMethod)  (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
-<para>
-The transform specific initialization method.</para>
+<indexterm zone="xmlSecTransformInitializeMethod"><primary>xmlSecTransformInitializeMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecTransformInitializeMethod)  (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>);</programlisting>
 <para>
+The transform specific initialization method.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>                  the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformFinalizeMethod" role="function">
 <title>xmlSecTransformFinalizeMethod ()</title>
-<indexterm zone="xmlSecTransformFinalizeMethod"><primary sortas="xmlSecTransformFinalizeMethod">xmlSecTransformFinalizeMethod</primary></indexterm><programlisting><link linkend="void">void</link>                (*xmlSecTransformFinalizeMethod)    (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
-<para>
-The transform specific destroy method.</para>
+<indexterm zone="xmlSecTransformFinalizeMethod"><primary>xmlSecTransformFinalizeMethod</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                (*xmlSecTransformFinalizeMethod)    (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>);</programlisting>
 <para>
+The transform specific destroy method.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>                  the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformGetDataTypeMethod" role="function">
 <title>xmlSecTransformGetDataTypeMethod ()</title>
-<indexterm zone="xmlSecTransformGetDataTypeMethod"><primary sortas="xmlSecTransformGetDataTypeMethod">xmlSecTransformGetDataTypeMethod</primary></indexterm><programlisting><link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link>  (*xmlSecTransformGetDataTypeMethod)
-                                                        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecTransformMode">xmlSecTransformMode</link> mode,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformGetDataTypeMethod"><primary>xmlSecTransformGetDataTypeMethod</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformDataType"><returnvalue>xmlSecTransformDataType</returnvalue></link>  (*xmlSecTransformGetDataTypeMethod)
+                                                        (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformMode"><type>xmlSecTransformMode</type></link> mode</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 The transform specific method to query information about transform
-data type in specified mode <parameter>mode</parameter>.</para>
-<para>
+data type in specified mode <parameter>mode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>                  the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>mode</parameter>&#160;:</term>
-<listitem><simpara>                       the mode.
+<listitem><simpara>the mode.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to transform context object.
+<listitem><simpara>the pointer to transform context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> transform data type.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformNodeReadMethod" role="function">
 <title>xmlSecTransformNodeReadMethod ()</title>
-<indexterm zone="xmlSecTransformNodeReadMethod"><primary sortas="xmlSecTransformNodeReadMethod">xmlSecTransformNodeReadMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformNodeReadMethod)    (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformNodeReadMethod"><primary>xmlSecTransformNodeReadMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecTransformNodeReadMethod)    (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 The transform specific method to read the transform data from
-the <parameter>node</parameter>.</para>
-<para>
+the <parameter>node</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>                  the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>                       the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>               the pointer to transform context object.
+<listitem><simpara>the pointer to transform context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformNodeWriteMethod" role="function">
 <title>xmlSecTransformNodeWriteMethod ()</title>
-<indexterm zone="xmlSecTransformNodeWriteMethod"><primary sortas="xmlSecTransformNodeWriteMethod">xmlSecTransformNodeWriteMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformNodeWriteMethod)   (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
-<para>
-The transform specific method to write transform information to an XML node <parameter>node</parameter>.</para>
+<indexterm zone="xmlSecTransformNodeWriteMethod"><primary>xmlSecTransformNodeWriteMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecTransformNodeWriteMethod)   (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
+The transform specific method to write transform information to an XML node <parameter>node</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>                  the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>                       the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>               the pointer to transform context object.
+<listitem><simpara>the pointer to transform context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformSetKeyRequirementsMethod" role="function">
 <title>xmlSecTransformSetKeyRequirementsMethod ()</title>
-<indexterm zone="xmlSecTransformSetKeyRequirementsMethod"><primary sortas="xmlSecTransformSetKeyRequirementsMethod">xmlSecTransformSetKeyRequirementsMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformSetKeyRequirementsMethod)
-                                                        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);</programlisting>
-<para>
-Transform specific method to set transform's key requirements.</para>
+<indexterm zone="xmlSecTransformSetKeyRequirementsMethod"><primary>xmlSecTransformSetKeyRequirementsMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecTransformSetKeyRequirementsMethod)
+                                                        (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyReq"><type>xmlSecKeyReqPtr</type></link> keyReq</parameter>);</programlisting>
 <para>
+Transform specific method to set transform's key requirements.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>                  the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyReq</parameter>&#160;:</term>
-<listitem><simpara>                     the pointer to key requirements structure.
+<listitem><simpara>the pointer to key requirements structure.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformSetKeyMethod" role="function">
 <title>xmlSecTransformSetKeyMethod ()</title>
-<indexterm zone="xmlSecTransformSetKeyMethod"><primary sortas="xmlSecTransformSetKeyMethod">xmlSecTransformSetKeyMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformSetKeyMethod)      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
-<para>
-The transform specific method to set the key for use.</para>
+<indexterm zone="xmlSecTransformSetKeyMethod"><primary>xmlSecTransformSetKeyMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecTransformSetKeyMethod)      (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link> key</parameter>);</programlisting>
 <para>
+The transform specific method to set the key for use.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>                  the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>                        the pointer to key.
+<listitem><simpara>the pointer to key.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformVerifyMethod" role="function">
 <title>xmlSecTransformVerifyMethod ()</title>
-<indexterm zone="xmlSecTransformVerifyMethod"><primary sortas="xmlSecTransformVerifyMethod">xmlSecTransformVerifyMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformVerifyMethod)      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformVerifyMethod"><primary>xmlSecTransformVerifyMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecTransformVerifyMethod)      (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 The transform specific method to verify transform processing results
 (used by digest and signature transforms). This method sets <parameter>status</parameter>
 member of the <link linkend="xmlSecTransform"><type>xmlSecTransform</type></link> structure to either <link linkend="xmlSecTransformStatusOk"><type>xmlSecTransformStatusOk</type></link>
-if verification succeeded or <link linkend="xmlSecTransformStatusFail"><type>xmlSecTransformStatusFail</type></link> otherwise.</para>
-<para>
+if verification succeeded or <link linkend="xmlSecTransformStatusFail"><type>xmlSecTransformStatusFail</type></link> otherwise.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>                  the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>                       the input buffer.
+<listitem><simpara>the input buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>                   the size of input buffer <parameter>data</parameter>.
+<listitem><simpara>the size of input buffer <parameter>data</parameter>.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to transform context object.
+<listitem><simpara>the pointer to transform context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformPushBinMethod" role="function">
 <title>xmlSecTransformPushBinMethod ()</title>
-<indexterm zone="xmlSecTransformPushBinMethod"><primary sortas="xmlSecTransformPushBinMethod">xmlSecTransformPushBinMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformPushBinMethod)     (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                                         <link linkend="int">int</link> final,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformPushBinMethod"><primary>xmlSecTransformPushBinMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecTransformPushBinMethod)     (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> final</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 The transform specific method to process data from <parameter>data</parameter> and push
-result to the next transform in the chain.</para>
-<para>
+result to the next transform in the chain.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>                  the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>                       the input binary data,
+<listitem><simpara>the input binary data,
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>                   the input data size.
+<listitem><simpara>the input data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>final</parameter>&#160;:</term>
-<listitem><simpara>                      the flag: if set to 1 then it's the last
+<listitem><simpara>the flag: if set to 1 then it's the last
                              data chunk.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to transform context object.
+<listitem><simpara>the pointer to transform context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformPopBinMethod" role="function">
 <title>xmlSecTransformPopBinMethod ()</title>
-<indexterm zone="xmlSecTransformPopBinMethod"><primary sortas="xmlSecTransformPopBinMethod">xmlSecTransformPopBinMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformPopBinMethod)      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> maxDataSize,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> *dataSize,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformPopBinMethod"><primary>xmlSecTransformPopBinMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecTransformPopBinMethod)      (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> maxDataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> *dataSize</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 The transform specific method to pop data from previous transform
 in the chain and return result in the <parameter>data</parameter> buffer. The size of returned
-data is placed in the <parameter>dataSize</parameter>.</para>
-<para>
+data is placed in the <parameter>dataSize</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>                  the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>                       the buffer to store result data.
+<listitem><simpara>the buffer to store result data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>maxDataSize</parameter>&#160;:</term>
-<listitem><simpara>                the size of the buffer <parameter>data</parameter>.
+<listitem><simpara>the size of the buffer <parameter>data</parameter>.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>                   the pointer to returned data size.
+<listitem><simpara>the pointer to returned data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to transform context object.
+<listitem><simpara>the pointer to transform context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformPushXmlMethod" role="function">
 <title>xmlSecTransformPushXmlMethod ()</title>
-<indexterm zone="xmlSecTransformPushXmlMethod"><primary sortas="xmlSecTransformPushXmlMethod">xmlSecTransformPushXmlMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformPushXmlMethod)     (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformPushXmlMethod"><primary>xmlSecTransformPushXmlMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecTransformPushXmlMethod)     (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> nodes</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 The transform specific method to process <parameter>nodes</parameter> and push result to the next
-transform in the chain.</para>
-<para>
+transform in the chain.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>                  the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nodes</parameter>&#160;:</term>
-<listitem><simpara>                      the input nodes.
+<listitem><simpara>the input nodes.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to transform context object.
+<listitem><simpara>the pointer to transform context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformPopXmlMethod" role="function">
 <title>xmlSecTransformPopXmlMethod ()</title>
-<indexterm zone="xmlSecTransformPopXmlMethod"><primary sortas="xmlSecTransformPopXmlMethod">xmlSecTransformPopXmlMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformPopXmlMethod)      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> *nodes,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<indexterm zone="xmlSecTransformPopXmlMethod"><primary>xmlSecTransformPopXmlMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecTransformPopXmlMethod)      (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSet"><type>xmlSecNodeSetPtr</type></link> *nodes</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
 The transform specific method to pop data from previous transform in the chain,
-process the data and return result in <parameter>nodes</parameter>.</para>
-<para>
+process the data and return result in <parameter>nodes</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>                  the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nodes</parameter>&#160;:</term>
-<listitem><simpara>                      the pointer to store popinter to result nodes.
+<listitem><simpara>the pointer to store popinter to result nodes.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to transform context object.
+<listitem><simpara>the pointer to transform context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformExecuteMethod" role="function">
 <title>xmlSecTransformExecuteMethod ()</title>
-<indexterm zone="xmlSecTransformExecuteMethod"><primary sortas="xmlSecTransformExecuteMethod">xmlSecTransformExecuteMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformExecuteMethod)     (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="int">int</link> last,
-                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
-<para>
-Transform specific method to process a chunk of data.</para>
+<indexterm zone="xmlSecTransformExecuteMethod"><primary>xmlSecTransformExecuteMethod</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 (*xmlSecTransformExecuteMethod)     (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> last</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtxPtr</type></link> transformCtx</parameter>);</programlisting>
 <para>
+Transform specific method to process a chunk of data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>                  the pointer to transform object.
+<listitem><simpara>the pointer to transform object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>last</parameter>&#160;:</term>
-<listitem><simpara>                       the flag: if set to 1 then it's the last data chunk.
+<listitem><simpara>the flag: if set to 1 then it's the last data chunk.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to transform context object.
+<listitem><simpara>the pointer to transform context object.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformKlass" role="struct">
 <title>struct xmlSecTransformKlass</title>
-<indexterm zone="xmlSecTransformKlass"><primary sortas="xmlSecTransformKlass">xmlSecTransformKlass</primary></indexterm><programlisting>struct xmlSecTransformKlass {
+<indexterm zone="xmlSecTransformKlass"><primary>xmlSecTransformKlass</primary></indexterm>
+<programlisting>struct xmlSecTransformKlass {
     /* data */
     xmlSecSize                          klassSize;
     xmlSecSize                          objSize;
@@ -2167,153 +2136,132 @@ Transform specific method to process a chunk of data.</para>
 };
 </programlisting>
 <para>
-The transform klass desccription structure.</para>
-<para>
+The transform klass desccription structure.
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>klassSize</structfield>;</term>
-<listitem><simpara>                  the transform klass structure size.
+<varlistentry><term><link linkend="xmlSecSize"><type>xmlSecSize</type></link>&#160;<structfield id="xmlSecTransformKlass.klassSize">klassSize</structfield>;</term>
+<listitem><simpara>the transform klass structure size.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>objSize</structfield>;</term>
-<listitem><simpara>                    the transform object size.
+<varlistentry><term><link linkend="xmlSecSize"><type>xmlSecSize</type></link>&#160;<structfield id="xmlSecTransformKlass.objSize">objSize</structfield>;</term>
+<listitem><simpara>the transform object size.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>name</structfield>;</term>
-<listitem><simpara>                       the transform's name.
+<varlistentry><term>const&#160;<link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecTransformKlass.name">name</structfield>;</term>
+<listitem><simpara>the transform's name.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>href</structfield>;</term>
-<listitem><simpara>                       the transform's identification string (href).
+<varlistentry><term>const&#160;<link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecTransformKlass.href">href</structfield>;</term>
+<listitem><simpara>the transform's identification string (href).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link>&#160;<structfield>usage</structfield>;</term>
-<listitem><simpara>                      the allowed transforms usages.
+<varlistentry><term><link linkend="xmlSecTransformUsage"><type>xmlSecTransformUsage</type></link>&#160;<structfield id="xmlSecTransformKlass.usage">usage</structfield>;</term>
+<listitem><simpara>the allowed transforms usages.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformInitializeMethod">xmlSecTransformInitializeMethod</link>&#160;<structfield>initialize</structfield>;</term>
-<listitem><simpara>                 the initialization method.
+<varlistentry><term><link linkend="xmlSecTransformInitializeMethod"><type>xmlSecTransformInitializeMethod</type></link>&#160;<structfield id="xmlSecTransformKlass.initialize">initialize</structfield>;</term>
+<listitem><simpara>the initialization method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformFinalizeMethod">xmlSecTransformFinalizeMethod</link>&#160;<structfield>finalize</structfield>;</term>
-<listitem><simpara>                   the finmalization (destroy) function.
+<varlistentry><term><link linkend="xmlSecTransformFinalizeMethod"><type>xmlSecTransformFinalizeMethod</type></link>&#160;<structfield id="xmlSecTransformKlass.finalize">finalize</structfield>;</term>
+<listitem><simpara>the finmalization (destroy) function.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformNodeReadMethod">xmlSecTransformNodeReadMethod</link>&#160;<structfield>readNode</structfield>;</term>
-<listitem><simpara>                   the XML node read method.
+<varlistentry><term><link linkend="xmlSecTransformNodeReadMethod"><type>xmlSecTransformNodeReadMethod</type></link>&#160;<structfield id="xmlSecTransformKlass.readNode">readNode</structfield>;</term>
+<listitem><simpara>the XML node read method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformNodeWriteMethod">xmlSecTransformNodeWriteMethod</link>&#160;<structfield>writeNode</structfield>;</term>
-<listitem><simpara>                  the XML node write method.
+<varlistentry><term><link linkend="xmlSecTransformNodeWriteMethod"><type>xmlSecTransformNodeWriteMethod</type></link>&#160;<structfield id="xmlSecTransformKlass.writeNode">writeNode</structfield>;</term>
+<listitem><simpara>the XML node write method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformSetKeyRequirementsMethod">xmlSecTransformSetKeyRequirementsMethod</link>&#160;<structfield>setKeyReq</structfield>;</term>
-<listitem><simpara>                  the set key requirements method.
+<varlistentry><term><link linkend="xmlSecTransformSetKeyRequirementsMethod"><type>xmlSecTransformSetKeyRequirementsMethod</type></link>&#160;<structfield id="xmlSecTransformKlass.setKeyReq">setKeyReq</structfield>;</term>
+<listitem><simpara>the set key requirements method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformSetKeyMethod">xmlSecTransformSetKeyMethod</link>&#160;<structfield>setKey</structfield>;</term>
-<listitem><simpara>                     the set key method.
+<varlistentry><term><link linkend="xmlSecTransformSetKeyMethod"><type>xmlSecTransformSetKeyMethod</type></link>&#160;<structfield id="xmlSecTransformKlass.setKey">setKey</structfield>;</term>
+<listitem><simpara>the set key method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformVerifyMethod">xmlSecTransformVerifyMethod</link>&#160;<structfield>verify</structfield>;</term>
-<listitem><simpara>                     the verify method (for digest and signature transforms).
+<varlistentry><term><link linkend="xmlSecTransformVerifyMethod"><type>xmlSecTransformVerifyMethod</type></link>&#160;<structfield id="xmlSecTransformKlass.verify">verify</structfield>;</term>
+<listitem><simpara>the verify method (for digest and signature transforms).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformGetDataTypeMethod">xmlSecTransformGetDataTypeMethod</link>&#160;<structfield>getDataType</structfield>;</term>
-<listitem><simpara>                the input/output data type query method.
+<varlistentry><term><link linkend="xmlSecTransformGetDataTypeMethod"><type>xmlSecTransformGetDataTypeMethod</type></link>&#160;<structfield id="xmlSecTransformKlass.getDataType">getDataType</structfield>;</term>
+<listitem><simpara>the input/output data type query method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformPushBinMethod">xmlSecTransformPushBinMethod</link>&#160;<structfield>pushBin</structfield>;</term>
-<listitem><simpara>                    the binary data "push thru chain" processing method.
+<varlistentry><term><link linkend="xmlSecTransformPushBinMethod"><type>xmlSecTransformPushBinMethod</type></link>&#160;<structfield id="xmlSecTransformKlass.pushBin">pushBin</structfield>;</term>
+<listitem><simpara>the binary data "push thru chain" processing method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformPopBinMethod">xmlSecTransformPopBinMethod</link>&#160;<structfield>popBin</structfield>;</term>
-<listitem><simpara>                     the binary data "pop from chain" procesing method.
+<varlistentry><term><link linkend="xmlSecTransformPopBinMethod"><type>xmlSecTransformPopBinMethod</type></link>&#160;<structfield id="xmlSecTransformKlass.popBin">popBin</structfield>;</term>
+<listitem><simpara>the binary data "pop from chain" procesing method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformPushXmlMethod">xmlSecTransformPushXmlMethod</link>&#160;<structfield>pushXml</structfield>;</term>
-<listitem><simpara>                    the XML data "push thru chain" processing method.
+<varlistentry><term><link linkend="xmlSecTransformPushXmlMethod"><type>xmlSecTransformPushXmlMethod</type></link>&#160;<structfield id="xmlSecTransformKlass.pushXml">pushXml</structfield>;</term>
+<listitem><simpara>the XML data "push thru chain" processing method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformPopXmlMethod">xmlSecTransformPopXmlMethod</link>&#160;<structfield>popXml</structfield>;</term>
-<listitem><simpara>                     the XML data "pop from chain" procesing method.
+<varlistentry><term><link linkend="xmlSecTransformPopXmlMethod"><type>xmlSecTransformPopXmlMethod</type></link>&#160;<structfield id="xmlSecTransformKlass.popXml">popXml</structfield>;</term>
+<listitem><simpara>the XML data "pop from chain" procesing method.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformExecuteMethod">xmlSecTransformExecuteMethod</link>&#160;<structfield>execute</structfield>;</term>
-<listitem><simpara>                    the low level data processing method used  by default
+<varlistentry><term><link linkend="xmlSecTransformExecuteMethod"><type>xmlSecTransformExecuteMethod</type></link>&#160;<structfield id="xmlSecTransformKlass.execute">execute</structfield>;</term>
+<listitem><simpara>the low level data processing method used  by default
                              implementations of <parameter>pushBin</parameter>, <parameter>popBin</parameter>, <parameter>pushXml</parameter> and <parameter>popXml</parameter>.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
-<listitem><simpara>                  reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecTransformKlass.reserved0">reserved0</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
-<listitem><simpara>                  reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecTransformKlass.reserved1">reserved1</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformKlassGetName" role="macro">
 <title>xmlSecTransformKlassGetName()</title>
-<indexterm zone="xmlSecTransformKlassGetName"><primary sortas="xmlSecTransformKlassGetName">xmlSecTransformKlassGetName</primary></indexterm><programlisting>#define             xmlSecTransformKlassGetName(klass)</programlisting>
-<para>
-Macro. Returns transform klass name.</para>
+<indexterm zone="xmlSecTransformKlassGetName"><primary>xmlSecTransformKlassGetName</primary></indexterm>
+<programlisting>#define             xmlSecTransformKlassGetName(klass)</programlisting>
 <para>
+Macro. Returns transform klass name.
 </para><variablelist role="params">
 <varlistentry><term><parameter>klass</parameter>&#160;:</term>
-<listitem><simpara>              the transofrm's klass.
+<listitem><simpara>the transofrm's klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformIdListId" role="macro">
 <title>xmlSecTransformIdListId</title>
-<indexterm zone="xmlSecTransformIdListId"><primary sortas="xmlSecTransformIdListId">xmlSecTransformIdListId</primary></indexterm><programlisting>#define xmlSecTransformIdListId xmlSecTransformIdListGetKlass()
+<indexterm zone="xmlSecTransformIdListId"><primary>xmlSecTransformIdListId</primary></indexterm>
+<programlisting>#define xmlSecTransformIdListId xmlSecTransformIdListGetKlass()
 </programlisting>
 <para>
-Transform klasses list klass.</para>
-<para>
+Transform klasses list klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformIdListGetKlass" role="function">
 <title>xmlSecTransformIdListGetKlass ()</title>
-<indexterm zone="xmlSecTransformIdListGetKlass"><primary sortas="xmlSecTransformIdListGetKlass">xmlSecTransformIdListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     xmlSecTransformIdListGetKlass       (void);</programlisting>
-<para>
-The transform id list klass.</para>
+<indexterm zone="xmlSecTransformIdListGetKlass"><primary>xmlSecTransformIdListGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecPtrListId"><returnvalue>xmlSecPtrListId</returnvalue></link>     xmlSecTransformIdListGetKlass       (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The transform id list klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the transform id list klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformIdListFind" role="function">
 <title>xmlSecTransformIdListFind ()</title>
-<indexterm zone="xmlSecTransformIdListFind"><primary sortas="xmlSecTransformIdListFind">xmlSecTransformIdListFind</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformIdListFind           (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);</programlisting>
-<para>
-Lookups <parameter>dataId</parameter> in <parameter>list</parameter>.</para>
+<indexterm zone="xmlSecTransformIdListFind"><primary>xmlSecTransformIdListFind</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformIdListFind           (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> transformId</parameter>);</programlisting>
 <para>
+Lookups <parameter>dataId</parameter> in <parameter>list</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to transform ids list.
+<listitem><simpara>the pointer to transform ids list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>transformId</parameter>&#160;:</term>
-<listitem><simpara>        the transform klass.
+<listitem><simpara>the transform klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if <parameter>dataId</parameter> is found in the <parameter>list</parameter>, 0 if not and a negative
 value if an error occurs.
@@ -2321,242 +2269,243 @@ value if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformIdListFindByHref" role="function">
 <title>xmlSecTransformIdListFindByHref ()</title>
-<indexterm zone="xmlSecTransformIdListFindByHref"><primary sortas="xmlSecTransformIdListFindByHref">xmlSecTransformIdListFindByHref</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformIdListFindByHref     (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         const <link linkend="xmlChar">xmlChar</link> *href,
-                                                         <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);</programlisting>
-<para>
-Lookups data klass in the list with given <parameter>href</parameter> and <parameter>usage</parameter> in <parameter>list</parameter>.</para>
+<indexterm zone="xmlSecTransformIdListFindByHref"><primary>xmlSecTransformIdListFindByHref</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformIdListFindByHref     (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *href</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformUsage"><type>xmlSecTransformUsage</type></link> usage</parameter>);</programlisting>
 <para>
+Lookups data klass in the list with given <parameter>href</parameter> and <parameter>usage</parameter> in <parameter>list</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to transform ids list.
+<listitem><simpara>the pointer to transform ids list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>href</parameter>&#160;:</term>
-<listitem><simpara>               the desired transform klass href.
+<listitem><simpara>the desired transform klass href.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>usage</parameter>&#160;:</term>
-<listitem><simpara>              the desired transform usage.
+<listitem><simpara>the desired transform usage.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> transform klass is found and NULL otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformIdListFindByName" role="function">
 <title>xmlSecTransformIdListFindByName ()</title>
-<indexterm zone="xmlSecTransformIdListFindByName"><primary sortas="xmlSecTransformIdListFindByName">xmlSecTransformIdListFindByName</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformIdListFindByName     (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);</programlisting>
-<para>
-Lookups data klass in the list with given <parameter>name</parameter> and <parameter>usage</parameter> in <parameter>list</parameter>.</para>
+<indexterm zone="xmlSecTransformIdListFindByName"><primary>xmlSecTransformIdListFindByName</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformIdListFindByName     (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformUsage"><type>xmlSecTransformUsage</type></link> usage</parameter>);</programlisting>
 <para>
+Lookups data klass in the list with given <parameter>name</parameter> and <parameter>usage</parameter> in <parameter>list</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to transform ids list.
+<listitem><simpara>the pointer to transform ids list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>name</parameter>&#160;:</term>
-<listitem><simpara>               the desired transform klass name.
+<listitem><simpara>the desired transform klass name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>usage</parameter>&#160;:</term>
-<listitem><simpara>              the desired transform usage.
+<listitem><simpara>the desired transform usage.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> transform klass is found and NULL otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformIdListDebugDump" role="function">
 <title>xmlSecTransformIdListDebugDump ()</title>
-<indexterm zone="xmlSecTransformIdListDebugDump"><primary sortas="xmlSecTransformIdListDebugDump">xmlSecTransformIdListDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformIdListDebugDump      (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints binary transform debug information to <parameter>output</parameter>.</para>
+<indexterm zone="xmlSecTransformIdListDebugDump"><primary>xmlSecTransformIdListDebugDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecTransformIdListDebugDump      (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints binary transform debug information to <parameter>output</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to transform ids list.
+<listitem><simpara>the pointer to transform ids list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformIdListDebugXmlDump" role="function">
 <title>xmlSecTransformIdListDebugXmlDump ()</title>
-<indexterm zone="xmlSecTransformIdListDebugXmlDump"><primary sortas="xmlSecTransformIdListDebugXmlDump">xmlSecTransformIdListDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformIdListDebugXmlDump   (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints binary transform debug information to <parameter>output</parameter> in XML format.</para>
+<indexterm zone="xmlSecTransformIdListDebugXmlDump"><primary>xmlSecTransformIdListDebugXmlDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecTransformIdListDebugXmlDump   (<parameter><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link> list</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints binary transform debug information to <parameter>output</parameter> in XML format.
 </para><variablelist role="params">
 <varlistentry><term><parameter>list</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to transform ids list.
+<listitem><simpara>the pointer to transform ids list.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformIdUnknown" role="macro">
 <title>xmlSecTransformIdUnknown</title>
-<indexterm zone="xmlSecTransformIdUnknown"><primary sortas="xmlSecTransformIdUnknown">xmlSecTransformIdUnknown</primary></indexterm><programlisting>#define xmlSecTransformIdUnknown                        ((xmlSecTransformId)NULL)
+<indexterm zone="xmlSecTransformIdUnknown"><primary>xmlSecTransformIdUnknown</primary></indexterm>
+<programlisting>#define xmlSecTransformIdUnknown                        ((xmlSecTransformId)NULL)
 </programlisting>
 <para>
-The "unknown" transform id (NULL).</para>
-<para>
+The "unknown" transform id (NULL).
 </para></refsect2>
 <refsect2 id="xmlSecTransformBase64Id" role="macro">
 <title>xmlSecTransformBase64Id</title>
-<indexterm zone="xmlSecTransformBase64Id"><primary sortas="xmlSecTransformBase64Id">xmlSecTransformBase64Id</primary></indexterm><programlisting>#define             xmlSecTransformBase64Id</programlisting>
-<para>
-The base64 encode transform klass.</para>
+<indexterm zone="xmlSecTransformBase64Id"><primary>xmlSecTransformBase64Id</primary></indexterm>
+<programlisting>#define             xmlSecTransformBase64Id</programlisting>
 <para>
+The base64 encode transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformBase64GetKlass" role="function">
 <title>xmlSecTransformBase64GetKlass ()</title>
-<indexterm zone="xmlSecTransformBase64GetKlass"><primary sortas="xmlSecTransformBase64GetKlass">xmlSecTransformBase64GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformBase64GetKlass       (void);</programlisting>
+<indexterm zone="xmlSecTransformBase64GetKlass"><primary>xmlSecTransformBase64GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformBase64GetKlass       (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 The Base64 transform klass (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-Base-64"><type>sec-Base-64</type></link>).
 The normative specification for base64 decoding transforms is RFC 2045
 (http://www.ietf.org/rfc/rfc2045.txt). The base64 Transform element has
 no content. The input is decoded by the algorithms. This transform is
 useful if an application needs to sign the raw data associated with
-the encoded content of an element.</para>
-<para>
+the encoded content of an element.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> base64 transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformBase64SetLineSize" role="function">
 <title>xmlSecTransformBase64SetLineSize ()</title>
-<indexterm zone="xmlSecTransformBase64SetLineSize"><primary sortas="xmlSecTransformBase64SetLineSize">xmlSecTransformBase64SetLineSize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformBase64SetLineSize    (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> lineSize);</programlisting>
-<para>
-Sets the max line size to <parameter>lineSize</parameter>.</para>
+<indexterm zone="xmlSecTransformBase64SetLineSize"><primary>xmlSecTransformBase64SetLineSize</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecTransformBase64SetLineSize    (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> lineSize</parameter>);</programlisting>
 <para>
+Sets the max line size to <parameter>lineSize</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to BASE64 encode transform.
+<listitem><simpara>the pointer to BASE64 encode transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>lineSize</parameter>&#160;:</term>
-<listitem><simpara>           the new max line size.
+<listitem><simpara>the new max line size.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformInclC14NId" role="macro">
 <title>xmlSecTransformInclC14NId</title>
-<indexterm zone="xmlSecTransformInclC14NId"><primary sortas="xmlSecTransformInclC14NId">xmlSecTransformInclC14NId</primary></indexterm><programlisting>#define             xmlSecTransformInclC14NId</programlisting>
-<para>
-The regular (inclusive) C14N without comments transform klass.</para>
+<indexterm zone="xmlSecTransformInclC14NId"><primary>xmlSecTransformInclC14NId</primary></indexterm>
+<programlisting>#define             xmlSecTransformInclC14NId</programlisting>
 <para>
+The regular (inclusive) C14N without comments transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformInclC14NGetKlass" role="function">
 <title>xmlSecTransformInclC14NGetKlass ()</title>
-<indexterm zone="xmlSecTransformInclC14NGetKlass"><primary sortas="xmlSecTransformInclC14NGetKlass">xmlSecTransformInclC14NGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformInclC14NGetKlass     (void);</programlisting>
+<indexterm zone="xmlSecTransformInclC14NGetKlass"><primary>xmlSecTransformInclC14NGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformInclC14NGetKlass     (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 Inclusive (regular) canonicalization that omits comments transform klass
 (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-c14nAlg"><type>sec-c14nAlg</type></link> and
-http://www.w3.org/TR/2001/REC-xml-c14n-20010315).</para>
-<para>
+http://www.w3.org/TR/2001/REC-xml-c14n-20010315).
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> c14n transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformInclC14NWithCommentsId" role="macro">
 <title>xmlSecTransformInclC14NWithCommentsId</title>
-<indexterm zone="xmlSecTransformInclC14NWithCommentsId"><primary sortas="xmlSecTransformInclC14NWithCommentsId">xmlSecTransformInclC14NWithCommentsId</primary></indexterm><programlisting>#define             xmlSecTransformInclC14NWithCommentsId</programlisting>
-<para>
-The regular (inclusive) C14N with comments transform klass.</para>
+<indexterm zone="xmlSecTransformInclC14NWithCommentsId"><primary>xmlSecTransformInclC14NWithCommentsId</primary></indexterm>
+<programlisting>#define             xmlSecTransformInclC14NWithCommentsId</programlisting>
 <para>
+The regular (inclusive) C14N with comments transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformInclC14NWithCommentsGetKlass" role="function">
 <title>xmlSecTransformInclC14NWithCommentsGetKlass ()</title>
-<indexterm zone="xmlSecTransformInclC14NWithCommentsGetKlass"><primary sortas="xmlSecTransformInclC14NWithCommentsGetKlass">xmlSecTransformInclC14NWithCommentsGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformInclC14NWithCommentsGetKlass
-                                                        (void);</programlisting>
+<indexterm zone="xmlSecTransformInclC14NWithCommentsGetKlass"><primary>xmlSecTransformInclC14NWithCommentsGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformInclC14NWithCommentsGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 Inclusive (regular) canonicalization that includes comments transform klass
 (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-c14nAlg"><type>sec-c14nAlg</type></link> and
-http://www.w3.org/TR/2001/REC-xml-c14n-20010315).</para>
-<para>
+http://www.w3.org/TR/2001/REC-xml-c14n-20010315).
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> c14n with comments transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformInclC14N11Id" role="macro">
 <title>xmlSecTransformInclC14N11Id</title>
-<indexterm zone="xmlSecTransformInclC14N11Id"><primary sortas="xmlSecTransformInclC14N11Id">xmlSecTransformInclC14N11Id</primary></indexterm><programlisting>#define             xmlSecTransformInclC14N11Id</programlisting>
-<para>
-The regular (inclusive) C14N 1.1 without comments transform klass.</para>
+<indexterm zone="xmlSecTransformInclC14N11Id"><primary>xmlSecTransformInclC14N11Id</primary></indexterm>
+<programlisting>#define             xmlSecTransformInclC14N11Id</programlisting>
 <para>
+The regular (inclusive) C14N 1.1 without comments transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformInclC14N11GetKlass" role="function">
 <title>xmlSecTransformInclC14N11GetKlass ()</title>
-<indexterm zone="xmlSecTransformInclC14N11GetKlass"><primary sortas="xmlSecTransformInclC14N11GetKlass">xmlSecTransformInclC14N11GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformInclC14N11GetKlass   (void);</programlisting>
-<para>
-C14N version 1.1 (http://www.w3.org/TR/xml-c14n11)</para>
+<indexterm zone="xmlSecTransformInclC14N11GetKlass"><primary>xmlSecTransformInclC14N11GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformInclC14N11GetKlass   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+C14N version 1.1 (http://www.w3.org/TR/xml-c14n11)
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> c14n v1.1 transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformInclC14N11WithCommentsId" role="macro">
 <title>xmlSecTransformInclC14N11WithCommentsId</title>
-<indexterm zone="xmlSecTransformInclC14N11WithCommentsId"><primary sortas="xmlSecTransformInclC14N11WithCommentsId">xmlSecTransformInclC14N11WithCommentsId</primary></indexterm><programlisting>#define             xmlSecTransformInclC14N11WithCommentsId</programlisting>
-<para>
-The regular (inclusive) C14N 1.1 with comments transform klass.</para>
+<indexterm zone="xmlSecTransformInclC14N11WithCommentsId"><primary>xmlSecTransformInclC14N11WithCommentsId</primary></indexterm>
+<programlisting>#define             xmlSecTransformInclC14N11WithCommentsId</programlisting>
 <para>
+The regular (inclusive) C14N 1.1 with comments transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformInclC14N11WithCommentsGetKlass" role="function">
 <title>xmlSecTransformInclC14N11WithCommentsGetKlass ()</title>
-<indexterm zone="xmlSecTransformInclC14N11WithCommentsGetKlass"><primary sortas="xmlSecTransformInclC14N11WithCommentsGetKlass">xmlSecTransformInclC14N11WithCommentsGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformInclC14N11WithCommentsGetKlass
-                                                        (void);</programlisting>
-<para>
-C14N version 1.1 (http://www.w3.org/TR/xml-c14n11) with comments</para>
+<indexterm zone="xmlSecTransformInclC14N11WithCommentsGetKlass"><primary>xmlSecTransformInclC14N11WithCommentsGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformInclC14N11WithCommentsGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+C14N version 1.1 (http://www.w3.org/TR/xml-c14n11) with comments
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> c14n v1.1 with comments transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformExclC14NId" role="macro">
 <title>xmlSecTransformExclC14NId</title>
-<indexterm zone="xmlSecTransformExclC14NId"><primary sortas="xmlSecTransformExclC14NId">xmlSecTransformExclC14NId</primary></indexterm><programlisting>#define             xmlSecTransformExclC14NId</programlisting>
-<para>
-The exclusive C14N without comments transform klass.</para>
+<indexterm zone="xmlSecTransformExclC14NId"><primary>xmlSecTransformExclC14NId</primary></indexterm>
+<programlisting>#define             xmlSecTransformExclC14NId</programlisting>
 <para>
+The exclusive C14N without comments transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformExclC14NGetKlass" role="function">
 <title>xmlSecTransformExclC14NGetKlass ()</title>
-<indexterm zone="xmlSecTransformExclC14NGetKlass"><primary sortas="xmlSecTransformExclC14NGetKlass">xmlSecTransformExclC14NGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformExclC14NGetKlass     (void);</programlisting>
+<indexterm zone="xmlSecTransformExclC14NGetKlass"><primary>xmlSecTransformExclC14NGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformExclC14NGetKlass     (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 Exclusive canoncicalization that ommits comments transform klass
-(http://www.w3.org/TR/xml-exc-c14n/).</para>
-<para>
+(http://www.w3.org/TR/xml-exc-c14n/).
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> exclusive c14n transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformExclC14NWithCommentsId" role="macro">
 <title>xmlSecTransformExclC14NWithCommentsId</title>
-<indexterm zone="xmlSecTransformExclC14NWithCommentsId"><primary sortas="xmlSecTransformExclC14NWithCommentsId">xmlSecTransformExclC14NWithCommentsId</primary></indexterm><programlisting>#define             xmlSecTransformExclC14NWithCommentsId</programlisting>
-<para>
-The exclusive C14N with comments transform klass.</para>
+<indexterm zone="xmlSecTransformExclC14NWithCommentsId"><primary>xmlSecTransformExclC14NWithCommentsId</primary></indexterm>
+<programlisting>#define             xmlSecTransformExclC14NWithCommentsId</programlisting>
 <para>
+The exclusive C14N with comments transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformExclC14NWithCommentsGetKlass" role="function">
 <title>xmlSecTransformExclC14NWithCommentsGetKlass ()</title>
-<indexterm zone="xmlSecTransformExclC14NWithCommentsGetKlass"><primary sortas="xmlSecTransformExclC14NWithCommentsGetKlass">xmlSecTransformExclC14NWithCommentsGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformExclC14NWithCommentsGetKlass
-                                                        (void);</programlisting>
+<indexterm zone="xmlSecTransformExclC14NWithCommentsGetKlass"><primary>xmlSecTransformExclC14NWithCommentsGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformExclC14NWithCommentsGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 Exclusive canoncicalization that includes comments transform klass
-(http://www.w3.org/TR/xml-exc-c14n/).</para>
-<para>
+(http://www.w3.org/TR/xml-exc-c14n/).
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> exclusive c14n with comments transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformEnvelopedId" role="macro">
 <title>xmlSecTransformEnvelopedId</title>
-<indexterm zone="xmlSecTransformEnvelopedId"><primary sortas="xmlSecTransformEnvelopedId">xmlSecTransformEnvelopedId</primary></indexterm><programlisting>#define             xmlSecTransformEnvelopedId</programlisting>
-<para>
-The "enveloped" transform klass.</para>
+<indexterm zone="xmlSecTransformEnvelopedId"><primary>xmlSecTransformEnvelopedId</primary></indexterm>
+<programlisting>#define             xmlSecTransformEnvelopedId</programlisting>
 <para>
+The "enveloped" transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformEnvelopedGetKlass" role="function">
 <title>xmlSecTransformEnvelopedGetKlass ()</title>
-<indexterm zone="xmlSecTransformEnvelopedGetKlass"><primary sortas="xmlSecTransformEnvelopedGetKlass">xmlSecTransformEnvelopedGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformEnvelopedGetKlass    (void);</programlisting>
+<indexterm zone="xmlSecTransformEnvelopedGetKlass"><primary>xmlSecTransformEnvelopedGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformEnvelopedGetKlass    (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 The enveloped transform klass (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-EnvelopedSignature"><type>sec-EnvelopedSignature</type></link>):
 </para>
@@ -2581,101 +2530,101 @@ those of the XPath transform, but may only be applied to a node-set from
 its parent XML document. Note that it is not necessary to use an XPath
 expression evaluator to create this transform. However, this transform
 MUST produce output in exactly the same manner as the XPath transform
-parameterized by the XPath expression above.</para>
-<para>
+parameterized by the XPath expression above.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> enveloped transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformXPathId" role="macro">
 <title>xmlSecTransformXPathId</title>
-<indexterm zone="xmlSecTransformXPathId"><primary sortas="xmlSecTransformXPathId">xmlSecTransformXPathId</primary></indexterm><programlisting>#define             xmlSecTransformXPathId</programlisting>
-<para>
-The XPath transform klass.</para>
+<indexterm zone="xmlSecTransformXPathId"><primary>xmlSecTransformXPathId</primary></indexterm>
+<programlisting>#define             xmlSecTransformXPathId</programlisting>
 <para>
+The XPath transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformXPathGetKlass" role="function">
 <title>xmlSecTransformXPathGetKlass ()</title>
-<indexterm zone="xmlSecTransformXPathGetKlass"><primary sortas="xmlSecTransformXPathGetKlass">xmlSecTransformXPathGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformXPathGetKlass        (void);</programlisting>
+<indexterm zone="xmlSecTransformXPathGetKlass"><primary>xmlSecTransformXPathGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformXPathGetKlass        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 The XPath transform evaluates given XPath expression and
 intersects the result with the previous nodes set. See
-http://www.w3.org/TR/xmldsig-core/<link linkend="sec-XPath"><type>sec-XPath</type></link> for more details.</para>
-<para>
+http://www.w3.org/TR/xmldsig-core/<link linkend="sec-XPath"><type>sec-XPath</type></link> for more details.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> XPath transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformXPath2Id" role="macro">
 <title>xmlSecTransformXPath2Id</title>
-<indexterm zone="xmlSecTransformXPath2Id"><primary sortas="xmlSecTransformXPath2Id">xmlSecTransformXPath2Id</primary></indexterm><programlisting>#define             xmlSecTransformXPath2Id</programlisting>
-<para>
-The XPath2 transform klass.</para>
+<indexterm zone="xmlSecTransformXPath2Id"><primary>xmlSecTransformXPath2Id</primary></indexterm>
+<programlisting>#define             xmlSecTransformXPath2Id</programlisting>
 <para>
+The XPath2 transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformXPath2GetKlass" role="function">
 <title>xmlSecTransformXPath2GetKlass ()</title>
-<indexterm zone="xmlSecTransformXPath2GetKlass"><primary sortas="xmlSecTransformXPath2GetKlass">xmlSecTransformXPath2GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformXPath2GetKlass       (void);</programlisting>
-<para>
-The XPath2 transform (http://www.w3.org/TR/xmldsig-filter2/).</para>
+<indexterm zone="xmlSecTransformXPath2GetKlass"><primary>xmlSecTransformXPath2GetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformXPath2GetKlass       (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The XPath2 transform (http://www.w3.org/TR/xmldsig-filter2/).
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> XPath2 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformXPointerId" role="macro">
 <title>xmlSecTransformXPointerId</title>
-<indexterm zone="xmlSecTransformXPointerId"><primary sortas="xmlSecTransformXPointerId">xmlSecTransformXPointerId</primary></indexterm><programlisting>#define             xmlSecTransformXPointerId</programlisting>
-<para>
-The XPointer transform klass.</para>
+<indexterm zone="xmlSecTransformXPointerId"><primary>xmlSecTransformXPointerId</primary></indexterm>
+<programlisting>#define             xmlSecTransformXPointerId</programlisting>
 <para>
+The XPointer transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformXPointerGetKlass" role="function">
 <title>xmlSecTransformXPointerGetKlass ()</title>
-<indexterm zone="xmlSecTransformXPointerGetKlass"><primary sortas="xmlSecTransformXPointerGetKlass">xmlSecTransformXPointerGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformXPointerGetKlass     (void);</programlisting>
+<indexterm zone="xmlSecTransformXPointerGetKlass"><primary>xmlSecTransformXPointerGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformXPointerGetKlass     (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 The XPointer transform klass
-(http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt).</para>
-<para>
+(http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt).
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> XPointer transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformXPointerSetExpr" role="function">
 <title>xmlSecTransformXPointerSetExpr ()</title>
-<indexterm zone="xmlSecTransformXPointerSetExpr"><primary sortas="xmlSecTransformXPointerSetExpr">xmlSecTransformXPointerSetExpr</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformXPointerSetExpr      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         const <link linkend="xmlChar">xmlChar</link> *expr,
-                                                         <link linkend="xmlSecNodeSetType">xmlSecNodeSetType</link> nodeSetType,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> hereNode);</programlisting>
-<para>
-Sets the XPointer expression for an XPointer <parameter>transform</parameter>.</para>
+<indexterm zone="xmlSecTransformXPointerSetExpr"><primary>xmlSecTransformXPointerSetExpr</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformXPointerSetExpr      (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *expr</parameter>,
+                                                         <parameter><link linkend="xmlSecNodeSetType"><type>xmlSecNodeSetType</type></link> nodeSetType</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> hereNode</parameter>);</programlisting>
 <para>
+Sets the XPointer expression for an XPointer <parameter>transform</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to XPointer transform.
+<listitem><simpara>the pointer to XPointer transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>expr</parameter>&#160;:</term>
-<listitem><simpara>               the XPointer expression.
+<listitem><simpara>the XPointer expression.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nodeSetType</parameter>&#160;:</term>
-<listitem><simpara>        the type of evaluated XPointer expression.
+<listitem><simpara>the type of evaluated XPointer expression.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>hereNode</parameter>&#160;:</term>
-<listitem><simpara>           the pointer to "here" node.
+<listitem><simpara>the pointer to "here" node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformXsltId" role="macro">
 <title>xmlSecTransformXsltId</title>
-<indexterm zone="xmlSecTransformXsltId"><primary sortas="xmlSecTransformXsltId">xmlSecTransformXsltId</primary></indexterm><programlisting>#define             xmlSecTransformXsltId</programlisting>
-<para>
-The XSLT transform klass.</para>
+<indexterm zone="xmlSecTransformXsltId"><primary>xmlSecTransformXsltId</primary></indexterm>
+<programlisting>#define             xmlSecTransformXsltId</programlisting>
 <para>
+The XSLT transform klass.
 </para></refsect2>
 <refsect2 id="xmlSecTransformXsltGetKlass" role="function">
 <title>xmlSecTransformXsltGetKlass ()</title>
-<indexterm zone="xmlSecTransformXsltGetKlass"><primary sortas="xmlSecTransformXsltGetKlass">xmlSecTransformXsltGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformXsltGetKlass         (void);</programlisting>
+<indexterm zone="xmlSecTransformXsltGetKlass"><primary>xmlSecTransformXsltGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformXsltGetKlass         (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 XSLT transform klass (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-XSLT"><type>sec-XSLT</type></link>):
 </para>
@@ -2705,23 +2654,23 @@ serializations of their output, we further RECOMMEND inserting a transform
 after the XSLT transform to canonicalize the output. These steps will help
 to ensure interoperability of the resulting signatures among applications
 that support the XSLT transform. Note that if the output is actually HTML,
-then the result of these steps is logically equivalent [XHTML].</para>
-<para>
+then the result of these steps is logically equivalent [XHTML].
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to XSLT transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformRemoveXmlTagsC14NId" role="macro">
 <title>xmlSecTransformRemoveXmlTagsC14NId</title>
-<indexterm zone="xmlSecTransformRemoveXmlTagsC14NId"><primary sortas="xmlSecTransformRemoveXmlTagsC14NId">xmlSecTransformRemoveXmlTagsC14NId</primary></indexterm><programlisting>#define             xmlSecTransformRemoveXmlTagsC14NId</programlisting>
-<para>
-The "remove all xml tags" transform klass (used before base64 transforms).</para>
+<indexterm zone="xmlSecTransformRemoveXmlTagsC14NId"><primary>xmlSecTransformRemoveXmlTagsC14NId</primary></indexterm>
+<programlisting>#define             xmlSecTransformRemoveXmlTagsC14NId</programlisting>
 <para>
+The "remove all xml tags" transform klass (used before base64 transforms).
 </para></refsect2>
 <refsect2 id="xmlSecTransformRemoveXmlTagsC14NGetKlass" role="function">
 <title>xmlSecTransformRemoveXmlTagsC14NGetKlass ()</title>
-<indexterm zone="xmlSecTransformRemoveXmlTagsC14NGetKlass"><primary sortas="xmlSecTransformRemoveXmlTagsC14NGetKlass">xmlSecTransformRemoveXmlTagsC14NGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRemoveXmlTagsC14NGetKlass
-                                                        (void);</programlisting>
+<indexterm zone="xmlSecTransformRemoveXmlTagsC14NGetKlass"><primary>xmlSecTransformRemoveXmlTagsC14NGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformRemoveXmlTagsC14NGetKlass
+                                                        (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 The "remove xml tags" transform klass (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-Base-64"><type>sec-Base-64</type></link>):
 Base64 transform requires an octet stream for input. If an XPath node-set
@@ -2733,48 +2682,47 @@ identified by a barename XPointer in the Reference URI, and its content
 consists solely of base64 encoded character data, then this transform
 automatically strips away the start and end tags of the identified element
 and any of its descendant elements as well as any descendant comments and
-processing instructions. The output of this transform is an octet stream.</para>
-<para>
+processing instructions. The output of this transform is an octet stream.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> "remove xml tags" transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformVisa3DHackId" role="macro">
 <title>xmlSecTransformVisa3DHackId</title>
-<indexterm zone="xmlSecTransformVisa3DHackId"><primary sortas="xmlSecTransformVisa3DHackId">xmlSecTransformVisa3DHackId</primary></indexterm><programlisting>#define             xmlSecTransformVisa3DHackId</programlisting>
+<indexterm zone="xmlSecTransformVisa3DHackId"><primary>xmlSecTransformVisa3DHackId</primary></indexterm>
+<programlisting>#define             xmlSecTransformVisa3DHackId</programlisting>
 <para>
 Selects node subtree by given node id string. The only reason why we need this
 is Visa3D protocol. It doesn't follow XML/XPointer/XMLDSig specs and allows
 invalid XPointer expressions in the URI attribute. Since we couldn't evaluate
-such expressions thru XPath/XPointer engine, we need to have this hack here.</para>
-<para>
+such expressions thru XPath/XPointer engine, we need to have this hack here.
 </para></refsect2>
 <refsect2 id="xmlSecTransformVisa3DHackGetKlass" role="function">
 <title>xmlSecTransformVisa3DHackGetKlass ()</title>
-<indexterm zone="xmlSecTransformVisa3DHackGetKlass"><primary sortas="xmlSecTransformVisa3DHackGetKlass">xmlSecTransformVisa3DHackGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformVisa3DHackGetKlass   (void);</programlisting>
+<indexterm zone="xmlSecTransformVisa3DHackGetKlass"><primary>xmlSecTransformVisa3DHackGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecTransformId"><returnvalue>xmlSecTransformId</returnvalue></link>   xmlSecTransformVisa3DHackGetKlass   (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 The Visa3DHack transform klass. The only reason why we need this
 is Visa3D protocol. It doesn't follow XML/XPointer/XMLDSig specs and allows
 invalid XPointer expressions in the URI attribute. Since we couldn't evaluate
-such expressions thru XPath/XPointer engine, we need to have this hack here.</para>
-<para>
+such expressions thru XPath/XPointer engine, we need to have this hack here.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Visa3DHack transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecTransformVisa3DHackSetID" role="function">
 <title>xmlSecTransformVisa3DHackSetID ()</title>
-<indexterm zone="xmlSecTransformVisa3DHackSetID"><primary sortas="xmlSecTransformVisa3DHackSetID">xmlSecTransformVisa3DHackSetID</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformVisa3DHackSetID      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                                         const <link linkend="xmlChar">xmlChar</link> *id);</programlisting>
-<para>
-Sets the ID value for an Visa3DHack <parameter>transform</parameter>.</para>
+<indexterm zone="xmlSecTransformVisa3DHackSetID"><primary>xmlSecTransformVisa3DHackSetID</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecTransformVisa3DHackSetID      (<parameter><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link> transform</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *id</parameter>);</programlisting>
 <para>
+Sets the ID value for an Visa3DHack <parameter>transform</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>transform</parameter>&#160;:</term>
-<listitem><simpara>          the pointer to Visa3DHack transform.
+<listitem><simpara>the pointer to Visa3DHack transform.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>                 the ID value.
+<listitem><simpara>the ID value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
@@ -2782,7 +2730,4 @@ Sets the ID value for an Visa3DHack <parameter>transform</parameter>.</para>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/version.sgml b/docs/api/sgml/version.sgml
index 6294cdf..9875bb8 100644
--- a/docs/api/sgml/version.sgml
+++ b/docs/api/sgml/version.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-version.top_of_page">version</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>version</refname>
 <refpurpose>Version macros.</refpurpose>
@@ -13,78 +14,65 @@
 <refsynopsisdiv id="xmlsec-version.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-#define             <link linkend="XMLSEC-VERSION--CAPS">XMLSEC_VERSION</link>
-#define             <link linkend="XMLSEC-VERSION-MAJOR--CAPS">XMLSEC_VERSION_MAJOR</link>
-#define             <link linkend="XMLSEC-VERSION-MINOR--CAPS">XMLSEC_VERSION_MINOR</link>
-#define             <link linkend="XMLSEC-VERSION-SUBMINOR--CAPS">XMLSEC_VERSION_SUBMINOR</link>
-#define             <link linkend="XMLSEC-VERSION-INFO--CAPS">XMLSEC_VERSION_INFO</link>
+<synopsis>#define             <link linkend="XMLSEC-VERSION:CAPS">XMLSEC_VERSION</link>
+#define             <link linkend="XMLSEC-VERSION-MAJOR:CAPS">XMLSEC_VERSION_MAJOR</link>
+#define             <link linkend="XMLSEC-VERSION-MINOR:CAPS">XMLSEC_VERSION_MINOR</link>
+#define             <link linkend="XMLSEC-VERSION-SUBMINOR:CAPS">XMLSEC_VERSION_SUBMINOR</link>
+#define             <link linkend="XMLSEC-VERSION-INFO:CAPS">XMLSEC_VERSION_INFO</link>
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-version.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Version macros.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-version.details" role="details">
 <title role="details.title">Details</title>
-<refsect2 id="XMLSEC-VERSION--CAPS" role="macro">
+<refsect2 id="XMLSEC-VERSION:CAPS" role="macro">
 <title>XMLSEC_VERSION</title>
-<indexterm zone="XMLSEC-VERSION--CAPS"><primary sortas="XMLSEC_VERSION">XMLSEC_VERSION</primary></indexterm><programlisting>#define XMLSEC_VERSION			"1.2.15"
+<indexterm zone="XMLSEC-VERSION:CAPS"><primary>XMLSEC_VERSION</primary></indexterm>
+<programlisting>#define XMLSEC_VERSION			"1.2.15"
 </programlisting>
 <para>
 The library version string in the format
-"&lt;major-number&gt;.&lt;minor-number&gt;.&lt;sub-minor-number&gt;".</para>
-<para>
+"&lt;major-number&gt;.&lt;minor-number&gt;.&lt;sub-minor-number&gt;".
 </para></refsect2>
-<refsect2 id="XMLSEC-VERSION-MAJOR--CAPS" role="macro">
+<refsect2 id="XMLSEC-VERSION-MAJOR:CAPS" role="macro">
 <title>XMLSEC_VERSION_MAJOR</title>
-<indexterm zone="XMLSEC-VERSION-MAJOR--CAPS"><primary sortas="XMLSEC_VERSION_MAJOR">XMLSEC_VERSION_MAJOR</primary></indexterm><programlisting>#define XMLSEC_VERSION_MAJOR		1
+<indexterm zone="XMLSEC-VERSION-MAJOR:CAPS"><primary>XMLSEC_VERSION_MAJOR</primary></indexterm>
+<programlisting>#define XMLSEC_VERSION_MAJOR		1
 </programlisting>
 <para>
-The library major version number.</para>
-<para>
+The library major version number.
 </para></refsect2>
-<refsect2 id="XMLSEC-VERSION-MINOR--CAPS" role="macro">
+<refsect2 id="XMLSEC-VERSION-MINOR:CAPS" role="macro">
 <title>XMLSEC_VERSION_MINOR</title>
-<indexterm zone="XMLSEC-VERSION-MINOR--CAPS"><primary sortas="XMLSEC_VERSION_MINOR">XMLSEC_VERSION_MINOR</primary></indexterm><programlisting>#define XMLSEC_VERSION_MINOR		2
+<indexterm zone="XMLSEC-VERSION-MINOR:CAPS"><primary>XMLSEC_VERSION_MINOR</primary></indexterm>
+<programlisting>#define XMLSEC_VERSION_MINOR		2
 </programlisting>
 <para>
-The library minor version number.</para>
-<para>
+The library minor version number.
 </para></refsect2>
-<refsect2 id="XMLSEC-VERSION-SUBMINOR--CAPS" role="macro">
+<refsect2 id="XMLSEC-VERSION-SUBMINOR:CAPS" role="macro">
 <title>XMLSEC_VERSION_SUBMINOR</title>
-<indexterm zone="XMLSEC-VERSION-SUBMINOR--CAPS"><primary sortas="XMLSEC_VERSION_SUBMINOR">XMLSEC_VERSION_SUBMINOR</primary></indexterm><programlisting>#define XMLSEC_VERSION_SUBMINOR		15
+<indexterm zone="XMLSEC-VERSION-SUBMINOR:CAPS"><primary>XMLSEC_VERSION_SUBMINOR</primary></indexterm>
+<programlisting>#define XMLSEC_VERSION_SUBMINOR		15
 </programlisting>
 <para>
-The library sub-minor version number.</para>
-<para>
+The library sub-minor version number.
 </para></refsect2>
-<refsect2 id="XMLSEC-VERSION-INFO--CAPS" role="macro">
+<refsect2 id="XMLSEC-VERSION-INFO:CAPS" role="macro">
 <title>XMLSEC_VERSION_INFO</title>
-<indexterm zone="XMLSEC-VERSION-INFO--CAPS"><primary sortas="XMLSEC_VERSION_INFO">XMLSEC_VERSION_INFO</primary></indexterm><programlisting>#define XMLSEC_VERSION_INFO		"3:15:2"
+<indexterm zone="XMLSEC-VERSION-INFO:CAPS"><primary>XMLSEC_VERSION_INFO</primary></indexterm>
+<programlisting>#define XMLSEC_VERSION_INFO		"3:15:2"
 </programlisting>
 <para>
 The library version info string in the format
-"&lt;major-number&gt;+&lt;minor-number&gt;:&lt;sub-minor-number&gt;:&lt;minor-number&gt;".</para>
-<para>
+"&lt;major-number&gt;+&lt;minor-number&gt;:&lt;sub-minor-number&gt;:&lt;minor-number&gt;".
 </para></refsect2>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/x509.sgml b/docs/api/sgml/x509.sgml
index cea70c2..83e697d 100644
--- a/docs/api/sgml/x509.sgml
+++ b/docs/api/sgml/x509.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-x509.top_of_page">x509</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>x509</refname>
 <refpurpose><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate";>&lt;dsig:X509Certificate/&gt;</ulink> node parser.</refpurpose>
@@ -13,102 +14,92 @@
 <refsynopsisdiv id="xmlsec-x509.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-#define             <link linkend="XMLSEC-X509DATA-CERTIFICATE-NODE--CAPS">XMLSEC_X509DATA_CERTIFICATE_NODE</link>
-#define             <link linkend="XMLSEC-X509DATA-SUBJECTNAME-NODE--CAPS">XMLSEC_X509DATA_SUBJECTNAME_NODE</link>
-#define             <link linkend="XMLSEC-X509DATA-ISSUERSERIAL-NODE--CAPS">XMLSEC_X509DATA_ISSUERSERIAL_NODE</link>
-#define             <link linkend="XMLSEC-X509DATA-SKI-NODE--CAPS">XMLSEC_X509DATA_SKI_NODE</link>
-#define             <link linkend="XMLSEC-X509DATA-CRL-NODE--CAPS">XMLSEC_X509DATA_CRL_NODE</link>
-#define             <link linkend="XMLSEC-X509DATA-DEFAULT--CAPS">XMLSEC_X509DATA_DEFAULT</link>
-<link linkend="int">int</link>                 <link linkend="xmlSecX509DataGetNodeContent">xmlSecX509DataGetNodeContent</link>        (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="int">int</link> deleteChildren,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<synopsis>#define             <link linkend="XMLSEC-X509DATA-CERTIFICATE-NODE:CAPS">XMLSEC_X509DATA_CERTIFICATE_NODE</link>
+#define             <link linkend="XMLSEC-X509DATA-SUBJECTNAME-NODE:CAPS">XMLSEC_X509DATA_SUBJECTNAME_NODE</link>
+#define             <link linkend="XMLSEC-X509DATA-ISSUERSERIAL-NODE:CAPS">XMLSEC_X509DATA_ISSUERSERIAL_NODE</link>
+#define             <link linkend="XMLSEC-X509DATA-SKI-NODE:CAPS">XMLSEC_X509DATA_SKI_NODE</link>
+#define             <link linkend="XMLSEC-X509DATA-CRL-NODE:CAPS">XMLSEC_X509DATA_CRL_NODE</link>
+#define             <link linkend="XMLSEC-X509DATA-DEFAULT:CAPS">XMLSEC_X509DATA_DEFAULT</link>
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecX509DataGetNodeContent">xmlSecX509DataGetNodeContent</link>        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> deleteChildren</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-x509.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate";>&lt;dsig:X509Certificate/&gt;</ulink> node parser.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-x509.details" role="details">
 <title role="details.title">Details</title>
-<refsect2 id="XMLSEC-X509DATA-CERTIFICATE-NODE--CAPS" role="macro">
+<refsect2 id="XMLSEC-X509DATA-CERTIFICATE-NODE:CAPS" role="macro">
 <title>XMLSEC_X509DATA_CERTIFICATE_NODE</title>
-<indexterm zone="XMLSEC-X509DATA-CERTIFICATE-NODE--CAPS"><primary sortas="XMLSEC_X509DATA_CERTIFICATE_NODE">XMLSEC_X509DATA_CERTIFICATE_NODE</primary></indexterm><programlisting>#define XMLSEC_X509DATA_CERTIFICATE_NODE                        0x00000001
+<indexterm zone="XMLSEC-X509DATA-CERTIFICATE-NODE:CAPS"><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";>&lt;dsig:X509Certificate/&gt;</ulink> node found or would be written back.</para>
-<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></refsect2>
-<refsect2 id="XMLSEC-X509DATA-SUBJECTNAME-NODE--CAPS" role="macro">
+<refsect2 id="XMLSEC-X509DATA-SUBJECTNAME-NODE:CAPS" role="macro">
 <title>XMLSEC_X509DATA_SUBJECTNAME_NODE</title>
-<indexterm zone="XMLSEC-X509DATA-SUBJECTNAME-NODE--CAPS"><primary sortas="XMLSEC_X509DATA_SUBJECTNAME_NODE">XMLSEC_X509DATA_SUBJECTNAME_NODE</primary></indexterm><programlisting>#define XMLSEC_X509DATA_SUBJECTNAME_NODE                        0x00000002
+<indexterm zone="XMLSEC-X509DATA-SUBJECTNAME-NODE:CAPS"><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";>&lt;dsig:X509SubjectName/&gt;</ulink> node found or would be written back.</para>
-<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></refsect2>
-<refsect2 id="XMLSEC-X509DATA-ISSUERSERIAL-NODE--CAPS" role="macro">
+<refsect2 id="XMLSEC-X509DATA-ISSUERSERIAL-NODE:CAPS" role="macro">
 <title>XMLSEC_X509DATA_ISSUERSERIAL_NODE</title>
-<indexterm zone="XMLSEC-X509DATA-ISSUERSERIAL-NODE--CAPS"><primary sortas="XMLSEC_X509DATA_ISSUERSERIAL_NODE">XMLSEC_X509DATA_ISSUERSERIAL_NODE</primary></indexterm><programlisting>#define XMLSEC_X509DATA_ISSUERSERIAL_NODE                       0x00000004
+<indexterm zone="XMLSEC-X509DATA-ISSUERSERIAL-NODE:CAPS"><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";>&lt;dsig:X509IssuerSerial/&gt;</ulink> node found or would be written back.</para>
-<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></refsect2>
-<refsect2 id="XMLSEC-X509DATA-SKI-NODE--CAPS" role="macro">
+<refsect2 id="XMLSEC-X509DATA-SKI-NODE:CAPS" role="macro">
 <title>XMLSEC_X509DATA_SKI_NODE</title>
-<indexterm zone="XMLSEC-X509DATA-SKI-NODE--CAPS"><primary sortas="XMLSEC_X509DATA_SKI_NODE">XMLSEC_X509DATA_SKI_NODE</primary></indexterm><programlisting>#define XMLSEC_X509DATA_SKI_NODE                                0x00000008
+<indexterm zone="XMLSEC-X509DATA-SKI-NODE:CAPS"><primary>XMLSEC_X509DATA_SKI_NODE</primary></indexterm>
+<programlisting>#define XMLSEC_X509DATA_SKI_NODE                                0x00000008
 </programlisting>
 <para>
-&lt;dsig:/X509SKI&gt; node found or would be written back.</para>
-<para>
+&lt;dsig:/X509SKI&gt; node found or would be written back.
 </para></refsect2>
-<refsect2 id="XMLSEC-X509DATA-CRL-NODE--CAPS" role="macro">
+<refsect2 id="XMLSEC-X509DATA-CRL-NODE:CAPS" role="macro">
 <title>XMLSEC_X509DATA_CRL_NODE</title>
-<indexterm zone="XMLSEC-X509DATA-CRL-NODE--CAPS"><primary sortas="XMLSEC_X509DATA_CRL_NODE">XMLSEC_X509DATA_CRL_NODE</primary></indexterm><programlisting>#define XMLSEC_X509DATA_CRL_NODE                                0x00000010
+<indexterm zone="XMLSEC-X509DATA-CRL-NODE:CAPS"><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";>&lt;dsig:X509CRL/&gt;</ulink> node found or would be written back.</para>
-<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></refsect2>
-<refsect2 id="XMLSEC-X509DATA-DEFAULT--CAPS" role="macro">
+<refsect2 id="XMLSEC-X509DATA-DEFAULT:CAPS" role="macro">
 <title>XMLSEC_X509DATA_DEFAULT</title>
-<indexterm zone="XMLSEC-X509DATA-DEFAULT--CAPS"><primary sortas="XMLSEC_X509DATA_DEFAULT">XMLSEC_X509DATA_DEFAULT</primary></indexterm><programlisting>#define             XMLSEC_X509DATA_DEFAULT</programlisting>
+<indexterm zone="XMLSEC-X509DATA-DEFAULT:CAPS"><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";>&lt;dsig:X509Data/&gt;</ulink> node template.</para>
-<para>
+<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node template.
 </para></refsect2>
 <refsect2 id="xmlSecX509DataGetNodeContent" role="function">
 <title>xmlSecX509DataGetNodeContent ()</title>
-<indexterm zone="xmlSecX509DataGetNodeContent"><primary sortas="xmlSecX509DataGetNodeContent">xmlSecX509DataGetNodeContent</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecX509DataGetNodeContent        (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="int">int</link> deleteChildren,
-                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<indexterm zone="xmlSecX509DataGetNodeContent"><primary>xmlSecX509DataGetNodeContent</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecX509DataGetNodeContent        (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> deleteChildren</parameter>,
+                                                         <parameter><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtxPtr</type></link> keyInfoCtx</parameter>);</programlisting>
 <para>
 Reads the contents of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node and returns it as
-a bits mask.</para>
-<para>
+a bits mask.
 </para><variablelist role="params">
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.
+<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>&#160;:</term>
-<listitem><simpara>     the flag that indicates whether to remove node children after reading.
+<listitem><simpara>the flag that indicates whether to remove node children after reading.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node processing context.
+<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>&#160;:</term><listitem><simpara> the bit mask representing the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node content
 or a negative value if an error occurs.
@@ -117,7 +108,4 @@ or a negative value if an error occurs.
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/xmldsig.sgml b/docs/api/sgml/xmldsig.sgml
index b95fd98..eac8b35 100644
--- a/docs/api/sgml/xmldsig.sgml
+++ b/docs/api/sgml/xmldsig.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-xmldsig.top_of_page">xmldsig</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>xmldsig</refname>
 <refpurpose>XML Digital Signature support.</refpurpose>
@@ -13,149 +14,140 @@
 <refsynopsisdiv id="xmlsec-xmldsig.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-enum                <link linkend="xmlSecDSigStatus">xmlSecDSigStatus</link>;
-#define             <link linkend="XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS--CAPS">XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS</link>
-#define             <link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES--CAPS">XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</link>
-#define             <link linkend="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES--CAPS">XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</link>
-#define             <link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE--CAPS">XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</link>
-#define             <link linkend="XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK--CAPS">XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</link>
+<synopsis>enum                <link linkend="xmlSecDSigStatus">xmlSecDSigStatus</link>;
+#define             <link linkend="XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS:CAPS">XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS</link>
+#define             <link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES:CAPS">XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</link>
+#define             <link linkend="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES:CAPS">XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</link>
+#define             <link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE:CAPS">XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</link>
+#define             <link linkend="XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK:CAPS">XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</link>
 struct              <link linkend="xmlSecDSigCtx">xmlSecDSigCtx</link>;
-<link linkend="xmlSecDSigCtxPtr">xmlSecDSigCtxPtr</link>    <link linkend="xmlSecDSigCtxCreate">xmlSecDSigCtxCreate</link>                 (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
-<link linkend="void">void</link>                <link linkend="xmlSecDSigCtxDestroy">xmlSecDSigCtxDestroy</link>                (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecDSigCtxInitialize">xmlSecDSigCtxInitialize</link>             (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
-<link linkend="void">void</link>                <link linkend="xmlSecDSigCtxFinalize">xmlSecDSigCtxFinalize</link>               (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecDSigCtxSign">xmlSecDSigCtxSign</link>                   (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> tmpl);
-<link linkend="int">int</link>                 <link linkend="xmlSecDSigCtxVerify">xmlSecDSigCtxVerify</link>                 (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="int">int</link>                 <link linkend="xmlSecDSigCtxEnableReferenceTransform">xmlSecDSigCtxEnableReferenceTransform</link>
-                                                        (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);
-<link linkend="int">int</link>                 <link linkend="xmlSecDSigCtxEnableSignatureTransform">xmlSecDSigCtxEnableSignatureTransform</link>
-                                                        (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);
-<link linkend="xmlSecBufferPtr">xmlSecBufferPtr</link>     <link linkend="xmlSecDSigCtxGetPreSignBuffer">xmlSecDSigCtxGetPreSignBuffer</link>       (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx);
-<link linkend="void">void</link>                <link linkend="xmlSecDSigCtxDebugDump">xmlSecDSigCtxDebugDump</link>              (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
-<link linkend="void">void</link>                <link linkend="xmlSecDSigCtxDebugXmlDump">xmlSecDSigCtxDebugXmlDump</link>           (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="xmlSecDSigCtxPtr"><returnvalue>xmlSecDSigCtxPtr</returnvalue></link>    <link linkend="xmlSecDSigCtxCreate">xmlSecDSigCtxCreate</link>                 (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> keysMngr</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecDSigCtxDestroy">xmlSecDSigCtxDestroy</link>                (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecDSigCtxInitialize">xmlSecDSigCtxInitialize</link>             (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>,
+                                                         <parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> keysMngr</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecDSigCtxFinalize">xmlSecDSigCtxFinalize</link>               (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecDSigCtxSign">xmlSecDSigCtxSign</link>                   (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> tmpl</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecDSigCtxVerify">xmlSecDSigCtxVerify</link>                 (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecDSigCtxEnableReferenceTransform">xmlSecDSigCtxEnableReferenceTransform</link>
+                                                        (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> transformId</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecDSigCtxEnableSignatureTransform">xmlSecDSigCtxEnableSignatureTransform</link>
+                                                        (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> transformId</parameter>);
+<link linkend="xmlSecBufferPtr"><returnvalue>xmlSecBufferPtr</returnvalue></link>     <link linkend="xmlSecDSigCtxGetPreSignBuffer">xmlSecDSigCtxGetPreSignBuffer</link>       (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecDSigCtxDebugDump">xmlSecDSigCtxDebugDump</link>              (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecDSigCtxDebugXmlDump">xmlSecDSigCtxDebugXmlDump</link>           (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
 enum                <link linkend="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</link>;
 struct              <link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtx</link>;
-<link linkend="xmlSecDSigReferenceCtxPtr">xmlSecDSigReferenceCtxPtr</link>  <link linkend="xmlSecDSigReferenceCtxCreate">xmlSecDSigReferenceCtxCreate</link> (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                                         <link linkend="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</link> origin);
-<link linkend="void">void</link>                <link linkend="xmlSecDSigReferenceCtxDestroy">xmlSecDSigReferenceCtxDestroy</link>       (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecDSigReferenceCtxInitialize">xmlSecDSigReferenceCtxInitialize</link>    (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
-                                                         <link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                                         <link linkend="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</link> origin);
-<link linkend="void">void</link>                <link linkend="xmlSecDSigReferenceCtxFinalize">xmlSecDSigReferenceCtxFinalize</link>      (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecDSigReferenceCtxProcessNode">xmlSecDSigReferenceCtxProcessNode</link>   (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="xmlSecBuffer">xmlSecBufferPtr</link>     <link linkend="xmlSecDSigReferenceCtxGetPreDigestBuffer">xmlSecDSigReferenceCtxGetPreDigestBuffer</link>
-                                                        (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx);
-<link linkend="void">void</link>                <link linkend="xmlSecDSigReferenceCtxDebugDump">xmlSecDSigReferenceCtxDebugDump</link>     (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
-<link linkend="void">void</link>                <link linkend="xmlSecDSigReferenceCtxDebugXmlDump">xmlSecDSigReferenceCtxDebugXmlDump</link>  (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="xmlSecDSigReferenceCtxPtr"><returnvalue>xmlSecDSigReferenceCtxPtr</returnvalue></link>  <link linkend="xmlSecDSigReferenceCtxCreate">xmlSecDSigReferenceCtxCreate</link> (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>,
+                                                         <parameter><link linkend="xmlSecDSigReferenceOrigin"><type>xmlSecDSigReferenceOrigin</type></link> origin</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecDSigReferenceCtxDestroy">xmlSecDSigReferenceCtxDestroy</link>       (<parameter><link linkend="xmlSecDSigReferenceCtx"><type>xmlSecDSigReferenceCtxPtr</type></link> dsigRefCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecDSigReferenceCtxInitialize">xmlSecDSigReferenceCtxInitialize</link>    (<parameter><link linkend="xmlSecDSigReferenceCtx"><type>xmlSecDSigReferenceCtxPtr</type></link> dsigRefCtx</parameter>,
+                                                         <parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>,
+                                                         <parameter><link linkend="xmlSecDSigReferenceOrigin"><type>xmlSecDSigReferenceOrigin</type></link> origin</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecDSigReferenceCtxFinalize">xmlSecDSigReferenceCtxFinalize</link>      (<parameter><link linkend="xmlSecDSigReferenceCtx"><type>xmlSecDSigReferenceCtxPtr</type></link> dsigRefCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecDSigReferenceCtxProcessNode">xmlSecDSigReferenceCtxProcessNode</link>   (<parameter><link linkend="xmlSecDSigReferenceCtx"><type>xmlSecDSigReferenceCtxPtr</type></link> dsigRefCtx</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>);
+<link linkend="xmlSecBuffer"><returnvalue>xmlSecBufferPtr</returnvalue></link>     <link linkend="xmlSecDSigReferenceCtxGetPreDigestBuffer">xmlSecDSigReferenceCtxGetPreDigestBuffer</link>
+                                                        (<parameter><link linkend="xmlSecDSigReferenceCtx"><type>xmlSecDSigReferenceCtxPtr</type></link> dsigRefCtx</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecDSigReferenceCtxDebugDump">xmlSecDSigReferenceCtxDebugDump</link>     (<parameter><link linkend="xmlSecDSigReferenceCtx"><type>xmlSecDSigReferenceCtxPtr</type></link> dsigRefCtx</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecDSigReferenceCtxDebugXmlDump">xmlSecDSigReferenceCtxDebugXmlDump</link>  (<parameter><link linkend="xmlSecDSigReferenceCtx"><type>xmlSecDSigReferenceCtxPtr</type></link> dsigRefCtx</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
 #define             <link linkend="xmlSecDSigReferenceCtxListId">xmlSecDSigReferenceCtxListId</link>
-<link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     <link linkend="xmlSecDSigReferenceCtxListGetKlass">xmlSecDSigReferenceCtxListGetKlass</link>  (void);
+<link linkend="xmlSecPtrListId"><returnvalue>xmlSecPtrListId</returnvalue></link>     <link linkend="xmlSecDSigReferenceCtxListGetKlass">xmlSecDSigReferenceCtxListGetKlass</link>  (<parameter><type>void</type></parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-xmldsig.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 XML Digital Signature support.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-xmldsig.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecDSigStatus" role="enum">
 <title>enum xmlSecDSigStatus</title>
-<indexterm zone="xmlSecDSigStatus"><primary sortas="xmlSecDSigStatus">xmlSecDSigStatus</primary></indexterm><programlisting>typedef enum {
+<indexterm zone="xmlSecDSigStatus"><primary>xmlSecDSigStatus</primary></indexterm>
+<programlisting>typedef enum {
     xmlSecDSigStatusUnknown = 0,
     xmlSecDSigStatusSucceeded,
     xmlSecDSigStatusInvalid
 } xmlSecDSigStatus;
 </programlisting>
 <para>
-XML Digital signature processing status.</para>
-<para>
+XML Digital signature processing status.
 </para><variablelist role="enum">
 <varlistentry id="xmlSecDSigStatusUnknown" role="constant">
 <term><literal>xmlSecDSigStatusUnknown</literal></term>
-<listitem><simpara>    the status is unknow.
+<listitem><simpara>the status is unknow.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecDSigStatusSucceeded" role="constant">
 <term><literal>xmlSecDSigStatusSucceeded</literal></term>
-<listitem><simpara>  the processing succeeded.
+<listitem><simpara>the processing succeeded.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecDSigStatusInvalid" role="constant">
 <term><literal>xmlSecDSigStatusInvalid</literal></term>
-<listitem><simpara>    the processing failed.
+<listitem><simpara>the processing failed.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2 id="XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS--CAPS" role="macro">
+<refsect2 id="XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS:CAPS" role="macro">
 <title>XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS</title>
-<indexterm zone="XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS--CAPS"><primary sortas="XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS">XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS</primary></indexterm><programlisting>#define XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS                      0x00000001
+<indexterm zone="XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS:CAPS"><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";>&lt;dsig:Manifests/&gt;</ulink> nodes will not be processed.</para>
-<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></refsect2>
-<refsect2 id="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES--CAPS" role="macro">
+<refsect2 id="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES:CAPS" role="macro">
 <title>XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</title>
-<indexterm zone="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES--CAPS"><primary sortas="XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES">XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</primary></indexterm><programlisting>#define XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES           0x00000002
+<indexterm zone="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES:CAPS"><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";>&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>
+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></refsect2>
-<refsect2 id="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES--CAPS" role="macro">
+<refsect2 id="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES:CAPS" role="macro">
 <title>XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</title>
-<indexterm zone="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES--CAPS"><primary sortas="XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES">XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</primary></indexterm><programlisting>#define XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES             0x00000004
+<indexterm zone="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES:CAPS"><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";>&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>
+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></refsect2>
-<refsect2 id="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE--CAPS" role="macro">
+<refsect2 id="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE:CAPS" role="macro">
 <title>XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</title>
-<indexterm zone="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE--CAPS"><primary sortas="XMLSEC_DSIG_FLAGS_STORE_SIGNATURE">XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</primary></indexterm><programlisting>#define XMLSEC_DSIG_FLAGS_STORE_SIGNATURE                       0x00000008
+<indexterm zone="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE:CAPS"><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";>&lt;dsig:SignedInfo/&gt;</ulink>
-element processing will be stored in <link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtx</type></link>.</para>
-<para>
+element processing will be stored in <link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtx</type></link>.
 </para></refsect2>
-<refsect2 id="XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK--CAPS" role="macro">
+<refsect2 id="XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK:CAPS" role="macro">
 <title>XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</title>
-<indexterm zone="XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK--CAPS"><primary sortas="XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK">XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</primary></indexterm><programlisting>#define XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK                       0x00000010
+<indexterm zone="XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK:CAPS"><primary>XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</primary></indexterm>
+<programlisting>#define XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK                       0x00000010
 </programlisting>
 <para>
 If this flag is set then URI ID references are resolved directly
 without using XPointers. This allows one to sign/verify Visa3D
-documents that don't follow XML, XPointer and XML DSig specifications.</para>
-<para>
+documents that don't follow XML, XPointer and XML DSig specifications.
 </para></refsect2>
 <refsect2 id="xmlSecDSigCtx" role="struct">
 <title>struct xmlSecDSigCtx</title>
-<indexterm zone="xmlSecDSigCtx"><primary sortas="xmlSecDSigCtx">xmlSecDSigCtx</primary></indexterm><programlisting>struct xmlSecDSigCtx {
+<indexterm zone="xmlSecDSigCtx"><primary>xmlSecDSigCtx</primary></indexterm>
+<programlisting>struct xmlSecDSigCtx {
     /* these data user can set before performing the operation */
     void*                       userData;
     unsigned int                flags;
@@ -189,150 +181,124 @@ documents that don't follow XML, XPointer and XML DSig specifications.</para>
 };
 </programlisting>
 <para>
-XML DSig processing context.</para>
-<para>
+XML DSig processing context.
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>userData</structfield>;</term>
-<listitem><simpara>                   the pointer to user data (xmlsec and xmlsec-crypto libraries
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecDSigCtx.userData">userData</structfield>;</term>
+<listitem><simpara>the pointer to user data (xmlsec and xmlsec-crypto libraries
                              never touches this).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term>unsigned&#160;<link linkend="int">int</link>&#160;<structfield>flags</structfield>;</term>
-<listitem><simpara>                      the XML Digital Signature processing flags.
+<varlistentry><term>unsigned&#160;<link linkend="int"><type>int</type></link>&#160;<structfield id="xmlSecDSigCtx.flags">flags</structfield>;</term>
+<listitem><simpara>the XML Digital Signature processing flags.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term>unsigned&#160;<link linkend="int">int</link>&#160;<structfield>flags2</structfield>;</term>
-<listitem><simpara>                     the XML Digital Signature processing flags.
+<varlistentry><term>unsigned&#160;<link linkend="int"><type>int</type></link>&#160;<structfield id="xmlSecDSigCtx.flags2">flags2</structfield>;</term>
+<listitem><simpara>the XML Digital Signature processing flags.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link>&#160;<structfield>keyInfoReadCtx</structfield>;</term>
-<listitem><simpara>             the reading key context.
+<varlistentry><term><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtx</type></link>&#160;<structfield id="xmlSecDSigCtx.keyInfoReadCtx">keyInfoReadCtx</structfield>;</term>
+<listitem><simpara>the reading key context.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link>&#160;<structfield>keyInfoWriteCtx</structfield>;</term>
-<listitem><simpara>            the writing key context (not used for signature verification).
+<varlistentry><term><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtx</type></link>&#160;<structfield id="xmlSecDSigCtx.keyInfoWriteCtx">keyInfoWriteCtx</structfield>;</term>
+<listitem><simpara>the writing key context (not used for signature verification).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformCtx">xmlSecTransformCtx</link>&#160;<structfield>transformCtx</structfield>;</term>
-<listitem><simpara>               the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> node processing context.
+<varlistentry><term><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtx</type></link>&#160;<structfield id="xmlSecDSigCtx.transformCtx">transformCtx</structfield>;</term>
+<listitem><simpara>the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> node processing context.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformUriType">xmlSecTransformUriType</link>&#160;<structfield>enabledReferenceUris</structfield>;</term>
-<listitem><simpara>       the URI types allowed for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node.
+<varlistentry><term><link linkend="xmlSecTransformUriType"><type>xmlSecTransformUriType</type></link>&#160;<structfield id="xmlSecDSigCtx.enabledReferenceUris">enabledReferenceUris</structfield>;</term>
+<listitem><simpara>the URI types allowed for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrListPtr</link>&#160;<structfield>enabledReferenceTransforms</structfield>;</term>
-<listitem><simpara> the list of transforms allowed in <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node.
+<varlistentry><term><link linkend="xmlSecPtrList"><type>xmlSecPtrListPtr</type></link>&#160;<structfield id="xmlSecDSigCtx.enabledReferenceTransforms">enabledReferenceTransforms</structfield>;</term>
+<listitem><simpara>the list of transforms allowed in <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformCtxPreExecuteCallback">xmlSecTransformCtxPreExecuteCallback</link>&#160;<structfield>referencePreExecuteCallback</structfield>;</term>
+<varlistentry><term><link linkend="xmlSecTransformCtxPreExecuteCallback"><type>xmlSecTransformCtxPreExecuteCallback</type></link>&#160;<structfield id="xmlSecDSigCtx.referencePreExecuteCallback">referencePreExecuteCallback</structfield>;</term>
 <listitem><simpara>the callback for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node processing.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformId">xmlSecTransformId</link>&#160;<structfield>defSignMethodId</structfield>;</term>
-<listitem><simpara>            the default signing method klass.
+<varlistentry><term><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link>&#160;<structfield id="xmlSecDSigCtx.defSignMethodId">defSignMethodId</structfield>;</term>
+<listitem><simpara>the default signing method klass.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformId">xmlSecTransformId</link>&#160;<structfield>defC14NMethodId</structfield>;</term>
-<listitem><simpara>            the default c14n method klass.
+<varlistentry><term><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link>&#160;<structfield id="xmlSecDSigCtx.defC14NMethodId">defC14NMethodId</structfield>;</term>
+<listitem><simpara>the default c14n method klass.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformId">xmlSecTransformId</link>&#160;<structfield>defDigestMethodId</structfield>;</term>
-<listitem><simpara>          the default digest method klass.
+<varlistentry><term><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link>&#160;<structfield id="xmlSecDSigCtx.defDigestMethodId">defDigestMethodId</structfield>;</term>
+<listitem><simpara>the default digest method klass.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKey">xmlSecKeyPtr</link>&#160;<structfield>signKey</structfield>;</term>
-<listitem><simpara>                    the signature key; application may set <link linkend="signKey"><type>signKey</type></link>
+<varlistentry><term><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link>&#160;<structfield id="xmlSecDSigCtx.signKey">signKey</structfield>;</term>
+<listitem><simpara>the signature key; application may set <link linkend="signKey"><type>signKey</type></link>
                              before calling <link linkend="xmlSecDSigCtxSign"><type>xmlSecDSigCtxSign</type></link> or <link linkend="xmlSecDSigCtxVerify"><type>xmlSecDSigCtxVerify</type></link>
                              functions.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformOperation">xmlSecTransformOperation</link>&#160;<structfield>operation</structfield>;</term>
-<listitem><simpara>                  the operation: sign or verify.
+<varlistentry><term><link linkend="xmlSecTransformOperation"><type>xmlSecTransformOperation</type></link>&#160;<structfield id="xmlSecDSigCtx.operation">operation</structfield>;</term>
+<listitem><simpara>the operation: sign or verify.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecBuffer">xmlSecBufferPtr</link>&#160;<structfield>result</structfield>;</term>
-<listitem><simpara>                     the pointer to signature (not valid for signature verificaction).
+<varlistentry><term><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link>&#160;<structfield id="xmlSecDSigCtx.result">result</structfield>;</term>
+<listitem><simpara>the pointer to signature (not valid for signature verificaction).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecDSigStatus">xmlSecDSigStatus</link>&#160;<structfield>status</structfield>;</term>
-<listitem><simpara>                     the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signatuire";>&lt;dsig:Signatuire/&gt;</ulink> procesisng status.
+<varlistentry><term><link linkend="xmlSecDSigStatus"><type>xmlSecDSigStatus</type></link>&#160;<structfield id="xmlSecDSigCtx.status">status</structfield>;</term>
+<listitem><simpara>the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signatuire";>&lt;dsig:Signatuire/&gt;</ulink> procesisng status.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link>&#160;<structfield>signMethod</structfield>;</term>
-<listitem><simpara>                 the pointer to signature transform.
+<varlistentry><term><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link>&#160;<structfield id="xmlSecDSigCtx.signMethod">signMethod</structfield>;</term>
+<listitem><simpara>the pointer to signature transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link>&#160;<structfield>c14nMethod</structfield>;</term>
-<listitem><simpara>                 the pointer to c14n transform.
+<varlistentry><term><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link>&#160;<structfield id="xmlSecDSigCtx.c14nMethod">c14nMethod</structfield>;</term>
+<listitem><simpara>the pointer to c14n transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link>&#160;<structfield>preSignMemBufMethod</structfield>;</term>
-<listitem><simpara>        the pointer to binary buffer right before signature
-                             (valid only if <link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE--CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</type></link> flag is set).
+<varlistentry><term><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link>&#160;<structfield id="xmlSecDSigCtx.preSignMemBufMethod">preSignMemBufMethod</structfield>;</term>
+<listitem><simpara>the pointer to binary buffer right before signature
+                             (valid only if <link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE:CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</type></link> flag is set).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlNode">xmlNodePtr</link>&#160;<structfield>signValueNode</structfield>;</term>
-<listitem><simpara>              the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureValue";>&lt;dsig:SignatureValue/&gt;</ulink> node.
+<varlistentry><term><link linkend="xmlNode"><type>xmlNodePtr</type></link>&#160;<structfield id="xmlSecDSigCtx.signValueNode">signValueNode</structfield>;</term>
+<listitem><simpara>the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureValue";>&lt;dsig:SignatureValue/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>id</structfield>;</term>
-<listitem><simpara>                         the pointer to Id attribute of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node.
+<varlistentry><term><link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecDSigCtx.id">id</structfield>;</term>
+<listitem><simpara>the pointer to Id attribute of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrList</link>&#160;<structfield>signedInfoReferences</structfield>;</term>
-<listitem><simpara>       the list of references in <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> node.
+<varlistentry><term><link linkend="xmlSecPtrList"><type>xmlSecPtrList</type></link>&#160;<structfield id="xmlSecDSigCtx.signedInfoReferences">signedInfoReferences</structfield>;</term>
+<listitem><simpara>the list of references in <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrList</link>&#160;<structfield>manifestReferences</structfield>;</term>
-<listitem><simpara>         the list of references in <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink> nodes.
+<varlistentry><term><link linkend="xmlSecPtrList"><type>xmlSecPtrList</type></link>&#160;<structfield id="xmlSecDSigCtx.manifestReferences">manifestReferences</structfield>;</term>
+<listitem><simpara>the list of references in <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink> nodes.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
-<listitem><simpara>                  reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecDSigCtx.reserved0">reserved0</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
-<listitem><simpara>                  reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecDSigCtx.reserved1">reserved1</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecDSigCtxCreate" role="function">
 <title>xmlSecDSigCtxCreate ()</title>
-<indexterm zone="xmlSecDSigCtxCreate"><primary sortas="xmlSecDSigCtxCreate">xmlSecDSigCtxCreate</primary></indexterm><programlisting><link linkend="xmlSecDSigCtxPtr">xmlSecDSigCtxPtr</link>    xmlSecDSigCtxCreate                 (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
+<indexterm zone="xmlSecDSigCtxCreate"><primary>xmlSecDSigCtxCreate</primary></indexterm>
+<programlisting><link linkend="xmlSecDSigCtxPtr"><returnvalue>xmlSecDSigCtxPtr</returnvalue></link>    xmlSecDSigCtxCreate                 (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> keysMngr</parameter>);</programlisting>
 <para>
 Creates <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> element processing context.
 The caller is responsible for destroying returend object by calling
-<link linkend="xmlSecDSigCtxDestroy"><type>xmlSecDSigCtxDestroy</type></link> function.</para>
-<para>
+<link linkend="xmlSecDSigCtxDestroy"><type>xmlSecDSigCtxDestroy</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keysMngr</parameter>&#160;:</term>
-<listitem><simpara>           the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated context object or NULL if an error
 occurs.
@@ -340,76 +306,76 @@ occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecDSigCtxDestroy" role="function">
 <title>xmlSecDSigCtxDestroy ()</title>
-<indexterm zone="xmlSecDSigCtxDestroy"><primary sortas="xmlSecDSigCtxDestroy">xmlSecDSigCtxDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecDSigCtxDestroy                (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx);</programlisting>
-<para>
-Destroy context object created with <link linkend="xmlSecDSigCtxCreate"><type>xmlSecDSigCtxCreate</type></link> function.</para>
+<indexterm zone="xmlSecDSigCtxDestroy"><primary>xmlSecDSigCtxDestroy</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecDSigCtxDestroy                (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>);</programlisting>
 <para>
+Destroy context object created with <link linkend="xmlSecDSigCtxCreate"><type>xmlSecDSigCtxCreate</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
+<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 id="xmlSecDSigCtxInitialize" role="function">
 <title>xmlSecDSigCtxInitialize ()</title>
-<indexterm zone="xmlSecDSigCtxInitialize"><primary sortas="xmlSecDSigCtxInitialize">xmlSecDSigCtxInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecDSigCtxInitialize             (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
+<indexterm zone="xmlSecDSigCtxInitialize"><primary>xmlSecDSigCtxInitialize</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecDSigCtxInitialize             (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>,
+                                                         <parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> keysMngr</parameter>);</programlisting>
 <para>
 Initializes <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> element processing context.
 The caller is responsible for cleaing up returend object by calling
-<link linkend="xmlSecDSigCtxFinalize"><type>xmlSecDSigCtxFinalize</type></link> function.</para>
-<para>
+<link linkend="xmlSecDSigCtxFinalize"><type>xmlSecDSigCtxFinalize</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
+<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>&#160;:</term>
-<listitem><simpara>           the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecDSigCtxFinalize" role="function">
 <title>xmlSecDSigCtxFinalize ()</title>
-<indexterm zone="xmlSecDSigCtxFinalize"><primary sortas="xmlSecDSigCtxFinalize">xmlSecDSigCtxFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecDSigCtxFinalize               (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx);</programlisting>
-<para>
-Cleans up <parameter>dsigCtx</parameter> object initialized with <link linkend="xmlSecDSigCtxInitialize"><type>xmlSecDSigCtxInitialize</type></link> function.</para>
+<indexterm zone="xmlSecDSigCtxFinalize"><primary>xmlSecDSigCtxFinalize</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecDSigCtxFinalize               (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>);</programlisting>
 <para>
+Cleans up <parameter>dsigCtx</parameter> object initialized with <link linkend="xmlSecDSigCtxInitialize"><type>xmlSecDSigCtxInitialize</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
+<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 id="xmlSecDSigCtxSign" role="function">
 <title>xmlSecDSigCtxSign ()</title>
-<indexterm zone="xmlSecDSigCtxSign"><primary sortas="xmlSecDSigCtxSign">xmlSecDSigCtxSign</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecDSigCtxSign                   (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> tmpl);</programlisting>
-<para>
-Signs the data as described in <parameter>tmpl</parameter> node.</para>
+<indexterm zone="xmlSecDSigCtxSign"><primary>xmlSecDSigCtxSign</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecDSigCtxSign                   (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> tmpl</parameter>);</programlisting>
 <para>
+Signs the data as described in <parameter>tmpl</parameter> node.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
+<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>&#160;:</term>
-<listitem><simpara>               the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node with signature template.
+<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>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecDSigCtxVerify" role="function">
 <title>xmlSecDSigCtxVerify ()</title>
-<indexterm zone="xmlSecDSigCtxVerify"><primary sortas="xmlSecDSigCtxVerify">xmlSecDSigCtxVerify</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecDSigCtxVerify                 (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
+<indexterm zone="xmlSecDSigCtxVerify"><primary>xmlSecDSigCtxVerify</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecDSigCtxVerify                 (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>);</programlisting>
 <para>
 Vaidates signature in the <parameter>node</parameter>. The verification result is returned
-in <link linkend="status"><type>status</type></link> member of the <parameter>dsigCtx</parameter> object.</para>
-<para>
+in <link linkend="status"><type>status</type></link> member of the <parameter>dsigCtx</parameter> object.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
+<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>&#160;:</term>
-<listitem><simpara>               the pointer with <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</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>&#160;:</term><listitem><simpara> 0 on success (check <link linkend="status"><type>status</type></link> member of <parameter>dsigCtx</parameter> to get
 signature verification result) or a negative value if an error occurs.
@@ -417,96 +383,96 @@ signature verification result) or a negative value if an error occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecDSigCtxEnableReferenceTransform" role="function">
 <title>xmlSecDSigCtxEnableReferenceTransform ()</title>
-<indexterm zone="xmlSecDSigCtxEnableReferenceTransform"><primary sortas="xmlSecDSigCtxEnableReferenceTransform">xmlSecDSigCtxEnableReferenceTransform</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecDSigCtxEnableReferenceTransform
-                                                        (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);</programlisting>
-<para>
-Enables <parameter>transformId</parameter> for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> elements processing.</para>
+<indexterm zone="xmlSecDSigCtxEnableReferenceTransform"><primary>xmlSecDSigCtxEnableReferenceTransform</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecDSigCtxEnableReferenceTransform
+                                                        (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> transformId</parameter>);</programlisting>
 <para>
+Enables <parameter>transformId</parameter> for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> elements processing.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
+<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>&#160;:</term>
-<listitem><simpara>        the transform klass.
+<listitem><simpara>the transform klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecDSigCtxEnableSignatureTransform" role="function">
 <title>xmlSecDSigCtxEnableSignatureTransform ()</title>
-<indexterm zone="xmlSecDSigCtxEnableSignatureTransform"><primary sortas="xmlSecDSigCtxEnableSignatureTransform">xmlSecDSigCtxEnableSignatureTransform</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecDSigCtxEnableSignatureTransform
-                                                        (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);</programlisting>
-<para>
-Enables <parameter>transformId</parameter> for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> element processing.</para>
+<indexterm zone="xmlSecDSigCtxEnableSignatureTransform"><primary>xmlSecDSigCtxEnableSignatureTransform</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecDSigCtxEnableSignatureTransform
+                                                        (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>,
+                                                         <parameter><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link> transformId</parameter>);</programlisting>
 <para>
+Enables <parameter>transformId</parameter> for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> element processing.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
+<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>&#160;:</term>
-<listitem><simpara>        the transform klass.
+<listitem><simpara>the transform klass.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecDSigCtxGetPreSignBuffer" role="function">
 <title>xmlSecDSigCtxGetPreSignBuffer ()</title>
-<indexterm zone="xmlSecDSigCtxGetPreSignBuffer"><primary sortas="xmlSecDSigCtxGetPreSignBuffer">xmlSecDSigCtxGetPreSignBuffer</primary></indexterm><programlisting><link linkend="xmlSecBufferPtr">xmlSecBufferPtr</link>     xmlSecDSigCtxGetPreSignBuffer       (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx);</programlisting>
+<indexterm zone="xmlSecDSigCtxGetPreSignBuffer"><primary>xmlSecDSigCtxGetPreSignBuffer</primary></indexterm>
+<programlisting><link linkend="xmlSecBufferPtr"><returnvalue>xmlSecBufferPtr</returnvalue></link>     xmlSecDSigCtxGetPreSignBuffer       (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>);</programlisting>
 <para>
 Gets pointer to the buffer with serialized <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> element
 just before signature claculation (valid if and only if
-<link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE--CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</type></link> context flag is set.</para>
-<para>
+<link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE:CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</type></link> context flag is set.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
+<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>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecDSigCtxDebugDump" role="function">
 <title>xmlSecDSigCtxDebugDump ()</title>
-<indexterm zone="xmlSecDSigCtxDebugDump"><primary sortas="xmlSecDSigCtxDebugDump">xmlSecDSigCtxDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecDSigCtxDebugDump              (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints the debug information about <parameter>dsigCtx</parameter> to <parameter>output</parameter>.</para>
+<indexterm zone="xmlSecDSigCtxDebugDump"><primary>xmlSecDSigCtxDebugDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecDSigCtxDebugDump              (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints the debug information about <parameter>dsigCtx</parameter> to <parameter>output</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
+<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>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecDSigCtxDebugXmlDump" role="function">
 <title>xmlSecDSigCtxDebugXmlDump ()</title>
-<indexterm zone="xmlSecDSigCtxDebugXmlDump"><primary sortas="xmlSecDSigCtxDebugXmlDump">xmlSecDSigCtxDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecDSigCtxDebugXmlDump           (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints the debug information about <parameter>dsigCtx</parameter> to <parameter>output</parameter> in XML format.</para>
+<indexterm zone="xmlSecDSigCtxDebugXmlDump"><primary>xmlSecDSigCtxDebugXmlDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecDSigCtxDebugXmlDump           (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints the debug information about <parameter>dsigCtx</parameter> to <parameter>output</parameter> in XML format.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
+<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>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecDSigReferenceOrigin" role="enum">
 <title>enum xmlSecDSigReferenceOrigin</title>
-<indexterm zone="xmlSecDSigReferenceOrigin"><primary sortas="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</primary></indexterm><programlisting>typedef enum  {
+<indexterm zone="xmlSecDSigReferenceOrigin"><primary>xmlSecDSigReferenceOrigin</primary></indexterm>
+<programlisting>typedef enum  {
     xmlSecDSigReferenceOriginSignedInfo,
     xmlSecDSigReferenceOriginManifest
 } xmlSecDSigReferenceOrigin;
 </programlisting>
 <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>
+node or in the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink> node.
 </para><variablelist role="enum">
 <varlistentry id="xmlSecDSigReferenceOriginSignedInfo" role="constant">
 <term><literal>xmlSecDSigReferenceOriginSignedInfo</literal></term>
@@ -515,13 +481,14 @@ node or in the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;
 </varlistentry>
 <varlistentry id="xmlSecDSigReferenceOriginManifest" role="constant">
 <term><literal>xmlSecDSigReferenceOriginManifest</literal></term>
-<listitem><simpara>  reference &lt;dsig:Manifest&gt; node.
+<listitem><simpara>reference &lt;dsig:Manifest&gt; node.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecDSigReferenceCtx" role="struct">
 <title>struct xmlSecDSigReferenceCtx</title>
-<indexterm zone="xmlSecDSigReferenceCtx"><primary sortas="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtx</primary></indexterm><programlisting>struct xmlSecDSigReferenceCtx {
+<indexterm zone="xmlSecDSigReferenceCtx"><primary>xmlSecDSigReferenceCtx</primary></indexterm>
+<programlisting>struct xmlSecDSigReferenceCtx {
     void*                       userData;
     xmlSecDSigCtxPtr            dsigCtx;
     xmlSecDSigReferenceOrigin   origin;
@@ -541,147 +508,134 @@ node or in the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;
 };
 </programlisting>
 <para>
-The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> processing context.</para>
-<para>
+The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> processing context.
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>userData</structfield>;</term>
-<listitem><simpara>                   the pointer to user data (xmlsec and xmlsec-crypto libraries
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecDSigReferenceCtx.userData">userData</structfield>;</term>
+<listitem><simpara>the pointer to user data (xmlsec and xmlsec-crypto libraries
                              never touches this).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link>&#160;<structfield>dsigCtx</structfield>;</term>
-<listitem><simpara>                    the pointer to "parent" <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
+<varlistentry><term><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link>&#160;<structfield id="xmlSecDSigReferenceCtx.dsigCtx">dsigCtx</structfield>;</term>
+<listitem><simpara>the pointer to "parent" <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</link>&#160;<structfield>origin</structfield>;</term>
-<listitem><simpara>                     the signature origin (<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> or <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink>).
+<varlistentry><term><link linkend="xmlSecDSigReferenceOrigin"><type>xmlSecDSigReferenceOrigin</type></link>&#160;<structfield id="xmlSecDSigReferenceCtx.origin">origin</structfield>;</term>
+<listitem><simpara>the signature origin (<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> or <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink>).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformCtx">xmlSecTransformCtx</link>&#160;<structfield>transformCtx</structfield>;</term>
-<listitem><simpara>               the reference processing transforms context.
+<varlistentry><term><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtx</type></link>&#160;<structfield id="xmlSecDSigReferenceCtx.transformCtx">transformCtx</structfield>;</term>
+<listitem><simpara>the reference processing transforms context.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link>&#160;<structfield>digestMethod</structfield>;</term>
-<listitem><simpara>               the pointer to digest transform.
+<varlistentry><term><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link>&#160;<structfield id="xmlSecDSigReferenceCtx.digestMethod">digestMethod</structfield>;</term>
+<listitem><simpara>the pointer to digest transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecBuffer">xmlSecBufferPtr</link>&#160;<structfield>result</structfield>;</term>
-<listitem><simpara>                     the pointer to digest result.
+<varlistentry><term><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link>&#160;<structfield id="xmlSecDSigReferenceCtx.result">result</structfield>;</term>
+<listitem><simpara>the pointer to digest result.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecDSigStatus">xmlSecDSigStatus</link>&#160;<structfield>status</structfield>;</term>
-<listitem><simpara>                     the reference processing status.
+<varlistentry><term><link linkend="xmlSecDSigStatus"><type>xmlSecDSigStatus</type></link>&#160;<structfield id="xmlSecDSigReferenceCtx.status">status</structfield>;</term>
+<listitem><simpara>the reference processing status.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link>&#160;<structfield>preDigestMemBufMethod</structfield>;</term>
-<listitem><simpara>      the pointer to binary buffer right before digest
+<varlistentry><term><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link>&#160;<structfield id="xmlSecDSigReferenceCtx.preDigestMemBufMethod">preDigestMemBufMethod</structfield>;</term>
+<listitem><simpara>the pointer to binary buffer right before digest
                              (valid only if either
-                             <link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES--CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</type></link> or
-                             <link linkend="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES--CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</type></link> flags are set).
+                             <link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES:CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</type></link> or
+                             <link linkend="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES:CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</type></link> flags are set).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>id</structfield>;</term>
-<listitem><simpara>                         the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node ID attribute.
+<varlistentry><term><link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecDSigReferenceCtx.id">id</structfield>;</term>
+<listitem><simpara>the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node ID attribute.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>uri</structfield>;</term>
-<listitem><simpara>                        the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node URI attribute.
+<varlistentry><term><link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecDSigReferenceCtx.uri">uri</structfield>;</term>
+<listitem><simpara>the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node URI attribute.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>type</structfield>;</term>
-<listitem><simpara>                       the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node Type attribute.
+<varlistentry><term><link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecDSigReferenceCtx.type">type</structfield>;</term>
+<listitem><simpara>the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node Type attribute.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
-<listitem><simpara>                  reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecDSigReferenceCtx.reserved0">reserved0</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
-<listitem><simpara>                  reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecDSigReferenceCtx.reserved1">reserved1</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecDSigReferenceCtxCreate" role="function">
 <title>xmlSecDSigReferenceCtxCreate ()</title>
-<indexterm zone="xmlSecDSigReferenceCtxCreate"><primary sortas="xmlSecDSigReferenceCtxCreate">xmlSecDSigReferenceCtxCreate</primary></indexterm><programlisting><link linkend="xmlSecDSigReferenceCtxPtr">xmlSecDSigReferenceCtxPtr</link>  xmlSecDSigReferenceCtxCreate (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                                         <link linkend="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</link> origin);</programlisting>
+<indexterm zone="xmlSecDSigReferenceCtxCreate"><primary>xmlSecDSigReferenceCtxCreate</primary></indexterm>
+<programlisting><link linkend="xmlSecDSigReferenceCtxPtr"><returnvalue>xmlSecDSigReferenceCtxPtr</returnvalue></link>  xmlSecDSigReferenceCtxCreate (<parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>,
+                                                         <parameter><link linkend="xmlSecDSigReferenceOrigin"><type>xmlSecDSigReferenceOrigin</type></link> origin</parameter>);</programlisting>
 <para>
 Creates new <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context. Caller is responsible
 for destroying the returned context by calling <link linkend="xmlSecDSigReferenceCtxDestroy"><type>xmlSecDSigReferenceCtxDestroy</type></link>
-function.</para>
-<para>
+function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
-<listitem><simpara>            the pointer to parent <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node processing context.
+<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>&#160;:</term>
-<listitem><simpara>             the reference origin (<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> or <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink> node).
+<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>&#160;:</term><listitem><simpara> pointer to newly created context or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecDSigReferenceCtxDestroy" role="function">
 <title>xmlSecDSigReferenceCtxDestroy ()</title>
-<indexterm zone="xmlSecDSigReferenceCtxDestroy"><primary sortas="xmlSecDSigReferenceCtxDestroy">xmlSecDSigReferenceCtxDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecDSigReferenceCtxDestroy       (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx);</programlisting>
-<para>
-Destroy context object created with <link linkend="xmlSecDSigReferenceCtxCreate"><type>xmlSecDSigReferenceCtxCreate</type></link> function.</para>
+<indexterm zone="xmlSecDSigReferenceCtxDestroy"><primary>xmlSecDSigReferenceCtxDestroy</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecDSigReferenceCtxDestroy       (<parameter><link linkend="xmlSecDSigReferenceCtx"><type>xmlSecDSigReferenceCtxPtr</type></link> dsigRefCtx</parameter>);</programlisting>
 <para>
+Destroy context object created with <link linkend="xmlSecDSigReferenceCtxCreate"><type>xmlSecDSigReferenceCtxCreate</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigRefCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context.
+<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 id="xmlSecDSigReferenceCtxInitialize" role="function">
 <title>xmlSecDSigReferenceCtxInitialize ()</title>
-<indexterm zone="xmlSecDSigReferenceCtxInitialize"><primary sortas="xmlSecDSigReferenceCtxInitialize">xmlSecDSigReferenceCtxInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecDSigReferenceCtxInitialize    (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
-                                                         <link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                                         <link linkend="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</link> origin);</programlisting>
+<indexterm zone="xmlSecDSigReferenceCtxInitialize"><primary>xmlSecDSigReferenceCtxInitialize</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecDSigReferenceCtxInitialize    (<parameter><link linkend="xmlSecDSigReferenceCtx"><type>xmlSecDSigReferenceCtxPtr</type></link> dsigRefCtx</parameter>,
+                                                         <parameter><link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtxPtr</type></link> dsigCtx</parameter>,
+                                                         <parameter><link linkend="xmlSecDSigReferenceOrigin"><type>xmlSecDSigReferenceOrigin</type></link> origin</parameter>);</programlisting>
 <para>
 Initializes new <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context. Caller is responsible
 for cleaning up the returned context by calling <link linkend="xmlSecDSigReferenceCtxFinalize"><type>xmlSecDSigReferenceCtxFinalize</type></link>
-function.</para>
-<para>
+function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigRefCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context.
+<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>&#160;:</term>
-<listitem><simpara>            the pointer to parent <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node processing context.
+<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>&#160;:</term>
-<listitem><simpara>             the reference origin (<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> or <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink> node).
+<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>&#160;:</term><listitem><simpara> 0 on succes or aa negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecDSigReferenceCtxFinalize" role="function">
 <title>xmlSecDSigReferenceCtxFinalize ()</title>
-<indexterm zone="xmlSecDSigReferenceCtxFinalize"><primary sortas="xmlSecDSigReferenceCtxFinalize">xmlSecDSigReferenceCtxFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecDSigReferenceCtxFinalize      (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx);</programlisting>
-<para>
-Cleans up context object created with <link linkend="xmlSecDSigReferenceCtxInitialize"><type>xmlSecDSigReferenceCtxInitialize</type></link> function.</para>
+<indexterm zone="xmlSecDSigReferenceCtxFinalize"><primary>xmlSecDSigReferenceCtxFinalize</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecDSigReferenceCtxFinalize      (<parameter><link linkend="xmlSecDSigReferenceCtx"><type>xmlSecDSigReferenceCtxPtr</type></link> dsigRefCtx</parameter>);</programlisting>
 <para>
+Cleans up context object created with <link linkend="xmlSecDSigReferenceCtxInitialize"><type>xmlSecDSigReferenceCtxInitialize</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigRefCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context.
+<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 id="xmlSecDSigReferenceCtxProcessNode" role="function">
 <title>xmlSecDSigReferenceCtxProcessNode ()</title>
-<indexterm zone="xmlSecDSigReferenceCtxProcessNode"><primary sortas="xmlSecDSigReferenceCtxProcessNode">xmlSecDSigReferenceCtxProcessNode</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecDSigReferenceCtxProcessNode   (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
+<indexterm zone="xmlSecDSigReferenceCtxProcessNode"><primary>xmlSecDSigReferenceCtxProcessNode</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecDSigReferenceCtxProcessNode   (<parameter><link linkend="xmlSecDSigReferenceCtx"><type>xmlSecDSigReferenceCtxPtr</type></link> dsigRefCtx</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>);</programlisting>
 <para>
 The Reference Element (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-Reference"><type>sec-Reference</type></link>)
 </para>
@@ -695,78 +649,77 @@ was created. The Type attribute facilitates the processing of referenced
 data. For example, while this specification makes no requirements over
 external data, an application may wish to signal that the referent is a
 Manifest. An optional ID attribute permits a Reference to be referenced
-from elsewhere.</para>
-<para>
+from elsewhere.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigRefCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context.
+<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>&#160;:</term>
-<listitem><simpara>               the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</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>&#160;:</term><listitem><simpara> 0 on succes or aa negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecDSigReferenceCtxGetPreDigestBuffer" role="function">
 <title>xmlSecDSigReferenceCtxGetPreDigestBuffer ()</title>
-<indexterm zone="xmlSecDSigReferenceCtxGetPreDigestBuffer"><primary sortas="xmlSecDSigReferenceCtxGetPreDigestBuffer">xmlSecDSigReferenceCtxGetPreDigestBuffer</primary></indexterm><programlisting><link linkend="xmlSecBuffer">xmlSecBufferPtr</link>     xmlSecDSigReferenceCtxGetPreDigestBuffer
-                                                        (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx);</programlisting>
+<indexterm zone="xmlSecDSigReferenceCtxGetPreDigestBuffer"><primary>xmlSecDSigReferenceCtxGetPreDigestBuffer</primary></indexterm>
+<programlisting><link linkend="xmlSecBuffer"><returnvalue>xmlSecBufferPtr</returnvalue></link>     xmlSecDSigReferenceCtxGetPreDigestBuffer
+                                                        (<parameter><link linkend="xmlSecDSigReferenceCtx"><type>xmlSecDSigReferenceCtxPtr</type></link> dsigRefCtx</parameter>);</programlisting>
 <para>
 Gets the results of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node processing just before digesting
-(valid only if <link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES--CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</type></link> or
-<link linkend="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES--CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</type></link> flas of signature context
-is set).</para>
-<para>
+(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><variablelist role="params">
 <varlistentry><term><parameter>dsigRefCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context.
+<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>&#160;:</term><listitem><simpara> pointer to the buffer or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecDSigReferenceCtxDebugDump" role="function">
 <title>xmlSecDSigReferenceCtxDebugDump ()</title>
-<indexterm zone="xmlSecDSigReferenceCtxDebugDump"><primary sortas="xmlSecDSigReferenceCtxDebugDump">xmlSecDSigReferenceCtxDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecDSigReferenceCtxDebugDump     (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints debug information about <parameter>dsigRefCtx</parameter> to <parameter>output</parameter>.</para>
+<indexterm zone="xmlSecDSigReferenceCtxDebugDump"><primary>xmlSecDSigReferenceCtxDebugDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecDSigReferenceCtxDebugDump     (<parameter><link linkend="xmlSecDSigReferenceCtx"><type>xmlSecDSigReferenceCtxPtr</type></link> dsigRefCtx</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints debug information about <parameter>dsigRefCtx</parameter> to <parameter>output</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigRefCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context.
+<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>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecDSigReferenceCtxDebugXmlDump" role="function">
 <title>xmlSecDSigReferenceCtxDebugXmlDump ()</title>
-<indexterm zone="xmlSecDSigReferenceCtxDebugXmlDump"><primary sortas="xmlSecDSigReferenceCtxDebugXmlDump">xmlSecDSigReferenceCtxDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecDSigReferenceCtxDebugXmlDump  (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints debug information about <parameter>dsigRefCtx</parameter> to <parameter>output</parameter> in output format.</para>
+<indexterm zone="xmlSecDSigReferenceCtxDebugXmlDump"><primary>xmlSecDSigReferenceCtxDebugXmlDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecDSigReferenceCtxDebugXmlDump  (<parameter><link linkend="xmlSecDSigReferenceCtx"><type>xmlSecDSigReferenceCtxPtr</type></link> dsigRefCtx</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints debug information about <parameter>dsigRefCtx</parameter> to <parameter>output</parameter> in output format.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dsigRefCtx</parameter>&#160;:</term>
-<listitem><simpara>         the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context.
+<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>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecDSigReferenceCtxListId" role="macro">
 <title>xmlSecDSigReferenceCtxListId</title>
-<indexterm zone="xmlSecDSigReferenceCtxListId"><primary sortas="xmlSecDSigReferenceCtxListId">xmlSecDSigReferenceCtxListId</primary></indexterm><programlisting>#define             xmlSecDSigReferenceCtxListId</programlisting>
-<para>
-The references list klass.</para>
+<indexterm zone="xmlSecDSigReferenceCtxListId"><primary>xmlSecDSigReferenceCtxListId</primary></indexterm>
+<programlisting>#define             xmlSecDSigReferenceCtxListId</programlisting>
 <para>
+The references list klass.
 </para></refsect2>
 <refsect2 id="xmlSecDSigReferenceCtxListGetKlass" role="function">
 <title>xmlSecDSigReferenceCtxListGetKlass ()</title>
-<indexterm zone="xmlSecDSigReferenceCtxListGetKlass"><primary sortas="xmlSecDSigReferenceCtxListGetKlass">xmlSecDSigReferenceCtxListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     xmlSecDSigReferenceCtxListGetKlass  (void);</programlisting>
-<para>
-The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing contexts list klass.</para>
+<indexterm zone="xmlSecDSigReferenceCtxListGetKlass"><primary>xmlSecDSigReferenceCtxListGetKlass</primary></indexterm>
+<programlisting><link linkend="xmlSecPtrListId"><returnvalue>xmlSecPtrListId</returnvalue></link>     xmlSecDSigReferenceCtxListGetKlass  (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing contexts list klass.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context list klass.
 </simpara></listitem></varlistentry>
@@ -774,7 +727,4 @@ The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Refer
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/xmlenc.sgml b/docs/api/sgml/xmlenc.sgml
index 3815f60..2420571 100644
--- a/docs/api/sgml/xmlenc.sgml
+++ b/docs/api/sgml/xmlenc.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-xmlenc.top_of_page">xmlenc</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>xmlenc</refname>
 <refpurpose>XML Encryption support.</refpurpose>
@@ -13,89 +14,80 @@
 <refsynopsisdiv id="xmlsec-xmlenc.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-enum                <link linkend="xmlEncCtxMode">xmlEncCtxMode</link>;
-#define             <link linkend="XMLSEC-ENC-RETURN-REPLACED-NODE--CAPS">XMLSEC_ENC_RETURN_REPLACED_NODE</link>
+<synopsis>enum                <link linkend="xmlEncCtxMode">xmlEncCtxMode</link>;
+#define             <link linkend="XMLSEC-ENC-RETURN-REPLACED-NODE:CAPS">XMLSEC_ENC_RETURN_REPLACED_NODE</link>
 struct              <link linkend="xmlSecEncCtx">xmlSecEncCtx</link>;
-<link linkend="xmlSecEncCtxPtr">xmlSecEncCtxPtr</link>     <link linkend="xmlSecEncCtxCreate">xmlSecEncCtxCreate</link>                  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
-<link linkend="void">void</link>                <link linkend="xmlSecEncCtxDestroy">xmlSecEncCtxDestroy</link>                 (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecEncCtxInitialize">xmlSecEncCtxInitialize</link>              (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
-<link linkend="void">void</link>                <link linkend="xmlSecEncCtxFinalize">xmlSecEncCtxFinalize</link>                (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecEncCtxCopyUserPref">xmlSecEncCtxCopyUserPref</link>            (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> dst,
-                                                         <link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> src);
-<link linkend="void">void</link>                <link linkend="xmlSecEncCtxReset">xmlSecEncCtxReset</link>                   (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx);
-<link linkend="int">int</link>                 <link linkend="xmlSecEncCtxBinaryEncrypt">xmlSecEncCtxBinaryEncrypt</link>           (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> tmpl,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize);
-<link linkend="int">int</link>                 <link linkend="xmlSecEncCtxXmlEncrypt">xmlSecEncCtxXmlEncrypt</link>              (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> tmpl,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="int">int</link>                 <link linkend="xmlSecEncCtxUriEncrypt">xmlSecEncCtxUriEncrypt</link>              (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> tmpl,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri);
-<link linkend="int">int</link>                 <link linkend="xmlSecEncCtxDecrypt">xmlSecEncCtxDecrypt</link>                 (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="xmlSecBufferPtr">xmlSecBufferPtr</link>     <link linkend="xmlSecEncCtxDecryptToBuffer">xmlSecEncCtxDecryptToBuffer</link>         (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="void">void</link>                <link linkend="xmlSecEncCtxDebugDump">xmlSecEncCtxDebugDump</link>               (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
-<link linkend="void">void</link>                <link linkend="xmlSecEncCtxDebugXmlDump">xmlSecEncCtxDebugXmlDump</link>            (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="xmlSecEncCtxPtr"><returnvalue>xmlSecEncCtxPtr</returnvalue></link>     <link linkend="xmlSecEncCtxCreate">xmlSecEncCtxCreate</link>                  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> keysMngr</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecEncCtxDestroy">xmlSecEncCtxDestroy</link>                 (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecEncCtxInitialize">xmlSecEncCtxInitialize</link>              (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>,
+                                                         <parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> keysMngr</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecEncCtxFinalize">xmlSecEncCtxFinalize</link>                (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecEncCtxCopyUserPref">xmlSecEncCtxCopyUserPref</link>            (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> dst</parameter>,
+                                                         <parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> src</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecEncCtxReset">xmlSecEncCtxReset</link>                   (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecEncCtxBinaryEncrypt">xmlSecEncCtxBinaryEncrypt</link>           (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> tmpl</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecEncCtxXmlEncrypt">xmlSecEncCtxXmlEncrypt</link>              (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> tmpl</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecEncCtxUriEncrypt">xmlSecEncCtxUriEncrypt</link>              (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> tmpl</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecEncCtxDecrypt">xmlSecEncCtxDecrypt</link>                 (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>);
+<link linkend="xmlSecBufferPtr"><returnvalue>xmlSecBufferPtr</returnvalue></link>     <link linkend="xmlSecEncCtxDecryptToBuffer">xmlSecEncCtxDecryptToBuffer</link>         (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecEncCtxDebugDump">xmlSecEncCtxDebugDump</link>               (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecEncCtxDebugXmlDump">xmlSecEncCtxDebugXmlDump</link>            (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-xmlenc.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 XML Encryption support.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-xmlenc.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlEncCtxMode" role="enum">
 <title>enum xmlEncCtxMode</title>
-<indexterm zone="xmlEncCtxMode"><primary sortas="xmlEncCtxMode">xmlEncCtxMode</primary></indexterm><programlisting>typedef enum {
+<indexterm zone="xmlEncCtxMode"><primary>xmlEncCtxMode</primary></indexterm>
+<programlisting>typedef enum {
     xmlEncCtxModeEncryptedData = 0,
     xmlEncCtxModeEncryptedKey
 } xmlEncCtxMode;
 </programlisting>
 <para>
-The <link linkend="xmlSecEncCtx"><type>xmlSecEncCtx</type></link> mode.</para>
-<para>
+The <link linkend="xmlSecEncCtx"><type>xmlSecEncCtx</type></link> mode.
 </para><variablelist role="enum">
 <varlistentry id="xmlEncCtxModeEncryptedData" role="constant">
 <term><literal>xmlEncCtxModeEncryptedData</literal></term>
-<listitem><simpara> the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> element procesing.
+<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 id="xmlEncCtxModeEncryptedKey" role="constant">
 <term><literal>xmlEncCtxModeEncryptedKey</literal></term>
-<listitem><simpara>  the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> element processing.
+<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 id="XMLSEC-ENC-RETURN-REPLACED-NODE--CAPS" role="macro">
+<refsect2 id="XMLSEC-ENC-RETURN-REPLACED-NODE:CAPS" role="macro">
 <title>XMLSEC_ENC_RETURN_REPLACED_NODE</title>
-<indexterm zone="XMLSEC-ENC-RETURN-REPLACED-NODE--CAPS"><primary sortas="XMLSEC_ENC_RETURN_REPLACED_NODE">XMLSEC_ENC_RETURN_REPLACED_NODE</primary></indexterm><programlisting>#define XMLSEC_ENC_RETURN_REPLACED_NODE                 0x00000001
+<indexterm zone="XMLSEC-ENC-RETURN-REPLACED-NODE:CAPS"><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>
+If this flag is set, then the replaced node will be returned in the replacedNodeList
 </para></refsect2>
 <refsect2 id="xmlSecEncCtx" role="struct">
 <title>struct xmlSecEncCtx</title>
-<indexterm zone="xmlSecEncCtx"><primary sortas="xmlSecEncCtx">xmlSecEncCtx</primary></indexterm><programlisting>struct xmlSecEncCtx {
+<indexterm zone="xmlSecEncCtx"><primary>xmlSecEncCtx</primary></indexterm>
+<programlisting>struct xmlSecEncCtx {
     /* these data user can set before performing the operation */
     void*                       userData;
     unsigned int                flags;
@@ -133,160 +125,133 @@ If this flag is set, then the replaced node will be returned in the replacedNode
 };
 </programlisting>
 <para>
-XML Encrypiton context.</para>
-<para>
+XML Encrypiton context.
 </para><variablelist role="struct">
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>userData</structfield>;</term>
-<listitem><simpara>                   the pointer to user data (xmlsec and xmlsec-crypto libraries
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecEncCtx.userData">userData</structfield>;</term>
+<listitem><simpara>the pointer to user data (xmlsec and xmlsec-crypto libraries
                              never touches this).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term>unsigned&#160;<link linkend="int">int</link>&#160;<structfield>flags</structfield>;</term>
-<listitem><simpara>                      the XML Encryption processing flags.
+<varlistentry><term>unsigned&#160;<link linkend="int"><type>int</type></link>&#160;<structfield id="xmlSecEncCtx.flags">flags</structfield>;</term>
+<listitem><simpara>the XML Encryption processing flags.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term>unsigned&#160;<link linkend="int">int</link>&#160;<structfield>flags2</structfield>;</term>
-<listitem><simpara>                     the XML Encryption processing flags.
+<varlistentry><term>unsigned&#160;<link linkend="int"><type>int</type></link>&#160;<structfield id="xmlSecEncCtx.flags2">flags2</structfield>;</term>
+<listitem><simpara>the XML Encryption processing flags.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlEncCtxMode">xmlEncCtxMode</link>&#160;<structfield>mode</structfield>;</term>
-<listitem><simpara>                       the mode.
+<varlistentry><term><link linkend="xmlEncCtxMode"><type>xmlEncCtxMode</type></link>&#160;<structfield id="xmlSecEncCtx.mode">mode</structfield>;</term>
+<listitem><simpara>the mode.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link>&#160;<structfield>keyInfoReadCtx</structfield>;</term>
-<listitem><simpara>             the reading key context.
+<varlistentry><term><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtx</type></link>&#160;<structfield id="xmlSecEncCtx.keyInfoReadCtx">keyInfoReadCtx</structfield>;</term>
+<listitem><simpara>the reading key context.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link>&#160;<structfield>keyInfoWriteCtx</structfield>;</term>
-<listitem><simpara>            the writing key context (not used for signature verification).
+<varlistentry><term><link linkend="xmlSecKeyInfoCtx"><type>xmlSecKeyInfoCtx</type></link>&#160;<structfield id="xmlSecEncCtx.keyInfoWriteCtx">keyInfoWriteCtx</structfield>;</term>
+<listitem><simpara>the writing key context (not used for signature verification).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformCtx">xmlSecTransformCtx</link>&#160;<structfield>transformCtx</structfield>;</term>
-<listitem><simpara>               the transforms processing context.
+<varlistentry><term><link linkend="xmlSecTransformCtx"><type>xmlSecTransformCtx</type></link>&#160;<structfield id="xmlSecEncCtx.transformCtx">transformCtx</structfield>;</term>
+<listitem><simpara>the transforms processing context.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformId">xmlSecTransformId</link>&#160;<structfield>defEncMethodId</structfield>;</term>
-<listitem><simpara>             the default encryption method (used if
+<varlistentry><term><link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link>&#160;<structfield id="xmlSecEncCtx.defEncMethodId">defEncMethodId</structfield>;</term>
+<listitem><simpara>the default encryption method (used if
                              <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod";>&lt;enc:EncryptionMethod/&gt;</ulink> node is not present).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecKey">xmlSecKeyPtr</link>&#160;<structfield>encKey</structfield>;</term>
-<listitem><simpara>                     the signature key; application may set <link linkend="encKey"><type>encKey</type></link>
+<varlistentry><term><link linkend="xmlSecKey"><type>xmlSecKeyPtr</type></link>&#160;<structfield id="xmlSecEncCtx.encKey">encKey</structfield>;</term>
+<listitem><simpara>the signature key; application may set <link linkend="encKey"><type>encKey</type></link>
                              before calling encryption/decryption functions.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransformOperation">xmlSecTransformOperation</link>&#160;<structfield>operation</structfield>;</term>
-<listitem><simpara>                  the operation: encrypt or decrypt.
+<varlistentry><term><link linkend="xmlSecTransformOperation"><type>xmlSecTransformOperation</type></link>&#160;<structfield id="xmlSecEncCtx.operation">operation</structfield>;</term>
+<listitem><simpara>the operation: encrypt or decrypt.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecBuffer">xmlSecBufferPtr</link>&#160;<structfield>result</structfield>;</term>
-<listitem><simpara>                     the pointer to signature (not valid for signature verificaction).
+<varlistentry><term><link linkend="xmlSecBuffer"><type>xmlSecBufferPtr</type></link>&#160;<structfield id="xmlSecEncCtx.result">result</structfield>;</term>
+<listitem><simpara>the pointer to signature (not valid for signature verificaction).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="int">int</link>&#160;<structfield>resultBase64Encoded</structfield>;</term>
-<listitem><simpara>        the flag: if set then result in <link linkend="result"><type>result</type></link> is base64 encoded.
+<varlistentry><term><link linkend="int"><type>int</type></link>&#160;<structfield id="xmlSecEncCtx.resultBase64Encoded">resultBase64Encoded</structfield>;</term>
+<listitem><simpara>the flag: if set then result in <link linkend="result"><type>result</type></link> is base64 encoded.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="int">int</link>&#160;<structfield>resultReplaced</structfield>;</term>
-<listitem><simpara>             the flag: if set then resulted <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink>
+<varlistentry><term><link linkend="int"><type>int</type></link>&#160;<structfield id="xmlSecEncCtx.resultReplaced">resultReplaced</structfield>;</term>
+<listitem><simpara>the flag: if set then resulted <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink>
                              or <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node is added to the document.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link>&#160;<structfield>encMethod</structfield>;</term>
-<listitem><simpara>                  the pointer to encryption transform.
+<varlistentry><term><link linkend="xmlSecTransform"><type>xmlSecTransformPtr</type></link>&#160;<structfield id="xmlSecEncCtx.encMethod">encMethod</structfield>;</term>
+<listitem><simpara>the pointer to encryption transform.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>id</structfield>;</term>
-<listitem><simpara>                         the ID attribute of <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink>
+<varlistentry><term><link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecEncCtx.id">id</structfield>;</term>
+<listitem><simpara>the ID attribute of <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink>
                              or <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>type</structfield>;</term>
-<listitem><simpara>                       the Type attribute of <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink>
+<varlistentry><term><link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecEncCtx.type">type</structfield>;</term>
+<listitem><simpara>the Type attribute of <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink>
                              or <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>mimeType</structfield>;</term>
-<listitem><simpara>                   the MimeType attribute of <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink>
+<varlistentry><term><link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecEncCtx.mimeType">mimeType</structfield>;</term>
+<listitem><simpara>the MimeType attribute of <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink>
                              or <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>encoding</structfield>;</term>
-<listitem><simpara>                   the Encoding attributeof <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink>
+<varlistentry><term><link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecEncCtx.encoding">encoding</structfield>;</term>
+<listitem><simpara>the Encoding attributeof <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink>
                              or <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>recipient</structfield>;</term>
-<listitem><simpara>                  the Recipient attribute of <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node..
+<varlistentry><term><link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecEncCtx.recipient">recipient</structfield>;</term>
+<listitem><simpara>the Recipient attribute of <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node..
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>carriedKeyName</structfield>;</term>
-<listitem><simpara>             the CarriedKeyName attribute of <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node.
+<varlistentry><term><link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecEncCtx.carriedKeyName">carriedKeyName</structfield>;</term>
+<listitem><simpara>the CarriedKeyName attribute of <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlNode">xmlNodePtr</link>&#160;<structfield>encDataNode</structfield>;</term>
-<listitem><simpara>                the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink>
+<varlistentry><term><link linkend="xmlNode"><type>xmlNodePtr</type></link>&#160;<structfield id="xmlSecEncCtx.encDataNode">encDataNode</structfield>;</term>
+<listitem><simpara>the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink>
                              or <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlNode">xmlNodePtr</link>&#160;<structfield>encMethodNode</structfield>;</term>
-<listitem><simpara>              the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod";>&lt;enc:EncryptionMethod/&gt;</ulink> node.
+<varlistentry><term><link linkend="xmlNode"><type>xmlNodePtr</type></link>&#160;<structfield id="xmlSecEncCtx.encMethodNode">encMethodNode</structfield>;</term>
+<listitem><simpara>the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod";>&lt;enc:EncryptionMethod/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlNode">xmlNodePtr</link>&#160;<structfield>keyInfoNode</structfield>;</term>
-<listitem><simpara>                the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-KeyInfo";>&lt;enc:KeyInfo/&gt;</ulink> node.
+<varlistentry><term><link linkend="xmlNode"><type>xmlNodePtr</type></link>&#160;<structfield id="xmlSecEncCtx.keyInfoNode">keyInfoNode</structfield>;</term>
+<listitem><simpara>the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-KeyInfo";>&lt;enc:KeyInfo/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlNode">xmlNodePtr</link>&#160;<structfield>cipherValueNode</structfield>;</term>
-<listitem><simpara>            the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue";>&lt;enc:CipherValue/&gt;</ulink> node.
+<varlistentry><term><link linkend="xmlNode"><type>xmlNodePtr</type></link>&#160;<structfield id="xmlSecEncCtx.cipherValueNode">cipherValueNode</structfield>;</term>
+<listitem><simpara>the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue";>&lt;enc:CipherValue/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlNode">xmlNodePtr</link>&#160;<structfield>replacedNodeList</structfield>;</term>
-<listitem><simpara> the first node of the list of replaced nodes depending on the nodeReplacementMode
+<varlistentry><term><link linkend="xmlNode"><type>xmlNodePtr</type></link>&#160;<structfield id="xmlSecEncCtx.replacedNodeList">replacedNodeList</structfield>;</term>
+<listitem><simpara>the first node of the list of replaced nodes depending on the nodeReplacementMode
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
-<listitem><simpara>                  reserved for the future.
+<varlistentry><term><link linkend="void"><type>void</type></link>&#160;*<structfield id="xmlSecEncCtx.reserved1">reserved1</structfield>;</term>
+<listitem><simpara>reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecEncCtxCreate" role="function">
 <title>xmlSecEncCtxCreate ()</title>
-<indexterm zone="xmlSecEncCtxCreate"><primary sortas="xmlSecEncCtxCreate">xmlSecEncCtxCreate</primary></indexterm><programlisting><link linkend="xmlSecEncCtxPtr">xmlSecEncCtxPtr</link>     xmlSecEncCtxCreate                  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
+<indexterm zone="xmlSecEncCtxCreate"><primary>xmlSecEncCtxCreate</primary></indexterm>
+<programlisting><link linkend="xmlSecEncCtxPtr"><returnvalue>xmlSecEncCtxPtr</returnvalue></link>     xmlSecEncCtxCreate                  (<parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> keysMngr</parameter>);</programlisting>
 <para>
 Creates <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> element processing context.
 The caller is responsible for destroying returend object by calling
-<link linkend="xmlSecEncCtxDestroy"><type>xmlSecEncCtxDestroy</type></link> function.</para>
-<para>
+<link linkend="xmlSecEncCtxDestroy"><type>xmlSecEncCtxDestroy</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>keysMngr</parameter>&#160;:</term>
-<listitem><simpara>           the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated context object or NULL if an error
 occurs.
@@ -294,209 +259,206 @@ occurs.
 </variablelist></refsect2>
 <refsect2 id="xmlSecEncCtxDestroy" role="function">
 <title>xmlSecEncCtxDestroy ()</title>
-<indexterm zone="xmlSecEncCtxDestroy"><primary sortas="xmlSecEncCtxDestroy">xmlSecEncCtxDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecEncCtxDestroy                 (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx);</programlisting>
-<para>
-Destroy context object created with <link linkend="xmlSecEncCtxCreate"><type>xmlSecEncCtxCreate</type></link> function.</para>
+<indexterm zone="xmlSecEncCtxDestroy"><primary>xmlSecEncCtxDestroy</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecEncCtxDestroy                 (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>);</programlisting>
 <para>
+Destroy context object created with <link linkend="xmlSecEncCtxCreate"><type>xmlSecEncCtxCreate</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
+<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 id="xmlSecEncCtxInitialize" role="function">
 <title>xmlSecEncCtxInitialize ()</title>
-<indexterm zone="xmlSecEncCtxInitialize"><primary sortas="xmlSecEncCtxInitialize">xmlSecEncCtxInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecEncCtxInitialize              (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
+<indexterm zone="xmlSecEncCtxInitialize"><primary>xmlSecEncCtxInitialize</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecEncCtxInitialize              (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>,
+                                                         <parameter><link linkend="xmlSecKeysMngr"><type>xmlSecKeysMngrPtr</type></link> keysMngr</parameter>);</programlisting>
 <para>
 Initializes <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> element processing context.
 The caller is responsible for cleaing up returend object by calling
-<link linkend="xmlSecEncCtxFinalize"><type>xmlSecEncCtxFinalize</type></link> function.</para>
-<para>
+<link linkend="xmlSecEncCtxFinalize"><type>xmlSecEncCtxFinalize</type></link> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
+<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>&#160;:</term>
-<listitem><simpara>           the pointer to keys manager.
+<listitem><simpara>the pointer to keys manager.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecEncCtxFinalize" role="function">
 <title>xmlSecEncCtxFinalize ()</title>
-<indexterm zone="xmlSecEncCtxFinalize"><primary sortas="xmlSecEncCtxFinalize">xmlSecEncCtxFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecEncCtxFinalize                (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx);</programlisting>
-<para>
-Cleans up <parameter>encCtx</parameter> object.</para>
+<indexterm zone="xmlSecEncCtxFinalize"><primary>xmlSecEncCtxFinalize</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecEncCtxFinalize                (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>);</programlisting>
 <para>
+Cleans up <parameter>encCtx</parameter> object.
 </para><variablelist role="params">
 <varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
+<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 id="xmlSecEncCtxCopyUserPref" role="function">
 <title>xmlSecEncCtxCopyUserPref ()</title>
-<indexterm zone="xmlSecEncCtxCopyUserPref"><primary sortas="xmlSecEncCtxCopyUserPref">xmlSecEncCtxCopyUserPref</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecEncCtxCopyUserPref            (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> dst,
-                                                         <link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> src);</programlisting>
-<para>
-Copies user preference from <parameter>src</parameter> context to <parameter>dst</parameter>.</para>
+<indexterm zone="xmlSecEncCtxCopyUserPref"><primary>xmlSecEncCtxCopyUserPref</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecEncCtxCopyUserPref            (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> dst</parameter>,
+                                                         <parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> src</parameter>);</programlisting>
 <para>
+Copies user preference from <parameter>src</parameter> context to <parameter>dst</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>dst</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to destination context.
+<listitem><simpara>the pointer to destination context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>src</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to source context.
+<listitem><simpara>the pointer to source context.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecEncCtxReset" role="function">
 <title>xmlSecEncCtxReset ()</title>
-<indexterm zone="xmlSecEncCtxReset"><primary sortas="xmlSecEncCtxReset">xmlSecEncCtxReset</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecEncCtxReset                   (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx);</programlisting>
-<para>
-Resets <parameter>encCtx</parameter> object, user settings are not touched.</para>
+<indexterm zone="xmlSecEncCtxReset"><primary>xmlSecEncCtxReset</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecEncCtxReset                   (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>);</programlisting>
 <para>
+Resets <parameter>encCtx</parameter> object, user settings are not touched.
 </para><variablelist role="params">
 <varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
+<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 id="xmlSecEncCtxBinaryEncrypt" role="function">
 <title>xmlSecEncCtxBinaryEncrypt ()</title>
-<indexterm zone="xmlSecEncCtxBinaryEncrypt"><primary sortas="xmlSecEncCtxBinaryEncrypt">xmlSecEncCtxBinaryEncrypt</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecEncCtxBinaryEncrypt           (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> tmpl,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize);</programlisting>
-<para>
-Encrypts <parameter>data</parameter> according to template <parameter>tmpl</parameter>.</para>
+<indexterm zone="xmlSecEncCtxBinaryEncrypt"><primary>xmlSecEncCtxBinaryEncrypt</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecEncCtxBinaryEncrypt           (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> tmpl</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *data</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> dataSize</parameter>);</programlisting>
 <para>
+Encrypts <parameter>data</parameter> according to template <parameter>tmpl</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
+<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>&#160;:</term>
-<listitem><simpara>               the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> template node.
+<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>&#160;:</term>
-<listitem><simpara>               the pointer for binary buffer.
+<listitem><simpara>the pointer for binary buffer.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
-<listitem><simpara>           the <parameter>data</parameter> buffer size.
+<listitem><simpara>the <parameter>data</parameter> buffer size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecEncCtxXmlEncrypt" role="function">
 <title>xmlSecEncCtxXmlEncrypt ()</title>
-<indexterm zone="xmlSecEncCtxXmlEncrypt"><primary sortas="xmlSecEncCtxXmlEncrypt">xmlSecEncCtxXmlEncrypt</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecEncCtxXmlEncrypt              (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> tmpl,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
+<indexterm zone="xmlSecEncCtxXmlEncrypt"><primary>xmlSecEncCtxXmlEncrypt</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecEncCtxXmlEncrypt              (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> tmpl</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>);</programlisting>
 <para>
 Encrypts <parameter>node</parameter> according to template <parameter>tmpl</parameter>. If requested, <parameter>node</parameter> is replaced
-with result <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node.</para>
-<para>
+with result <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node.
 </para><variablelist role="params">
 <varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
+<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>&#160;:</term>
-<listitem><simpara>               the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> template node.
+<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>&#160;:</term>
-<listitem><simpara>               the pointer to node for encryption.
+<listitem><simpara>the pointer to node for encryption.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecEncCtxUriEncrypt" role="function">
 <title>xmlSecEncCtxUriEncrypt ()</title>
-<indexterm zone="xmlSecEncCtxUriEncrypt"><primary sortas="xmlSecEncCtxUriEncrypt">xmlSecEncCtxUriEncrypt</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecEncCtxUriEncrypt              (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> tmpl,
-                                                         const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
-<para>
-Encrypts data from <parameter>uri</parameter> according to template <parameter>tmpl</parameter>.</para>
+<indexterm zone="xmlSecEncCtxUriEncrypt"><primary>xmlSecEncCtxUriEncrypt</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecEncCtxUriEncrypt              (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> tmpl</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *uri</parameter>);</programlisting>
 <para>
+Encrypts data from <parameter>uri</parameter> according to template <parameter>tmpl</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
+<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>&#160;:</term>
-<listitem><simpara>               the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> template node.
+<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>&#160;:</term>
-<listitem><simpara>                the URI.
+<listitem><simpara>the URI.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecEncCtxDecrypt" role="function">
 <title>xmlSecEncCtxDecrypt ()</title>
-<indexterm zone="xmlSecEncCtxDecrypt"><primary sortas="xmlSecEncCtxDecrypt">xmlSecEncCtxDecrypt</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecEncCtxDecrypt                 (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
-<para>
-Decrypts <parameter>node</parameter> and if necessary replaces <parameter>node</parameter> with decrypted data.</para>
+<indexterm zone="xmlSecEncCtxDecrypt"><primary>xmlSecEncCtxDecrypt</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecEncCtxDecrypt                 (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>);</programlisting>
 <para>
+Decrypts <parameter>node</parameter> and if necessary replaces <parameter>node</parameter> with decrypted data.
 </para><variablelist role="params">
 <varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
+<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>&#160;:</term>
-<listitem><simpara>               the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</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>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecEncCtxDecryptToBuffer" role="function">
 <title>xmlSecEncCtxDecryptToBuffer ()</title>
-<indexterm zone="xmlSecEncCtxDecryptToBuffer"><primary sortas="xmlSecEncCtxDecryptToBuffer">xmlSecEncCtxDecryptToBuffer</primary></indexterm><programlisting><link linkend="xmlSecBufferPtr">xmlSecBufferPtr</link>     xmlSecEncCtxDecryptToBuffer         (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
-<para>
-Decrypts <parameter>node</parameter> data to the <parameter>encCtx</parameter> buffer.</para>
+<indexterm zone="xmlSecEncCtxDecryptToBuffer"><primary>xmlSecEncCtxDecryptToBuffer</primary></indexterm>
+<programlisting><link linkend="xmlSecBufferPtr"><returnvalue>xmlSecBufferPtr</returnvalue></link>     xmlSecEncCtxDecryptToBuffer         (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>);</programlisting>
 <para>
+Decrypts <parameter>node</parameter> data to the <parameter>encCtx</parameter> buffer.
 </para><variablelist role="params">
 <varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
+<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>&#160;:</term>
-<listitem><simpara>               the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</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>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecEncCtxDebugDump" role="function">
 <title>xmlSecEncCtxDebugDump ()</title>
-<indexterm zone="xmlSecEncCtxDebugDump"><primary sortas="xmlSecEncCtxDebugDump">xmlSecEncCtxDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecEncCtxDebugDump               (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints the debug information about <parameter>encCtx</parameter> to <parameter>output</parameter>.</para>
+<indexterm zone="xmlSecEncCtxDebugDump"><primary>xmlSecEncCtxDebugDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecEncCtxDebugDump               (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints the debug information about <parameter>encCtx</parameter> to <parameter>output</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
+<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>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecEncCtxDebugXmlDump" role="function">
 <title>xmlSecEncCtxDebugXmlDump ()</title>
-<indexterm zone="xmlSecEncCtxDebugXmlDump"><primary sortas="xmlSecEncCtxDebugXmlDump">xmlSecEncCtxDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecEncCtxDebugXmlDump            (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints the debug information about <parameter>encCtx</parameter> to <parameter>output</parameter> in XML format.</para>
+<indexterm zone="xmlSecEncCtxDebugXmlDump"><primary>xmlSecEncCtxDebugXmlDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecEncCtxDebugXmlDump            (<parameter><link linkend="xmlSecEncCtx"><type>xmlSecEncCtxPtr</type></link> encCtx</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints the debug information about <parameter>encCtx</parameter> to <parameter>output</parameter> in XML format.
 </para><variablelist role="params">
 <varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
+<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>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/xmlsec.sgml b/docs/api/sgml/xmlsec.sgml
index ccb7afc..b3752f6 100644
--- a/docs/api/sgml/xmlsec.sgml
+++ b/docs/api/sgml/xmlsec.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-xmlsec.top_of_page">xmlsec</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>xmlsec</refname>
 <refpurpose>Utility functions.</refpurpose>
@@ -13,176 +14,208 @@
 <refsynopsisdiv id="xmlsec-xmlsec.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-typedef             <link linkend="xmlSec">xmlSecPtr</link>;
+<synopsis>typedef             <link linkend="xmlSec">xmlSecPtr</link>;
 #define             <link linkend="xmlSecSize">xmlSecSize</link>
-#define             <link linkend="XMLSEC-SIZE-BAD-CAST--CAPS">XMLSEC_SIZE_BAD_CAST</link>                (val)
+#define             <link linkend="XMLSEC-SIZE-BAD-CAST:CAPS">XMLSEC_SIZE_BAD_CAST</link>                (val)
 #define             <link linkend="xmlSecByte">xmlSecByte</link>
-<link linkend="int">int</link>                 <link linkend="xmlSecInit">xmlSecInit</link>                          (void);
-<link linkend="int">int</link>                 <link linkend="xmlSecShutdown">xmlSecShutdown</link>                      (void);
-#define             <link linkend="xmlSecCheckVersionExact">xmlSecCheckVersionExact</link>             ()
-#define             <link linkend="xmlSecCheckVersion">xmlSecCheckVersion</link>                  ()
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecInit">xmlSecInit</link>                          (<parameter><type>void</type></parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecShutdown">xmlSecShutdown</link>                      (<parameter><type>void</type></parameter>);
+#define             <link linkend="xmlSecCheckVersionExact">xmlSecCheckVersionExact</link>
+#define             <link linkend="xmlSecCheckVersion">xmlSecCheckVersion</link>
 enum                <link linkend="xmlSecCheckVersionMode">xmlSecCheckVersionMode</link>;
-<link linkend="int">int</link>                 <link linkend="xmlSecCheckVersionExt">xmlSecCheckVersionExt</link>               (<link linkend="int">int</link> major,
-                                                         <link linkend="int">int</link> minor,
-                                                         <link linkend="int">int</link> subminor,
-                                                         <link linkend="xmlSecCheckVersionMode">xmlSecCheckVersionMode</link> mode);
-#define             <link linkend="ATTRIBUTE-UNUSED--CAPS">ATTRIBUTE_UNUSED</link>
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCheckVersionExt">xmlSecCheckVersionExt</link>               (<parameter><link linkend="int"><type>int</type></link> major</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> minor</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> subminor</parameter>,
+                                                         <parameter><link linkend="xmlSecCheckVersionMode"><type>xmlSecCheckVersionMode</type></link> mode</parameter>);
+#define             <link linkend="ATTRIBUTE-UNUSED:CAPS">ATTRIBUTE_UNUSED</link>
+#define             <link linkend="XMLSEC-PTR-TO-FUNC-IMPL:CAPS">XMLSEC_PTR_TO_FUNC_IMPL</link>             (func_type)
+#define             <link linkend="XMLSEC-PTR-TO-FUNC:CAPS">XMLSEC_PTR_TO_FUNC</link>                  (func_type,
+                                                         ptr)
+#define             <link linkend="XMLSEC-FUNC-TO-PTR:CAPS">XMLSEC_FUNC_TO_PTR</link>                  (func_type,
+                                                         func)
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-xmlsec.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 Utility functions.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-xmlsec.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecPtr" role="typedef">
 <title>xmlSecPtr</title>
-<indexterm zone="xmlSecPtr"><primary sortas="xmlSecPtr">xmlSecPtr</primary></indexterm><programlisting>typedef void*                                   xmlSecPtr;
+<indexterm zone="xmlSecPtr"><primary>xmlSecPtr</primary></indexterm>
+<programlisting>typedef void*                                   xmlSecPtr;
 </programlisting>
 <para>
-Void pointer.</para>
-<para>
+Void pointer.
 </para></refsect2>
 <refsect2 id="xmlSecSize" role="macro">
 <title>xmlSecSize</title>
-<indexterm zone="xmlSecSize"><primary sortas="xmlSecSize">xmlSecSize</primary></indexterm><programlisting>#define             xmlSecSize</programlisting>
+<indexterm zone="xmlSecSize"><primary>xmlSecSize</primary></indexterm>
+<programlisting>#define             xmlSecSize</programlisting>
 <para>
 Size of something. Should be typedef instead of define
-but it will break ABI (todo).</para>
-<para>
+but it will break ABI (todo).
 </para></refsect2>
-<refsect2 id="XMLSEC-SIZE-BAD-CAST--CAPS" role="macro">
+<refsect2 id="XMLSEC-SIZE-BAD-CAST:CAPS" role="macro">
 <title>XMLSEC_SIZE_BAD_CAST()</title>
-<indexterm zone="XMLSEC-SIZE-BAD-CAST--CAPS"><primary sortas="XMLSEC_SIZE_BAD_CAST">XMLSEC_SIZE_BAD_CAST</primary></indexterm><programlisting>#define XMLSEC_SIZE_BAD_CAST(val)               ((xmlSecSize)(val))
+<indexterm zone="XMLSEC-SIZE-BAD-CAST:CAPS"><primary>XMLSEC_SIZE_BAD_CAST</primary></indexterm>
+<programlisting>#define XMLSEC_SIZE_BAD_CAST(val)               ((xmlSecSize)(val))
 </programlisting>
 <para>
-Bad cast to xmlSecSize</para>
-<para>
+Bad cast to xmlSecSize
 </para><variablelist role="params">
 <varlistentry><term><parameter>val</parameter>&#160;:</term>
-<listitem><simpara>        the value to cast
+<listitem><simpara>the value to cast
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecByte" role="macro">
 <title>xmlSecByte</title>
-<indexterm zone="xmlSecByte"><primary sortas="xmlSecByte">xmlSecByte</primary></indexterm><programlisting>#define xmlSecByte                              unsigned char
+<indexterm zone="xmlSecByte"><primary>xmlSecByte</primary></indexterm>
+<programlisting>#define xmlSecByte                              unsigned char
 </programlisting>
 <para>
 One byte. Should be typedef instead of define
-but it will break ABI (todo).</para>
-<para>
+but it will break ABI (todo).
 </para></refsect2>
 <refsect2 id="xmlSecInit" role="function">
 <title>xmlSecInit ()</title>
-<indexterm zone="xmlSecInit"><primary sortas="xmlSecInit">xmlSecInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecInit                          (void);</programlisting>
+<indexterm zone="xmlSecInit"><primary>xmlSecInit</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecInit                          (<parameter><type>void</type></parameter>);</programlisting>
 <para>
 Initializes XML Security Library. The depended libraries
-(LibXML and LibXSLT) must be initialized before.</para>
-<para>
+(LibXML and LibXSLT) must be initialized before.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecShutdown" role="function">
 <title>xmlSecShutdown ()</title>
-<indexterm zone="xmlSecShutdown"><primary sortas="xmlSecShutdown">xmlSecShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecShutdown                      (void);</programlisting>
-<para>
-Clean ups the XML Security Library.</para>
+<indexterm zone="xmlSecShutdown"><primary>xmlSecShutdown</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecShutdown                      (<parameter><type>void</type></parameter>);</programlisting>
 <para>
+Clean ups the XML Security Library.
 </para><variablelist role="params">
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCheckVersionExact" role="macro">
-<title>xmlSecCheckVersionExact()</title>
-<indexterm zone="xmlSecCheckVersionExact"><primary sortas="xmlSecCheckVersionExact">xmlSecCheckVersionExact</primary></indexterm><programlisting>#define             xmlSecCheckVersionExact()</programlisting>
+<title>xmlSecCheckVersionExact</title>
+<indexterm zone="xmlSecCheckVersionExact"><primary>xmlSecCheckVersionExact</primary></indexterm>
+<programlisting>#define             xmlSecCheckVersionExact()</programlisting>
 <para>
 Macro. Returns 1 if the loaded xmlsec library version exactly matches
 the one used to compile the caller, 0 if it does not or a negative
-value if an error occurs.</para>
-<para>
+value if an error occurs.
 </para></refsect2>
 <refsect2 id="xmlSecCheckVersion" role="macro">
-<title>xmlSecCheckVersion()</title>
-<indexterm zone="xmlSecCheckVersion"><primary sortas="xmlSecCheckVersion">xmlSecCheckVersion</primary></indexterm><programlisting>#define             xmlSecCheckVersion()</programlisting>
+<title>xmlSecCheckVersion</title>
+<indexterm zone="xmlSecCheckVersion"><primary>xmlSecCheckVersion</primary></indexterm>
+<programlisting>#define             xmlSecCheckVersion()</programlisting>
 <para>
 Macro. Returns 1 if the loaded xmlsec library version ABI compatible with
 the one used to compile the caller, 0 if it does not or a negative
-value if an error occurs.</para>
-<para>
+value if an error occurs.
 </para></refsect2>
 <refsect2 id="xmlSecCheckVersionMode" role="enum">
 <title>enum xmlSecCheckVersionMode</title>
-<indexterm zone="xmlSecCheckVersionMode"><primary sortas="xmlSecCheckVersionMode">xmlSecCheckVersionMode</primary></indexterm><programlisting>typedef enum {
+<indexterm zone="xmlSecCheckVersionMode"><primary>xmlSecCheckVersionMode</primary></indexterm>
+<programlisting>typedef enum {
     xmlSecCheckVersionExactMatch = 0,
     xmlSecCheckVersionABICompatible
 } xmlSecCheckVersionMode;
 </programlisting>
 <para>
-The xmlsec library version mode.</para>
-<para>
+The xmlsec library version mode.
 </para><variablelist role="enum">
 <varlistentry id="xmlSecCheckVersionExactMatch" role="constant">
 <term><literal>xmlSecCheckVersionExactMatch</literal></term>
-<listitem><simpara>       the version should match exactly.
+<listitem><simpara>the version should match exactly.
 </simpara></listitem>
 </varlistentry>
 <varlistentry id="xmlSecCheckVersionABICompatible" role="constant">
 <term><literal>xmlSecCheckVersionABICompatible</literal></term>
-<listitem><simpara>    the version should be ABI compatible.
+<listitem><simpara>the version should be ABI compatible.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCheckVersionExt" role="function">
 <title>xmlSecCheckVersionExt ()</title>
-<indexterm zone="xmlSecCheckVersionExt"><primary sortas="xmlSecCheckVersionExt">xmlSecCheckVersionExt</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCheckVersionExt               (<link linkend="int">int</link> major,
-                                                         <link linkend="int">int</link> minor,
-                                                         <link linkend="int">int</link> subminor,
-                                                         <link linkend="xmlSecCheckVersionMode">xmlSecCheckVersionMode</link> mode);</programlisting>
-<para>
-Checks if the loaded version of xmlsec library could be used.</para>
+<indexterm zone="xmlSecCheckVersionExt"><primary>xmlSecCheckVersionExt</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCheckVersionExt               (<parameter><link linkend="int"><type>int</type></link> major</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> minor</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> subminor</parameter>,
+                                                         <parameter><link linkend="xmlSecCheckVersionMode"><type>xmlSecCheckVersionMode</type></link> mode</parameter>);</programlisting>
 <para>
+Checks if the loaded version of xmlsec library could be used.
 </para><variablelist role="params">
 <varlistentry><term><parameter>major</parameter>&#160;:</term>
-<listitem><simpara>              the major version number.
+<listitem><simpara>the major version number.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>minor</parameter>&#160;:</term>
-<listitem><simpara>              the minor version number.
+<listitem><simpara>the minor version number.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>subminor</parameter>&#160;:</term>
-<listitem><simpara>           the subminor version number.
+<listitem><simpara>the subminor version number.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>mode</parameter>&#160;:</term>
-<listitem><simpara>               the version check mode.
+<listitem><simpara>the version check mode.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if the loaded xmlsec library version is OK to use
 0 if it is not or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="ATTRIBUTE-UNUSED--CAPS" role="macro">
+<refsect2 id="ATTRIBUTE-UNUSED:CAPS" role="macro">
 <title>ATTRIBUTE_UNUSED</title>
-<indexterm zone="ATTRIBUTE-UNUSED--CAPS"><primary sortas="ATTRIBUTE_UNUSED">ATTRIBUTE_UNUSED</primary></indexterm><programlisting>#define             ATTRIBUTE_UNUSED</programlisting>
-<para>
-Macro used to signal to GCC unused function parameters</para>
+<indexterm zone="ATTRIBUTE-UNUSED:CAPS"><primary>ATTRIBUTE_UNUSED</primary></indexterm>
+<programlisting>#define             ATTRIBUTE_UNUSED</programlisting>
 <para>
+Macro used to signal to GCC unused function parameters
 </para></refsect2>
+<refsect2 id="XMLSEC-PTR-TO-FUNC-IMPL:CAPS" role="macro">
+<title>XMLSEC_PTR_TO_FUNC_IMPL()</title>
+<indexterm zone="XMLSEC-PTR-TO-FUNC-IMPL:CAPS"><primary>XMLSEC_PTR_TO_FUNC_IMPL</primary></indexterm>
+<programlisting>#define             XMLSEC_PTR_TO_FUNC_IMPL(func_type)</programlisting>
+<para>
+Macro declares helper functions to convert between "void *" pointer and
+function pointer.
+</para><variablelist role="params">
+<varlistentry><term><parameter>func_type</parameter>&#160;:</term>
+<listitem><simpara>the function type.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="XMLSEC-PTR-TO-FUNC:CAPS" role="macro">
+<title>XMLSEC_PTR_TO_FUNC()</title>
+<indexterm zone="XMLSEC-PTR-TO-FUNC:CAPS"><primary>XMLSEC_PTR_TO_FUNC</primary></indexterm>
+<programlisting>#define             XMLSEC_PTR_TO_FUNC(func_type, ptr)</programlisting>
+<para>
+Macro converts from "void*" pointer to "func_type" function pointer.
+</para><variablelist role="params">
+<varlistentry><term><parameter>func_type</parameter>&#160;:</term>
+<listitem><simpara>the function type.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>ptr</parameter>&#160;:</term>
+<listitem><simpara>the "void*" pointer to be converted.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="XMLSEC-FUNC-TO-PTR:CAPS" role="macro">
+<title>XMLSEC_FUNC_TO_PTR()</title>
+<indexterm zone="XMLSEC-FUNC-TO-PTR:CAPS"><primary>XMLSEC_FUNC_TO_PTR</primary></indexterm>
+<programlisting>#define             XMLSEC_FUNC_TO_PTR(func_type, func)</programlisting>
+<para>
+Macro converts from "func_type" function pointer to "void*" pointer.
+</para><variablelist role="params">
+<varlistentry><term><parameter>func_type</parameter>&#160;:</term>
+<listitem><simpara>the function type.
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>func</parameter>&#160;:</term>
+<listitem><simpara>the "func_type" function pointer to be converted.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/sgml/xmltree.sgml b/docs/api/sgml/xmltree.sgml
index 4f49d90..55c74e8 100644
--- a/docs/api/sgml/xmltree.sgml
+++ b/docs/api/sgml/xmltree.sgml
@@ -2,9 +2,10 @@
 <refmeta>
 <refentrytitle role="top_of_page" id="xmlsec-xmltree.top_of_page">xmltree</refentrytitle>
 <manvolnum>3</manvolnum>
-<refmiscinfo>XMLSEC Library</refmiscinfo>
+<refmiscinfo>
+  XMLSEC Library
+</refmiscinfo>
 </refmeta>
-
 <refnamediv>
 <refname>xmltree</refname>
 <refpurpose>XML tree operations.</refpurpose>
@@ -13,248 +14,238 @@
 <refsynopsisdiv id="xmlsec-xmltree.synopsis" role="synopsis">
 <title role="synopsis.title">Synopsis</title>
 
-<synopsis>
-#define             <link linkend="xmlSecNodeGetName">xmlSecNodeGetName</link>                   (node)
-const <link linkend="xmlChar">xmlChar</link>*      <link linkend="xmlSecGetNodeNsHref">xmlSecGetNodeNsHref</link>                 (const <link linkend="xmlNode">xmlNodePtr</link> cur);
-<link linkend="int">int</link>                 <link linkend="xmlSecCheckNodeName">xmlSecCheckNodeName</link>                 (const <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         const <link linkend="xmlChar">xmlChar</link> *ns);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecGetNextElementNode">xmlSecGetNextElementNode</link>            (<link linkend="xmlNode">xmlNodePtr</link> cur);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecFindChild">xmlSecFindChild</link>                     (const <link linkend="xmlNode">xmlNodePtr</link> parent,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         const <link linkend="xmlChar">xmlChar</link> *ns);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecFindParent">xmlSecFindParent</link>                    (const <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         const <link linkend="xmlChar">xmlChar</link> *ns);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecFindNode">xmlSecFindNode</link>                      (const <link linkend="xmlNode">xmlNodePtr</link> parent,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         const <link linkend="xmlChar">xmlChar</link> *ns);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecAddChild">xmlSecAddChild</link>                      (<link linkend="xmlNode">xmlNodePtr</link> parent,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         const <link linkend="xmlChar">xmlChar</link> *ns);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecAddChildNode">xmlSecAddChildNode</link>                  (<link linkend="xmlNode">xmlNodePtr</link> parent,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> child);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecAddNextSibling">xmlSecAddNextSibling</link>                (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         const <link linkend="xmlChar">xmlChar</link> *ns);
-<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecAddPrevSibling">xmlSecAddPrevSibling</link>                (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         const <link linkend="xmlChar">xmlChar</link> *ns);
-<link linkend="int">int</link>                 <link linkend="xmlSecReplaceNode">xmlSecReplaceNode</link>                   (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> newNode);
-<link linkend="int">int</link>                 <link linkend="xmlSecReplaceNodeAndReturn">xmlSecReplaceNodeAndReturn</link>          (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> newNode,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> *replaced);
-<link linkend="int">int</link>                 <link linkend="xmlSecReplaceContent">xmlSecReplaceContent</link>                (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> newNode);
-<link linkend="int">int</link>                 <link linkend="xmlSecReplaceContentAndReturn">xmlSecReplaceContentAndReturn</link>       (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> newNode,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> *replaced);
-<link linkend="int">int</link>                 <link linkend="xmlSecReplaceNodeBuffer">xmlSecReplaceNodeBuffer</link>             (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="int">int</link>                 <link linkend="xmlSecReplaceNodeBufferAndReturn">xmlSecReplaceNodeBufferAndReturn</link>    (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> *replaced);
-<link linkend="int">int</link>                 <link linkend="xmlSecNodeEncodeAndSetContent">xmlSecNodeEncodeAndSetContent</link>       (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *buffer);
-<link linkend="void">void</link>                <link linkend="xmlSecAddIDs">xmlSecAddIDs</link>                        (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         const <link linkend="xmlChar">xmlChar</link> **ids);
-<link linkend="int">int</link>                 <link linkend="xmlSecGenerateAndAddID">xmlSecGenerateAndAddID</link>              (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *attrName,
-                                                         const <link linkend="xmlChar">xmlChar</link> *prefix,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> len);
-<link linkend="xmlChar">xmlChar</link>*            <link linkend="xmlSecGenerateID">xmlSecGenerateID</link>                    (const <link linkend="xmlChar">xmlChar</link> *prefix,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> len);
-<link linkend="xmlDoc">xmlDocPtr</link>           <link linkend="xmlSecCreateTree">xmlSecCreateTree</link>                    (const <link linkend="xmlChar">xmlChar</link> *rootNodeName,
-                                                         const <link linkend="xmlChar">xmlChar</link> *rootNodeNs);
-<link linkend="int">int</link>                 <link linkend="xmlSecIsEmptyNode">xmlSecIsEmptyNode</link>                   (<link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="int">int</link>                 <link linkend="xmlSecIsEmptyString">xmlSecIsEmptyString</link>                 (const <link linkend="xmlChar">xmlChar</link> *str);
-<link linkend="xmlChar">xmlChar</link>*            <link linkend="xmlSecGetQName">xmlSecGetQName</link>                      (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *href,
-                                                         const <link linkend="xmlChar">xmlChar</link> *local);
-<link linkend="int">int</link>                 <link linkend="xmlSecPrintXmlString">xmlSecPrintXmlString</link>                (<link linkend="FILE--CAPS">FILE</link> *fd,
-                                                         const <link linkend="xmlChar">xmlChar</link> *str);
+<synopsis>#define             <link linkend="xmlSecNodeGetName">xmlSecNodeGetName</link>                   (node)
+const <link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*      <link linkend="xmlSecGetNodeNsHref">xmlSecGetNodeNsHref</link>                 (<parameter>const <link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecCheckNodeName">xmlSecCheckNodeName</link>                 (<parameter>const <link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *ns</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecGetNextElementNode">xmlSecGetNextElementNode</link>            (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecFindChild">xmlSecFindChild</link>                     (<parameter>const <link linkend="xmlNode"><type>xmlNodePtr</type></link> parent</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *ns</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecFindParent">xmlSecFindParent</link>                    (<parameter>const <link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *ns</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecFindNode">xmlSecFindNode</link>                      (<parameter>const <link linkend="xmlNode"><type>xmlNodePtr</type></link> parent</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *ns</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecAddChild">xmlSecAddChild</link>                      (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> parent</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *ns</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecAddChildNode">xmlSecAddChildNode</link>                  (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> parent</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> child</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecAddNextSibling">xmlSecAddNextSibling</link>                (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *ns</parameter>);
+<link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          <link linkend="xmlSecAddPrevSibling">xmlSecAddPrevSibling</link>                (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *ns</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecReplaceNode">xmlSecReplaceNode</link>                   (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> newNode</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecReplaceNodeAndReturn">xmlSecReplaceNodeAndReturn</link>          (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> newNode</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> *replaced</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecReplaceContent">xmlSecReplaceContent</link>                (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> newNode</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecReplaceContentAndReturn">xmlSecReplaceContentAndReturn</link>       (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> newNode</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> *replaced</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecReplaceNodeBuffer">xmlSecReplaceNodeBuffer</link>             (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buffer</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecReplaceNodeBufferAndReturn">xmlSecReplaceNodeBufferAndReturn</link>    (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buffer</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> *replaced</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecNodeEncodeAndSetContent">xmlSecNodeEncodeAndSetContent</link>       (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *buffer</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecAddIDs">xmlSecAddIDs</link>                        (<parameter><link linkend="xmlDoc"><type>xmlDocPtr</type></link> doc</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> **ids</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecGenerateAndAddID">xmlSecGenerateAndAddID</link>              (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *attrName</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *prefix</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> len</parameter>);
+<link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*            <link linkend="xmlSecGenerateID">xmlSecGenerateID</link>                    (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *prefix</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> len</parameter>);
+<link linkend="xmlDoc"><returnvalue>xmlDocPtr</returnvalue></link>           <link linkend="xmlSecCreateTree">xmlSecCreateTree</link>                    (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *rootNodeName</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *rootNodeNs</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecIsEmptyNode">xmlSecIsEmptyNode</link>                   (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecIsEmptyString">xmlSecIsEmptyString</link>                 (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *str</parameter>);
+<link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*            <link linkend="xmlSecGetQName">xmlSecGetQName</link>                      (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *href</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *local</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecPrintXmlString">xmlSecPrintXmlString</link>                (<parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *fd</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *str</parameter>);
 #define             <link linkend="xmlSecIsHex">xmlSecIsHex</link>                         (c)
 #define             <link linkend="xmlSecGetHex">xmlSecGetHex</link>                        (c)
 struct              <link linkend="xmlSecQName2IntegerInfo">xmlSecQName2IntegerInfo</link>;
 typedef             <link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link>;
-<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link>  <link linkend="xmlSecQName2IntegerGetInfo">xmlSecQName2IntegerGetInfo</link>
-                                                        (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                                         <link linkend="int">int</link> intValue);
-<link linkend="int">int</link>                 <link linkend="xmlSecQName2IntegerGetInteger">xmlSecQName2IntegerGetInteger</link>       (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                                         const <link linkend="xmlChar">xmlChar</link> *qnameHref,
-                                                         const <link linkend="xmlChar">xmlChar</link> *qnameLocalPart,
-                                                         <link linkend="int">int</link> *intValue);
-<link linkend="int">int</link>                 <link linkend="xmlSecQName2IntegerGetIntegerFromString">xmlSecQName2IntegerGetIntegerFromString</link>
-                                                        (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *qname,
-                                                         <link linkend="int">int</link> *intValue);
-<link linkend="xmlChar">xmlChar</link> *           <link linkend="xmlSecQName2IntegerGetStringFromInteger">xmlSecQName2IntegerGetStringFromInteger</link>
-                                                        (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="int">int</link> intValue);
-<link linkend="int">int</link>                 <link linkend="xmlSecQName2IntegerNodeRead">xmlSecQName2IntegerNodeRead</link>         (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="int">int</link> *intValue);
-<link linkend="int">int</link>                 <link linkend="xmlSecQName2IntegerNodeWrite">xmlSecQName2IntegerNodeWrite</link>        (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *nodeName,
-                                                         const <link linkend="xmlChar">xmlChar</link> *nodeNs,
-                                                         <link linkend="int">int</link> intValue);
-<link linkend="int">int</link>                 <link linkend="xmlSecQName2IntegerAttributeRead">xmlSecQName2IntegerAttributeRead</link>    (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *attrName,
-                                                         <link linkend="int">int</link> *intValue);
-<link linkend="int">int</link>                 <link linkend="xmlSecQName2IntegerAttributeWrite">xmlSecQName2IntegerAttributeWrite</link>   (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *attrName,
-                                                         <link linkend="int">int</link> intValue);
-<link linkend="void">void</link>                <link linkend="xmlSecQName2IntegerDebugDump">xmlSecQName2IntegerDebugDump</link>        (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                                         <link linkend="int">int</link> intValue,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
-<link linkend="void">void</link>                <link linkend="xmlSecQName2IntegerDebugXmlDump">xmlSecQName2IntegerDebugXmlDump</link>     (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                                         <link linkend="int">int</link> intValue,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="xmlSecQName2IntegerInfoConst"><returnvalue>xmlSecQName2IntegerInfoConstPtr</returnvalue></link>  <link linkend="xmlSecQName2IntegerGetInfo">xmlSecQName2IntegerGetInfo</link>
+                                                        (<parameter><link linkend="xmlSecQName2IntegerInfoConst"><type>xmlSecQName2IntegerInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> intValue</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecQName2IntegerGetInteger">xmlSecQName2IntegerGetInteger</link>       (<parameter><link linkend="xmlSecQName2IntegerInfoConst"><type>xmlSecQName2IntegerInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *qnameHref</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *qnameLocalPart</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> *intValue</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecQName2IntegerGetIntegerFromString">xmlSecQName2IntegerGetIntegerFromString</link>
+                                                        (<parameter><link linkend="xmlSecQName2IntegerInfoConst"><type>xmlSecQName2IntegerInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *qname</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> *intValue</parameter>);
+<link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link> *           <link linkend="xmlSecQName2IntegerGetStringFromInteger">xmlSecQName2IntegerGetStringFromInteger</link>
+                                                        (<parameter><link linkend="xmlSecQName2IntegerInfoConst"><type>xmlSecQName2IntegerInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> intValue</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecQName2IntegerNodeRead">xmlSecQName2IntegerNodeRead</link>         (<parameter><link linkend="xmlSecQName2IntegerInfoConst"><type>xmlSecQName2IntegerInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> *intValue</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecQName2IntegerNodeWrite">xmlSecQName2IntegerNodeWrite</link>        (<parameter><link linkend="xmlSecQName2IntegerInfoConst"><type>xmlSecQName2IntegerInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *nodeName</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *nodeNs</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> intValue</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecQName2IntegerAttributeRead">xmlSecQName2IntegerAttributeRead</link>    (<parameter><link linkend="xmlSecQName2IntegerInfoConst"><type>xmlSecQName2IntegerInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *attrName</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> *intValue</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecQName2IntegerAttributeWrite">xmlSecQName2IntegerAttributeWrite</link>   (<parameter><link linkend="xmlSecQName2IntegerInfoConst"><type>xmlSecQName2IntegerInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *attrName</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> intValue</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecQName2IntegerDebugDump">xmlSecQName2IntegerDebugDump</link>        (<parameter><link linkend="xmlSecQName2IntegerInfoConst"><type>xmlSecQName2IntegerInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> intValue</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecQName2IntegerDebugXmlDump">xmlSecQName2IntegerDebugXmlDump</link>     (<parameter><link linkend="xmlSecQName2IntegerInfoConst"><type>xmlSecQName2IntegerInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> intValue</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
 typedef             <link linkend="xmlSecBitMask">xmlSecBitMask</link>;
 struct              <link linkend="xmlSecQName2BitMaskInfo">xmlSecQName2BitMaskInfo</link>;
 typedef             <link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link>;
-<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link>  <link linkend="xmlSecQName2BitMaskGetInfo">xmlSecQName2BitMaskGetInfo</link>
-                                                        (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask);
-<link linkend="int">int</link>                 <link linkend="xmlSecQName2BitMaskGetBitMask">xmlSecQName2BitMaskGetBitMask</link>       (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                                         const <link linkend="xmlChar">xmlChar</link> *qnameLocalPart,
-                                                         const <link linkend="xmlChar">xmlChar</link> *qnameHref,
-                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> *mask);
-<link linkend="int">int</link>                 <link linkend="xmlSecQName2BitMaskNodesRead">xmlSecQName2BitMaskNodesRead</link>        (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> *node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *nodeName,
-                                                         const <link linkend="xmlChar">xmlChar</link> *nodeNs,
-                                                         <link linkend="int">int</link> stopOnUnknown,
-                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> *mask);
-<link linkend="int">int</link>                 <link linkend="xmlSecQName2BitMaskGetBitMaskFromString">xmlSecQName2BitMaskGetBitMaskFromString</link>
-                                                        (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *qname,
-                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> *mask);
-<link linkend="xmlChar">xmlChar</link> *           <link linkend="xmlSecQName2BitMaskGetStringFromBitMask">xmlSecQName2BitMaskGetStringFromBitMask</link>
-                                                        (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask);
-<link linkend="int">int</link>                 <link linkend="xmlSecQName2BitMaskNodesWrite">xmlSecQName2BitMaskNodesWrite</link>       (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *nodeName,
-                                                         const <link linkend="xmlChar">xmlChar</link> *nodeNs,
-                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask);
-<link linkend="void">void</link>                <link linkend="xmlSecQName2BitMaskDebugDump">xmlSecQName2BitMaskDebugDump</link>        (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
-<link linkend="void">void</link>                <link linkend="xmlSecQName2BitMaskDebugXmlDump">xmlSecQName2BitMaskDebugXmlDump</link>     (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="xmlSecQName2BitMaskInfoConst"><returnvalue>xmlSecQName2BitMaskInfoConstPtr</returnvalue></link>  <link linkend="xmlSecQName2BitMaskGetInfo">xmlSecQName2BitMaskGetInfo</link>
+                                                        (<parameter><link linkend="xmlSecQName2BitMaskInfoConst"><type>xmlSecQName2BitMaskInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlSecBitMask"><type>xmlSecBitMask</type></link> mask</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecQName2BitMaskGetBitMask">xmlSecQName2BitMaskGetBitMask</link>       (<parameter><link linkend="xmlSecQName2BitMaskInfoConst"><type>xmlSecQName2BitMaskInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *qnameLocalPart</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *qnameHref</parameter>,
+                                                         <parameter><link linkend="xmlSecBitMask"><type>xmlSecBitMask</type></link> *mask</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecQName2BitMaskNodesRead">xmlSecQName2BitMaskNodesRead</link>        (<parameter><link linkend="xmlSecQName2BitMaskInfoConst"><type>xmlSecQName2BitMaskInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> *node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *nodeName</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *nodeNs</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> stopOnUnknown</parameter>,
+                                                         <parameter><link linkend="xmlSecBitMask"><type>xmlSecBitMask</type></link> *mask</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecQName2BitMaskGetBitMaskFromString">xmlSecQName2BitMaskGetBitMaskFromString</link>
+                                                        (<parameter><link linkend="xmlSecQName2BitMaskInfoConst"><type>xmlSecQName2BitMaskInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *qname</parameter>,
+                                                         <parameter><link linkend="xmlSecBitMask"><type>xmlSecBitMask</type></link> *mask</parameter>);
+<link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link> *           <link linkend="xmlSecQName2BitMaskGetStringFromBitMask">xmlSecQName2BitMaskGetStringFromBitMask</link>
+                                                        (<parameter><link linkend="xmlSecQName2BitMaskInfoConst"><type>xmlSecQName2BitMaskInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecBitMask"><type>xmlSecBitMask</type></link> mask</parameter>);
+<link linkend="int"><returnvalue>int</returnvalue></link>                 <link linkend="xmlSecQName2BitMaskNodesWrite">xmlSecQName2BitMaskNodesWrite</link>       (<parameter><link linkend="xmlSecQName2BitMaskInfoConst"><type>xmlSecQName2BitMaskInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *nodeName</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *nodeNs</parameter>,
+                                                         <parameter><link linkend="xmlSecBitMask"><type>xmlSecBitMask</type></link> mask</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecQName2BitMaskDebugDump">xmlSecQName2BitMaskDebugDump</link>        (<parameter><link linkend="xmlSecQName2BitMaskInfoConst"><type>xmlSecQName2BitMaskInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlSecBitMask"><type>xmlSecBitMask</type></link> mask</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="xmlSecQName2BitMaskDebugXmlDump">xmlSecQName2BitMaskDebugXmlDump</link>     (<parameter><link linkend="xmlSecQName2BitMaskInfoConst"><type>xmlSecQName2BitMaskInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlSecBitMask"><type>xmlSecBitMask</type></link> mask</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);
 </synopsis>
 </refsynopsisdiv>
 
-
-
-
-
-
-
-
-
 <refsect1 id="xmlsec-xmltree.description" role="desc">
 <title role="desc.title">Description</title>
 <para>
 XML tree operations.
 </para>
 </refsect1>
-
 <refsect1 id="xmlsec-xmltree.details" role="details">
 <title role="details.title">Details</title>
 <refsect2 id="xmlSecNodeGetName" role="macro">
 <title>xmlSecNodeGetName()</title>
-<indexterm zone="xmlSecNodeGetName"><primary sortas="xmlSecNodeGetName">xmlSecNodeGetName</primary></indexterm><programlisting>#define             xmlSecNodeGetName(node)</programlisting>
-<para>
-Macro. Returns node's name.</para>
+<indexterm zone="xmlSecNodeGetName"><primary>xmlSecNodeGetName</primary></indexterm>
+<programlisting>#define             xmlSecNodeGetName(node)</programlisting>
 <para>
+Macro. Returns node's name.
 </para><variablelist role="params">
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to node.
+<listitem><simpara>the pointer to node.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGetNodeNsHref" role="function">
 <title>xmlSecGetNodeNsHref ()</title>
-<indexterm zone="xmlSecGetNodeNsHref"><primary sortas="xmlSecGetNodeNsHref">xmlSecGetNodeNsHref</primary></indexterm><programlisting>const <link linkend="xmlChar">xmlChar</link>*      xmlSecGetNodeNsHref                 (const <link linkend="xmlNode">xmlNodePtr</link> cur);</programlisting>
-<para>
-Get's node's namespace href.</para>
+<indexterm zone="xmlSecGetNodeNsHref"><primary>xmlSecGetNodeNsHref</primary></indexterm>
+<programlisting>const <link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*      xmlSecGetNodeNsHref                 (<parameter>const <link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>);</programlisting>
 <para>
+Get's node's namespace href.
 </para><variablelist role="params">
 <varlistentry><term><parameter>cur</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to node.
+<listitem><simpara>the pointer to node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> node's namespace href.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCheckNodeName" role="function">
 <title>xmlSecCheckNodeName ()</title>
-<indexterm zone="xmlSecCheckNodeName"><primary sortas="xmlSecCheckNodeName">xmlSecCheckNodeName</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCheckNodeName                 (const <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
-<para>
-Checks that the node has a given name and a given namespace href.</para>
+<indexterm zone="xmlSecCheckNodeName"><primary>xmlSecCheckNodeName</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecCheckNodeName                 (<parameter>const <link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *ns</parameter>);</programlisting>
 <para>
+Checks that the node has a given name and a given namespace href.
 </para><variablelist role="params">
 <varlistentry><term><parameter>cur</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to an XML node.
+<listitem><simpara>the pointer to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>name</parameter>&#160;:</term>
-<listitem><simpara>               the name,
+<listitem><simpara>the name,
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>ns</parameter>&#160;:</term>
-<listitem><simpara>                 the namespace href.
+<listitem><simpara>the namespace href.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if the node matches or 0 otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGetNextElementNode" role="function">
 <title>xmlSecGetNextElementNode ()</title>
-<indexterm zone="xmlSecGetNextElementNode"><primary sortas="xmlSecGetNextElementNode">xmlSecGetNextElementNode</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecGetNextElementNode            (<link linkend="xmlNode">xmlNodePtr</link> cur);</programlisting>
-<para>
-Seraches for the next element node.</para>
+<indexterm zone="xmlSecGetNextElementNode"><primary>xmlSecGetNextElementNode</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecGetNextElementNode            (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>);</programlisting>
 <para>
+Seraches for the next element node.
 </para><variablelist role="params">
 <varlistentry><term><parameter>cur</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to an XML node.
+<listitem><simpara>the pointer to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to next element node or NULL if it is not found.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecFindChild" role="function">
 <title>xmlSecFindChild ()</title>
-<indexterm zone="xmlSecFindChild"><primary sortas="xmlSecFindChild">xmlSecFindChild</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecFindChild                     (const <link linkend="xmlNode">xmlNodePtr</link> parent,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
+<indexterm zone="xmlSecFindChild"><primary>xmlSecFindChild</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecFindChild                     (<parameter>const <link linkend="xmlNode"><type>xmlNodePtr</type></link> parent</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *ns</parameter>);</programlisting>
 <para>
 Searches a direct child of the <parameter>parent</parameter> node having given name and
-namespace href.</para>
-<para>
+namespace href.
 </para><variablelist role="params">
 <varlistentry><term><parameter>parent</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to XML node.
+<listitem><simpara>the pointer to XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>name</parameter>&#160;:</term>
-<listitem><simpara>               the name.
+<listitem><simpara>the name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>ns</parameter>&#160;:</term>
-<listitem><simpara>                 the namespace href (may be NULL).
+<listitem><simpara>the namespace href (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the found node or NULL if an error occurs or
 node is not found.
@@ -262,22 +253,22 @@ node is not found.
 </variablelist></refsect2>
 <refsect2 id="xmlSecFindParent" role="function">
 <title>xmlSecFindParent ()</title>
-<indexterm zone="xmlSecFindParent"><primary sortas="xmlSecFindParent">xmlSecFindParent</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecFindParent                    (const <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
+<indexterm zone="xmlSecFindParent"><primary>xmlSecFindParent</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecFindParent                    (<parameter>const <link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *ns</parameter>);</programlisting>
 <para>
 Searches the ancestors axis of the <parameter>cur</parameter> node for a node having given name
-and namespace href.</para>
-<para>
+and namespace href.
 </para><variablelist role="params">
 <varlistentry><term><parameter>cur</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to an XML node.
+<listitem><simpara>the pointer to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>name</parameter>&#160;:</term>
-<listitem><simpara>               the name.
+<listitem><simpara>the name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>ns</parameter>&#160;:</term>
-<listitem><simpara>                 the namespace href (may be NULL).
+<listitem><simpara>the namespace href (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the found node or NULL if an error occurs or
 node is not found.
@@ -285,22 +276,22 @@ node is not found.
 </variablelist></refsect2>
 <refsect2 id="xmlSecFindNode" role="function">
 <title>xmlSecFindNode ()</title>
-<indexterm zone="xmlSecFindNode"><primary sortas="xmlSecFindNode">xmlSecFindNode</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecFindNode                      (const <link linkend="xmlNode">xmlNodePtr</link> parent,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
+<indexterm zone="xmlSecFindNode"><primary>xmlSecFindNode</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecFindNode                      (<parameter>const <link linkend="xmlNode"><type>xmlNodePtr</type></link> parent</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *ns</parameter>);</programlisting>
 <para>
 Searches all children of the <parameter>parent</parameter> node having given name and
-namespace href.</para>
-<para>
+namespace href.
 </para><variablelist role="params">
 <varlistentry><term><parameter>parent</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to XML node.
+<listitem><simpara>the pointer to XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>name</parameter>&#160;:</term>
-<listitem><simpara>               the name.
+<listitem><simpara>the name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>ns</parameter>&#160;:</term>
-<listitem><simpara>                 the namespace href (may be NULL).
+<listitem><simpara>the namespace href (may be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the found node or NULL if an error occurs or
 node is not found.
@@ -308,442 +299,439 @@ node is not found.
 </variablelist></refsect2>
 <refsect2 id="xmlSecAddChild" role="function">
 <title>xmlSecAddChild ()</title>
-<indexterm zone="xmlSecAddChild"><primary sortas="xmlSecAddChild">xmlSecAddChild</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecAddChild                      (<link linkend="xmlNode">xmlNodePtr</link> parent,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
-<para>
-Adds a child to the node <parameter>parent</parameter> with given <parameter>name</parameter> and namespace <parameter>ns</parameter>.</para>
+<indexterm zone="xmlSecAddChild"><primary>xmlSecAddChild</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecAddChild                      (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> parent</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *ns</parameter>);</programlisting>
 <para>
+Adds a child to the node <parameter>parent</parameter> with given <parameter>name</parameter> and namespace <parameter>ns</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>parent</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to an XML node.
+<listitem><simpara>the pointer to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>name</parameter>&#160;:</term>
-<listitem><simpara>               the new node name.
+<listitem><simpara>the new node name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>ns</parameter>&#160;:</term>
-<listitem><simpara>                 the new node namespace.
+<listitem><simpara>the new node namespace.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the new node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecAddChildNode" role="function">
 <title>xmlSecAddChildNode ()</title>
-<indexterm zone="xmlSecAddChildNode"><primary sortas="xmlSecAddChildNode">xmlSecAddChildNode</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecAddChildNode                  (<link linkend="xmlNode">xmlNodePtr</link> parent,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> child);</programlisting>
-<para>
-Adds <parameter>child</parameter> node to the <parameter>parent</parameter> node.</para>
+<indexterm zone="xmlSecAddChildNode"><primary>xmlSecAddChildNode</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecAddChildNode                  (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> parent</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> child</parameter>);</programlisting>
 <para>
+Adds <parameter>child</parameter> node to the <parameter>parent</parameter> node.
 </para><variablelist role="params">
 <varlistentry><term><parameter>parent</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to an XML node.
+<listitem><simpara>the pointer to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>child</parameter>&#160;:</term>
-<listitem><simpara>              the new node.
+<listitem><simpara>the new node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the new node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecAddNextSibling" role="function">
 <title>xmlSecAddNextSibling ()</title>
-<indexterm zone="xmlSecAddNextSibling"><primary sortas="xmlSecAddNextSibling">xmlSecAddNextSibling</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecAddNextSibling                (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
-<para>
-Adds next sibling to the node <parameter>node</parameter> with given <parameter>name</parameter> and namespace <parameter>ns</parameter>.</para>
+<indexterm zone="xmlSecAddNextSibling"><primary>xmlSecAddNextSibling</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecAddNextSibling                (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *ns</parameter>);</programlisting>
 <para>
+Adds next sibling to the node <parameter>node</parameter> with given <parameter>name</parameter> and namespace <parameter>ns</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to an XML node.
+<listitem><simpara>the pointer to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>name</parameter>&#160;:</term>
-<listitem><simpara>               the new node name.
+<listitem><simpara>the new node name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>ns</parameter>&#160;:</term>
-<listitem><simpara>                 the new node namespace.
+<listitem><simpara>the new node namespace.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the new node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecAddPrevSibling" role="function">
 <title>xmlSecAddPrevSibling ()</title>
-<indexterm zone="xmlSecAddPrevSibling"><primary sortas="xmlSecAddPrevSibling">xmlSecAddPrevSibling</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecAddPrevSibling                (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
-<para>
-Adds prev sibling to the node <parameter>node</parameter> with given <parameter>name</parameter> and namespace <parameter>ns</parameter>.</para>
+<indexterm zone="xmlSecAddPrevSibling"><primary>xmlSecAddPrevSibling</primary></indexterm>
+<programlisting><link linkend="xmlNodePtr"><returnvalue>xmlNodePtr</returnvalue></link>          xmlSecAddPrevSibling                (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *ns</parameter>);</programlisting>
 <para>
+Adds prev sibling to the node <parameter>node</parameter> with given <parameter>name</parameter> and namespace <parameter>ns</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to an XML node.
+<listitem><simpara>the pointer to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>name</parameter>&#160;:</term>
-<listitem><simpara>               the new node name.
+<listitem><simpara>the new node name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>ns</parameter>&#160;:</term>
-<listitem><simpara>                 the new node namespace.
+<listitem><simpara>the new node namespace.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the new node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecReplaceNode" role="function">
 <title>xmlSecReplaceNode ()</title>
-<indexterm zone="xmlSecReplaceNode"><primary sortas="xmlSecReplaceNode">xmlSecReplaceNode</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecReplaceNode                   (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> newNode);</programlisting>
-<para>
-Swaps the <parameter>node</parameter> and <parameter>newNode</parameter> in the XML tree.</para>
+<indexterm zone="xmlSecReplaceNode"><primary>xmlSecReplaceNode</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecReplaceNode                   (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> newNode</parameter>);</programlisting>
 <para>
+Swaps the <parameter>node</parameter> and <parameter>newNode</parameter> in the XML tree.
 </para><variablelist role="params">
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the current node.
+<listitem><simpara>the current node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>newNode</parameter>&#160;:</term>
-<listitem><simpara>            the new node.
+<listitem><simpara>the new node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecReplaceNodeAndReturn" role="function">
 <title>xmlSecReplaceNodeAndReturn ()</title>
-<indexterm zone="xmlSecReplaceNodeAndReturn"><primary sortas="xmlSecReplaceNodeAndReturn">xmlSecReplaceNodeAndReturn</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecReplaceNodeAndReturn          (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> newNode,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> *replaced);</programlisting>
-<para>
-Swaps the <parameter>node</parameter> and <parameter>newNode</parameter> in the XML tree.</para>
+<indexterm zone="xmlSecReplaceNodeAndReturn"><primary>xmlSecReplaceNodeAndReturn</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecReplaceNodeAndReturn          (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> newNode</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> *replaced</parameter>);</programlisting>
 <para>
+Swaps the <parameter>node</parameter> and <parameter>newNode</parameter> in the XML tree.
 </para><variablelist role="params">
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the current node.
+<listitem><simpara>the current node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>newNode</parameter>&#160;:</term>
-<listitem><simpara>            the new node.
+<listitem><simpara>the new node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>replaced</parameter>&#160;:</term>
-<listitem><simpara>           the replaced node, or release it if NULL is given
+<listitem><simpara>the replaced node, or release it if NULL is given
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecReplaceContent" role="function">
 <title>xmlSecReplaceContent ()</title>
-<indexterm zone="xmlSecReplaceContent"><primary sortas="xmlSecReplaceContent">xmlSecReplaceContent</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecReplaceContent                (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> newNode);</programlisting>
-<para>
-Swaps the content of <parameter>node</parameter> and <parameter>newNode</parameter>.</para>
+<indexterm zone="xmlSecReplaceContent"><primary>xmlSecReplaceContent</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecReplaceContent                (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> newNode</parameter>);</programlisting>
 <para>
+Swaps the content of <parameter>node</parameter> and <parameter>newNode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the current node.
+<listitem><simpara>the current node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>newNode</parameter>&#160;:</term>
-<listitem><simpara>            the new node.
+<listitem><simpara>the new node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecReplaceContentAndReturn" role="function">
 <title>xmlSecReplaceContentAndReturn ()</title>
-<indexterm zone="xmlSecReplaceContentAndReturn"><primary sortas="xmlSecReplaceContentAndReturn">xmlSecReplaceContentAndReturn</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecReplaceContentAndReturn       (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> newNode,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> *replaced);</programlisting>
-<para>
-Swaps the content of <parameter>node</parameter> and <parameter>newNode</parameter>.</para>
+<indexterm zone="xmlSecReplaceContentAndReturn"><primary>xmlSecReplaceContentAndReturn</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecReplaceContentAndReturn       (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> newNode</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> *replaced</parameter>);</programlisting>
 <para>
+Swaps the content of <parameter>node</parameter> and <parameter>newNode</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the current node.
+<listitem><simpara>the current node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>newNode</parameter>&#160;:</term>
-<listitem><simpara>            the new node.
+<listitem><simpara>the new node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>replaced</parameter>&#160;:</term>
-<listitem><simpara>           the replaced nodes, or release them if NULL is given
+<listitem><simpara>the replaced nodes, or release them if NULL is given
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecReplaceNodeBuffer" role="function">
 <title>xmlSecReplaceNodeBuffer ()</title>
-<indexterm zone="xmlSecReplaceNodeBuffer"><primary sortas="xmlSecReplaceNodeBuffer">xmlSecReplaceNodeBuffer</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecReplaceNodeBuffer             (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
-<para>
-Swaps the <parameter>node</parameter> and the parsed XML data from the <parameter>buffer</parameter> in the XML tree.</para>
+<indexterm zone="xmlSecReplaceNodeBuffer"><primary>xmlSecReplaceNodeBuffer</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecReplaceNodeBuffer             (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buffer</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>);</programlisting>
 <para>
+Swaps the <parameter>node</parameter> and the parsed XML data from the <parameter>buffer</parameter> in the XML tree.
 </para><variablelist role="params">
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the current node.
+<listitem><simpara>the current node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buffer</parameter>&#160;:</term>
-<listitem><simpara>             the XML data.
+<listitem><simpara>the XML data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the XML data size.
+<listitem><simpara>the XML data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecReplaceNodeBufferAndReturn" role="function">
 <title>xmlSecReplaceNodeBufferAndReturn ()</title>
-<indexterm zone="xmlSecReplaceNodeBufferAndReturn"><primary sortas="xmlSecReplaceNodeBufferAndReturn">xmlSecReplaceNodeBufferAndReturn</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecReplaceNodeBufferAndReturn    (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> size,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> *replaced);</programlisting>
-<para>
-Swaps the <parameter>node</parameter> and the parsed XML data from the <parameter>buffer</parameter> in the XML tree.</para>
+<indexterm zone="xmlSecReplaceNodeBufferAndReturn"><primary>xmlSecReplaceNodeBufferAndReturn</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecReplaceNodeBufferAndReturn    (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlSecByte"><type>xmlSecByte</type></link> *buffer</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> size</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> *replaced</parameter>);</programlisting>
 <para>
+Swaps the <parameter>node</parameter> and the parsed XML data from the <parameter>buffer</parameter> in the XML tree.
 </para><variablelist role="params">
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the current node.
+<listitem><simpara>the current node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buffer</parameter>&#160;:</term>
-<listitem><simpara>             the XML data.
+<listitem><simpara>the XML data.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>size</parameter>&#160;:</term>
-<listitem><simpara>               the XML data size.
+<listitem><simpara>the XML data size.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>replaced</parameter>&#160;:</term>
-<listitem><simpara>           the replaced nodes, or release them if NULL is given
+<listitem><simpara>the replaced nodes, or release them if NULL is given
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecNodeEncodeAndSetContent" role="function">
 <title>xmlSecNodeEncodeAndSetContent ()</title>
-<indexterm zone="xmlSecNodeEncodeAndSetContent"><primary sortas="xmlSecNodeEncodeAndSetContent">xmlSecNodeEncodeAndSetContent</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNodeEncodeAndSetContent       (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *buffer);</programlisting>
+<indexterm zone="xmlSecNodeEncodeAndSetContent"><primary>xmlSecNodeEncodeAndSetContent</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecNodeEncodeAndSetContent       (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *buffer</parameter>);</programlisting>
 <para>
 Encodes "special" characters in the <parameter>buffer</parameter> and sets the result
-as the node content.</para>
-<para>
+as the node content.
 </para><variablelist role="params">
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>                   the pointer to an XML node.
+<listitem><simpara>the pointer to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>buffer</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to the node content.
+<listitem><simpara>the pointer to the node content.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecAddIDs" role="function">
 <title>xmlSecAddIDs ()</title>
-<indexterm zone="xmlSecAddIDs"><primary sortas="xmlSecAddIDs">xmlSecAddIDs</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecAddIDs                        (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                                         const <link linkend="xmlChar">xmlChar</link> **ids);</programlisting>
+<indexterm zone="xmlSecAddIDs"><primary>xmlSecAddIDs</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecAddIDs                        (<parameter><link linkend="xmlDoc"><type>xmlDocPtr</type></link> doc</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> cur</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> **ids</parameter>);</programlisting>
 <para>
 Walks thru all children of the <parameter>cur</parameter> node and adds all attributes
-from the <parameter>ids</parameter> list to the <parameter>doc</parameter> document IDs attributes hash.</para>
-<para>
+from the <parameter>ids</parameter> list to the <parameter>doc</parameter> document IDs attributes hash.
 </para><variablelist role="params">
 <varlistentry><term><parameter>doc</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to an XML document.
+<listitem><simpara>the pointer to an XML document.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>cur</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to an XML node.
+<listitem><simpara>the pointer to an XML node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>ids</parameter>&#160;:</term>
-<listitem><simpara>                the pointer to a NULL terminated list of ID attributes.
+<listitem><simpara>the pointer to a NULL terminated list of ID attributes.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGenerateAndAddID" role="function">
 <title>xmlSecGenerateAndAddID ()</title>
-<indexterm zone="xmlSecGenerateAndAddID"><primary sortas="xmlSecGenerateAndAddID">xmlSecGenerateAndAddID</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGenerateAndAddID              (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *attrName,
-                                                         const <link linkend="xmlChar">xmlChar</link> *prefix,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> len);</programlisting>
+<indexterm zone="xmlSecGenerateAndAddID"><primary>xmlSecGenerateAndAddID</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecGenerateAndAddID              (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *attrName</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *prefix</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> len</parameter>);</programlisting>
 <para>
 Generates a unique ID in the format &lt;<parameter>prefix</parameter>&gt;base64-encoded(<parameter>len</parameter> random bytes)
-and puts it in the attribute <parameter>attrName</parameter>.</para>
-<para>
+and puts it in the attribute <parameter>attrName</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>                       the node to ID attr to.
+<listitem><simpara>the node to ID attr to.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>attrName</parameter>&#160;:</term>
-<listitem><simpara>                   the ID attr name.
+<listitem><simpara>the ID attr name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>prefix</parameter>&#160;:</term>
-<listitem><simpara>                     the prefix to add to the generated ID (can be NULL).
+<listitem><simpara>the prefix to add to the generated ID (can be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>len</parameter>&#160;:</term>
-<listitem><simpara>                        the length of ID.
+<listitem><simpara>the length of ID.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGenerateID" role="function">
 <title>xmlSecGenerateID ()</title>
-<indexterm zone="xmlSecGenerateID"><primary sortas="xmlSecGenerateID">xmlSecGenerateID</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*            xmlSecGenerateID                    (const <link linkend="xmlChar">xmlChar</link> *prefix,
-                                                         <link linkend="xmlSecSize">xmlSecSize</link> len);</programlisting>
+<indexterm zone="xmlSecGenerateID"><primary>xmlSecGenerateID</primary></indexterm>
+<programlisting><link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*            xmlSecGenerateID                    (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *prefix</parameter>,
+                                                         <parameter><link linkend="xmlSecSize"><type>xmlSecSize</type></link> len</parameter>);</programlisting>
 <para>
 Generates a unique ID in the format &lt;<parameter>prefix</parameter>&gt;base64-encoded(<parameter>len</parameter> random bytes).
-The caller is responsible for freeing returned string using <parameter>xmlFree</parameter> function.</para>
-<para>
+The caller is responsible for freeing returned string using <parameter>xmlFree</parameter> function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>prefix</parameter>&#160;:</term>
-<listitem><simpara>                     the prefix to add to the generated ID (can be NULL).
+<listitem><simpara>the prefix to add to the generated ID (can be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>len</parameter>&#160;:</term>
-<listitem><simpara>                        the length of ID.
+<listitem><simpara>the length of ID.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to generated ID string or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecCreateTree" role="function">
 <title>xmlSecCreateTree ()</title>
-<indexterm zone="xmlSecCreateTree"><primary sortas="xmlSecCreateTree">xmlSecCreateTree</primary></indexterm><programlisting><link linkend="xmlDoc">xmlDocPtr</link>           xmlSecCreateTree                    (const <link linkend="xmlChar">xmlChar</link> *rootNodeName,
-                                                         const <link linkend="xmlChar">xmlChar</link> *rootNodeNs);</programlisting>
-<para>
-Creates a new XML tree with one root node <parameter>rootNodeName</parameter>.</para>
+<indexterm zone="xmlSecCreateTree"><primary>xmlSecCreateTree</primary></indexterm>
+<programlisting><link linkend="xmlDoc"><returnvalue>xmlDocPtr</returnvalue></link>           xmlSecCreateTree                    (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *rootNodeName</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *rootNodeNs</parameter>);</programlisting>
 <para>
+Creates a new XML tree with one root node <parameter>rootNodeName</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>rootNodeName</parameter>&#160;:</term>
-<listitem><simpara>       the root node name.
+<listitem><simpara>the root node name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>rootNodeNs</parameter>&#160;:</term>
-<listitem><simpara>         the root node namespace (otpional).
+<listitem><simpara>the root node namespace (otpional).
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the newly created tree or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecIsEmptyNode" role="function">
 <title>xmlSecIsEmptyNode ()</title>
-<indexterm zone="xmlSecIsEmptyNode"><primary sortas="xmlSecIsEmptyNode">xmlSecIsEmptyNode</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecIsEmptyNode                   (<link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
-<para>
-Checks whethere the <parameter>node</parameter> is empty (i.e. has only whitespaces children).</para>
+<indexterm zone="xmlSecIsEmptyNode"><primary>xmlSecIsEmptyNode</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecIsEmptyNode                   (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>);</programlisting>
 <para>
+Checks whethere the <parameter>node</parameter> is empty (i.e. has only whitespaces children).
 </para><variablelist role="params">
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the node to check
+<listitem><simpara>the node to check
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if <parameter>node</parameter> is empty, 0 otherwise or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecIsEmptyString" role="function">
 <title>xmlSecIsEmptyString ()</title>
-<indexterm zone="xmlSecIsEmptyString"><primary sortas="xmlSecIsEmptyString">xmlSecIsEmptyString</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecIsEmptyString                 (const <link linkend="xmlChar">xmlChar</link> *str);</programlisting>
-<para>
-Checks whethere the <parameter>str</parameter> is empty (i.e. has only whitespaces children).</para>
+<indexterm zone="xmlSecIsEmptyString"><primary>xmlSecIsEmptyString</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecIsEmptyString                 (<parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *str</parameter>);</programlisting>
 <para>
+Checks whethere the <parameter>str</parameter> is empty (i.e. has only whitespaces children).
 </para><variablelist role="params">
 <varlistentry><term><parameter>str</parameter>&#160;:</term>
-<listitem><simpara>                the string to check
+<listitem><simpara>the string to check
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if <parameter>str</parameter> is empty, 0 otherwise or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGetQName" role="function">
 <title>xmlSecGetQName ()</title>
-<indexterm zone="xmlSecGetQName"><primary sortas="xmlSecGetQName">xmlSecGetQName</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*            xmlSecGetQName                      (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *href,
-                                                         const <link linkend="xmlChar">xmlChar</link> *local);</programlisting>
+<indexterm zone="xmlSecGetQName"><primary>xmlSecGetQName</primary></indexterm>
+<programlisting><link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link>*            xmlSecGetQName                      (<parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *href</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *local</parameter>);</programlisting>
 <para>
 Creates QName (prefix:local) from <parameter>href</parameter> and <parameter>local</parameter> in the context of the <parameter>node</parameter>.
-Caller is responsible for freeing returned string with xmlFree.</para>
-<para>
+Caller is responsible for freeing returned string with xmlFree.
 </para><variablelist role="params">
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the context node.
+<listitem><simpara>the context node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>href</parameter>&#160;:</term>
-<listitem><simpara>               the QName href (can be NULL).
+<listitem><simpara>the QName href (can be NULL).
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>local</parameter>&#160;:</term>
-<listitem><simpara>              the QName local part.
+<listitem><simpara>the QName local part.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> qname or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecPrintXmlString" role="function">
 <title>xmlSecPrintXmlString ()</title>
-<indexterm zone="xmlSecPrintXmlString"><primary sortas="xmlSecPrintXmlString">xmlSecPrintXmlString</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecPrintXmlString                (<link linkend="FILE--CAPS">FILE</link> *fd,
-                                                         const <link linkend="xmlChar">xmlChar</link> *str);</programlisting>
-<para>
-Encodes the <parameter>str</parameter> (e.g. replaces '&amp;' with '&amp;amp;') and writes it to <parameter>fd</parameter>.</para>
+<indexterm zone="xmlSecPrintXmlString"><primary>xmlSecPrintXmlString</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecPrintXmlString                (<parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *fd</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *str</parameter>);</programlisting>
 <para>
+Encodes the <parameter>str</parameter> (e.g. replaces '&amp;' with '&amp;amp;') and writes it to <parameter>fd</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>fd</parameter>&#160;:</term>
-<listitem><simpara>                the file descriptor to write the XML string to
+<listitem><simpara>the file descriptor to write the XML string to
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>str</parameter>&#160;:</term>
-<listitem><simpara>               the string
+<listitem><simpara>the string
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> he number of bytes transmitted or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecIsHex" role="macro">
 <title>xmlSecIsHex()</title>
-<indexterm zone="xmlSecIsHex"><primary sortas="xmlSecIsHex">xmlSecIsHex</primary></indexterm><programlisting>#define             xmlSecIsHex(c)</programlisting>
-<para>
-Macro. Returns 1 if <parameter>c</parameter> is a hex digit or 0 other wise.</para>
+<indexterm zone="xmlSecIsHex"><primary>xmlSecIsHex</primary></indexterm>
+<programlisting>#define             xmlSecIsHex(c)</programlisting>
 <para>
+Macro. Returns 1 if <parameter>c</parameter> is a hex digit or 0 other wise.
 </para><variablelist role="params">
 <varlistentry><term><parameter>c</parameter>&#160;:</term>
-<listitem><simpara>                  the character.
+<listitem><simpara>the character.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecGetHex" role="macro">
 <title>xmlSecGetHex()</title>
-<indexterm zone="xmlSecGetHex"><primary sortas="xmlSecGetHex">xmlSecGetHex</primary></indexterm><programlisting>#define             xmlSecGetHex(c)</programlisting>
-<para>
-Macro. Returns the hex value of the <parameter>c</parameter>.</para>
+<indexterm zone="xmlSecGetHex"><primary>xmlSecGetHex</primary></indexterm>
+<programlisting>#define             xmlSecGetHex(c)</programlisting>
 <para>
+Macro. Returns the hex value of the <parameter>c</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>c</parameter>&#160;:</term>
-<listitem><simpara>                  the character,
+<listitem><simpara>the character,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecQName2IntegerInfo" role="struct">
 <title>struct xmlSecQName2IntegerInfo</title>
-<indexterm zone="xmlSecQName2IntegerInfo"><primary sortas="xmlSecQName2IntegerInfo">xmlSecQName2IntegerInfo</primary></indexterm><programlisting>struct xmlSecQName2IntegerInfo {
+<indexterm zone="xmlSecQName2IntegerInfo"><primary>xmlSecQName2IntegerInfo</primary></indexterm>
+<programlisting>struct xmlSecQName2IntegerInfo {
     const xmlChar*      qnameHref;
     const xmlChar*      qnameLocalPart;
     int                 intValue;
 };
 </programlisting>
 <para>
-QName &lt;-&gt; Integer conversion definition.</para>
-<para>
+QName &lt;-&gt; Integer conversion definition.
 </para><variablelist role="struct">
-<varlistentry>
-<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>qnameHref</structfield>;</term>
-<listitem><simpara>          the QName href
+<varlistentry><term>const&#160;<link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecQName2IntegerInfo.qnameHref">qnameHref</structfield>;</term>
+<listitem><simpara>the QName href
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>qnameLocalPart</structfield>;</term>
-<listitem><simpara>     the QName local
+<varlistentry><term>const&#160;<link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecQName2IntegerInfo.qnameLocalPart">qnameLocalPart</structfield>;</term>
+<listitem><simpara>the QName local
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="int">int</link>&#160;<structfield>intValue</structfield>;</term>
-<listitem><simpara>           the integer value
+<varlistentry><term><link linkend="int"><type>int</type></link>&#160;<structfield id="xmlSecQName2IntegerInfo.intValue">intValue</structfield>;</term>
+<listitem><simpara>the integer value
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecQName2IntegerInfoConstPtr" role="typedef">
 <title>xmlSecQName2IntegerInfoConstPtr</title>
-<indexterm zone="xmlSecQName2IntegerInfoConstPtr"><primary sortas="xmlSecQName2IntegerInfoConstPtr">xmlSecQName2IntegerInfoConstPtr</primary></indexterm><programlisting>typedef const xmlSecQName2IntegerInfo *         xmlSecQName2IntegerInfoConstPtr;
+<indexterm zone="xmlSecQName2IntegerInfoConstPtr"><primary>xmlSecQName2IntegerInfoConstPtr</primary></indexterm>
+<programlisting>typedef const xmlSecQName2IntegerInfo *         xmlSecQName2IntegerInfoConstPtr;
 </programlisting>
 <para>
-Pointer to constant QName &lt;-&gt; Integer conversion definition.</para>
-<para>
+Pointer to constant QName &lt;-&gt; Integer conversion definition.
 </para></refsect2>
 <refsect2 id="xmlSecQName2IntegerGetInfo" role="function">
 <title>xmlSecQName2IntegerGetInfo ()</title>
-<indexterm zone="xmlSecQName2IntegerGetInfo"><primary sortas="xmlSecQName2IntegerGetInfo">xmlSecQName2IntegerGetInfo</primary></indexterm><programlisting><link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link>  xmlSecQName2IntegerGetInfo
-                                                        (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                                         <link linkend="int">int</link> intValue);</programlisting>
-<para>
-Maps integer <parameter>intValue</parameter> to a QName prefix.</para>
+<indexterm zone="xmlSecQName2IntegerGetInfo"><primary>xmlSecQName2IntegerGetInfo</primary></indexterm>
+<programlisting><link linkend="xmlSecQName2IntegerInfoConst"><returnvalue>xmlSecQName2IntegerInfoConstPtr</returnvalue></link>  xmlSecQName2IntegerGetInfo
+                                                        (<parameter><link linkend="xmlSecQName2IntegerInfoConst"><type>xmlSecQName2IntegerInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> intValue</parameter>);</programlisting>
 <para>
+Maps integer <parameter>intValue</parameter> to a QName prefix.
 </para><variablelist role="params">
 <varlistentry><term><parameter>info</parameter>&#160;:</term>
-<listitem><simpara>               the qname&lt;-&gt;integer mapping information.
+<listitem><simpara>the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>intValue</parameter>&#160;:</term>
-<listitem><simpara>           the integer value.
+<listitem><simpara>the integer value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the QName info that is mapped to <parameter>intValue</parameter> or NULL if such value
 is not found.
@@ -751,478 +739,472 @@ is not found.
 </variablelist></refsect2>
 <refsect2 id="xmlSecQName2IntegerGetInteger" role="function">
 <title>xmlSecQName2IntegerGetInteger ()</title>
-<indexterm zone="xmlSecQName2IntegerGetInteger"><primary sortas="xmlSecQName2IntegerGetInteger">xmlSecQName2IntegerGetInteger</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecQName2IntegerGetInteger       (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                                         const <link linkend="xmlChar">xmlChar</link> *qnameHref,
-                                                         const <link linkend="xmlChar">xmlChar</link> *qnameLocalPart,
-                                                         <link linkend="int">int</link> *intValue);</programlisting>
-<para>
-Maps qname qname to an integer and returns it in <parameter>intValue</parameter>.</para>
+<indexterm zone="xmlSecQName2IntegerGetInteger"><primary>xmlSecQName2IntegerGetInteger</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecQName2IntegerGetInteger       (<parameter><link linkend="xmlSecQName2IntegerInfoConst"><type>xmlSecQName2IntegerInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *qnameHref</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *qnameLocalPart</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> *intValue</parameter>);</programlisting>
 <para>
+Maps qname qname to an integer and returns it in <parameter>intValue</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>info</parameter>&#160;:</term>
-<listitem><simpara>               the qname&lt;-&gt;integer mapping information.
+<listitem><simpara>the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>qnameHref</parameter>&#160;:</term>
-<listitem><simpara>          the qname href value.
+<listitem><simpara>the qname href value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>qnameLocalPart</parameter>&#160;:</term>
-<listitem><simpara>     the qname local part value.
+<listitem><simpara>the qname local part value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>intValue</parameter>&#160;:</term>
-<listitem><simpara>           the pointer to result integer value.
+<listitem><simpara>the pointer to result integer value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecQName2IntegerGetIntegerFromString" role="function">
 <title>xmlSecQName2IntegerGetIntegerFromString ()</title>
-<indexterm zone="xmlSecQName2IntegerGetIntegerFromString"><primary sortas="xmlSecQName2IntegerGetIntegerFromString">xmlSecQName2IntegerGetIntegerFromString</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecQName2IntegerGetIntegerFromString
-                                                        (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *qname,
-                                                         <link linkend="int">int</link> *intValue);</programlisting>
-<para>
-Converts <parameter>qname</parameter> into integer in context of <parameter>node</parameter>.</para>
-<para>
+<indexterm zone="xmlSecQName2IntegerGetIntegerFromString"><primary>xmlSecQName2IntegerGetIntegerFromString</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecQName2IntegerGetIntegerFromString
+                                                        (<parameter><link linkend="xmlSecQName2IntegerInfoConst"><type>xmlSecQName2IntegerInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *qname</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> *intValue</parameter>);</programlisting>
+<para>
+Converts <parameter>qname</parameter> into integer in context of <parameter>node</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>info</parameter>&#160;:</term>
-<listitem><simpara>               the qname&lt;-&gt;integer mapping information.
+<listitem><simpara>the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to node.
+<listitem><simpara>the pointer to node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>qname</parameter>&#160;:</term>
-<listitem><simpara>              the qname string.
+<listitem><simpara>the qname string.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>intValue</parameter>&#160;:</term>
-<listitem><simpara>           the pointer to result integer value.
+<listitem><simpara>the pointer to result integer value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecQName2IntegerGetStringFromInteger" role="function">
 <title>xmlSecQName2IntegerGetStringFromInteger ()</title>
-<indexterm zone="xmlSecQName2IntegerGetStringFromInteger"><primary sortas="xmlSecQName2IntegerGetStringFromInteger">xmlSecQName2IntegerGetStringFromInteger</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link> *           xmlSecQName2IntegerGetStringFromInteger
-                                                        (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="int">int</link> intValue);</programlisting>
+<indexterm zone="xmlSecQName2IntegerGetStringFromInteger"><primary>xmlSecQName2IntegerGetStringFromInteger</primary></indexterm>
+<programlisting><link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link> *           xmlSecQName2IntegerGetStringFromInteger
+                                                        (<parameter><link linkend="xmlSecQName2IntegerInfoConst"><type>xmlSecQName2IntegerInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> intValue</parameter>);</programlisting>
 <para>
 Creates qname string for <parameter>intValue</parameter> in context of given <parameter>node</parameter>. Caller
-is responsible for freeing returned string with <parameter>xmlFree</parameter>.</para>
-<para>
+is responsible for freeing returned string with <parameter>xmlFree</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>info</parameter>&#160;:</term>
-<listitem><simpara>               the qname&lt;-&gt;integer mapping information.
+<listitem><simpara>the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to node.
+<listitem><simpara>the pointer to node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>intValue</parameter>&#160;:</term>
-<listitem><simpara>           the integer value.
+<listitem><simpara>the integer value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated string on success or NULL if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecQName2IntegerNodeRead" role="function">
 <title>xmlSecQName2IntegerNodeRead ()</title>
-<indexterm zone="xmlSecQName2IntegerNodeRead"><primary sortas="xmlSecQName2IntegerNodeRead">xmlSecQName2IntegerNodeRead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecQName2IntegerNodeRead         (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="int">int</link> *intValue);</programlisting>
+<indexterm zone="xmlSecQName2IntegerNodeRead"><primary>xmlSecQName2IntegerNodeRead</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecQName2IntegerNodeRead         (<parameter><link linkend="xmlSecQName2IntegerInfoConst"><type>xmlSecQName2IntegerInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> *intValue</parameter>);</programlisting>
 <para>
 Reads the content of <parameter>node</parameter> and converts it to an integer using mapping
-from <parameter>info</parameter>.</para>
-<para>
+from <parameter>info</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>info</parameter>&#160;:</term>
-<listitem><simpara>               the qname&lt;-&gt;integer mapping information.
+<listitem><simpara>the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to node.
+<listitem><simpara>the pointer to node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>intValue</parameter>&#160;:</term>
-<listitem><simpara>           the pointer to result integer value.
+<listitem><simpara>the pointer to result integer value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecQName2IntegerNodeWrite" role="function">
 <title>xmlSecQName2IntegerNodeWrite ()</title>
-<indexterm zone="xmlSecQName2IntegerNodeWrite"><primary sortas="xmlSecQName2IntegerNodeWrite">xmlSecQName2IntegerNodeWrite</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecQName2IntegerNodeWrite        (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *nodeName,
-                                                         const <link linkend="xmlChar">xmlChar</link> *nodeNs,
-                                                         <link linkend="int">int</link> intValue);</programlisting>
-<para>
-Creates new child node in <parameter>node</parameter> and sets its value to <parameter>intValue</parameter>.</para>
-<para>
+<indexterm zone="xmlSecQName2IntegerNodeWrite"><primary>xmlSecQName2IntegerNodeWrite</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecQName2IntegerNodeWrite        (<parameter><link linkend="xmlSecQName2IntegerInfoConst"><type>xmlSecQName2IntegerInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *nodeName</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *nodeNs</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> intValue</parameter>);</programlisting>
+<para>
+Creates new child node in <parameter>node</parameter> and sets its value to <parameter>intValue</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>info</parameter>&#160;:</term>
-<listitem><simpara>               the qname&lt;-&gt;integer mapping information.
+<listitem><simpara>the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the parent node.
+<listitem><simpara>the parent node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nodeName</parameter>&#160;:</term>
-<listitem><simpara>           the child node name.
+<listitem><simpara>the child node name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nodeNs</parameter>&#160;:</term>
-<listitem><simpara>             the child node namespace.
+<listitem><simpara>the child node namespace.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>intValue</parameter>&#160;:</term>
-<listitem><simpara>           the integer value.
+<listitem><simpara>the integer value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecQName2IntegerAttributeRead" role="function">
 <title>xmlSecQName2IntegerAttributeRead ()</title>
-<indexterm zone="xmlSecQName2IntegerAttributeRead"><primary sortas="xmlSecQName2IntegerAttributeRead">xmlSecQName2IntegerAttributeRead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecQName2IntegerAttributeRead    (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *attrName,
-                                                         <link linkend="int">int</link> *intValue);</programlisting>
+<indexterm zone="xmlSecQName2IntegerAttributeRead"><primary>xmlSecQName2IntegerAttributeRead</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecQName2IntegerAttributeRead    (<parameter><link linkend="xmlSecQName2IntegerInfoConst"><type>xmlSecQName2IntegerInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *attrName</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> *intValue</parameter>);</programlisting>
 <para>
 Gets the value of <parameter>attrName</parameter> atrtibute from <parameter>node</parameter> and converts it to integer
-according to <parameter>info</parameter>.</para>
-<para>
+according to <parameter>info</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>info</parameter>&#160;:</term>
-<listitem><simpara>               the qname&lt;-&gt;integer mapping information.
+<listitem><simpara>the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the element node.
+<listitem><simpara>the element node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>attrName</parameter>&#160;:</term>
-<listitem><simpara>           the attribute name.
+<listitem><simpara>the attribute name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>intValue</parameter>&#160;:</term>
-<listitem><simpara>           the pointer to result integer value.
+<listitem><simpara>the pointer to result integer value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecQName2IntegerAttributeWrite" role="function">
 <title>xmlSecQName2IntegerAttributeWrite ()</title>
-<indexterm zone="xmlSecQName2IntegerAttributeWrite"><primary sortas="xmlSecQName2IntegerAttributeWrite">xmlSecQName2IntegerAttributeWrite</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecQName2IntegerAttributeWrite   (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *attrName,
-                                                         <link linkend="int">int</link> intValue);</programlisting>
+<indexterm zone="xmlSecQName2IntegerAttributeWrite"><primary>xmlSecQName2IntegerAttributeWrite</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecQName2IntegerAttributeWrite   (<parameter><link linkend="xmlSecQName2IntegerInfoConst"><type>xmlSecQName2IntegerInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *attrName</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> intValue</parameter>);</programlisting>
 <para>
 Converts <parameter>intValue</parameter> to a qname and sets it to the value of
-attribute <parameter>attrName</parameter> in <parameter>node</parameter>.</para>
-<para>
+attribute <parameter>attrName</parameter> in <parameter>node</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>info</parameter>&#160;:</term>
-<listitem><simpara>               the qname&lt;-&gt;integer mapping information.
+<listitem><simpara>the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the parent node.
+<listitem><simpara>the parent node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>attrName</parameter>&#160;:</term>
-<listitem><simpara>           the name of attribute.
+<listitem><simpara>the name of attribute.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>intValue</parameter>&#160;:</term>
-<listitem><simpara>           the integer value.
+<listitem><simpara>the integer value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecQName2IntegerDebugDump" role="function">
 <title>xmlSecQName2IntegerDebugDump ()</title>
-<indexterm zone="xmlSecQName2IntegerDebugDump"><primary sortas="xmlSecQName2IntegerDebugDump">xmlSecQName2IntegerDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecQName2IntegerDebugDump        (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                                         <link linkend="int">int</link> intValue,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints <parameter>intValue</parameter> into <parameter>output</parameter>.</para>
+<indexterm zone="xmlSecQName2IntegerDebugDump"><primary>xmlSecQName2IntegerDebugDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecQName2IntegerDebugDump        (<parameter><link linkend="xmlSecQName2IntegerInfoConst"><type>xmlSecQName2IntegerInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> intValue</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints <parameter>intValue</parameter> into <parameter>output</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>info</parameter>&#160;:</term>
-<listitem><simpara>               the qname&lt;-&gt;integer mapping information.
+<listitem><simpara>the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>intValue</parameter>&#160;:</term>
-<listitem><simpara>           the integer value.
+<listitem><simpara>the integer value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>name</parameter>&#160;:</term>
-<listitem><simpara>               the value name to print.
+<listitem><simpara>the value name to print.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecQName2IntegerDebugXmlDump" role="function">
 <title>xmlSecQName2IntegerDebugXmlDump ()</title>
-<indexterm zone="xmlSecQName2IntegerDebugXmlDump"><primary sortas="xmlSecQName2IntegerDebugXmlDump">xmlSecQName2IntegerDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecQName2IntegerDebugXmlDump     (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                                         <link linkend="int">int</link> intValue,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints <parameter>intValue</parameter> into <parameter>output</parameter> in XML format.</para>
+<indexterm zone="xmlSecQName2IntegerDebugXmlDump"><primary>xmlSecQName2IntegerDebugXmlDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecQName2IntegerDebugXmlDump     (<parameter><link linkend="xmlSecQName2IntegerInfoConst"><type>xmlSecQName2IntegerInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> intValue</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints <parameter>intValue</parameter> into <parameter>output</parameter> in XML format.
 </para><variablelist role="params">
 <varlistentry><term><parameter>info</parameter>&#160;:</term>
-<listitem><simpara>               the qname&lt;-&gt;integer mapping information.
+<listitem><simpara>the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>intValue</parameter>&#160;:</term>
-<listitem><simpara>           the integer value.
+<listitem><simpara>the integer value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>name</parameter>&#160;:</term>
-<listitem><simpara>               the value name to print.
+<listitem><simpara>the value name to print.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecBitMask" role="typedef">
 <title>xmlSecBitMask</title>
-<indexterm zone="xmlSecBitMask"><primary sortas="xmlSecBitMask">xmlSecBitMask</primary></indexterm><programlisting>typedef unsigned int                                    xmlSecBitMask;
+<indexterm zone="xmlSecBitMask"><primary>xmlSecBitMask</primary></indexterm>
+<programlisting>typedef unsigned int                                    xmlSecBitMask;
 </programlisting>
 <para>
-Bitmask datatype.</para>
-<para>
+Bitmask datatype.
 </para></refsect2>
 <refsect2 id="xmlSecQName2BitMaskInfo" role="struct">
 <title>struct xmlSecQName2BitMaskInfo</title>
-<indexterm zone="xmlSecQName2BitMaskInfo"><primary sortas="xmlSecQName2BitMaskInfo">xmlSecQName2BitMaskInfo</primary></indexterm><programlisting>struct xmlSecQName2BitMaskInfo {
+<indexterm zone="xmlSecQName2BitMaskInfo"><primary>xmlSecQName2BitMaskInfo</primary></indexterm>
+<programlisting>struct xmlSecQName2BitMaskInfo {
     const xmlChar*      qnameHref;
     const xmlChar*      qnameLocalPart;
     xmlSecBitMask       mask;
 };
 </programlisting>
 <para>
-QName &lt;-&gt; Bitmask conversion definition.</para>
-<para>
+QName &lt;-&gt; Bitmask conversion definition.
 </para><variablelist role="struct">
-<varlistentry>
-<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>qnameHref</structfield>;</term>
-<listitem><simpara>          the QName href
+<varlistentry><term>const&#160;<link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecQName2BitMaskInfo.qnameHref">qnameHref</structfield>;</term>
+<listitem><simpara>the QName href
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>qnameLocalPart</structfield>;</term>
-<listitem><simpara>     the QName local
+<varlistentry><term>const&#160;<link linkend="xmlChar"><type>xmlChar</type></link>&#160;*<structfield id="xmlSecQName2BitMaskInfo.qnameLocalPart">qnameLocalPart</structfield>;</term>
+<listitem><simpara>the QName local
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
-<term><link linkend="xmlSecBitMask">xmlSecBitMask</link>&#160;<structfield>mask</structfield>;</term>
-<listitem><simpara>               the bitmask value
+<varlistentry><term><link linkend="xmlSecBitMask"><type>xmlSecBitMask</type></link>&#160;<structfield id="xmlSecQName2BitMaskInfo.mask">mask</structfield>;</term>
+<listitem><simpara>the bitmask value
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecQName2BitMaskInfoConstPtr" role="typedef">
 <title>xmlSecQName2BitMaskInfoConstPtr</title>
-<indexterm zone="xmlSecQName2BitMaskInfoConstPtr"><primary sortas="xmlSecQName2BitMaskInfoConstPtr">xmlSecQName2BitMaskInfoConstPtr</primary></indexterm><programlisting>typedef const xmlSecQName2BitMaskInfo*          xmlSecQName2BitMaskInfoConstPtr;
+<indexterm zone="xmlSecQName2BitMaskInfoConstPtr"><primary>xmlSecQName2BitMaskInfoConstPtr</primary></indexterm>
+<programlisting>typedef const xmlSecQName2BitMaskInfo*          xmlSecQName2BitMaskInfoConstPtr;
 </programlisting>
 <para>
-Pointer to constant QName &lt;-&gt; Bitmask conversion definition.</para>
-<para>
+Pointer to constant QName &lt;-&gt; Bitmask conversion definition.
 </para></refsect2>
 <refsect2 id="xmlSecQName2BitMaskGetInfo" role="function">
 <title>xmlSecQName2BitMaskGetInfo ()</title>
-<indexterm zone="xmlSecQName2BitMaskGetInfo"><primary sortas="xmlSecQName2BitMaskGetInfo">xmlSecQName2BitMaskGetInfo</primary></indexterm><programlisting><link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link>  xmlSecQName2BitMaskGetInfo
-                                                        (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask);</programlisting>
-<para>
-Converts <parameter>mask</parameter> to qname.</para>
+<indexterm zone="xmlSecQName2BitMaskGetInfo"><primary>xmlSecQName2BitMaskGetInfo</primary></indexterm>
+<programlisting><link linkend="xmlSecQName2BitMaskInfoConst"><returnvalue>xmlSecQName2BitMaskInfoConstPtr</returnvalue></link>  xmlSecQName2BitMaskGetInfo
+                                                        (<parameter><link linkend="xmlSecQName2BitMaskInfoConst"><type>xmlSecQName2BitMaskInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlSecBitMask"><type>xmlSecBitMask</type></link> mask</parameter>);</programlisting>
 <para>
+Converts <parameter>mask</parameter> to qname.
 </para><variablelist role="params">
 <varlistentry><term><parameter>info</parameter>&#160;:</term>
-<listitem><simpara>               the qname&lt;-&gt;bit mask mapping information.
+<listitem><simpara>the qname&lt;-&gt;bit mask mapping information.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>mask</parameter>&#160;:</term>
-<listitem><simpara>               the bit mask.
+<listitem><simpara>the bit mask.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the qname info for <parameter>mask</parameter> or NULL if mask is unknown.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecQName2BitMaskGetBitMask" role="function">
 <title>xmlSecQName2BitMaskGetBitMask ()</title>
-<indexterm zone="xmlSecQName2BitMaskGetBitMask"><primary sortas="xmlSecQName2BitMaskGetBitMask">xmlSecQName2BitMaskGetBitMask</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecQName2BitMaskGetBitMask       (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                                         const <link linkend="xmlChar">xmlChar</link> *qnameLocalPart,
-                                                         const <link linkend="xmlChar">xmlChar</link> *qnameHref,
-                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> *mask);</programlisting>
-<para>
-Converts <parameter>qnameLocalPart</parameter> to <parameter>mask</parameter>.</para>
+<indexterm zone="xmlSecQName2BitMaskGetBitMask"><primary>xmlSecQName2BitMaskGetBitMask</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecQName2BitMaskGetBitMask       (<parameter><link linkend="xmlSecQName2BitMaskInfoConst"><type>xmlSecQName2BitMaskInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *qnameLocalPart</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *qnameHref</parameter>,
+                                                         <parameter><link linkend="xmlSecBitMask"><type>xmlSecBitMask</type></link> *mask</parameter>);</programlisting>
 <para>
+Converts <parameter>qnameLocalPart</parameter> to <parameter>mask</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>info</parameter>&#160;:</term>
-<listitem><simpara>               the qname&lt;-&gt;bit mask mapping information.
+<listitem><simpara>the qname&lt;-&gt;bit mask mapping information.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>qnameLocalPart</parameter>&#160;:</term>
-<listitem><simpara>     the qname LocalPart value.
+<listitem><simpara>the qname LocalPart value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>qnameHref</parameter>&#160;:</term>
-<listitem><simpara>          the qname Href value.
+<listitem><simpara>the qname Href value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>mask</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to result mask.
+<listitem><simpara>the pointer to result mask.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecQName2BitMaskNodesRead" role="function">
 <title>xmlSecQName2BitMaskNodesRead ()</title>
-<indexterm zone="xmlSecQName2BitMaskNodesRead"><primary sortas="xmlSecQName2BitMaskNodesRead">xmlSecQName2BitMaskNodesRead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecQName2BitMaskNodesRead        (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> *node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *nodeName,
-                                                         const <link linkend="xmlChar">xmlChar</link> *nodeNs,
-                                                         <link linkend="int">int</link> stopOnUnknown,
-                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> *mask);</programlisting>
+<indexterm zone="xmlSecQName2BitMaskNodesRead"><primary>xmlSecQName2BitMaskNodesRead</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecQName2BitMaskNodesRead        (<parameter><link linkend="xmlSecQName2BitMaskInfoConst"><type>xmlSecQName2BitMaskInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> *node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *nodeName</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *nodeNs</parameter>,
+                                                         <parameter><link linkend="int"><type>int</type></link> stopOnUnknown</parameter>,
+                                                         <parameter><link linkend="xmlSecBitMask"><type>xmlSecBitMask</type></link> *mask</parameter>);</programlisting>
 <para>
 Reads &lt;<parameter>nodeNs</parameter>:<parameter>nodeName</parameter>&gt; elements and puts the result bit mask
 into <parameter>mask</parameter>. When function exits, <parameter>node</parameter> points to the first element node
-after all the &lt;<parameter>nodeNs</parameter>:<parameter>nodeName</parameter>&gt; elements.</para>
-<para>
+after all the &lt;<parameter>nodeNs</parameter>:<parameter>nodeName</parameter>&gt; elements.
 </para><variablelist role="params">
 <varlistentry><term><parameter>info</parameter>&#160;:</term>
-<listitem><simpara>               the qname&lt;-&gt;bit mask mapping information.
+<listitem><simpara>the qname&lt;-&gt;bit mask mapping information.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the start.
+<listitem><simpara>the start.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nodeName</parameter>&#160;:</term>
-<listitem><simpara>           the mask nodes name.
+<listitem><simpara>the mask nodes name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nodeNs</parameter>&#160;:</term>
-<listitem><simpara>             the mask nodes namespace.
+<listitem><simpara>the mask nodes namespace.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>stopOnUnknown</parameter>&#160;:</term>
-<listitem><simpara>      if this flag is set then function exits if unknown
+<listitem><simpara>if this flag is set then function exits if unknown
                      value was found.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>mask</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to result mask.
+<listitem><simpara>the pointer to result mask.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecQName2BitMaskGetBitMaskFromString" role="function">
 <title>xmlSecQName2BitMaskGetBitMaskFromString ()</title>
-<indexterm zone="xmlSecQName2BitMaskGetBitMaskFromString"><primary sortas="xmlSecQName2BitMaskGetBitMaskFromString">xmlSecQName2BitMaskGetBitMaskFromString</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecQName2BitMaskGetBitMaskFromString
-                                                        (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *qname,
-                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> *mask);</programlisting>
-<para>
-Converts <parameter>qname</parameter> into integer in context of <parameter>node</parameter>.</para>
-<para>
+<indexterm zone="xmlSecQName2BitMaskGetBitMaskFromString"><primary>xmlSecQName2BitMaskGetBitMaskFromString</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecQName2BitMaskGetBitMaskFromString
+                                                        (<parameter><link linkend="xmlSecQName2BitMaskInfoConst"><type>xmlSecQName2BitMaskInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *qname</parameter>,
+                                                         <parameter><link linkend="xmlSecBitMask"><type>xmlSecBitMask</type></link> *mask</parameter>);</programlisting>
+<para>
+Converts <parameter>qname</parameter> into integer in context of <parameter>node</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>info</parameter>&#160;:</term>
-<listitem><simpara>               the qname&lt;-&gt;integer mapping information.
+<listitem><simpara>the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to node.
+<listitem><simpara>the pointer to node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>qname</parameter>&#160;:</term>
-<listitem><simpara>              the qname string.
+<listitem><simpara>the qname string.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>mask</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to result msk value.
+<listitem><simpara>the pointer to result msk value.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecQName2BitMaskGetStringFromBitMask" role="function">
 <title>xmlSecQName2BitMaskGetStringFromBitMask ()</title>
-<indexterm zone="xmlSecQName2BitMaskGetStringFromBitMask"><primary sortas="xmlSecQName2BitMaskGetStringFromBitMask">xmlSecQName2BitMaskGetStringFromBitMask</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link> *           xmlSecQName2BitMaskGetStringFromBitMask
-                                                        (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask);</programlisting>
+<indexterm zone="xmlSecQName2BitMaskGetStringFromBitMask"><primary>xmlSecQName2BitMaskGetStringFromBitMask</primary></indexterm>
+<programlisting><link linkend="xmlChar"><returnvalue>xmlChar</returnvalue></link> *           xmlSecQName2BitMaskGetStringFromBitMask
+                                                        (<parameter><link linkend="xmlSecQName2BitMaskInfoConst"><type>xmlSecQName2BitMaskInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter><link linkend="xmlSecBitMask"><type>xmlSecBitMask</type></link> mask</parameter>);</programlisting>
 <para>
 Creates qname string for <parameter>mask</parameter> in context of given <parameter>node</parameter>. Caller
-is responsible for freeing returned string with <parameter>xmlFree</parameter>.</para>
-<para>
+is responsible for freeing returned string with <parameter>xmlFree</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>info</parameter>&#160;:</term>
-<listitem><simpara>               the qname&lt;-&gt;integer mapping information.
+<listitem><simpara>the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the pointer to node.
+<listitem><simpara>the pointer to node.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>mask</parameter>&#160;:</term>
-<listitem><simpara>               the mask.
+<listitem><simpara>the mask.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated string on success or NULL if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecQName2BitMaskNodesWrite" role="function">
 <title>xmlSecQName2BitMaskNodesWrite ()</title>
-<indexterm zone="xmlSecQName2BitMaskNodesWrite"><primary sortas="xmlSecQName2BitMaskNodesWrite">xmlSecQName2BitMaskNodesWrite</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecQName2BitMaskNodesWrite       (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
-                                                         const <link linkend="xmlChar">xmlChar</link> *nodeName,
-                                                         const <link linkend="xmlChar">xmlChar</link> *nodeNs,
-                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask);</programlisting>
-<para>
-Writes &lt;<parameter>nodeNs</parameter>:<parameter>nodeName</parameter>&gt; elemnts with values from <parameter>mask</parameter> to <parameter>node</parameter>.</para>
-<para>
+<indexterm zone="xmlSecQName2BitMaskNodesWrite"><primary>xmlSecQName2BitMaskNodesWrite</primary></indexterm>
+<programlisting><link linkend="int"><returnvalue>int</returnvalue></link>                 xmlSecQName2BitMaskNodesWrite       (<parameter><link linkend="xmlSecQName2BitMaskInfoConst"><type>xmlSecQName2BitMaskInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlNode"><type>xmlNodePtr</type></link> node</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *nodeName</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *nodeNs</parameter>,
+                                                         <parameter><link linkend="xmlSecBitMask"><type>xmlSecBitMask</type></link> mask</parameter>);</programlisting>
+<para>
+Writes &lt;<parameter>nodeNs</parameter>:<parameter>nodeName</parameter>&gt; elemnts with values from <parameter>mask</parameter> to <parameter>node</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>info</parameter>&#160;:</term>
-<listitem><simpara>               the qname&lt;-&gt;bit mask mapping information.
+<listitem><simpara>the qname&lt;-&gt;bit mask mapping information.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>node</parameter>&#160;:</term>
-<listitem><simpara>               the parent element for mask nodes.
+<listitem><simpara>the parent element for mask nodes.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nodeName</parameter>&#160;:</term>
-<listitem><simpara>           the mask nodes name.
+<listitem><simpara>the mask nodes name.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>nodeNs</parameter>&#160;:</term>
-<listitem><simpara>             the mask nodes namespace.
+<listitem><simpara>the mask nodes namespace.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>mask</parameter>&#160;:</term>
-<listitem><simpara>               the bit mask.
+<listitem><simpara>the bit mask.
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecQName2BitMaskDebugDump" role="function">
 <title>xmlSecQName2BitMaskDebugDump ()</title>
-<indexterm zone="xmlSecQName2BitMaskDebugDump"><primary sortas="xmlSecQName2BitMaskDebugDump">xmlSecQName2BitMaskDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecQName2BitMaskDebugDump        (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints debug information about <parameter>mask</parameter> to <parameter>output</parameter>.</para>
+<indexterm zone="xmlSecQName2BitMaskDebugDump"><primary>xmlSecQName2BitMaskDebugDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecQName2BitMaskDebugDump        (<parameter><link linkend="xmlSecQName2BitMaskInfoConst"><type>xmlSecQName2BitMaskInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlSecBitMask"><type>xmlSecBitMask</type></link> mask</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints debug information about <parameter>mask</parameter> to <parameter>output</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>info</parameter>&#160;:</term>
-<listitem><simpara>               the qname&lt;-&gt;bit mask mapping information.
+<listitem><simpara>the qname&lt;-&gt;bit mask mapping information.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>mask</parameter>&#160;:</term>
-<listitem><simpara>               the bit mask.
+<listitem><simpara>the bit mask.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>name</parameter>&#160;:</term>
-<listitem><simpara>               the value name to print.
+<listitem><simpara>the value name to print.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="xmlSecQName2BitMaskDebugXmlDump" role="function">
 <title>xmlSecQName2BitMaskDebugXmlDump ()</title>
-<indexterm zone="xmlSecQName2BitMaskDebugXmlDump"><primary sortas="xmlSecQName2BitMaskDebugXmlDump">xmlSecQName2BitMaskDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecQName2BitMaskDebugXmlDump     (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask,
-                                                         const <link linkend="xmlChar">xmlChar</link> *name,
-                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
-<para>
-Prints debug information about <parameter>mask</parameter> to <parameter>output</parameter> in XML format.</para>
+<indexterm zone="xmlSecQName2BitMaskDebugXmlDump"><primary>xmlSecQName2BitMaskDebugXmlDump</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                xmlSecQName2BitMaskDebugXmlDump     (<parameter><link linkend="xmlSecQName2BitMaskInfoConst"><type>xmlSecQName2BitMaskInfoConstPtr</type></link> info</parameter>,
+                                                         <parameter><link linkend="xmlSecBitMask"><type>xmlSecBitMask</type></link> mask</parameter>,
+                                                         <parameter>const <link linkend="xmlChar"><type>xmlChar</type></link> *name</parameter>,
+                                                         <parameter><link linkend="FILE:CAPS"><type>FILE</type></link> *output</parameter>);</programlisting>
 <para>
+Prints debug information about <parameter>mask</parameter> to <parameter>output</parameter> in XML format.
 </para><variablelist role="params">
 <varlistentry><term><parameter>info</parameter>&#160;:</term>
-<listitem><simpara>               the qname&lt;-&gt;bit mask mapping information.
+<listitem><simpara>the qname&lt;-&gt;bit mask mapping information.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>mask</parameter>&#160;:</term>
-<listitem><simpara>               the bit mask.
+<listitem><simpara>the bit mask.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>name</parameter>&#160;:</term>
-<listitem><simpara>               the value name to print.
+<listitem><simpara>the value name to print.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>output</parameter>&#160;:</term>
-<listitem><simpara>             the pointer to output FILE.
+<listitem><simpara>the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
 </refsect1>
 
-
-
-
 </refentry>
diff --git a/docs/api/tmpl/app.sgml b/docs/api/tmpl/app.sgml
index 670a639..9238a73 100644
--- a/docs/api/tmpl/app.sgml
+++ b/docs/api/tmpl/app.sgml
@@ -17,11 +17,15 @@ Crypto-engine application support function used by xmlsec command line utility.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecCryptoInit ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -30,6 +34,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -54,6 +59,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -69,6 +75,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -84,6 +91,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -99,6 +107,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -114,6 +123,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -129,6 +139,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -144,6 +155,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -159,6 +171,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -174,6 +187,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -189,6 +203,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -204,6 +219,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -219,6 +235,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -234,6 +251,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -249,6 +267,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -264,6 +283,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -279,6 +299,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -294,6 +315,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -309,6 +331,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -324,6 +347,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -339,6 +363,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -354,6 +379,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -369,6 +395,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -384,6 +411,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -399,6 +427,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -414,6 +443,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -429,6 +459,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -444,6 +475,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -459,6 +491,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -474,6 +507,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -489,6 +523,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -504,6 +539,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -519,6 +555,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -534,6 +571,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -549,6 +587,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -564,6 +603,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -579,6 +619,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -594,6 +635,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -609,6 +651,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -624,6 +667,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -639,6 +683,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -654,6 +699,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -669,6 +715,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -684,6 +731,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -701,6 +749,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -849,6 +898,7 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/base64.sgml b/docs/api/tmpl/base64.sgml
index 6612a1e..a6d4ebf 100644
--- a/docs/api/tmpl/base64.sgml
+++ b/docs/api/tmpl/base64.sgml
@@ -17,6 +17,9 @@ Base64 encoding/decoding functions.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO XMLSEC_BASE64_LINESIZE ##### -->
 <para>
 
@@ -29,6 +32,7 @@ Base64 encoding/decoding functions.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/bn.sgml b/docs/api/tmpl/bn.sgml
index b45678c..8b000f2 100644
--- a/docs/api/tmpl/bn.sgml
+++ b/docs/api/tmpl/bn.sgml
@@ -17,6 +17,9 @@ Big numbers support functions.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM xmlSecBnFormat ##### -->
 <para>
 
diff --git a/docs/api/tmpl/buffer.sgml b/docs/api/tmpl/buffer.sgml
index 08f0fc2..33a89bd 100644
--- a/docs/api/tmpl/buffer.sgml
+++ b/docs/api/tmpl/buffer.sgml
@@ -17,6 +17,9 @@ Binary buffer implementation.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM xmlSecAllocMode ##### -->
 <para>
 
diff --git a/docs/api/tmpl/dl.sgml b/docs/api/tmpl/dl.sgml
index 3fc3977..88ca820 100644
--- a/docs/api/tmpl/dl.sgml
+++ b/docs/api/tmpl/dl.sgml
@@ -17,6 +17,9 @@ Dynamic crypto-engine library loading support.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms ##### -->
 <para>
 
@@ -31,6 +34,7 @@ Dynamic crypto-engine library loading support.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -39,6 +43,7 @@ Dynamic crypto-engine library loading support.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -83,6 +88,7 @@ Dynamic crypto-engine library loading support.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/errors.sgml b/docs/api/tmpl/errors.sgml
index d02c09d..30ab00b 100644
--- a/docs/api/tmpl/errors.sgml
+++ b/docs/api/tmpl/errors.sgml
@@ -17,6 +17,9 @@ Error/log messages support.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO XMLSEC_ERRORS_R_XMLSEC_FAILED ##### -->
 <para>
 
@@ -372,6 +375,7 @@ Error/log messages support.
 
 </para>
 
+ void: 
 
 
 <!-- ##### FUNCTION xmlSecErrorsShutdown ##### -->
@@ -379,6 +383,7 @@ Error/log messages support.
 
 </para>
 
+ void: 
 
 
 <!-- ##### FUNCTION xmlSecErrorsSetCallback ##### -->
diff --git a/docs/api/tmpl/exports.sgml b/docs/api/tmpl/exports.sgml
index 37ef9fc..f4d396d 100644
--- a/docs/api/tmpl/exports.sgml
+++ b/docs/api/tmpl/exports.sgml
@@ -17,6 +17,9 @@ Black magic to export functions on Windows.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO extern ##### -->
 <para>
 
diff --git a/docs/api/tmpl/gcrypt/app.sgml b/docs/api/tmpl/gcrypt/app.sgml
index 68fdfcc..4a009fc 100644
--- a/docs/api/tmpl/gcrypt/app.sgml
+++ b/docs/api/tmpl/gcrypt/app.sgml
@@ -6,7 +6,7 @@ Application functions implementation for GnuTLS.
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-Application functions implementation for GnuTLS.
+Application functions implementation for GCrypt.
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -17,7 +17,10 @@ Application functions implementation for GnuTLS.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSAppInit ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION xmlSecGCryptAppInit ##### -->
 <para>
 
 </para>
@@ -26,15 +29,16 @@ Application functions implementation for GnuTLS.
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSAppShutdown ##### -->
+<!-- ##### FUNCTION xmlSecGCryptAppShutdown ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSAppDefaultKeysMngrInit ##### -->
+<!-- ##### FUNCTION xmlSecGCryptAppDefaultKeysMngrInit ##### -->
 <para>
 
 </para>
@@ -43,7 +47,7 @@ Application functions implementation for GnuTLS.
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSAppDefaultKeysMngrAdoptKey ##### -->
+<!-- ##### FUNCTION xmlSecGCryptAppDefaultKeysMngrAdoptKey ##### -->
 <para>
 
 </para>
@@ -53,7 +57,7 @@ Application functions implementation for GnuTLS.
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSAppDefaultKeysMngrLoad ##### -->
+<!-- ##### FUNCTION xmlSecGCryptAppDefaultKeysMngrLoad ##### -->
 <para>
 
 </para>
@@ -63,7 +67,7 @@ Application functions implementation for GnuTLS.
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSAppDefaultKeysMngrSave ##### -->
+<!-- ##### FUNCTION xmlSecGCryptAppDefaultKeysMngrSave ##### -->
 <para>
 
 </para>
@@ -74,7 +78,7 @@ Application functions implementation for GnuTLS.
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSAppKeysMngrCertLoad ##### -->
+<!-- ##### FUNCTION xmlSecGCryptAppKeysMngrCertLoad ##### -->
 <para>
 
 </para>
@@ -86,7 +90,7 @@ Application functions implementation for GnuTLS.
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSAppKeysMngrCertLoadMemory ##### -->
+<!-- ##### FUNCTION xmlSecGCryptAppKeysMngrCertLoadMemory ##### -->
 <para>
 
 </para>
@@ -99,7 +103,7 @@ Application functions implementation for GnuTLS.
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSAppKeyLoad ##### -->
+<!-- ##### FUNCTION xmlSecGCryptAppKeyLoad ##### -->
 <para>
 
 </para>
@@ -112,7 +116,7 @@ Application functions implementation for GnuTLS.
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSAppKeyLoadMemory ##### -->
+<!-- ##### FUNCTION xmlSecGCryptAppKeyLoadMemory ##### -->
 <para>
 
 </para>
@@ -126,7 +130,7 @@ Application functions implementation for GnuTLS.
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSAppPkcs12Load ##### -->
+<!-- ##### FUNCTION xmlSecGCryptAppPkcs12Load ##### -->
 <para>
 
 </para>
@@ -138,7 +142,7 @@ Application functions implementation for GnuTLS.
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSAppPkcs12LoadMemory ##### -->
+<!-- ##### FUNCTION xmlSecGCryptAppPkcs12LoadMemory ##### -->
 <para>
 
 </para>
@@ -151,7 +155,7 @@ Application functions implementation for GnuTLS.
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSAppKeyCertLoad ##### -->
+<!-- ##### FUNCTION xmlSecGCryptAppKeyCertLoad ##### -->
 <para>
 
 </para>
@@ -162,7 +166,7 @@ Application functions implementation for GnuTLS.
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSAppKeyCertLoadMemory ##### -->
+<!-- ##### FUNCTION xmlSecGCryptAppKeyCertLoadMemory ##### -->
 <para>
 
 </para>
@@ -174,11 +178,12 @@ Application functions implementation for GnuTLS.
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSAppGetDefaultPwdCallback ##### -->
+<!-- ##### FUNCTION xmlSecGCryptAppGetDefaultPwdCallback ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/gcrypt/crypto.sgml b/docs/api/tmpl/gcrypt/crypto.sgml
index a2d210d..b079b8c 100644
--- a/docs/api/tmpl/gcrypt/crypto.sgml
+++ b/docs/api/tmpl/gcrypt/crypto.sgml
@@ -2,11 +2,11 @@
 crypto
 
 <!-- ##### SECTION Short_Description ##### -->
-Crypto transforms implementation for GnuTLS.
+Crypto transforms implementation for GCrypt.
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-Crypto transforms implementation for GnuTLS.
+Crypto transforms implementation for GCrypt.
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -17,31 +17,37 @@ Crypto transforms implementation for GnuTLS.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION xmlSecCryptoGetFunctions_gnutls ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION xmlSecCryptoGetFunctions_gcrypt ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSInit ##### -->
+<!-- ##### FUNCTION xmlSecGCryptInit ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSShutdown ##### -->
+<!-- ##### FUNCTION xmlSecGCryptShutdown ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSKeysMngrInit ##### -->
+<!-- ##### FUNCTION xmlSecGCryptKeysMngrInit ##### -->
 <para>
 
 </para>
@@ -50,7 +56,7 @@ Crypto transforms implementation for GnuTLS.
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSGenerateRandom ##### -->
+<!-- ##### FUNCTION xmlSecGCryptGenerateRandom ##### -->
 <para>
 
 </para>
@@ -60,22 +66,23 @@ Crypto transforms implementation for GnuTLS.
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSKeyDataAesId ##### -->
+<!-- ##### MACRO xmlSecGCryptKeyDataAesId ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSKeyDataAesGetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGCryptKeyDataAesGetKlass ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSKeyDataAesSet ##### -->
+<!-- ##### FUNCTION xmlSecGCryptKeyDataAesSet ##### -->
 <para>
 
 </para>
@@ -86,67 +93,119 @@ Crypto transforms implementation for GnuTLS.
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSTransformAes128CbcId ##### -->
+<!-- ##### MACRO xmlSecGCryptTransformAes128CbcId ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGCryptTransformAes128CbcGetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGCryptTransformAes192CbcId ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSTransformAes128CbcGetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGCryptTransformAes192CbcGetKlass ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSTransformAes192CbcId ##### -->
+<!-- ##### MACRO xmlSecGCryptTransformAes256CbcId ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSTransformAes192CbcGetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGCryptTransformAes256CbcGetKlass ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSTransformAes256CbcId ##### -->
+<!-- ##### MACRO xmlSecGCryptTransformKWAes128Id ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSTransformAes256CbcGetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGCryptTransformKWAes128GetKlass ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSKeyDataDesId ##### -->
+<!-- ##### MACRO xmlSecGCryptTransformKWAes192Id ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSKeyDataDesGetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGCryptTransformKWAes192GetKlass ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSKeyDataDesSet ##### -->
+<!-- ##### MACRO xmlSecGCryptTransformKWAes256Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGCryptTransformKWAes256GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGCryptKeyDataDesId ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGCryptKeyDataDesGetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecGCryptKeyDataDesSet ##### -->
 <para>
 
 </para>
@@ -157,30 +216,119 @@ Crypto transforms implementation for GnuTLS.
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSTransformDes3CbcId ##### -->
+<!-- ##### MACRO xmlSecGCryptTransformDes3CbcId ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGCryptTransformDes3CbcGetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGCryptTransformKWDes3Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGCryptTransformKWDes3GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGCryptKeyDataDsaId ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGCryptKeyDataDsaGetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecGCryptKeyDataDsaAdoptKey ##### -->
 <para>
 
 </para>
 
+ data: 
+ dsa_key: 
+ Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSTransformDes3CbcGetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGCryptKeyDataDsaAdoptKeyPair ##### -->
 <para>
 
 </para>
 
+ data: 
+ pub_key: 
+ priv_key: 
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSHmacGetMinOutputLength ##### -->
+<!-- ##### FUNCTION xmlSecGCryptKeyDataDsaGetPublicKey ##### -->
 <para>
 
 </para>
 
+ data: 
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSHmacSetMinOutputLength ##### -->
+<!-- ##### FUNCTION xmlSecGCryptKeyDataDsaGetPrivateKey ##### -->
+<para>
+
+</para>
+
+ data: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGCryptTransformDsaSha1Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGCryptTransformDsaSha1GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecGCryptHmacGetMinOutputLength ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecGCryptHmacSetMinOutputLength ##### -->
 <para>
 
 </para>
@@ -188,22 +336,23 @@ Crypto transforms implementation for GnuTLS.
 @min_length: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSKeyDataHmacId ##### -->
+<!-- ##### MACRO xmlSecGCryptKeyDataHmacId ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSKeyDataHmacGetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGCryptKeyDataHmacGetKlass ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSKeyDataHmacSet ##### -->
+<!-- ##### FUNCTION xmlSecGCryptKeyDataHmacSet ##### -->
 <para>
 
 </para>
@@ -214,183 +363,346 @@ Crypto transforms implementation for GnuTLS.
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSTransformHmacMd5Id ##### -->
+<!-- ##### MACRO xmlSecGCryptTransformHmacMd5Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGCryptTransformHmacMd5GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGCryptTransformHmacRipemd160Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGCryptTransformHmacRipemd160GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGCryptTransformHmacSha1Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGCryptTransformHmacSha1GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGCryptTransformHmacSha256Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGCryptTransformHmacSha256GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGCryptTransformHmacSha384Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGCryptTransformHmacSha384GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGCryptTransformHmacSha512Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGCryptTransformHmacSha512GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGCryptKeyDataRsaId ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGCryptKeyDataRsaGetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecGCryptKeyDataRsaAdoptKey ##### -->
+<para>
+
+</para>
+
+ data: 
+ rsa_key: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecGCryptKeyDataRsaAdoptKeyPair ##### -->
+<para>
+
+</para>
+
+ data: 
+ pub_key: 
+ priv_key: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecGCryptKeyDataRsaGetPublicKey ##### -->
+<para>
+
+</para>
+
+ data: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecGCryptKeyDataRsaGetPrivateKey ##### -->
+<para>
+
+</para>
+
+ data: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGCryptTransformRsaMd5Id ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSTransformHmacMd5GetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGCryptTransformRsaMd5GetKlass ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSTransformHmacRipemd160Id ##### -->
+<!-- ##### MACRO xmlSecGCryptTransformRsaRipemd160Id ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSTransformHmacRipemd160GetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGCryptTransformRsaRipemd160GetKlass ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSTransformHmacSha1Id ##### -->
+<!-- ##### MACRO xmlSecGCryptTransformRsaSha1Id ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSTransformHmacSha1GetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGCryptTransformRsaSha1GetKlass ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSTransformHmacSha256Id ##### -->
+<!-- ##### MACRO xmlSecGCryptTransformRsaSha256Id ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSTransformHmacSha256GetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGCryptTransformRsaSha256GetKlass ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSTransformHmacSha384Id ##### -->
+<!-- ##### MACRO xmlSecGCryptTransformRsaSha384Id ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSTransformHmacSha384GetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGCryptTransformRsaSha384GetKlass ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSTransformHmacSha512Id ##### -->
+<!-- ##### MACRO xmlSecGCryptTransformRsaSha512Id ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSTransformHmacSha512GetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGCryptTransformRsaSha512GetKlass ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSTransformSha1Id ##### -->
+<!-- ##### MACRO xmlSecGCryptTransformSha1Id ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSTransformSha1GetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGCryptTransformSha1GetKlass ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSTransformSha256Id ##### -->
+<!-- ##### MACRO xmlSecGCryptTransformSha256Id ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSTransformSha256GetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGCryptTransformSha256GetKlass ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSTransformSha384Id ##### -->
+<!-- ##### MACRO xmlSecGCryptTransformSha384Id ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSTransformSha384GetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGCryptTransformSha384GetKlass ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSTransformSha512Id ##### -->
+<!-- ##### MACRO xmlSecGCryptTransformSha512Id ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSTransformSha512GetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGCryptTransformSha512GetKlass ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSTransformMd5Id ##### -->
+<!-- ##### MACRO xmlSecGCryptTransformMd5Id ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSTransformMd5GetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGCryptTransformMd5GetKlass ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecGnuTLSTransformRipemd160Id ##### -->
+<!-- ##### MACRO xmlSecGCryptTransformRipemd160Id ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION xmlSecGnuTLSTransformRipemd160GetKlass ##### -->
+<!-- ##### FUNCTION xmlSecGCryptTransformRipemd160GetKlass ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/gcrypt/xmlsec-gcrypt-unused.sgml b/docs/api/tmpl/gcrypt/xmlsec-gcrypt-unused.sgml
index e69de29..dfeb99d 100644
--- a/docs/api/tmpl/gcrypt/xmlsec-gcrypt-unused.sgml
+++ b/docs/api/tmpl/gcrypt/xmlsec-gcrypt-unused.sgml
@@ -0,0 +1,7 @@
+<!-- ##### FUNCTION xmlSecCryptoGetFunctions_GCrypt ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
diff --git a/docs/api/tmpl/gnutls/app.sgml b/docs/api/tmpl/gnutls/app.sgml
index 68fdfcc..24bd87a 100644
--- a/docs/api/tmpl/gnutls/app.sgml
+++ b/docs/api/tmpl/gnutls/app.sgml
@@ -17,6 +17,9 @@ Application functions implementation for GnuTLS.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecGnuTLSAppInit ##### -->
 <para>
 
@@ -31,6 +34,7 @@ Application functions implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -179,6 +183,7 @@ Application functions implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/gnutls/crypto.sgml b/docs/api/tmpl/gnutls/crypto.sgml
index a2d210d..e8cf486 100644
--- a/docs/api/tmpl/gnutls/crypto.sgml
+++ b/docs/api/tmpl/gnutls/crypto.sgml
@@ -17,11 +17,15 @@ Crypto transforms implementation for GnuTLS.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecCryptoGetFunctions_gnutls ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -30,6 +34,7 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -38,6 +43,7 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -72,6 +78,7 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -98,6 +105,7 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -113,6 +121,7 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -128,6 +137,55 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGnuTLSTransformKWAes128Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSTransformKWAes128GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGnuTLSTransformKWAes192Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSTransformKWAes192GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGnuTLSTransformKWAes256Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSTransformKWAes256GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
 @Returns: 
 
 
@@ -143,6 +201,7 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -169,6 +228,94 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGnuTLSTransformKWDes3Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSTransformKWDes3GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGnuTLSKeyDataDsaId ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSKeyDataDsaGetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSKeyDataDsaAdoptKey ##### -->
+<para>
+
+</para>
+
+ data: 
+ dsa_key: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSKeyDataDsaAdoptKeyPair ##### -->
+<para>
+
+</para>
+
+ data: 
+ pub_key: 
+ priv_key: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSKeyDataDsaGetPublicKey ##### -->
+<para>
+
+</para>
+
+ data: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSKeyDataDsaGetPrivateKey ##### -->
+<para>
+
+</para>
+
+ data: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGnuTLSTransformDsaSha1Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSTransformDsaSha1GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
 @Returns: 
 
 
@@ -177,6 +324,7 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -200,6 +348,7 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -226,6 +375,7 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -241,6 +391,7 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -256,6 +407,7 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -271,6 +423,7 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -286,6 +439,7 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -301,6 +455,158 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGnuTLSKeyDataRsaId ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSKeyDataRsaGetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSKeyDataRsaAdoptKey ##### -->
+<para>
+
+</para>
+
+ data: 
+ rsa_key: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSKeyDataRsaAdoptKeyPair ##### -->
+<para>
+
+</para>
+
+ data: 
+ pub_key: 
+ priv_key: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSKeyDataRsaGetPublicKey ##### -->
+<para>
+
+</para>
+
+ data: 
+ Returns: 
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSKeyDataRsaGetPrivateKey ##### -->
+<para>
+
+</para>
+
+ data: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGnuTLSTransformRsaMd5Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSTransformRsaMd5GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGnuTLSTransformRsaRipemd160Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSTransformRsaRipemd160GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGnuTLSTransformRsaSha1Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSTransformRsaSha1GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGnuTLSTransformRsaSha256Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSTransformRsaSha256GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGnuTLSTransformRsaSha384Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSTransformRsaSha384GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecGnuTLSTransformRsaSha512Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecGnuTLSTransformRsaSha512GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
 @Returns: 
 
 
@@ -316,6 +622,7 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -331,6 +638,7 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -346,6 +654,7 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -361,6 +670,7 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -376,6 +686,7 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -391,6 +702,7 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/io.sgml b/docs/api/tmpl/io.sgml
index 6b13d8d..bcf7118 100644
--- a/docs/api/tmpl/io.sgml
+++ b/docs/api/tmpl/io.sgml
@@ -17,11 +17,15 @@ Input/output support.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecIOInit ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -30,6 +34,7 @@ Input/output support.
 
 </para>
 
+ void: 
 
 
 <!-- ##### FUNCTION xmlSecIOCleanupCallbacks ##### -->
@@ -37,6 +42,7 @@ Input/output support.
 
 </para>
 
+ void: 
 
 
 <!-- ##### FUNCTION xmlSecIORegisterDefaultCallbacks ##### -->
@@ -44,6 +50,7 @@ Input/output support.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -71,6 +78,7 @@ Input/output support.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/keyinfo.sgml b/docs/api/tmpl/keyinfo.sgml
index 5e2acca..e6ea391 100644
--- a/docs/api/tmpl/keyinfo.sgml
+++ b/docs/api/tmpl/keyinfo.sgml
@@ -17,6 +17,9 @@ keyinfo
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecKeyInfoNodeRead ##### -->
 <para>
 
@@ -255,6 +258,7 @@ keyinfo
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -270,6 +274,7 @@ keyinfo
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -285,6 +290,7 @@ keyinfo
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -300,6 +306,7 @@ keyinfo
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/keys.sgml b/docs/api/tmpl/keys.sgml
index 4b25137..7bd74cf 100644
--- a/docs/api/tmpl/keys.sgml
+++ b/docs/api/tmpl/keys.sgml
@@ -17,6 +17,9 @@ Crypto key object definition.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### TYPEDEF xmlSecKeyUsage ##### -->
 <para>
 
@@ -178,6 +181,7 @@ Crypto key object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -284,6 +288,7 @@ Crypto key object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -510,6 +515,7 @@ Crypto key object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/keysdata.sgml b/docs/api/tmpl/keysdata.sgml
index 8b070e1..3260521 100644
--- a/docs/api/tmpl/keysdata.sgml
+++ b/docs/api/tmpl/keysdata.sgml
@@ -17,6 +17,9 @@ Crypto key data object definition.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### TYPEDEF xmlSecKeyDataUsage ##### -->
 <para>
 
@@ -189,6 +192,7 @@ Crypto key data object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -197,6 +201,7 @@ Crypto key data object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -205,6 +210,7 @@ Crypto key data object definition.
 
 </para>
 
+ void: 
 
 
 <!-- ##### FUNCTION xmlSecKeyDataIdsRegisterDefault ##### -->
@@ -212,6 +218,7 @@ Crypto key data object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -587,6 +594,7 @@ Crypto key data object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -602,6 +610,7 @@ Crypto key data object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -915,6 +924,7 @@ Crypto key data object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/keysmngr.sgml b/docs/api/tmpl/keysmngr.sgml
index 53b2d56..6f55ffa 100644
--- a/docs/api/tmpl/keysmngr.sgml
+++ b/docs/api/tmpl/keysmngr.sgml
@@ -17,11 +17,15 @@ Keys manager object support.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecKeysMngrCreate ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -252,6 +256,7 @@ Keys manager object support.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/list.sgml b/docs/api/tmpl/list.sgml
index 92d56d3..4455f8d 100644
--- a/docs/api/tmpl/list.sgml
+++ b/docs/api/tmpl/list.sgml
@@ -17,6 +17,9 @@ Generic list structure implementation.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT xmlSecPtrList ##### -->
 <para>
 
@@ -256,6 +259,7 @@ Generic list structure implementation.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/membuf.sgml b/docs/api/tmpl/membuf.sgml
index 0b69c7b..873eb5a 100644
--- a/docs/api/tmpl/membuf.sgml
+++ b/docs/api/tmpl/membuf.sgml
@@ -17,6 +17,9 @@ Memory buffer transform implementation.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO xmlSecTransformMemBufId ##### -->
 <para>
 
@@ -29,6 +32,7 @@ Memory buffer transform implementation.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/mscrypto/app.sgml b/docs/api/tmpl/mscrypto/app.sgml
index a738ead..48cf7db 100644
--- a/docs/api/tmpl/mscrypto/app.sgml
+++ b/docs/api/tmpl/mscrypto/app.sgml
@@ -17,6 +17,9 @@ Application functions implementation for MS Crypto.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecMSCryptoAppInit ##### -->
 <para>
 
@@ -31,6 +34,7 @@ Application functions implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -39,6 +43,7 @@ Application functions implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -247,6 +252,7 @@ Application functions implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/mscrypto/certkeys.sgml b/docs/api/tmpl/mscrypto/certkeys.sgml
index 65eb143..58c2077 100644
--- a/docs/api/tmpl/mscrypto/certkeys.sgml
+++ b/docs/api/tmpl/mscrypto/certkeys.sgml
@@ -17,6 +17,9 @@ MS Crypto certificates helper functions.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecMSCryptoKeyDataGetCert ##### -->
 <para>
 
diff --git a/docs/api/tmpl/mscrypto/crypto.sgml b/docs/api/tmpl/mscrypto/crypto.sgml
index 4e5b1b1..1df46b7 100644
--- a/docs/api/tmpl/mscrypto/crypto.sgml
+++ b/docs/api/tmpl/mscrypto/crypto.sgml
@@ -17,11 +17,15 @@ Crypto transforms implementation for MS Crypto.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecCryptoGetFunctions_mscrypto ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -30,6 +34,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -38,6 +43,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -149,6 +155,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -164,6 +171,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -179,6 +187,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -194,6 +203,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -209,6 +219,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -224,6 +235,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -239,6 +251,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -254,6 +267,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -269,6 +283,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -284,6 +299,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -299,6 +315,23 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecMSCryptoTransformRsaOaepId ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecMSCryptoTransformRsaOaepGetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
 @Returns: 
 
 
@@ -314,6 +347,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -329,6 +363,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -344,6 +379,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -359,6 +395,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -374,6 +411,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -389,6 +427,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -404,6 +443,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -430,6 +470,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -445,6 +486,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -460,6 +502,55 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecMSCryptoTransformKWAes128Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecMSCryptoTransformKWAes128GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecMSCryptoTransformKWAes192Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecMSCryptoTransformKWAes192GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecMSCryptoTransformKWAes256Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecMSCryptoTransformKWAes256GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
 @Returns: 
 
 
@@ -475,6 +566,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -490,6 +582,23 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
+ Returns: 
+
+
+<!-- ##### MACRO xmlSecMSCryptoTransformKWDes3Id ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION xmlSecMSCryptoTransformKWDes3GetKlass ##### -->
+<para>
+
+</para>
+
+ void: 
 @Returns: 
 
 
@@ -498,6 +607,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -521,6 +631,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -547,6 +658,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -562,6 +674,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -577,6 +690,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -592,6 +706,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -607,6 +722,7 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/mscrypto/keysstore.sgml b/docs/api/tmpl/mscrypto/keysstore.sgml
index 5523e6f..2c95039 100644
--- a/docs/api/tmpl/mscrypto/keysstore.sgml
+++ b/docs/api/tmpl/mscrypto/keysstore.sgml
@@ -17,6 +17,9 @@ Keys store implementation for MS Crypto.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO xmlSecMSCryptoKeysStoreId ##### -->
 <para>
 
@@ -29,6 +32,7 @@ Keys store implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/mscrypto/x509.sgml b/docs/api/tmpl/mscrypto/x509.sgml
index df31bb3..1be2828 100644
--- a/docs/api/tmpl/mscrypto/x509.sgml
+++ b/docs/api/tmpl/mscrypto/x509.sgml
@@ -17,6 +17,9 @@ X509 certificates support implementation for MS Crypto.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO xmlSecMSCryptoKeyDataX509Id ##### -->
 <para>
 
@@ -29,6 +32,7 @@ X509 certificates support implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -121,6 +125,7 @@ X509 certificates support implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -136,6 +141,7 @@ X509 certificates support implementation for MS Crypto.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/nodeset.sgml b/docs/api/tmpl/nodeset.sgml
index da83523..c31c4ff 100644
--- a/docs/api/tmpl/nodeset.sgml
+++ b/docs/api/tmpl/nodeset.sgml
@@ -17,6 +17,9 @@ Nodeset object implementation.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM xmlSecNodeSetType ##### -->
 <para>
 
diff --git a/docs/api/tmpl/nss/app.sgml b/docs/api/tmpl/nss/app.sgml
index dd133a0..16cbcfb 100644
--- a/docs/api/tmpl/nss/app.sgml
+++ b/docs/api/tmpl/nss/app.sgml
@@ -17,6 +17,9 @@ Application functions implementation for NSS.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecNssAppInit ##### -->
 <para>
 
@@ -31,6 +34,7 @@ Application functions implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -237,6 +241,7 @@ Application functions implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/nss/bignum.sgml b/docs/api/tmpl/nss/bignum.sgml
index c846475..cd8b2b2 100644
--- a/docs/api/tmpl/nss/bignum.sgml
+++ b/docs/api/tmpl/nss/bignum.sgml
@@ -17,6 +17,9 @@ Big numbers helper functions.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecNssNodeGetBigNumValue ##### -->
 <para>
 
diff --git a/docs/api/tmpl/nss/crypto.sgml b/docs/api/tmpl/nss/crypto.sgml
index af4dd3e..6e625db 100644
--- a/docs/api/tmpl/nss/crypto.sgml
+++ b/docs/api/tmpl/nss/crypto.sgml
@@ -17,11 +17,15 @@ Crypto transforms implementation for NSS.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecCryptoGetFunctions_nss ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -30,6 +34,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -38,6 +43,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -79,6 +85,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -94,6 +101,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -120,6 +128,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -135,6 +144,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -150,6 +160,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -165,6 +176,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -180,6 +192,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -195,6 +208,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -210,6 +224,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -236,6 +251,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -251,6 +267,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -266,6 +283,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -281,6 +299,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -289,6 +308,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -312,6 +332,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -338,6 +359,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -353,6 +375,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -368,6 +391,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -383,6 +407,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -398,6 +423,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -413,6 +439,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -428,6 +455,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -443,6 +471,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -458,6 +487,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -473,6 +503,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -488,6 +519,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -503,6 +535,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -518,6 +551,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -533,6 +567,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -548,6 +583,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -563,6 +599,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -578,6 +615,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -593,6 +631,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -608,6 +647,7 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/nss/keysstore.sgml b/docs/api/tmpl/nss/keysstore.sgml
index b11e935..fef8396 100644
--- a/docs/api/tmpl/nss/keysstore.sgml
+++ b/docs/api/tmpl/nss/keysstore.sgml
@@ -17,6 +17,9 @@ Keys store implementation for NSS.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO xmlSecNssKeysStoreId ##### -->
 <para>
 
@@ -29,6 +32,7 @@ Keys store implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/nss/pkikeys.sgml b/docs/api/tmpl/nss/pkikeys.sgml
index c174c01..8541a55 100644
--- a/docs/api/tmpl/nss/pkikeys.sgml
+++ b/docs/api/tmpl/nss/pkikeys.sgml
@@ -17,6 +17,9 @@ PKI keys data implementation.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecNssPKIAdoptKey ##### -->
 <para>
 
diff --git a/docs/api/tmpl/nss/x509.sgml b/docs/api/tmpl/nss/x509.sgml
index e10f5a5..e897bc0 100644
--- a/docs/api/tmpl/nss/x509.sgml
+++ b/docs/api/tmpl/nss/x509.sgml
@@ -17,6 +17,9 @@ X509 certificates support implementation for NSS.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO xmlSecNssKeyDataX509Id ##### -->
 <para>
 
@@ -29,6 +32,7 @@ X509 certificates support implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -130,6 +134,7 @@ X509 certificates support implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -145,6 +150,7 @@ X509 certificates support implementation for NSS.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/openssl/app.sgml b/docs/api/tmpl/openssl/app.sgml
index 9372120..1bb1425 100644
--- a/docs/api/tmpl/openssl/app.sgml
+++ b/docs/api/tmpl/openssl/app.sgml
@@ -17,6 +17,9 @@ Application functions implementation for OpenSSL.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecOpenSSLAppInit ##### -->
 <para>
 
@@ -31,6 +34,7 @@ Application functions implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -257,6 +261,7 @@ Application functions implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/openssl/bn.sgml b/docs/api/tmpl/openssl/bn.sgml
index 4c6cae0..73c85cc 100644
--- a/docs/api/tmpl/openssl/bn.sgml
+++ b/docs/api/tmpl/openssl/bn.sgml
@@ -17,6 +17,9 @@ Big numbers helper functions.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecOpenSSLNodeGetBNValue ##### -->
 <para>
 
diff --git a/docs/api/tmpl/openssl/crypto.sgml b/docs/api/tmpl/openssl/crypto.sgml
index 1d4c786..c1853bd 100644
--- a/docs/api/tmpl/openssl/crypto.sgml
+++ b/docs/api/tmpl/openssl/crypto.sgml
@@ -17,11 +17,15 @@ Crypto transforms implementation for OpenSSL.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecCryptoGetFunctions_openssl ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -30,6 +34,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -38,6 +43,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -74,6 +80,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -89,6 +96,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -115,6 +123,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -130,6 +139,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -145,6 +155,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -160,6 +171,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -175,6 +187,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -190,6 +203,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -205,6 +219,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -231,6 +246,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -246,6 +262,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -261,6 +278,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -314,6 +332,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -322,6 +341,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -345,6 +365,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -371,6 +392,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -386,6 +408,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -401,6 +424,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -416,6 +440,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -431,6 +456,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -446,6 +472,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -461,6 +488,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -476,6 +504,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -491,6 +520,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -506,6 +536,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -559,6 +590,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -574,6 +606,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -589,6 +622,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -604,6 +638,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -619,6 +654,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -634,6 +670,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -649,6 +686,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -664,6 +702,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -679,6 +718,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -694,6 +734,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -709,6 +750,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -724,6 +766,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -739,6 +782,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -754,6 +798,7 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/openssl/evp.sgml b/docs/api/tmpl/openssl/evp.sgml
index 817ca6e..e97b12e 100644
--- a/docs/api/tmpl/openssl/evp.sgml
+++ b/docs/api/tmpl/openssl/evp.sgml
@@ -17,6 +17,9 @@ EVP keys data implementation.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecOpenSSLEvpKeyDataAdoptEvp ##### -->
 <para>
 
diff --git a/docs/api/tmpl/openssl/x509.sgml b/docs/api/tmpl/openssl/x509.sgml
index 500bd95..bc79480 100644
--- a/docs/api/tmpl/openssl/x509.sgml
+++ b/docs/api/tmpl/openssl/x509.sgml
@@ -17,6 +17,9 @@ X509 certificates support implementation for OpenSSL.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO XMLSEC_STACK_OF_X509 ##### -->
 <para>
 
@@ -43,6 +46,7 @@ X509 certificates support implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -144,6 +148,7 @@ X509 certificates support implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -159,6 +164,7 @@ X509 certificates support implementation for OpenSSL.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/parser.sgml b/docs/api/tmpl/parser.sgml
index 1446adb..dd783cd 100644
--- a/docs/api/tmpl/parser.sgml
+++ b/docs/api/tmpl/parser.sgml
@@ -17,6 +17,9 @@ Parser transform implementation.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecParseFile ##### -->
 <para>
 
@@ -63,6 +66,7 @@ Parser transform implementation.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/private.sgml b/docs/api/tmpl/private.sgml
index fe559ba..cf91a66 100644
--- a/docs/api/tmpl/private.sgml
+++ b/docs/api/tmpl/private.sgml
@@ -17,11 +17,15 @@ Private header for building xmlsec-crypto-engine libraries.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### USER_FUNCTION xmlSecCryptoInitMethod ##### -->
 <para>
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -30,6 +34,7 @@ Private header for building xmlsec-crypto-engine libraries.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -47,6 +52,7 @@ Private header for building xmlsec-crypto-engine libraries.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -55,6 +61,7 @@ Private header for building xmlsec-crypto-engine libraries.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -63,6 +70,7 @@ Private header for building xmlsec-crypto-engine libraries.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -80,6 +88,7 @@ Private header for building xmlsec-crypto-engine libraries.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/soap.sgml b/docs/api/tmpl/soap.sgml
index d3e454c..87e19cc 100644
--- a/docs/api/tmpl/soap.sgml
+++ b/docs/api/tmpl/soap.sgml
@@ -17,6 +17,9 @@ Experimental soap support.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecSoap11CreateEnvelope ##### -->
 <para>
 
diff --git a/docs/api/tmpl/templates.sgml b/docs/api/tmpl/templates.sgml
index 7d97675..861ec8e 100644
--- a/docs/api/tmpl/templates.sgml
+++ b/docs/api/tmpl/templates.sgml
@@ -17,6 +17,9 @@ Dynamic templates creation functions.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION xmlSecTmplSignatureCreate ##### -->
 <para>
 
diff --git a/docs/api/tmpl/transforms.sgml b/docs/api/tmpl/transforms.sgml
index 8cc91b3..3b24a68 100644
--- a/docs/api/tmpl/transforms.sgml
+++ b/docs/api/tmpl/transforms.sgml
@@ -17,6 +17,9 @@ Transform object definition.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO XMLSEC_TRANSFORM_BINARY_CHUNK ##### -->
 <para>
 
@@ -29,6 +32,7 @@ Transform object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -37,6 +41,7 @@ Transform object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -45,6 +50,7 @@ Transform object definition.
 
 </para>
 
+ void: 
 
 
 <!-- ##### FUNCTION xmlSecTransformIdsRegisterDefault ##### -->
@@ -52,6 +58,7 @@ Transform object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -278,6 +285,7 @@ Transform object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -982,6 +990,7 @@ Transform object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -1054,6 +1063,7 @@ Transform object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -1078,6 +1088,7 @@ Transform object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -1093,6 +1104,7 @@ Transform object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -1108,6 +1120,7 @@ Transform object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -1123,6 +1136,7 @@ Transform object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -1138,6 +1152,7 @@ Transform object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -1153,6 +1168,7 @@ Transform object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -1168,6 +1184,7 @@ Transform object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -1183,6 +1200,7 @@ Transform object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -1198,6 +1216,7 @@ Transform object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -1213,6 +1232,7 @@ Transform object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -1240,6 +1260,7 @@ Transform object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -1255,6 +1276,7 @@ Transform object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -1270,6 +1292,7 @@ Transform object definition.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/version.sgml b/docs/api/tmpl/version.sgml
index c913138..a154ef8 100644
--- a/docs/api/tmpl/version.sgml
+++ b/docs/api/tmpl/version.sgml
@@ -17,6 +17,9 @@ Version macros.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO XMLSEC_VERSION ##### -->
 <para>
 
diff --git a/docs/api/tmpl/x509.sgml b/docs/api/tmpl/x509.sgml
index 65d77fc..737fb08 100644
--- a/docs/api/tmpl/x509.sgml
+++ b/docs/api/tmpl/x509.sgml
@@ -17,6 +17,9 @@ x509
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO XMLSEC_X509DATA_CERTIFICATE_NODE ##### -->
 <para>
 
diff --git a/docs/api/tmpl/xmldsig.sgml b/docs/api/tmpl/xmldsig.sgml
index f071c63..e6d0a6d 100644
--- a/docs/api/tmpl/xmldsig.sgml
+++ b/docs/api/tmpl/xmldsig.sgml
@@ -17,6 +17,9 @@ XML Digital Signature support.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM xmlSecDSigStatus ##### -->
 <para>
 
@@ -307,6 +310,7 @@ XML Digital Signature support.
 
 </para>
 
+ void: 
 @Returns: 
 
 
diff --git a/docs/api/tmpl/xmlenc.sgml b/docs/api/tmpl/xmlenc.sgml
index 351ff7d..f10b113 100644
--- a/docs/api/tmpl/xmlenc.sgml
+++ b/docs/api/tmpl/xmlenc.sgml
@@ -17,6 +17,9 @@ XML Encryption support.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM xmlEncCtxMode ##### -->
 <para>
 
diff --git a/docs/api/tmpl/xmlsec-unused.sgml b/docs/api/tmpl/xmlsec-unused.sgml
index efa860f..fafc409 100644
--- a/docs/api/tmpl/xmlsec-unused.sgml
+++ b/docs/api/tmpl/xmlsec-unused.sgml
@@ -1,3 +1,51 @@
+<!-- ##### SECTION ./tmpl/crypto.sgml:Long_Description ##### -->
+<para>
+Crypto engine selection.
+</para>
+
+
+<!-- ##### SECTION ./tmpl/crypto.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/crypto.sgml:Short_Description ##### -->
+Crypto engine selection.
+
+
+<!-- ##### SECTION ./tmpl/crypto.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/crypto.sgml:Title ##### -->
+crypto
+
+
+<!-- ##### SECTION ./tmpl/strings.sgml:Long_Description ##### -->
+<para>
+String constants.
+</para>
+
+
+<!-- ##### SECTION ./tmpl/strings.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/strings.sgml:Short_Description ##### -->
+String constants.
+
+
+<!-- ##### SECTION ./tmpl/strings.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/strings.sgml:Title ##### -->
+strings
+
+
 <!-- ##### SECTION ./tmpl/xkms.sgml:Long_Description ##### -->
 <para>
 
diff --git a/docs/api/tmpl/xmlsec.sgml b/docs/api/tmpl/xmlsec.sgml
index fe6f731..848cf2a 100644
--- a/docs/api/tmpl/xmlsec.sgml
+++ b/docs/api/tmpl/xmlsec.sgml
@@ -17,6 +17,9 @@ Utility functions.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### TYPEDEF xmlSecPtr ##### -->
 <para>
 
@@ -50,6 +53,7 @@ Utility functions.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -58,6 +62,7 @@ Utility functions.
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -102,3 +107,29 @@ Utility functions.
 
 
 
+<!-- ##### MACRO XMLSEC_PTR_TO_FUNC_IMPL ##### -->
+<para>
+
+</para>
+
+ func_type: 
+
+
+<!-- ##### MACRO XMLSEC_PTR_TO_FUNC ##### -->
+<para>
+
+</para>
+
+ func_type: 
+ ptr: 
+
+
+<!-- ##### MACRO XMLSEC_FUNC_TO_PTR ##### -->
+<para>
+
+</para>
+
+ func_type: 
+ func: 
+
+
diff --git a/docs/api/tmpl/xmltree.sgml b/docs/api/tmpl/xmltree.sgml
index d8dcd2c..c590fd9 100644
--- a/docs/api/tmpl/xmltree.sgml
+++ b/docs/api/tmpl/xmltree.sgml
@@ -17,6 +17,9 @@ XML tree operations.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO xmlSecNodeGetName ##### -->
 <para>
 
diff --git a/docs/api/xmlsec-app.html b/docs/api/xmlsec-app.html
index 8b08bc6..b6fa538 100644
--- a/docs/api/xmlsec-app.html
+++ b/docs/api/xmlsec-app.html
@@ -90,147 +90,147 @@
 <a name="AEN836"></a><h2>Name</h2>app -- Crypto-engine independent application support function.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-APP.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS"><font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOINIT">xmlSecCryptoInit</a>                    (void);
-<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOSHUTDOWN">xmlSecCryptoShutdown</a>                (void);
-<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOKEYSMNGRINIT">xmlSecCryptoKeysMngrInit</a>            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
+<pre class="SYNOPSIS"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-app.html#XMLSECCRYPTOINIT">xmlSecCryptoInit</a>                    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-app.html#XMLSECCRYPTOSHUTDOWN">xmlSecCryptoShutdown</a>                (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-app.html#XMLSECCRYPTOKEYSMNGRINIT">xmlSecCryptoKeysMngrInit</a>            (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);
 #define             <a href="xmlsec-app.html#XMLSECKEYDATAAESID">xmlSecKeyDataAesId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-app.html#XMLSECKEYDATAAESGETKLASS">xmlSecKeyDataAesGetKlass</a>            (void);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECKEYDATAAESGETKLASS">xmlSecKeyDataAesGetKlass</a>            (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECKEYDATADESID">xmlSecKeyDataDesId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-app.html#XMLSECKEYDATADESGETKLASS">xmlSecKeyDataDesGetKlass</a>            (void);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECKEYDATADESGETKLASS">xmlSecKeyDataDesGetKlass</a>            (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECKEYDATADSAID">xmlSecKeyDataDsaId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-app.html#XMLSECKEYDATADSAGETKLASS">xmlSecKeyDataDsaGetKlass</a>            (void);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECKEYDATADSAGETKLASS">xmlSecKeyDataDsaGetKlass</a>            (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECKEYDATAGOST2001ID">xmlSecKeyDataGost2001Id</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-app.html#XMLSECKEYDATAGOST2001GETKLASS">xmlSecKeyDataGost2001GetKlass</a>       (void);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECKEYDATAGOST2001GETKLASS">xmlSecKeyDataGost2001GetKlass</a>       (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECKEYDATAHMACID">xmlSecKeyDataHmacId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-app.html#XMLSECKEYDATAHMACGETKLASS">xmlSecKeyDataHmacGetKlass</a>           (void);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECKEYDATAHMACGETKLASS">xmlSecKeyDataHmacGetKlass</a>           (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECKEYDATARSAID">xmlSecKeyDataRsaId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-app.html#XMLSECKEYDATARSAGETKLASS">xmlSecKeyDataRsaGetKlass</a>            (void);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECKEYDATARSAGETKLASS">xmlSecKeyDataRsaGetKlass</a>            (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECKEYDATAX509ID">xmlSecKeyDataX509Id</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-app.html#XMLSECKEYDATAX509GETKLASS">xmlSecKeyDataX509GetKlass</a>           (void);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECKEYDATAX509GETKLASS">xmlSecKeyDataX509GetKlass</a>           (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECKEYDATARAWX509CERTID">xmlSecKeyDataRawX509CertId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-app.html#XMLSECKEYDATARAWX509CERTGETKLASS">xmlSecKeyDataRawX509CertGetKlass</a>    (void);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECKEYDATARAWX509CERTGETKLASS">xmlSecKeyDataRawX509CertGetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECX509STOREID">xmlSecX509StoreId</a>
-<font>xmlSecKeyDataStoreId</font>  <a href="xmlsec-app.html#XMLSECX509STOREGETKLASS">xmlSecX509StoreGetKlass</a>           (void);
+<gtkdoclink href="XMLSECKEYDATASTOREID"><span class="RETURNVALUE">xmlSecKeyDataStoreId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECX509STOREGETKLASS">xmlSecX509StoreGetKlass</a>           (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMAES128CBCID">xmlSecTransformAes128CbcId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMAES128CBCGETKLASS">xmlSecTransformAes128CbcGetKlass</a>    (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMAES128CBCGETKLASS">xmlSecTransformAes128CbcGetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMAES192CBCID">xmlSecTransformAes192CbcId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMAES192CBCGETKLASS">xmlSecTransformAes192CbcGetKlass</a>    (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMAES192CBCGETKLASS">xmlSecTransformAes192CbcGetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMAES256CBCID">xmlSecTransformAes256CbcId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMAES256CBCGETKLASS">xmlSecTransformAes256CbcGetKlass</a>    (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMAES256CBCGETKLASS">xmlSecTransformAes256CbcGetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMKWAES128ID">xmlSecTransformKWAes128Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMKWAES128GETKLASS">xmlSecTransformKWAes128GetKlass</a>     (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMKWAES128GETKLASS">xmlSecTransformKWAes128GetKlass</a>     (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMKWAES192ID">xmlSecTransformKWAes192Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMKWAES192GETKLASS">xmlSecTransformKWAes192GetKlass</a>     (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMKWAES192GETKLASS">xmlSecTransformKWAes192GetKlass</a>     (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMKWAES256ID">xmlSecTransformKWAes256Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMKWAES256GETKLASS">xmlSecTransformKWAes256GetKlass</a>     (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMKWAES256GETKLASS">xmlSecTransformKWAes256GetKlass</a>     (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMDES3CBCID">xmlSecTransformDes3CbcId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMDES3CBCGETKLASS">xmlSecTransformDes3CbcGetKlass</a>      (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMDES3CBCGETKLASS">xmlSecTransformDes3CbcGetKlass</a>      (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMKWDES3ID">xmlSecTransformKWDes3Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMKWDES3GETKLASS">xmlSecTransformKWDes3GetKlass</a>       (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMKWDES3GETKLASS">xmlSecTransformKWDes3GetKlass</a>       (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMDSASHA1ID">xmlSecTransformDsaSha1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMDSASHA1GETKLASS">xmlSecTransformDsaSha1GetKlass</a>      (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMDSASHA1GETKLASS">xmlSecTransformDsaSha1GetKlass</a>      (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMGOST2001GOSTR3411-94ID">xmlSecTransformGost2001GostR3411_94Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMGOST2001GOSTR3411-94GETKLASS">xmlSecTransformGost2001GostR3411_94GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMGOST2001GOSTR3411-94GETKLASS">xmlSecTransformGost2001GostR3411_94GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMHMACMD5ID">xmlSecTransformHmacMd5Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMHMACMD5GETKLASS">xmlSecTransformHmacMd5GetKlass</a>      (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMHMACMD5GETKLASS">xmlSecTransformHmacMd5GetKlass</a>      (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMHMACRIPEMD160ID">xmlSecTransformHmacRipemd160Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMHMACRIPEMD160GETKLASS">xmlSecTransformHmacRipemd160GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMHMACRIPEMD160GETKLASS">xmlSecTransformHmacRipemd160GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA1ID">xmlSecTransformHmacSha1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA1GETKLASS">xmlSecTransformHmacSha1GetKlass</a>     (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA1GETKLASS">xmlSecTransformHmacSha1GetKlass</a>     (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA224ID">xmlSecTransformHmacSha224Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA224GETKLASS">xmlSecTransformHmacSha224GetKlass</a>   (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA224GETKLASS">xmlSecTransformHmacSha224GetKlass</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA256ID">xmlSecTransformHmacSha256Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA256GETKLASS">xmlSecTransformHmacSha256GetKlass</a>   (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA256GETKLASS">xmlSecTransformHmacSha256GetKlass</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA384ID">xmlSecTransformHmacSha384Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA384GETKLASS">xmlSecTransformHmacSha384GetKlass</a>   (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA384GETKLASS">xmlSecTransformHmacSha384GetKlass</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA512ID">xmlSecTransformHmacSha512Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA512GETKLASS">xmlSecTransformHmacSha512GetKlass</a>   (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA512GETKLASS">xmlSecTransformHmacSha512GetKlass</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMMD5ID">xmlSecTransformMd5Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMMD5GETKLASS">xmlSecTransformMd5GetKlass</a>          (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMMD5GETKLASS">xmlSecTransformMd5GetKlass</a>          (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMRIPEMD160ID">xmlSecTransformRipemd160Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMRIPEMD160GETKLASS">xmlSecTransformRipemd160GetKlass</a>    (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMRIPEMD160GETKLASS">xmlSecTransformRipemd160GetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMRSAMD5ID">xmlSecTransformRsaMd5Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMRSAMD5GETKLASS">xmlSecTransformRsaMd5GetKlass</a>       (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMRSAMD5GETKLASS">xmlSecTransformRsaMd5GetKlass</a>       (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMRSARIPEMD160ID">xmlSecTransformRsaRipemd160Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMRSARIPEMD160GETKLASS">xmlSecTransformRsaRipemd160GetKlass</a> (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMRSARIPEMD160GETKLASS">xmlSecTransformRsaRipemd160GetKlass</a> (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA1ID">xmlSecTransformRsaSha1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA1GETKLASS">xmlSecTransformRsaSha1GetKlass</a>      (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA1GETKLASS">xmlSecTransformRsaSha1GetKlass</a>      (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA224ID">xmlSecTransformRsaSha224Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA224GETKLASS">xmlSecTransformRsaSha224GetKlass</a>    (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA224GETKLASS">xmlSecTransformRsaSha224GetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA256ID">xmlSecTransformRsaSha256Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA256GETKLASS">xmlSecTransformRsaSha256GetKlass</a>    (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA256GETKLASS">xmlSecTransformRsaSha256GetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA384ID">xmlSecTransformRsaSha384Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA384GETKLASS">xmlSecTransformRsaSha384GetKlass</a>    (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA384GETKLASS">xmlSecTransformRsaSha384GetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA512ID">xmlSecTransformRsaSha512Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA512GETKLASS">xmlSecTransformRsaSha512GetKlass</a>    (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA512GETKLASS">xmlSecTransformRsaSha512GetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMRSAPKCS1ID">xmlSecTransformRsaPkcs1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMRSAPKCS1GETKLASS">xmlSecTransformRsaPkcs1GetKlass</a>     (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMRSAPKCS1GETKLASS">xmlSecTransformRsaPkcs1GetKlass</a>     (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMRSAOAEPID">xmlSecTransformRsaOaepId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMRSAOAEPGETKLASS">xmlSecTransformRsaOaepGetKlass</a>      (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMRSAOAEPGETKLASS">xmlSecTransformRsaOaepGetKlass</a>      (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMGOSTR3411-94ID">xmlSecTransformGostR3411_94Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMGOSTR3411-94GETKLASS">xmlSecTransformGostR3411_94GetKlass</a> (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMGOSTR3411-94GETKLASS">xmlSecTransformGostR3411_94GetKlass</a> (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMSHA1ID">xmlSecTransformSha1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMSHA1GETKLASS">xmlSecTransformSha1GetKlass</a>         (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMSHA1GETKLASS">xmlSecTransformSha1GetKlass</a>         (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMSHA224ID">xmlSecTransformSha224Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMSHA224GETKLASS">xmlSecTransformSha224GetKlass</a>       (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMSHA224GETKLASS">xmlSecTransformSha224GetKlass</a>       (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMSHA256ID">xmlSecTransformSha256Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMSHA256GETKLASS">xmlSecTransformSha256GetKlass</a>       (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMSHA256GETKLASS">xmlSecTransformSha256GetKlass</a>       (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMSHA384ID">xmlSecTransformSha384Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMSHA384GETKLASS">xmlSecTransformSha384GetKlass</a>       (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMSHA384GETKLASS">xmlSecTransformSha384GetKlass</a>       (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-app.html#XMLSECTRANSFORMSHA512ID">xmlSecTransformSha512Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMSHA512GETKLASS">xmlSecTransformSha512GetKlass</a>       (void);
-<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOAPPINIT">xmlSecCryptoAppInit</a>                 (const <font>char</font> *config);
-<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOAPPSHUTDOWN">xmlSecCryptoAppShutdown</a>             (void);
-<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRINIT">xmlSecCryptoAppDefaultKeysMngrInit</a>  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecCryptoAppDefaultKeysMngrAdoptKey</a>
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRLOAD">xmlSecCryptoAppDefaultKeysMngrLoad</a>  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *uri);
-<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRSAVE">xmlSecCryptoAppDefaultKeysMngrSave</a>  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYSMNGRCERTLOAD">xmlSecCryptoAppKeysMngrCertLoad</a>     (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYSMNGRCERTLOADMEMORY">xmlSecCryptoAppKeysMngrCertLoadMemory</a>
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYLOAD">xmlSecCryptoAppKeyLoad</a>              (const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYLOADMEMORY">xmlSecCryptoAppKeyLoadMemory</a>        (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-app.html#XMLSECCRYPTOAPPPKCS12LOAD">xmlSecCryptoAppPkcs12Load</a>           (const <font>char</font> *filename,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-app.html#XMLSECCRYPTOAPPPKCS12LOADMEMORY">xmlSecCryptoAppPkcs12LoadMemory</a>     (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYCERTLOAD">xmlSecCryptoAppKeyCertLoad</a>          (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYCERTLOADMEMORY">xmlSecCryptoAppKeyCertLoadMemory</a>    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>void</font>*               <a href="xmlsec-app.html#XMLSECCRYPTOAPPGETDEFAULTPWDCALLBACK">xmlSecCryptoAppGetDefaultPwdCallback</a>
-                                                        (void);</pre>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-app.html#XMLSECTRANSFORMSHA512GETKLASS">xmlSecTransformSha512GetKlass</a>       (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-app.html#XMLSECCRYPTOAPPINIT">xmlSecCryptoAppInit</a>                 (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *config</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-app.html#XMLSECCRYPTOAPPSHUTDOWN">xmlSecCryptoAppShutdown</a>             (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRINIT">xmlSecCryptoAppDefaultKeysMngrInit</a>  (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecCryptoAppDefaultKeysMngrAdoptKey</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRLOAD">xmlSecCryptoAppDefaultKeysMngrLoad</a>  (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *uri</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRSAVE">xmlSecCryptoAppDefaultKeysMngrSave</a>  (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYSMNGRCERTLOAD">xmlSecCryptoAppKeysMngrCertLoad</a>     (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYSMNGRCERTLOADMEMORY">xmlSecCryptoAppKeysMngrCertLoadMemory</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYLOAD">xmlSecCryptoAppKeyLoad</a>              (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYLOADMEMORY">xmlSecCryptoAppKeyLoadMemory</a>        (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-app.html#XMLSECCRYPTOAPPPKCS12LOAD">xmlSecCryptoAppPkcs12Load</a>           (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-app.html#XMLSECCRYPTOAPPPKCS12LOADMEMORY">xmlSecCryptoAppPkcs12LoadMemory</a>     (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYCERTLOAD">xmlSecCryptoAppKeyCertLoad</a>          (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYCERTLOADMEMORY">xmlSecCryptoAppKeyCertLoadMemory</a>    (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>*               <a href="xmlsec-app.html#XMLSECCRYPTOAPPGETDEFAULTPWDCALLBACK">xmlSecCryptoAppGetDefaultPwdCallback</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-APP.DESCRIPTION"></a><h2>Description</h2>
@@ -240,41 +240,38 @@
 <a name="XMLSEC-APP.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOINIT"></a><h3>xmlSecCryptoInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoInit                    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCryptoInit                    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>XMLSec library specific crypto engine initialization.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1067"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1316"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOSHUTDOWN"></a><h3>xmlSecCryptoShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoShutdown                (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCryptoShutdown                (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>XMLSec library specific crypto engine shutdown.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1081"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1332"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOKEYSMNGRINIT"></a><h3>xmlSecCryptoKeysMngrInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoKeysMngrInit            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCryptoKeysMngrInit            (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);</pre>
 <p>Adds crypto specific key data stores in keys manager.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1096"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN1349"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1101"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1354"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -284,17 +281,15 @@
 <a name="XMLSECKEYDATAAESID"></a><h3>xmlSecKeyDataAesId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataAesId                      xmlSecKeyDataAesGetKlass()</pre>
 <p>The AES key klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAAESGETKLASS"></a><h3>xmlSecKeyDataAesGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataAesGetKlass            (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecKeyDataAesGetKlass            (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The AES key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1122"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1376"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> AES key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the AES key data
 klass is not implemented).</p></td>
@@ -305,17 +300,15 @@ klass is not implemented).</p></td>
 <a name="XMLSECKEYDATADESID"></a><h3>xmlSecKeyDataDesId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataDesId                      xmlSecKeyDataDesGetKlass()</pre>
 <p>The DES key klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATADESGETKLASS"></a><h3>xmlSecKeyDataDesGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataDesGetKlass            (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecKeyDataDesGetKlass            (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The DES key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1143"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1398"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> DES key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the DES key data
 klass is not implemented).</p></td>
@@ -326,17 +319,15 @@ klass is not implemented).</p></td>
 <a name="XMLSECKEYDATADSAID"></a><h3>xmlSecKeyDataDsaId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataDsaId                      xmlSecKeyDataDsaGetKlass()</pre>
 <p>The DSA key klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATADSAGETKLASS"></a><h3>xmlSecKeyDataDsaGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataDsaGetKlass            (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecKeyDataDsaGetKlass            (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The DSA key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1164"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1420"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> DSA key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the DSA key data
 klass is not implemented).</p></td>
@@ -347,17 +338,15 @@ klass is not implemented).</p></td>
 <a name="XMLSECKEYDATAGOST2001ID"></a><h3>xmlSecKeyDataGost2001Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataGost2001Id                 xmlSecKeyDataGost2001GetKlass()</pre>
 <p>The GOST2001 key klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAGOST2001GETKLASS"></a><h3>xmlSecKeyDataGost2001GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataGost2001GetKlass       (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecKeyDataGost2001GetKlass       (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The GOST2001 key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1185"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1442"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> GOST2001 key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the GOST2001 key data
 klass is not implemented).</p></td>
@@ -368,17 +357,15 @@ klass is not implemented).</p></td>
 <a name="XMLSECKEYDATAHMACID"></a><h3>xmlSecKeyDataHmacId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataHmacId                     xmlSecKeyDataHmacGetKlass()</pre>
 <p>The DHMAC key klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAHMACGETKLASS"></a><h3>xmlSecKeyDataHmacGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataHmacGetKlass           (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecKeyDataHmacGetKlass           (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1206"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1464"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> HMAC key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the HMAC key data
 klass is not implemented).</p></td>
@@ -389,17 +376,15 @@ klass is not implemented).</p></td>
 <a name="XMLSECKEYDATARSAID"></a><h3>xmlSecKeyDataRsaId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataRsaId                      xmlSecKeyDataRsaGetKlass()</pre>
 <p>The RSA key klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATARSAGETKLASS"></a><h3>xmlSecKeyDataRsaGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataRsaGetKlass            (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecKeyDataRsaGetKlass            (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1227"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1486"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the RSA key data
 klass is not implemented).</p></td>
@@ -410,17 +395,15 @@ klass is not implemented).</p></td>
 <a name="XMLSECKEYDATAX509ID"></a><h3>xmlSecKeyDataX509Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataX509Id                     xmlSecKeyDataX509GetKlass()</pre>
 <p>The X509 data klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAX509GETKLASS"></a><h3>xmlSecKeyDataX509GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataX509GetKlass           (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecKeyDataX509GetKlass           (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The X509 key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1248"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1508"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> X509 key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the X509 key data
 klass is not implemented).</p></td>
@@ -431,17 +414,15 @@ klass is not implemented).</p></td>
 <a name="XMLSECKEYDATARAWX509CERTID"></a><h3>xmlSecKeyDataRawX509CertId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataRawX509CertId              xmlSecKeyDataRawX509CertGetKlass()</pre>
 <p>The  raw X509 certificate klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATARAWX509CERTGETKLASS"></a><h3>xmlSecKeyDataRawX509CertGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataRawX509CertGetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecKeyDataRawX509CertGetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The raw X509 cert key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1269"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1530"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> raw x509 cert key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the raw X509 cert key data
 klass is not implemented).</p></td>
@@ -452,17 +433,15 @@ klass is not implemented).</p></td>
 <a name="XMLSECX509STOREID"></a><h3>xmlSecX509StoreId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecX509StoreId                       xmlSecX509StoreGetKlass()</pre>
 <p>The  X509 store klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECX509STOREGETKLASS"></a><h3>xmlSecX509StoreGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataStoreId</font>  xmlSecX509StoreGetKlass           (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATASTOREID"><span class="RETURNVALUE">xmlSecKeyDataStoreId</span></gtkdoclink>  xmlSecX509StoreGetKlass           (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The X509 certificates key data store klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1290"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1552"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to X509 certificates key data store klass or NULL if
 an error occurs (xmlsec-crypto library is not loaded or the raw X509
 cert key data klass is not implemented).</p></td>
@@ -473,17 +452,15 @@ cert key data klass is not implemented).</p></td>
 <a name="XMLSECTRANSFORMAES128CBCID"></a><h3>xmlSecTransformAes128CbcId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformAes128CbcId              xmlSecTransformAes128CbcGetKlass()</pre>
 <p>The AES128 CBC cipher transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMAES128CBCGETKLASS"></a><h3>xmlSecTransformAes128CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformAes128CbcGetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformAes128CbcGetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>AES 128 CBC encryption transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1311"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1574"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to AES 128 CBC encryption transform or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -494,17 +471,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMAES192CBCID"></a><h3>xmlSecTransformAes192CbcId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformAes192CbcId              xmlSecTransformAes192CbcGetKlass()</pre>
 <p>The AES192 CBC cipher transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMAES192CBCGETKLASS"></a><h3>xmlSecTransformAes192CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformAes192CbcGetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformAes192CbcGetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>AES 192 CBC encryption transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1332"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1596"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to AES 192 CBC encryption transform or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -515,17 +490,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMAES256CBCID"></a><h3>xmlSecTransformAes256CbcId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformAes256CbcId              xmlSecTransformAes256CbcGetKlass()</pre>
 <p>The AES256 CBC cipher transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMAES256CBCGETKLASS"></a><h3>xmlSecTransformAes256CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformAes256CbcGetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformAes256CbcGetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>AES 256 CBC encryption transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1353"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1618"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to AES 256 CBC encryption transform or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -536,17 +509,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMKWAES128ID"></a><h3>xmlSecTransformKWAes128Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformKWAes128Id               xmlSecTransformKWAes128GetKlass()</pre>
 <p>The AES 128 key wrap transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMKWAES128GETKLASS"></a><h3>xmlSecTransformKWAes128GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformKWAes128GetKlass     (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformKWAes128GetKlass     (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The AES-128 kew wrapper transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1374"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1640"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> AES-128 kew wrapper transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -557,17 +528,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMKWAES192ID"></a><h3>xmlSecTransformKWAes192Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformKWAes192Id               xmlSecTransformKWAes192GetKlass()</pre>
 <p>The AES 192 key wrap transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMKWAES192GETKLASS"></a><h3>xmlSecTransformKWAes192GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformKWAes192GetKlass     (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformKWAes192GetKlass     (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The AES-192 kew wrapper transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1395"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1662"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> AES-192 kew wrapper transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -578,17 +547,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMKWAES256ID"></a><h3>xmlSecTransformKWAes256Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformKWAes256Id               xmlSecTransformKWAes256GetKlass()</pre>
 <p>The AES 256 key wrap transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMKWAES256GETKLASS"></a><h3>xmlSecTransformKWAes256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformKWAes256GetKlass     (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformKWAes256GetKlass     (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The AES-256 kew wrapper transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1416"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1684"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> AES-256 kew wrapper transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -599,17 +566,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMDES3CBCID"></a><h3>xmlSecTransformDes3CbcId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformDes3CbcId                xmlSecTransformDes3CbcGetKlass()</pre>
 <p>The Triple DES encryption transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMDES3CBCGETKLASS"></a><h3>xmlSecTransformDes3CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformDes3CbcGetKlass      (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformDes3CbcGetKlass      (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Triple DES CBC encryption transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1437"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1706"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to Triple DES encryption transform or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -620,17 +585,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMKWDES3ID"></a><h3>xmlSecTransformKWDes3Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformKWDes3Id                 xmlSecTransformKWDes3GetKlass()</pre>
 <p>The DES3 CBC cipher transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMKWDES3GETKLASS"></a><h3>xmlSecTransformKWDes3GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformKWDes3GetKlass       (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformKWDes3GetKlass       (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The Triple DES key wrapper transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1458"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1728"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> Triple DES key wrapper transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -641,17 +604,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMDSASHA1ID"></a><h3>xmlSecTransformDsaSha1Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformDsaSha1Id                xmlSecTransformDsaSha1GetKlass()</pre>
 <p>The DSA-SHA1 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMDSASHA1GETKLASS"></a><h3>xmlSecTransformDsaSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformDsaSha1GetKlass      (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformDsaSha1GetKlass      (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The DSA-SHA1 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1479"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1750"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> DSA-SHA1 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -662,18 +623,16 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMGOST2001GOSTR3411-94ID"></a><h3>xmlSecTransformGost2001GostR3411_94Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformGost2001GostR3411_94Id           xmlSecTransformGost2001GostR3411_94GetKlass()</pre>
 <p>The GOST2001-GOSTR3411_94 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMGOST2001GOSTR3411-94GETKLASS"></a><h3>xmlSecTransformGost2001GostR3411_94GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformGost2001GostR3411_94GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformGost2001GostR3411_94GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The GOST2001-GOSTR3411_94 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1500"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1772"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> GOST2001-GOSTR3411_94 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -684,17 +643,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMHMACMD5ID"></a><h3>xmlSecTransformHmacMd5Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformHmacMd5Id                xmlSecTransformHmacMd5GetKlass()</pre>
 <p>The HMAC with MD5 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMHMACMD5GETKLASS"></a><h3>xmlSecTransformHmacMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformHmacMd5GetKlass      (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformHmacMd5GetKlass      (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-MD5 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1521"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1794"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-MD5 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -705,18 +662,16 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMHMACRIPEMD160ID"></a><h3>xmlSecTransformHmacRipemd160Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformHmacRipemd160Id          xmlSecTransformHmacRipemd160GetKlass()</pre>
 <p>The HMAC with RipeMD160 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMHMACRIPEMD160GETKLASS"></a><h3>xmlSecTransformHmacRipemd160GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformHmacRipemd160GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformHmacRipemd160GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-RIPEMD160 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1542"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1816"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-RIPEMD160 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -727,17 +682,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMHMACSHA1ID"></a><h3>xmlSecTransformHmacSha1Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformHmacSha1Id               xmlSecTransformHmacSha1GetKlass()</pre>
 <p>The HMAC with SHA1 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMHMACSHA1GETKLASS"></a><h3>xmlSecTransformHmacSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformHmacSha1GetKlass     (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformHmacSha1GetKlass     (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA1 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1563"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1838"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA1 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -748,17 +701,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMHMACSHA224ID"></a><h3>xmlSecTransformHmacSha224Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformHmacSha224Id             xmlSecTransformHmacSha224GetKlass()</pre>
 <p>The HMAC with SHA224 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMHMACSHA224GETKLASS"></a><h3>xmlSecTransformHmacSha224GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformHmacSha224GetKlass   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformHmacSha224GetKlass   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA224 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1584"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1860"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA224 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -769,17 +720,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMHMACSHA256ID"></a><h3>xmlSecTransformHmacSha256Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformHmacSha256Id             xmlSecTransformHmacSha256GetKlass()</pre>
 <p>The HMAC with SHA256 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMHMACSHA256GETKLASS"></a><h3>xmlSecTransformHmacSha256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformHmacSha256GetKlass   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformHmacSha256GetKlass   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA256 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1605"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1882"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA256 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -790,17 +739,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMHMACSHA384ID"></a><h3>xmlSecTransformHmacSha384Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformHmacSha384Id             xmlSecTransformHmacSha384GetKlass()</pre>
 <p>The HMAC with SHA384 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMHMACSHA384GETKLASS"></a><h3>xmlSecTransformHmacSha384GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformHmacSha384GetKlass   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformHmacSha384GetKlass   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA384 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1626"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1904"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA384 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -811,17 +758,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMHMACSHA512ID"></a><h3>xmlSecTransformHmacSha512Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformHmacSha512Id             xmlSecTransformHmacSha512GetKlass()</pre>
 <p>The HMAC with SHA512 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMHMACSHA512GETKLASS"></a><h3>xmlSecTransformHmacSha512GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformHmacSha512GetKlass   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformHmacSha512GetKlass   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA512 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1647"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1926"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA512 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -832,17 +777,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMMD5ID"></a><h3>xmlSecTransformMd5Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformMd5Id                    xmlSecTransformMd5GetKlass()</pre>
 <p>The MD5 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMMD5GETKLASS"></a><h3>xmlSecTransformMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformMd5GetKlass          (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformMd5GetKlass          (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>MD5 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1668"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1948"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to MD5 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -853,17 +796,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMRIPEMD160ID"></a><h3>xmlSecTransformRipemd160Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformRipemd160Id              xmlSecTransformRipemd160GetKlass()</pre>
 <p>The RIPEMD160 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMRIPEMD160GETKLASS"></a><h3>xmlSecTransformRipemd160GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRipemd160GetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformRipemd160GetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>RIPEMD-160 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1689"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1970"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to RIPEMD-160 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -874,17 +815,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMRSAMD5ID"></a><h3>xmlSecTransformRsaMd5Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformRsaMd5Id                 xmlSecTransformRsaMd5GetKlass()</pre>
 <p>The RSA-MD5 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMRSAMD5GETKLASS"></a><h3>xmlSecTransformRsaMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRsaMd5GetKlass       (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformRsaMd5GetKlass       (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-MD5 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1710"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1992"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-MD5 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -895,17 +834,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMRSARIPEMD160ID"></a><h3>xmlSecTransformRsaRipemd160Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformRsaRipemd160Id           xmlSecTransformRsaRipemd160GetKlass()</pre>
 <p>The RSA-RIPEMD160 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMRSARIPEMD160GETKLASS"></a><h3>xmlSecTransformRsaRipemd160GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRsaRipemd160GetKlass (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformRsaRipemd160GetKlass (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-RIPEMD160 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1731"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2014"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-RIPEMD160 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -916,17 +853,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMRSASHA1ID"></a><h3>xmlSecTransformRsaSha1Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformRsaSha1Id                xmlSecTransformRsaSha1GetKlass()</pre>
 <p>The RSA-SHA1 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMRSASHA1GETKLASS"></a><h3>xmlSecTransformRsaSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRsaSha1GetKlass      (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformRsaSha1GetKlass      (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-SHA1 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1752"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2036"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-SHA1 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -937,17 +872,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMRSASHA224ID"></a><h3>xmlSecTransformRsaSha224Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformRsaSha224Id              xmlSecTransformRsaSha224GetKlass()</pre>
 <p>The RSA-SHA224 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMRSASHA224GETKLASS"></a><h3>xmlSecTransformRsaSha224GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRsaSha224GetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformRsaSha224GetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-SHA224 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1773"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2058"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-SHA224 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -958,17 +891,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMRSASHA256ID"></a><h3>xmlSecTransformRsaSha256Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformRsaSha256Id              xmlSecTransformRsaSha256GetKlass()</pre>
 <p>The RSA-SHA256 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMRSASHA256GETKLASS"></a><h3>xmlSecTransformRsaSha256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRsaSha256GetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformRsaSha256GetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-SHA256 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1794"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2080"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-SHA256 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -979,17 +910,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMRSASHA384ID"></a><h3>xmlSecTransformRsaSha384Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformRsaSha384Id              xmlSecTransformRsaSha384GetKlass()</pre>
 <p>The RSA-SHA384 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMRSASHA384GETKLASS"></a><h3>xmlSecTransformRsaSha384GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRsaSha384GetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformRsaSha384GetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-SHA384 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1815"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2102"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-SHA384 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -1000,17 +929,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMRSASHA512ID"></a><h3>xmlSecTransformRsaSha512Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformRsaSha512Id              xmlSecTransformRsaSha512GetKlass()</pre>
 <p>The RSA-SHA512 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMRSASHA512GETKLASS"></a><h3>xmlSecTransformRsaSha512GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRsaSha512GetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformRsaSha512GetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-SHA512 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1836"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2124"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-SHA512 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -1021,17 +948,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMRSAPKCS1ID"></a><h3>xmlSecTransformRsaPkcs1Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformRsaPkcs1Id               xmlSecTransformRsaPkcs1GetKlass()</pre>
 <p>The RSA PKCS1 key transport transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMRSAPKCS1GETKLASS"></a><h3>xmlSecTransformRsaPkcs1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRsaPkcs1GetKlass     (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformRsaPkcs1GetKlass     (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-PKCS1 key transport transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1857"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2146"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-PKCS1 key transport transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -1042,17 +967,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMRSAOAEPID"></a><h3>xmlSecTransformRsaOaepId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformRsaOaepId                xmlSecTransformRsaOaepGetKlass()</pre>
 <p>The RSA PKCS1 key transport transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMRSAOAEPGETKLASS"></a><h3>xmlSecTransformRsaOaepGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRsaOaepGetKlass      (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformRsaOaepGetKlass      (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-OAEP key transport transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1878"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2168"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-OAEP key transport transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -1063,17 +986,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMGOSTR3411-94ID"></a><h3>xmlSecTransformGostR3411_94Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformGostR3411_94Id                   xmlSecTransformGostR3411_94GetKlass()</pre>
 <p>The GOSTR3411_94 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMGOSTR3411-94GETKLASS"></a><h3>xmlSecTransformGostR3411_94GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformGostR3411_94GetKlass (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformGostR3411_94GetKlass (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>GOSTR3411_94 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1899"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2190"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to GOSTR3411_94 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -1084,17 +1005,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMSHA1ID"></a><h3>xmlSecTransformSha1Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformSha1Id                   xmlSecTransformSha1GetKlass()</pre>
 <p>The SHA1 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMSHA1GETKLASS"></a><h3>xmlSecTransformSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformSha1GetKlass         (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformSha1GetKlass         (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA-1 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1920"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2212"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA-1 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -1105,17 +1024,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMSHA224ID"></a><h3>xmlSecTransformSha224Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformSha224Id                 xmlSecTransformSha224GetKlass()</pre>
 <p>The SHA224 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMSHA224GETKLASS"></a><h3>xmlSecTransformSha224GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformSha224GetKlass       (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformSha224GetKlass       (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA224 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1941"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2234"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA224 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -1126,17 +1043,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMSHA256ID"></a><h3>xmlSecTransformSha256Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformSha256Id                 xmlSecTransformSha256GetKlass()</pre>
 <p>The SHA256 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMSHA256GETKLASS"></a><h3>xmlSecTransformSha256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformSha256GetKlass       (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformSha256GetKlass       (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA256 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1962"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2256"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA256 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -1147,17 +1062,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMSHA384ID"></a><h3>xmlSecTransformSha384Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformSha384Id                 xmlSecTransformSha384GetKlass()</pre>
 <p>The SHA384 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMSHA384GETKLASS"></a><h3>xmlSecTransformSha384GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformSha384GetKlass       (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformSha384GetKlass       (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA384 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1983"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2278"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA384 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -1168,17 +1081,15 @@ implemented).</p></td>
 <a name="XMLSECTRANSFORMSHA512ID"></a><h3>xmlSecTransformSha512Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformSha512Id                 xmlSecTransformSha512GetKlass()</pre>
 <p>The SHA512 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMSHA512GETKLASS"></a><h3>xmlSecTransformSha512GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformSha512GetKlass       (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformSha512GetKlass       (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA512 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2004"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2300"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA512 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
@@ -1187,19 +1098,18 @@ implemented).</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOAPPINIT"></a><h3>xmlSecCryptoAppInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoAppInit                 (const <font>char</font> *config);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCryptoAppInit                 (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *config</code>);</pre>
 <p>General crypto engine initialization. This function is used
 by XMLSec command line utility and called before
 <code class="PARAMETER">xmlSecInit</code> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2020"><span style="white-space: nowrap"><code class="PARAMETER">config</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the path to crypto library configuration.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2318"><span style="white-space: nowrap"><code class="PARAMETER">config</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the path to crypto library configuration.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2025"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2323"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1207,32 +1117,30 @@ by XMLSec command line utility and called before
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOAPPSHUTDOWN"></a><h3>xmlSecCryptoAppShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoAppShutdown             (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCryptoAppShutdown             (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after
 <code class="PARAMETER">xmlSecShutdown</code> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2040"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2340"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOAPPDEFAULTKEYSMNGRINIT"></a><h3>xmlSecCryptoAppDefaultKeysMngrInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoAppDefaultKeysMngrInit  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCryptoAppDefaultKeysMngrInit  (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);</pre>
 <p>Initializes <code class="PARAMETER">mngr</code> with simple keys store <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREID"><span class="TYPE">xmlSecSimpleKeysStoreId</span></a>
 and a default crypto key data stores.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2058"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2360"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2063"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2365"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1240,24 +1148,23 @@ and a default crypto key data stores.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOAPPDEFAULTKEYSMNGRADOPTKEY"></a><h3>xmlSecCryptoAppDefaultKeysMngrAdoptKey ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoAppDefaultKeysMngrAdoptKey
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCryptoAppDefaultKeysMngrAdoptKey
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);</pre>
 <p>Adds <code class="PARAMETER">key</code> to the keys manager <code class="PARAMETER">mngr</code> created with <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecCryptoAppDefaultKeysMngrInit</span></a>
 function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2083"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2389"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2088"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2394"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2093"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2399"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1265,23 +1172,22 @@ function.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOAPPDEFAULTKEYSMNGRLOAD"></a><h3>xmlSecCryptoAppDefaultKeysMngrLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoAppDefaultKeysMngrLoad  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *uri);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCryptoAppDefaultKeysMngrLoad  (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *uri</code>);</pre>
 <p>Loads XML keys file from <code class="PARAMETER">uri</code> to the keys manager <code class="PARAMETER">mngr</code> created
 with <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecCryptoAppDefaultKeysMngrInit</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2113"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2423"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2118"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the uri.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2428"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the uri.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2123"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2433"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1289,27 +1195,26 @@ with <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRINIT"><span class="T
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOAPPDEFAULTKEYSMNGRSAVE"></a><h3>xmlSecCryptoAppDefaultKeysMngrSave ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoAppDefaultKeysMngrSave  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCryptoAppDefaultKeysMngrSave  (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Saves keys from <code class="PARAMETER">mngr</code> to  XML keys file.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2141"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2457"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2146"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the destination filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2462"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the destination filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2151"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the type of keys to save (public/private/symmetric).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2467"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the type of keys to save (public/private/symmetric).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2156"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2472"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1317,34 +1222,33 @@ with <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRINIT"><span class="T
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOAPPKEYSMNGRCERTLOAD"></a><h3>xmlSecCryptoAppKeysMngrCertLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoAppKeysMngrCertLoad     (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCryptoAppKeysMngrCertLoad     (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Reads cert from <code class="PARAMETER">filename</code> and adds to the list of trusted or known
 untrusted certs in <code class="PARAMETER">store</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2176"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2500"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2181"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the certificate file.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2505"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2186"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2510"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2191"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the flag that indicates is the certificate in <code class="PARAMETER">filename</code>
+<td align="LEFT" valign="TOP"><a name="AEN2515"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag that indicates is the certificate in <code class="PARAMETER">filename</code>
                      trusted or not.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2197"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2521"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1352,39 +1256,38 @@ untrusted certs in <code class="PARAMETER">store</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOAPPKEYSMNGRCERTLOADMEMORY"></a><h3>xmlSecCryptoAppKeysMngrCertLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoAppKeysMngrCertLoadMemory
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCryptoAppKeysMngrCertLoadMemory
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Reads cert from binary buffer <code class="PARAMETER">data</code> and adds to the list of trusted or known
 untrusted certs in <code class="PARAMETER">store</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2218"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2552"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2223"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the certificate binary data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2557"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2228"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the certificate binary data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2562"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2233"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2567"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2238"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the flag that indicates is the certificate trusted or not.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2572"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag that indicates is the certificate trusted or not.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2243"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2577"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1392,37 +1295,36 @@ untrusted certs in <code class="PARAMETER">store</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOAPPKEYLOAD"></a><h3>xmlSecCryptoAppKeyLoad ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecCryptoAppKeyLoad              (const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecCryptoAppKeyLoad              (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key from the a file.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2262"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the key filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2606"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2267"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the key file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2611"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2272"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the key file password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2616"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2277"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the key password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2621"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2282"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2626"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2287"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2631"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1430,42 +1332,41 @@ untrusted certs in <code class="PARAMETER">store</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOAPPKEYLOADMEMORY"></a><h3>xmlSecCryptoAppKeyLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecCryptoAppKeyLoadMemory        (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecCryptoAppKeyLoadMemory        (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key from the memory buffer.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2307"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the binary key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2663"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2312"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the size of binary key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2668"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the size of binary key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2317"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the key file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2673"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2322"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the key file password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2678"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2327"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the key password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2683"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2332"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2688"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2337"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2693"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1473,34 +1374,33 @@ untrusted certs in <code class="PARAMETER">store</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOAPPPKCS12LOAD"></a><h3>xmlSecCryptoAppPkcs12Load ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecCryptoAppPkcs12Load           (const <font>char</font> *filename,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecCryptoAppPkcs12Load           (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key and all associated certificates from the PKCS12 file.
 For uniformity, call xmlSecCryptoAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2355"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the PKCS12 key filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2719"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2360"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the PKCS12 file password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2724"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2365"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2729"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2370"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2734"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2375"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2739"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1508,39 +1408,38 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOAPPPKCS12LOADMEMORY"></a><h3>xmlSecCryptoAppPkcs12LoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecCryptoAppPkcs12LoadMemory     (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecCryptoAppPkcs12LoadMemory     (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key and all associated certificates from the PKCS12 data in memory buffer.
 For uniformity, call xmlSecCryptoAppKeyLoadMemory instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2394"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the PKCS12 binary data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2768"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2399"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the PKCS12 binary data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2773"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2404"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the PKCS12 file password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2778"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2409"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2783"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2414"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2788"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2419"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2793"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1548,27 +1447,26 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOAPPKEYCERTLOAD"></a><h3>xmlSecCryptoAppKeyCertLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoAppKeyCertLoad          (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCryptoAppKeyCertLoad          (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);</pre>
 <p>Reads the certificate from $<code class="PARAMETER">filename</code> and adds it to key.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2437"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2817"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2442"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the certificate filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2822"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2447"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2827"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2452"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2832"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1576,32 +1474,31 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOAPPKEYCERTLOADMEMORY"></a><h3>xmlSecCryptoAppKeyCertLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoAppKeyCertLoadMemory    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCryptoAppKeyCertLoadMemory    (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);</pre>
 <p>Reads the certificate from memory buffer and adds it to key.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2470"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2858"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2475"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the certificate binary data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2863"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2480"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the certificate binary data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2868"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2485"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2873"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2490"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2878"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1609,13 +1506,12 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOAPPGETDEFAULTPWDCALLBACK"></a><h3>xmlSecCryptoAppGetDefaultPwdCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>*               xmlSecCryptoAppGetDefaultPwdCallback
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>*               xmlSecCryptoAppGetDefaultPwdCallback
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Gets default password callback.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2504"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2894"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> default password callback.</p></td>
 </tr></tbody></table>
 </div>
diff --git a/docs/api/xmlsec-base64.html b/docs/api/xmlsec-base64.html
index 9d2bfeb..c755f3c 100644
--- a/docs/api/xmlsec-base64.html
+++ b/docs/api/xmlsec-base64.html
@@ -87,33 +87,33 @@
 <h1>
 <a name="XMLSEC-BASE64"></a>base64</h1>
 <div class="REFNAMEDIV">
-<a name="AEN2514"></a><h2>Name</h2>base64 -- Base64 encoding/decoding functions.</div>
+<a name="AEN2904"></a><h2>Name</h2>base64 -- Base64 encoding/decoding functions.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-BASE64.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">#define             <a href="xmlsec-base64.html#XMLSEC-BASE64-LINESIZE--CAPS">XMLSEC_BASE64_LINESIZE</a>
-<font>int</font>                 <a href="xmlsec-base64.html#XMLSECBASE64GETDEFAULTLINESIZE">xmlSecBase64GetDefaultLineSize</a>      (void);
-<font>void</font>                <a href="xmlsec-base64.html#XMLSECBASE64SETDEFAULTLINESIZE">xmlSecBase64SetDefaultLineSize</a>      (<font>int</font> columns);
-<font>xmlSecBase64CtxPtr</font>  <a href="xmlsec-base64.html#XMLSECBASE64CTXCREATE">xmlSecBase64CtxCreate</a>               (<font>int</font> encode,
-                                                         <font>int</font> columns);
-<font>void</font>                <a href="xmlsec-base64.html#XMLSECBASE64CTXDESTROY">xmlSecBase64CtxDestroy</a>              (<font>xmlSecBase64CtxPtr</font> ctx);
-<font>int</font>                 <a href="xmlsec-base64.html#XMLSECBASE64CTXINITIALIZE">xmlSecBase64CtxInitialize</a>           (<font>xmlSecBase64CtxPtr</font> ctx,
-                                                         <font>int</font> encode,
-                                                         <font>int</font> columns);
-<font>void</font>                <a href="xmlsec-base64.html#XMLSECBASE64CTXFINALIZE">xmlSecBase64CtxFinalize</a>             (<font>xmlSecBase64CtxPtr</font> ctx);
-<font>int</font>                 <a href="xmlsec-base64.html#XMLSECBASE64CTXUPDATE">xmlSecBase64CtxUpdate</a>               (<font>xmlSecBase64CtxPtr</font> ctx,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *in,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> inSize,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *out,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> outSize);
-<font>int</font>                 <a href="xmlsec-base64.html#XMLSECBASE64CTXFINAL">xmlSecBase64CtxFinal</a>                (<font>xmlSecBase64CtxPtr</font> ctx,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *out,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> outSize);
-<font>xmlChar</font>*            <a href="xmlsec-base64.html#XMLSECBASE64ENCODE">xmlSecBase64Encode</a>                  (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len,
-                                                         <font>int</font> columns);
-<font>int</font>                 <a href="xmlsec-base64.html#XMLSECBASE64DECODE">xmlSecBase64Decode</a>                  (const <font>xmlChar</font> *str,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len);</pre>
+<pre class="SYNOPSIS">#define             <a href="xmlsec-base64.html#XMLSEC-BASE64-LINESIZE:CAPS">XMLSEC_BASE64_LINESIZE</a>
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-base64.html#XMLSECBASE64GETDEFAULTLINESIZE">xmlSecBase64GetDefaultLineSize</a>      (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-base64.html#XMLSECBASE64SETDEFAULTLINESIZE">xmlSecBase64SetDefaultLineSize</a>      (<code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> columns</code>);
+<gtkdoclink href="XMLSECBASE64CTX"><span class="RETURNVALUE">xmlSecBase64CtxPtr</span></gtkdoclink><a href="xmlsec-base64.html#XMLSECBASE64CTXCREATE">xmlSecBase64CtxCreate</a>               (<code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> encode</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> columns</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-base64.html#XMLSECBASE64CTXDESTROY">xmlSecBase64CtxDestroy</a>              (<code class="PARAMETER"><gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64CtxPtr</span></gtkdoclink> ctx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-base64.html#XMLSECBASE64CTXINITIALIZE">xmlSecBase64CtxInitialize</a>           (<code class="PARAMETER"><gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64CtxPtr</span></gtkdoclink> ctx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> encode</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> columns</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-base64.html#XMLSECBASE64CTXFINALIZE">xmlSecBase64CtxFinalize</a>             (<code class="PARAMETER"><gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64CtxPtr</span></gtkdoclink> ctx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-base64.html#XMLSECBASE64CTXUPDATE">xmlSecBase64CtxUpdate</a>               (<code class="PARAMETER"><gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64CtxPtr</span></gtkdoclink> ctx</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *in</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> inSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *out</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> outSize</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-base64.html#XMLSECBASE64CTXFINAL">xmlSecBase64CtxFinal</a>                (<code class="PARAMETER"><gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64CtxPtr</span></gtkdoclink> ctx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *out</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> outSize</code>);
+<gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*            <a href="xmlsec-base64.html#XMLSECBASE64ENCODE">xmlSecBase64Encode</a>                  (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> len</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> columns</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-base64.html#XMLSECBASE64DECODE">xmlSecBase64Decode</a>                  (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *str</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> len</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-BASE64.DESCRIPTION"></a><h2>Description</h2>
@@ -122,54 +122,50 @@
 <div class="REFSECT1">
 <a name="XMLSEC-BASE64.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="XMLSEC-BASE64-LINESIZE--CAPS"></a><h3>XMLSEC_BASE64_LINESIZE</h3>
+<a name="XMLSEC-BASE64-LINESIZE:CAPS"></a><h3>XMLSEC_BASE64_LINESIZE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_BASE64_LINESIZE                          64</pre>
 <p>The default maximum base64 encoded line size.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBASE64GETDEFAULTLINESIZE"></a><h3>xmlSecBase64GetDefaultLineSize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBase64GetDefaultLineSize      (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBase64GetDefaultLineSize      (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Gets the current default line size.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2584"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3031"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the current default line size.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBASE64SETDEFAULTLINESIZE"></a><h3>xmlSecBase64SetDefaultLineSize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecBase64SetDefaultLineSize      (<font>int</font> columns);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecBase64SetDefaultLineSize      (<code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> columns</code>);</pre>
 <p>Sets the current default line size.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2599"><span style="white-space: nowrap"><code class="PARAMETER">columns</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> number of columns</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3048"><span style="white-space: nowrap"><code class="PARAMETER">columns</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>number of columns</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBASE64CTXCREATE"></a><h3>xmlSecBase64CtxCreate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecBase64CtxPtr</font>  xmlSecBase64CtxCreate               (<font>int</font> encode,
-                                                         <font>int</font> columns);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECBASE64CTX"><span class="RETURNVALUE">xmlSecBase64CtxPtr</span></gtkdoclink>  xmlSecBase64CtxCreate               (<code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> encode</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> columns</code>);</pre>
 <p>Allocates and initializes new base64 context.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2615"><span style="white-space: nowrap"><code class="PARAMETER">encode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the encode/decode flag (1 - encode, 0 - decode)</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3068"><span style="white-space: nowrap"><code class="PARAMETER">encode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the encode/decode flag (1 - encode, 0 - decode)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2620"><span style="white-space: nowrap"><code class="PARAMETER">columns</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the max line length.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3073"><span style="white-space: nowrap"><code class="PARAMETER">columns</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the max line length.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2625"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3078"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> a pointer to newly created <gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64Ctx</span></gtkdoclink> structure
 or NULL if an error occurs.</p></td>
 </tr>
@@ -178,39 +174,37 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBASE64CTXDESTROY"></a><h3>xmlSecBase64CtxDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecBase64CtxDestroy              (<font>xmlSecBase64CtxPtr</font> ctx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecBase64CtxDestroy              (<code class="PARAMETER"><gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64CtxPtr</span></gtkdoclink> ctx</code>);</pre>
 <p>Destroys base64 context.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2642"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to <gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64Ctx</span></gtkdoclink> structure.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3097"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64Ctx</span></gtkdoclink> structure.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBASE64CTXINITIALIZE"></a><h3>xmlSecBase64CtxInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBase64CtxInitialize           (<font>xmlSecBase64CtxPtr</font> ctx,
-                                                         <font>int</font> encode,
-                                                         <font>int</font> columns);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBase64CtxInitialize           (<code class="PARAMETER"><gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64CtxPtr</span></gtkdoclink> ctx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> encode</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> columns</code>);</pre>
 <p>Initializes new base64 context.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2661"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to <gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64Ctx</span></gtkdoclink> structure,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3122"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64Ctx</span></gtkdoclink> structure,</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2668"><span style="white-space: nowrap"><code class="PARAMETER">encode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the encode/decode flag (1 - encode, 0 - decode)</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3129"><span style="white-space: nowrap"><code class="PARAMETER">encode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the encode/decode flag (1 - encode, 0 - decode)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2673"><span style="white-space: nowrap"><code class="PARAMETER">columns</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the max line length.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3134"><span style="white-space: nowrap"><code class="PARAMETER">columns</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the max line length.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2678"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3139"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success and a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -218,49 +212,47 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBASE64CTXFINALIZE"></a><h3>xmlSecBase64CtxFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecBase64CtxFinalize             (<font>xmlSecBase64CtxPtr</font> ctx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecBase64CtxFinalize             (<code class="PARAMETER"><gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64CtxPtr</span></gtkdoclink> ctx</code>);</pre>
 <p>Frees all the resources allocated by <code class="PARAMETER">ctx</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2694"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to <gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64Ctx</span></gtkdoclink> structure,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3157"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64Ctx</span></gtkdoclink> structure,</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBASE64CTXUPDATE"></a><h3>xmlSecBase64CtxUpdate ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBase64CtxUpdate               (<font>xmlSecBase64CtxPtr</font> ctx,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *in,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> inSize,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *out,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> outSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBase64CtxUpdate               (<code class="PARAMETER"><gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64CtxPtr</span></gtkdoclink> ctx</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *in</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> inSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *out</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> outSize</code>);</pre>
 <p>Encodes or decodes the next piece of data from input buffer.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2715"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to <gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64Ctx</span></gtkdoclink> structure</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3188"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64Ctx</span></gtkdoclink> structure</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2722"><span style="white-space: nowrap"><code class="PARAMETER">in</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the input buffer</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3195"><span style="white-space: nowrap"><code class="PARAMETER">in</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input buffer</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2727"><span style="white-space: nowrap"><code class="PARAMETER">inSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the input buffer size</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3200"><span style="white-space: nowrap"><code class="PARAMETER">inSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input buffer size</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2732"><span style="white-space: nowrap"><code class="PARAMETER">out</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the output buffer</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3205"><span style="white-space: nowrap"><code class="PARAMETER">out</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the output buffer</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2737"><span style="white-space: nowrap"><code class="PARAMETER">outSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the output buffer size</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3210"><span style="white-space: nowrap"><code class="PARAMETER">outSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the output buffer size</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2742"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3215"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the number of bytes written to output buffer or
 -1 if an error occurs.</p></td>
 </tr>
@@ -269,28 +261,27 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBASE64CTXFINAL"></a><h3>xmlSecBase64CtxFinal ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBase64CtxFinal                (<font>xmlSecBase64CtxPtr</font> ctx,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *out,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> outSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBase64CtxFinal                (<code class="PARAMETER"><gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64CtxPtr</span></gtkdoclink> ctx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *out</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> outSize</code>);</pre>
 <p>Encodes or decodes the last piece of data stored in the context
 and finalizes the result.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2759"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to <gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64Ctx</span></gtkdoclink> structure</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3238"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64Ctx</span></gtkdoclink> structure</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2766"><span style="white-space: nowrap"><code class="PARAMETER">out</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the output buffer</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3245"><span style="white-space: nowrap"><code class="PARAMETER">out</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the output buffer</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2771"><span style="white-space: nowrap"><code class="PARAMETER">outSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the output buffer size</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3250"><span style="white-space: nowrap"><code class="PARAMETER">outSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the output buffer size</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2776"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3255"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the number of bytes written to output buffer or
 -1 if an error occurs.</p></td>
 </tr>
@@ -299,30 +290,29 @@ and finalizes the result.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBASE64ENCODE"></a><h3>xmlSecBase64Encode ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlChar</font>*            xmlSecBase64Encode                  (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len,
-                                                         <font>int</font> columns);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*            xmlSecBase64Encode                  (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> len</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> columns</code>);</pre>
 <p>Encodes the data from input buffer and allocates the string for the result.
 The caller is responsible for freeing returned buffer using
 <gtkdoclink href="XMLFREE"><code class="FUNCTION">xmlFree()</code></gtkdoclink> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2795"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the input buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3280"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2800"><span style="white-space: nowrap"><code class="PARAMETER">len</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the input buffer size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3285"><span style="white-space: nowrap"><code class="PARAMETER">len</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2805"><span style="white-space: nowrap"><code class="PARAMETER">columns</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the output max line length (if 0 then no line breaks
+<td align="LEFT" valign="TOP"><a name="AEN3290"><span style="white-space: nowrap"><code class="PARAMETER">columns</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the output max line length (if 0 then no line breaks
                      would be inserted)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2810"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3295"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> newly allocated string with base64 encoded data
 or NULL if an error occurs.</p></td>
 </tr>
@@ -331,28 +321,27 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBASE64DECODE"></a><h3>xmlSecBase64Decode ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBase64Decode                  (const <font>xmlChar</font> *str,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBase64Decode                  (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *str</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> len</code>);</pre>
 <p>Decodes input base64 encoded string and puts result into
 the output buffer.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2827"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the input buffer with base64 encoded string</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3318"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input buffer with base64 encoded string</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2832"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the output buffer</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3323"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the output buffer</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2837"><span style="white-space: nowrap"><code class="PARAMETER">len</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the output buffer size</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3328"><span style="white-space: nowrap"><code class="PARAMETER">len</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the output buffer size</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2842"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3333"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the number of bytes written to the output buffer or
 a negative value if an error occurs</p></td>
 </tr>
diff --git a/docs/api/xmlsec-bn.html b/docs/api/xmlsec-bn.html
index 67d8c70..9eabf58 100644
--- a/docs/api/xmlsec-bn.html
+++ b/docs/api/xmlsec-bn.html
@@ -87,61 +87,61 @@
 <h1>
 <a name="XMLSEC-BN"></a>bn</h1>
 <div class="REFNAMEDIV">
-<a name="AEN2852"></a><h2>Name</h2>bn -- Big numbers support functions.</div>
+<a name="AEN3343"></a><h2>Name</h2>bn -- Big numbers support functions.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-BN.SYNOPSIS"></a><h2>Synopsis</h2>
 <pre class="SYNOPSIS">enum                <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a>;
-<font>xmlSecBnPtr</font>         <a href="xmlsec-bn.html#XMLSECBNCREATE">xmlSecBnCreate</a>                      (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>void</font>                <a href="xmlsec-bn.html#XMLSECBNDESTROY">xmlSecBnDestroy</a>                     (<font>xmlSecBnPtr</font> bn);
-<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNINITIALIZE">xmlSecBnInitialize</a>                  (<font>xmlSecBnPtr</font> bn,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>void</font>                <a href="xmlsec-bn.html#XMLSECBNFINALIZE">xmlSecBnFinalize</a>                    (<font>xmlSecBnPtr</font> bn);
-<a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a>*         <a href="xmlsec-bn.html#XMLSECBNGETDATA">xmlSecBnGetData</a>                     (<font>xmlSecBnPtr</font> bn);
-<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNSETDATA">xmlSecBnSetData</a>                     (<font>xmlSecBnPtr</font> bn,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-bn.html#XMLSECBNGETSIZE">xmlSecBnGetSize</a>                     (<font>xmlSecBnPtr</font> bn);
-<font>void</font>                <a href="xmlsec-bn.html#XMLSECBNZERO">xmlSecBnZero</a>                        (<font>xmlSecBnPtr</font> bn);
-<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNFROMSTRING">xmlSecBnFromString</a>                  (<font>xmlSecBnPtr</font> bn,
-                                                         const <font>xmlChar</font> *str,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> base);
-<font>xmlChar</font>*            <a href="xmlsec-bn.html#XMLSECBNTOSTRING">xmlSecBnToString</a>                    (<font>xmlSecBnPtr</font> bn,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> base);
-<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNFROMHEXSTRING">xmlSecBnFromHexString</a>               (<font>xmlSecBnPtr</font> bn,
-                                                         const <font>xmlChar</font> *str);
-<font>xmlChar</font>*            <a href="xmlsec-bn.html#XMLSECBNTOHEXSTRING">xmlSecBnToHexString</a>                 (<font>xmlSecBnPtr</font> bn);
-<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNFROMDECSTRING">xmlSecBnFromDecString</a>               (<font>xmlSecBnPtr</font> bn,
-                                                         const <font>xmlChar</font> *str);
-<font>xmlChar</font>*            <a href="xmlsec-bn.html#XMLSECBNTODECSTRING">xmlSecBnToDecString</a>                 (<font>xmlSecBnPtr</font> bn);
-<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNMUL">xmlSecBnMul</a>                         (<font>xmlSecBnPtr</font> bn,
-                                                         <font>int</font> multiplier);
-<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNDIV">xmlSecBnDiv</a>                         (<font>xmlSecBnPtr</font> bn,
-                                                         <font>int</font> divider,
-                                                         <font>int</font> *mod);
-<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNADD">xmlSecBnAdd</a>                         (<font>xmlSecBnPtr</font> bn,
-                                                         <font>int</font> delta);
-<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNREVERSE">xmlSecBnReverse</a>                     (<font>xmlSecBnPtr</font> bn);
-<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNCOMPARE">xmlSecBnCompare</a>                     (<font>xmlSecBnPtr</font> bn,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);
-<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNCOMPAREREVERSE">xmlSecBnCompareReverse</a>              (<font>xmlSecBnPtr</font> bn,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);
-<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNGETNODEVALUE">xmlSecBnGetNodeValue</a>                (<font>xmlSecBnPtr</font> bn,
-                                                         <font>xmlNodePtr</font> cur,
-                                                         <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a> format,
-                                                         <font>int</font> reverse);
-<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNSETNODEVALUE">xmlSecBnSetNodeValue</a>                (<font>xmlSecBnPtr</font> bn,
-                                                         <font>xmlNodePtr</font> cur,
-                                                         <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a> format,
-                                                         <font>int</font> reverse,
-                                                         <font>int</font> addLineBreaks);
-<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNBLOBSETNODEVALUE">xmlSecBnBlobSetNodeValue</a>            (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <font>xmlNodePtr</font> cur,
-                                                         <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a> format,
-                                                         <font>int</font> reverse,
-                                                         <font>int</font> addLineBreaks);</pre>
+<gtkdoclink href="XMLSECBN"><span class="RETURNVALUE">xmlSecBnPtr</span></gtkdoclink><a href="xmlsec-bn.html#XMLSECBNCREATE">xmlSecBnCreate</a>                      (<code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-bn.html#XMLSECBNDESTROY">xmlSecBnDestroy</a>                     (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-bn.html#XMLSECBNINITIALIZE">xmlSecBnInitialize</a>                  (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-bn.html#XMLSECBNFINALIZE">xmlSecBnFinalize</a>                    (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>);
+<a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="RETURNVALUE">xmlSecByte</span></a>*         <a href="xmlsec-bn.html#XMLSECBNGETDATA">xmlSecBnGetData</a>                     (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-bn.html#XMLSECBNSETDATA">xmlSecBnSetData</a>                     (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          <a href="xmlsec-bn.html#XMLSECBNGETSIZE">xmlSecBnGetSize</a>                     (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-bn.html#XMLSECBNZERO">xmlSecBnZero</a>                        (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-bn.html#XMLSECBNFROMSTRING">xmlSecBnFromString</a>                  (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *str</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> base</code>);
+<gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*            <a href="xmlsec-bn.html#XMLSECBNTOSTRING">xmlSecBnToString</a>                    (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> base</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-bn.html#XMLSECBNFROMHEXSTRING">xmlSecBnFromHexString</a>               (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *str</code>);
+<gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*            <a href="xmlsec-bn.html#XMLSECBNTOHEXSTRING">xmlSecBnToHexString</a>                 (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-bn.html#XMLSECBNFROMDECSTRING">xmlSecBnFromDecString</a>               (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *str</code>);
+<gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*            <a href="xmlsec-bn.html#XMLSECBNTODECSTRING">xmlSecBnToDecString</a>                 (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-bn.html#XMLSECBNMUL">xmlSecBnMul</a>                         (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> multiplier</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-bn.html#XMLSECBNDIV">xmlSecBnDiv</a>                         (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> divider</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> *mod</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-bn.html#XMLSECBNADD">xmlSecBnAdd</a>                         (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> delta</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-bn.html#XMLSECBNREVERSE">xmlSecBnReverse</a>                     (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-bn.html#XMLSECBNCOMPARE">xmlSecBnCompare</a>                     (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-bn.html#XMLSECBNCOMPAREREVERSE">xmlSecBnCompareReverse</a>              (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-bn.html#XMLSECBNGETNODEVALUE">xmlSecBnGetNodeValue</a>                (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-bn.html#XMLSECBNFORMAT"><span class="TYPE">xmlSecBnFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> reverse</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-bn.html#XMLSECBNSETNODEVALUE">xmlSecBnSetNodeValue</a>                (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-bn.html#XMLSECBNFORMAT"><span class="TYPE">xmlSecBnFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> reverse</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> addLineBreaks</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-bn.html#XMLSECBNBLOBSETNODEVALUE">xmlSecBnBlobSetNodeValue</a>            (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-bn.html#XMLSECBNFORMAT"><span class="TYPE">xmlSecBnFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> reverse</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> addLineBreaks</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-BN.DESCRIPTION"></a><h2>Description</h2>
@@ -158,37 +158,35 @@
 } xmlSecBnFormat;</pre>
 <p>The big numbers formats.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECBNBASE64"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecBnBase64</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>             the base64 decoded binary blob.</p></td>
+<td align="LEFT" valign="TOP"><p>the base64 decoded binary blob.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECBNHEX"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecBnHex</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>                the hex number.</p></td>
+<td align="LEFT" valign="TOP"><p>the hex number.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECBNDEC"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecBnDec</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>                the decimal number.</p></td>
+<td align="LEFT" valign="TOP"><p>the decimal number.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNCREATE"></a><h3>xmlSecBnCreate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecBnPtr</font>         xmlSecBnCreate                      (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECBN"><span class="RETURNVALUE">xmlSecBnPtr</span></gtkdoclink>         xmlSecBnCreate                      (<code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);</pre>
 <p>Creates a new BN object. Caller is responsible for destroying it
 by calling <code class="PARAMETER">xmlSecBnDestroy</code> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2995"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the initial allocated BN size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3612"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the initial allocated BN size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3000"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3617"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the newly BN or a NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -196,35 +194,33 @@ by calling <code class="PARAMETER">xmlSecBnDestroy</code> function.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNDESTROY"></a><h3>xmlSecBnDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecBnDestroy                     (<font>xmlSecBnPtr</font> bn);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecBnDestroy                     (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>);</pre>
 <p>Destroys <code class="PARAMETER">bn</code> object created with <code class="PARAMETER">xmlSecBnCreate</code> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN3017"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3636"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNINITIALIZE"></a><h3>xmlSecBnInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnInitialize                  (<font>xmlSecBnPtr</font> bn,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBnInitialize                  (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);</pre>
 <p>Initializes a BN object. Caller is responsible for destroying it
 by calling <code class="PARAMETER">xmlSecBnFinalize</code> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3034"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3657"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3039"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the initial allocated BN size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3662"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the initial allocated BN size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3044"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3667"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -232,29 +228,27 @@ by calling <code class="PARAMETER">xmlSecBnFinalize</code> function.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNFINALIZE"></a><h3>xmlSecBnFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecBnFinalize                    (<font>xmlSecBnPtr</font> bn);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecBnFinalize                    (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>);</pre>
 <p>Destroys <code class="PARAMETER">bn</code> object created with <code class="PARAMETER">xmlSecBnInitialize</code> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN3061"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3686"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNGETDATA"></a><h3>xmlSecBnGetData ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a>*         xmlSecBnGetData                     (<font>xmlSecBnPtr</font> bn);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="RETURNVALUE">xmlSecByte</span></a>*         xmlSecBnGetData                     (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>);</pre>
 <p>Gets pointer to the binary <code class="PARAMETER">bn</code> representation.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3077"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3704"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3082"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3709"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to binary BN data or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -262,27 +256,26 @@ by calling <code class="PARAMETER">xmlSecBnFinalize</code> function.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNSETDATA"></a><h3>xmlSecBnSetData ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnSetData                     (<font>xmlSecBnPtr</font> bn,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBnSetData                     (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);</pre>
 <p>Sets the value of <code class="PARAMETER">bn</code> to <code class="PARAMETER">data</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3101"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3734"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3106"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to new BN binary data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3739"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to new BN binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3111"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the size of new BN data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3744"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the size of new BN data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3116"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3749"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -290,17 +283,16 @@ by calling <code class="PARAMETER">xmlSecBnFinalize</code> function.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNGETSIZE"></a><h3>xmlSecBnGetSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecBnGetSize                     (<font>xmlSecBnPtr</font> bn);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          xmlSecBnGetSize                     (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>);</pre>
 <p>Gets the size of binary data in <code class="PARAMETER">bn</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3132"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3767"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3137"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3772"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the size of binary data.</p></td>
 </tr>
 </tbody></table>
@@ -308,39 +300,37 @@ by calling <code class="PARAMETER">xmlSecBnFinalize</code> function.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNZERO"></a><h3>xmlSecBnZero ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecBnZero                        (<font>xmlSecBnPtr</font> bn);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecBnZero                        (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>);</pre>
 <p>Sets the value of <code class="PARAMETER">bn</code> to zero.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN3153"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3790"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNFROMSTRING"></a><h3>xmlSecBnFromString ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnFromString                  (<font>xmlSecBnPtr</font> bn,
-                                                         const <font>xmlChar</font> *str,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> base);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBnFromString                  (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *str</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> base</code>);</pre>
 <p>Reads <code class="PARAMETER">bn</code> from string <code class="PARAMETER">str</code> assuming it has base <code class="PARAMETER">base</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3173"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3816"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3178"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the string with BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3821"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the string with BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3183"><span style="white-space: nowrap"><code class="PARAMETER">base</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the base for <code class="PARAMETER">str</code>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3826"><span style="white-space: nowrap"><code class="PARAMETER">base</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the base for <code class="PARAMETER">str</code>.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3189"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3832"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -348,23 +338,22 @@ by calling <code class="PARAMETER">xmlSecBnFinalize</code> function.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNTOSTRING"></a><h3>xmlSecBnToString ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlChar</font>*            xmlSecBnToString                    (<font>xmlSecBnPtr</font> bn,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> base);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*            xmlSecBnToString                    (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> base</code>);</pre>
 <p>Writes <code class="PARAMETER">bn</code> to string with base <code class="PARAMETER">base</code>. Caller is responsible for
 freeing returned string with <code class="PARAMETER">xmlFree</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3208"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3855"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3213"><span style="white-space: nowrap"><code class="PARAMETER">base</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the base for returned string.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3860"><span style="white-space: nowrap"><code class="PARAMETER">base</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the base for returned string.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3218"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3865"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the string represenataion if BN or a NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -372,22 +361,21 @@ freeing returned string with <code class="PARAMETER">xmlFree</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNFROMHEXSTRING"></a><h3>xmlSecBnFromHexString ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnFromHexString               (<font>xmlSecBnPtr</font> bn,
-                                                         const <font>xmlChar</font> *str);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBnFromHexString               (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *str</code>);</pre>
 <p>Reads <code class="PARAMETER">bn</code> from hex string <code class="PARAMETER">str</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3236"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3887"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3241"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the string with BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3892"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the string with BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3246"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3897"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -395,18 +383,17 @@ freeing returned string with <code class="PARAMETER">xmlFree</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNTOHEXSTRING"></a><h3>xmlSecBnToHexString ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlChar</font>*            xmlSecBnToHexString                 (<font>xmlSecBnPtr</font> bn);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*            xmlSecBnToHexString                 (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>);</pre>
 <p>Writes <code class="PARAMETER">bn</code> to hex string. Caller is responsible for
 freeing returned string with <code class="PARAMETER">xmlFree</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3263"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3916"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3268"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3921"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the string represenataion if BN or a NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -414,22 +401,21 @@ freeing returned string with <code class="PARAMETER">xmlFree</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNFROMDECSTRING"></a><h3>xmlSecBnFromDecString ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnFromDecString               (<font>xmlSecBnPtr</font> bn,
-                                                         const <font>xmlChar</font> *str);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBnFromDecString               (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *str</code>);</pre>
 <p>Reads <code class="PARAMETER">bn</code> from decimal string <code class="PARAMETER">str</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3286"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3943"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3291"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the string with BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3948"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the string with BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3296"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3953"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -437,18 +423,17 @@ freeing returned string with <code class="PARAMETER">xmlFree</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNTODECSTRING"></a><h3>xmlSecBnToDecString ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlChar</font>*            xmlSecBnToDecString                 (<font>xmlSecBnPtr</font> bn);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*            xmlSecBnToDecString                 (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>);</pre>
 <p>Writes <code class="PARAMETER">bn</code> to decimal string. Caller is responsible for
 freeing returned string with <code class="PARAMETER">xmlFree</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3313"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3972"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3318"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3977"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the string represenataion if BN or a NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -456,22 +441,21 @@ freeing returned string with <code class="PARAMETER">xmlFree</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNMUL"></a><h3>xmlSecBnMul ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnMul                         (<font>xmlSecBnPtr</font> bn,
-                                                         <font>int</font> multiplier);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBnMul                         (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> multiplier</code>);</pre>
 <p>Multiplies <code class="PARAMETER">bn</code> with <code class="PARAMETER">multiplier</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3336"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3999"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3341"><span style="white-space: nowrap"><code class="PARAMETER">multiplier</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the multiplier.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4004"><span style="white-space: nowrap"><code class="PARAMETER">multiplier</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the multiplier.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3346"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4009"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -479,27 +463,26 @@ freeing returned string with <code class="PARAMETER">xmlFree</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNDIV"></a><h3>xmlSecBnDiv ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnDiv                         (<font>xmlSecBnPtr</font> bn,
-                                                         <font>int</font> divider,
-                                                         <font>int</font> *mod);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBnDiv                         (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> divider</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> *mod</code>);</pre>
 <p>Divides <code class="PARAMETER">bn</code> by <code class="PARAMETER">divider</code> and places modulus into <code class="PARAMETER">mod</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3366"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4035"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3371"><span style="white-space: nowrap"><code class="PARAMETER">divider</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>    the divider</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4040"><span style="white-space: nowrap"><code class="PARAMETER">divider</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the divider</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3376"><span style="white-space: nowrap"><code class="PARAMETER">mod</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the pointer for modulus result.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4045"><span style="white-space: nowrap"><code class="PARAMETER">mod</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer for modulus result.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3381"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4050"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -507,22 +490,21 @@ freeing returned string with <code class="PARAMETER">xmlFree</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNADD"></a><h3>xmlSecBnAdd ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnAdd                         (<font>xmlSecBnPtr</font> bn,
-                                                         <font>int</font> delta);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBnAdd                         (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> delta</code>);</pre>
 <p>Adds <code class="PARAMETER">delta</code> to <code class="PARAMETER">bn</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3399"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4072"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3404"><span style="white-space: nowrap"><code class="PARAMETER">delta</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>      the delta.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4077"><span style="white-space: nowrap"><code class="PARAMETER">delta</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the delta.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3409"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4082"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -530,17 +512,16 @@ freeing returned string with <code class="PARAMETER">xmlFree</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNREVERSE"></a><h3>xmlSecBnReverse ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnReverse                     (<font>xmlSecBnPtr</font> bn);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBnReverse                     (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>);</pre>
 <p>Reverses bytes order in <code class="PARAMETER">bn</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3425"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4100"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3430"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4105"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -548,27 +529,26 @@ freeing returned string with <code class="PARAMETER">xmlFree</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNCOMPARE"></a><h3>xmlSecBnCompare ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnCompare                     (<font>xmlSecBnPtr</font> bn,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBnCompare                     (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>);</pre>
 <p>Compares the <code class="PARAMETER">bn</code> with <code class="PARAMETER">data</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3449"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4130"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3454"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the data to compare BN to.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4135"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data to compare BN to.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3459"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>   the <code class="PARAMETER">data</code> size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4140"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the <code class="PARAMETER">data</code> size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3465"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4146"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 if data is equal, negative value if <code class="PARAMETER">bn</code> is less or positive value if <code class="PARAMETER">bn</code>
 is greater than <code class="PARAMETER">data</code>.</p></td>
 </tr>
@@ -577,27 +557,26 @@ is greater than <code class="PARAMETER">data</code>.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNCOMPAREREVERSE"></a><h3>xmlSecBnCompareReverse ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnCompareReverse              (<font>xmlSecBnPtr</font> bn,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBnCompareReverse              (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>);</pre>
 <p>Compares the <code class="PARAMETER">bn</code> with reverse <code class="PARAMETER">data</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3487"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4174"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3492"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the data to compare BN to.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4179"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data to compare BN to.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3497"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>   the <code class="PARAMETER">data</code> size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4184"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the <code class="PARAMETER">data</code> size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3503"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4190"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 if data is equal, negative value if <code class="PARAMETER">bn</code> is less or positive value if <code class="PARAMETER">bn</code>
 is greater than <code class="PARAMETER">data</code>.</p></td>
 </tr>
@@ -606,32 +585,31 @@ is greater than <code class="PARAMETER">data</code>.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNGETNODEVALUE"></a><h3>xmlSecBnGetNodeValue ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnGetNodeValue                (<font>xmlSecBnPtr</font> bn,
-                                                         <font>xmlNodePtr</font> cur,
-                                                         <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a> format,
-                                                         <font>int</font> reverse);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBnGetNodeValue                (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-bn.html#XMLSECBNFORMAT"><span class="TYPE">xmlSecBnFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> reverse</code>);</pre>
 <p>Converts the node content from <code class="PARAMETER">format</code> to <code class="PARAMETER">bn</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3526"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4221"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3531"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the poitner to an XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4226"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the poitner to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3536"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the BN format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4231"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the BN format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3541"><span style="white-space: nowrap"><code class="PARAMETER">reverse</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>    if set then reverse read buffer after reading.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4236"><span style="white-space: nowrap"><code class="PARAMETER">reverse</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>if set then reverse read buffer after reading.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3546"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4241"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success and a negative values if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -639,37 +617,36 @@ is greater than <code class="PARAMETER">data</code>.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNSETNODEVALUE"></a><h3>xmlSecBnSetNodeValue ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnSetNodeValue                (<font>xmlSecBnPtr</font> bn,
-                                                         <font>xmlNodePtr</font> cur,
-                                                         <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a> format,
-                                                         <font>int</font> reverse,
-                                                         <font>int</font> addLineBreaks);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBnSetNodeValue                (<code class="PARAMETER"><gtkdoclink href="XMLSECBN"><span class="TYPE">xmlSecBnPtr</span></gtkdoclink> bn</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-bn.html#XMLSECBNFORMAT"><span class="TYPE">xmlSecBnFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> reverse</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> addLineBreaks</code>);</pre>
 <p>Converts the <code class="PARAMETER">bn</code> and sets it to node content.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3566"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the pointer to BN.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4271"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3571"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the poitner to an XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4276"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the poitner to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3576"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the BN format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4281"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the BN format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3581"><span style="white-space: nowrap"><code class="PARAMETER">reverse</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the flag that indicates whether to reverse the buffer before writing.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4286"><span style="white-space: nowrap"><code class="PARAMETER">reverse</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag that indicates whether to reverse the buffer before writing.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3586"><span style="white-space: nowrap"><code class="PARAMETER">addLineBreaks</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>      the flag; it is equal to 1 then linebreaks will be added before and after new buffer content.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4291"><span style="white-space: nowrap"><code class="PARAMETER">addLineBreaks</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag; it is equal to 1 then linebreaks will be added before and after new buffer content.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3591"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4296"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success and a negative values if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -677,44 +654,43 @@ is greater than <code class="PARAMETER">data</code>.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBNBLOBSETNODEVALUE"></a><h3>xmlSecBnBlobSetNodeValue ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnBlobSetNodeValue            (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <font>xmlNodePtr</font> cur,
-                                                         <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a> format,
-                                                         <font>int</font> reverse,
-                                                         <font>int</font> addLineBreaks);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBnBlobSetNodeValue            (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-bn.html#XMLSECBNFORMAT"><span class="TYPE">xmlSecBnFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> reverse</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> addLineBreaks</code>);</pre>
 <p>Converts the <code class="PARAMETER">blob</code> and sets it to node content.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3612"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to BN blob.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4329"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BN blob.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3617"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>   the size of BN blob.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4334"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the size of BN blob.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3622"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the poitner to an XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4339"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the poitner to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3627"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the BN format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4344"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the BN format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3632"><span style="white-space: nowrap"><code class="PARAMETER">reverse</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>    the flag that indicates whether to reverse the buffer before writing.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4349"><span style="white-space: nowrap"><code class="PARAMETER">reverse</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag that indicates whether to reverse the buffer before writing.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3637"><span style="white-space: nowrap"><code class="PARAMETER">addLineBreaks</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>  if the flag is equal to 1 then
+<td align="LEFT" valign="TOP"><a name="AEN4354"><span style="white-space: nowrap"><code class="PARAMETER">addLineBreaks</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>if the flag is equal to 1 then
              linebreaks will be added before and after
              new buffer content.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3642"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4359"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success and a negative values if an error occurs.</p></td>
 </tr>
 </tbody></table>
diff --git a/docs/api/xmlsec-buffer.html b/docs/api/xmlsec-buffer.html
index 3451f26..72d3d6b 100644
--- a/docs/api/xmlsec-buffer.html
+++ b/docs/api/xmlsec-buffer.html
@@ -87,47 +87,47 @@
 <h1>
 <a name="XMLSEC-BUFFER"></a>buffer</h1>
 <div class="REFNAMEDIV">
-<a name="AEN3652"></a><h2>Name</h2>buffer -- Binary buffer implementation.</div>
+<a name="AEN4369"></a><h2>Name</h2>buffer -- Binary buffer implementation.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-BUFFER.SYNOPSIS"></a><h2>Synopsis</h2>
 <pre class="SYNOPSIS">enum                <a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a>;
 struct              <a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a>;
-<font>void</font>                <a href="xmlsec-buffer.html#XMLSECBUFFERSETDEFAULTALLOCMODE">xmlSecBufferSetDefaultAllocMode</a>     (<a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a> defAllocMode,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> defInitialSize);
-<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a>     <a href="xmlsec-buffer.html#XMLSECBUFFERCREATE">xmlSecBufferCreate</a>                  (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>void</font>                <a href="xmlsec-buffer.html#XMLSECBUFFERDESTROY">xmlSecBufferDestroy</a>                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);
-<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERINITIALIZE">xmlSecBufferInitialize</a>              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>void</font>                <a href="xmlsec-buffer.html#XMLSECBUFFERFINALIZE">xmlSecBufferFinalize</a>                (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);
-<a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a>*         <a href="xmlsec-buffer.html#XMLSECBUFFERGETDATA">xmlSecBufferGetData</a>                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);
-<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERSETDATA">xmlSecBufferSetData</a>                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-buffer.html#XMLSECBUFFERGETSIZE">xmlSecBufferGetSize</a>                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);
-<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERSETSIZE">xmlSecBufferSetSize</a>                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-buffer.html#XMLSECBUFFERGETMAXSIZE">xmlSecBufferGetMaxSize</a>              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);
-<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERSETMAXSIZE">xmlSecBufferSetMaxSize</a>              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>void</font>                <a href="xmlsec-buffer.html#XMLSECBUFFEREMPTY">xmlSecBufferEmpty</a>                   (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);
-<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERAPPEND">xmlSecBufferAppend</a>                  (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERPREPEND">xmlSecBufferPrepend</a>                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERREMOVEHEAD">xmlSecBufferRemoveHead</a>              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERREMOVETAIL">xmlSecBufferRemoveTail</a>              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERREADFILE">xmlSecBufferReadFile</a>                (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         const <font>char</font> *filename);
-<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERBASE64NODECONTENTREAD">xmlSecBufferBase64NodeContentRead</a>   (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         <font>xmlNodePtr</font> node);
-<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERBASE64NODECONTENTWRITE">xmlSecBufferBase64NodeContentWrite</a>  (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <font>int</font> columns);
-<font>xmlOutputBufferPtr</font>  <a href="xmlsec-buffer.html#XMLSECBUFFERCREATEOUTPUTBUFFER">xmlSecBufferCreateOutputBuffer</a>      (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-buffer.html#XMLSECBUFFERSETDEFAULTALLOCMODE">xmlSecBufferSetDefaultAllocMode</a>     (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECALLOCMODE"><span class="TYPE">xmlSecAllocMode</span></a> defAllocMode</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> defInitialSize</code>);
+<a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="RETURNVALUE">xmlSecBufferPtr</span></a>     <a href="xmlsec-buffer.html#XMLSECBUFFERCREATE">xmlSecBufferCreate</a>                  (<code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-buffer.html#XMLSECBUFFERDESTROY">xmlSecBufferDestroy</a>                 (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-buffer.html#XMLSECBUFFERINITIALIZE">xmlSecBufferInitialize</a>              (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-buffer.html#XMLSECBUFFERFINALIZE">xmlSecBufferFinalize</a>                (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>);
+<a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="RETURNVALUE">xmlSecByte</span></a>*         <a href="xmlsec-buffer.html#XMLSECBUFFERGETDATA">xmlSecBufferGetData</a>                 (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-buffer.html#XMLSECBUFFERSETDATA">xmlSecBufferSetData</a>                 (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          <a href="xmlsec-buffer.html#XMLSECBUFFERGETSIZE">xmlSecBufferGetSize</a>                 (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-buffer.html#XMLSECBUFFERSETSIZE">xmlSecBufferSetSize</a>                 (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          <a href="xmlsec-buffer.html#XMLSECBUFFERGETMAXSIZE">xmlSecBufferGetMaxSize</a>              (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-buffer.html#XMLSECBUFFERSETMAXSIZE">xmlSecBufferSetMaxSize</a>              (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-buffer.html#XMLSECBUFFEREMPTY">xmlSecBufferEmpty</a>                   (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-buffer.html#XMLSECBUFFERAPPEND">xmlSecBufferAppend</a>                  (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-buffer.html#XMLSECBUFFERPREPEND">xmlSecBufferPrepend</a>                 (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-buffer.html#XMLSECBUFFERREMOVEHEAD">xmlSecBufferRemoveHead</a>              (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-buffer.html#XMLSECBUFFERREMOVETAIL">xmlSecBufferRemoveTail</a>              (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-buffer.html#XMLSECBUFFERREADFILE">xmlSecBufferReadFile</a>                (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-buffer.html#XMLSECBUFFERBASE64NODECONTENTREAD">xmlSecBufferBase64NodeContentRead</a>   (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-buffer.html#XMLSECBUFFERBASE64NODECONTENTWRITE">xmlSecBufferBase64NodeContentWrite</a>  (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> columns</code>);
+<gtkdoclink href="XMLOUTPUTBUFFERPTR"><span class="RETURNVALUE">xmlOutputBufferPtr</span></gtkdoclink><a href="xmlsec-buffer.html#XMLSECBUFFERCREATEOUTPUTBUFFER">xmlSecBufferCreateOutputBuffer</a>      (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-BUFFER.DESCRIPTION"></a><h2>Description</h2>
@@ -143,16 +143,15 @@ struct              <a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a>;
 } xmlSecAllocMode;</pre>
 <p>The memory allocation mode (used by <code class="PARAMETER">xmlSecBuffer</code> and <code class="PARAMETER">xmlSecList</code>).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECALLOCMODEEXACT"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecAllocModeExact</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>       the memory allocation mode that minimizes total
+<td align="LEFT" valign="TOP"><p>the memory allocation mode that minimizes total
                              allocated memory size.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECALLOCMODEDOUBLE"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecAllocModeDouble</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>      the memory allocation mode that tries to minimize
+<td align="LEFT" valign="TOP"><p>the memory allocation mode that tries to minimize
                              the number of malloc calls.</p></td>
 </tr>
 </tbody></table>
@@ -168,61 +167,58 @@ struct              <a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a>;
 };</pre>
 <p>Binary data buffer.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3769"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *<code class="STRUCTFIELD">data</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p> the pointer to buffer data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4576"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *<code class="STRUCTFIELD">data</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to buffer data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3775"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">size</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p> the current data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4583"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> <code class="STRUCTFIELD">size</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the current data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3781"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">maxSize</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p> the max data size (allocated buffer size).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4590"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> <code class="STRUCTFIELD">maxSize</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the max data size (allocated buffer size).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3787"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a> <code class="STRUCTFIELD">allocMode</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p> the buffer memory allocation mode.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4597"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECALLOCMODE"><span class="TYPE">xmlSecAllocMode</span></a> <code class="STRUCTFIELD">allocMode</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the buffer memory allocation mode.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBUFFERSETDEFAULTALLOCMODE"></a><h3>xmlSecBufferSetDefaultAllocMode ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecBufferSetDefaultAllocMode     (<a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a> defAllocMode,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> defInitialSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecBufferSetDefaultAllocMode     (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECALLOCMODE"><span class="TYPE">xmlSecAllocMode</span></a> defAllocMode</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> defInitialSize</code>);</pre>
 <p>Sets new global default allocation mode and minimal intial size.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3804"><span style="white-space: nowrap"><code class="PARAMETER">defAllocMode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the new default buffer allocation mode.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4619"><span style="white-space: nowrap"><code class="PARAMETER">defAllocMode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new default buffer allocation mode.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3809"><span style="white-space: nowrap"><code class="PARAMETER">defInitialSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the new default buffer minimal intial size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4624"><span style="white-space: nowrap"><code class="PARAMETER">defInitialSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new default buffer minimal intial size.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBUFFERCREATE"></a><h3>xmlSecBufferCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a>     xmlSecBufferCreate                  (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="RETURNVALUE">xmlSecBufferPtr</span></a>     xmlSecBufferCreate                  (<code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);</pre>
 <p>Allocates and initalizes new memory buffer with given size.
 Caller is responsible for calling <a href="xmlsec-buffer.html#XMLSECBUFFERDESTROY"><span class="TYPE">xmlSecBufferDestroy</span></a> function
 to free the buffer.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3826"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the intial size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4643"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the intial size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3831"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4648"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly allocated buffer or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -230,35 +226,33 @@ to free the buffer.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBUFFERDESTROY"></a><h3>xmlSecBufferDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecBufferDestroy                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecBufferDestroy                 (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>);</pre>
 <p>Desrtoys buffer object created with <a href="xmlsec-buffer.html#XMLSECBUFFERCREATE"><span class="TYPE">xmlSecBufferCreate</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN3848"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to buffer object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4667"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to buffer object.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBUFFERINITIALIZE"></a><h3>xmlSecBufferInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferInitialize              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBufferInitialize              (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);</pre>
 <p>Initializes buffer object <code class="PARAMETER">buf</code>. Caller is responsible for calling
 <a href="xmlsec-buffer.html#XMLSECBUFFERFINALIZE"><span class="TYPE">xmlSecBufferFinalize</span></a> function to free allocated resources.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3867"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to buffer object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4690"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3872"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the initial buffer size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4695"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the initial buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3877"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4700"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -266,30 +260,28 @@ to free the buffer.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBUFFERFINALIZE"></a><h3>xmlSecBufferFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecBufferFinalize                (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecBufferFinalize                (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>);</pre>
 <p>Frees allocated resource for a buffer intialized with <a href="xmlsec-buffer.html#XMLSECBUFFERINITIALIZE"><span class="TYPE">xmlSecBufferInitialize</span></a>
 function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN3894"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to buffer object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4719"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to buffer object.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBUFFERGETDATA"></a><h3>xmlSecBufferGetData ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a>*         xmlSecBufferGetData                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="RETURNVALUE">xmlSecByte</span></a>*         xmlSecBufferGetData                 (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>);</pre>
 <p>Gets pointer to buffer's data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3909"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to buffer object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4736"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3914"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4741"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to buffer's data.</p></td>
 </tr>
 </tbody></table>
@@ -297,27 +289,26 @@ function.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBUFFERSETDATA"></a><h3>xmlSecBufferSetData ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferSetData                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBufferSetData                 (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);</pre>
 <p>Sets the value of the buffer to <code class="PARAMETER">data</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3932"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to buffer object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4765"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3937"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4770"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3942"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4775"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3947"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4780"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -325,17 +316,16 @@ function.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBUFFERGETSIZE"></a><h3>xmlSecBufferGetSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecBufferGetSize                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          xmlSecBufferGetSize                 (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>);</pre>
 <p>Gets the current buffer data size.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3962"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to buffer object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4797"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3967"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4802"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the current data size.</p></td>
 </tr>
 </tbody></table>
@@ -343,23 +333,22 @@ function.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBUFFERSETSIZE"></a><h3>xmlSecBufferSetSize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferSetSize                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBufferSetSize                 (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);</pre>
 <p>Sets new buffer data size. If necessary, buffer grows to
 have at least <code class="PARAMETER">size</code> bytes.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3984"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to buffer object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4823"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3989"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the new data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4828"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3994"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4833"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -367,17 +356,16 @@ have at least <code class="PARAMETER">size</code> bytes.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBUFFERGETMAXSIZE"></a><h3>xmlSecBufferGetMaxSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecBufferGetMaxSize              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          xmlSecBufferGetMaxSize              (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>);</pre>
 <p>Gets the maximum (allocated) buffer size.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4009"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to buffer object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4850"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4014"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4855"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the maximum (allocated) buffer size.</p></td>
 </tr>
 </tbody></table>
@@ -385,23 +373,22 @@ have at least <code class="PARAMETER">size</code> bytes.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBUFFERSETMAXSIZE"></a><h3>xmlSecBufferSetMaxSize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferSetMaxSize              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBufferSetMaxSize              (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);</pre>
 <p>Sets new buffer maximum size. If necessary, buffer grows to
 have at least <code class="PARAMETER">size</code> bytes.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4031"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to buffer object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4876"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4036"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the new maximum size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4881"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new maximum size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4041"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4886"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -409,39 +396,37 @@ have at least <code class="PARAMETER">size</code> bytes.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBUFFEREMPTY"></a><h3>xmlSecBufferEmpty ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecBufferEmpty                   (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecBufferEmpty                   (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>);</pre>
 <p>Empties the buffer.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN4056"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to buffer object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4903"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to buffer object.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBUFFERAPPEND"></a><h3>xmlSecBufferAppend ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferAppend                  (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBufferAppend                  (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);</pre>
 <p>Appends the <code class="PARAMETER">data</code> after the current data stored in the buffer.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4074"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to buffer object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4927"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4079"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4932"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4084"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4937"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4089"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4942"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -449,27 +434,26 @@ have at least <code class="PARAMETER">size</code> bytes.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBUFFERPREPEND"></a><h3>xmlSecBufferPrepend ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferPrepend                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBufferPrepend                 (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);</pre>
 <p>Prepends the <code class="PARAMETER">data</code> before the current data stored in the buffer.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4107"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to buffer object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4966"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4112"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4971"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4117"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4976"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4122"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4981"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -477,22 +461,21 @@ have at least <code class="PARAMETER">size</code> bytes.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBUFFERREMOVEHEAD"></a><h3>xmlSecBufferRemoveHead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferRemoveHead              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBufferRemoveHead              (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);</pre>
 <p>Removes <code class="PARAMETER">size</code> bytes from the beginning of the current buffer.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4139"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to buffer object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5002"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4144"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the number of bytes to be removed.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5007"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the number of bytes to be removed.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4149"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5012"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -500,22 +483,21 @@ have at least <code class="PARAMETER">size</code> bytes.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBUFFERREMOVETAIL"></a><h3>xmlSecBufferRemoveTail ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferRemoveTail              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBufferRemoveTail              (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);</pre>
 <p>Removes <code class="PARAMETER">size</code> bytes from the end of current buffer.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4166"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to buffer object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5033"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4171"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the number of bytes to be removed.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5038"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the number of bytes to be removed.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4176"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5043"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -523,22 +505,21 @@ have at least <code class="PARAMETER">size</code> bytes.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBUFFERREADFILE"></a><h3>xmlSecBufferReadFile ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferReadFile                (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         const <font>char</font> *filename);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBufferReadFile                (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>);</pre>
 <p>Reads the content of the file <code class="PARAMETER">filename</code> in the buffer.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4193"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to buffer object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5064"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4198"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5069"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4203"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5074"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -546,23 +527,22 @@ have at least <code class="PARAMETER">size</code> bytes.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBUFFERBASE64NODECONTENTREAD"></a><h3>xmlSecBufferBase64NodeContentRead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferBase64NodeContentRead   (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         <font>xmlNodePtr</font> node);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBufferBase64NodeContentRead   (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>);</pre>
 <p>Reads the content of the <code class="PARAMETER">node</code>, base64 decodes it and stores the
 result in the buffer.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4220"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to buffer object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5095"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4225"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5100"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4230"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5105"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -570,27 +550,26 @@ result in the buffer.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBUFFERBASE64NODECONTENTWRITE"></a><h3>xmlSecBufferBase64NodeContentWrite ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferBase64NodeContentWrite  (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <font>int</font> columns);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecBufferBase64NodeContentWrite  (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> columns</code>);</pre>
 <p>Sets the content of the <code class="PARAMETER">node</code> to the base64 encoded buffer data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4248"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to buffer object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5129"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4253"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to a node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5134"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to a node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4258"><span style="white-space: nowrap"><code class="PARAMETER">columns</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the max line size fro base64 encoded data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5139"><span style="white-space: nowrap"><code class="PARAMETER">columns</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the max line size fro base64 encoded data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4263"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5144"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -598,18 +577,17 @@ result in the buffer.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECBUFFERCREATEOUTPUTBUFFER"></a><h3>xmlSecBufferCreateOutputBuffer ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlOutputBufferPtr</font>  xmlSecBufferCreateOutputBuffer      (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLOUTPUTBUFFERPTR"><span class="RETURNVALUE">xmlOutputBufferPtr</span></gtkdoclink>  xmlSecBufferCreateOutputBuffer      (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buf</code>);</pre>
 <p>Creates new LibXML output buffer to store data in the <code class="PARAMETER">buf</code>. Caller is
 responsible for destroying <code class="PARAMETER">buf</code> when processing is done.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4280"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5163"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4285"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5168"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly allocated output buffer or NULL if an error
 occurs.</p></td>
 </tr>
diff --git a/docs/api/xmlsec-dl.html b/docs/api/xmlsec-dl.html
index 9a136c9..9c343a1 100644
--- a/docs/api/xmlsec-dl.html
+++ b/docs/api/xmlsec-dl.html
@@ -87,19 +87,19 @@
 <h1>
 <a name="XMLSEC-DL"></a>dl</h1>
 <div class="REFNAMEDIV">
-<a name="AEN4295"></a><h2>Name</h2>dl -- Dynamic crypto-engine library loading support.</div>
+<a name="AEN5178"></a><h2>Name</h2>dl -- Dynamic crypto-engine library loading support.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-DL.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS"><font>int</font>                 <a href="xmlsec-dl.html#XMLSECCRYPTODLFUNCTIONSREGISTERKEYDATAANDTRANSFORMS">xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms</a>
-                                                        (<font>xmlSecCryptoDLFunctionsPtr</font> functions);
-<font>int</font>                 <a href="xmlsec-dl.html#XMLSECCRYPTODLINIT">xmlSecCryptoDLInit</a>                  (void);
-<font>int</font>                 <a href="xmlsec-dl.html#XMLSECCRYPTODLSHUTDOWN">xmlSecCryptoDLShutdown</a>              (void);
-<font>int</font>                 <a href="xmlsec-dl.html#XMLSECCRYPTODLLOADLIBRARY">xmlSecCryptoDLLoadLibrary</a>           (const <font>xmlChar</font> *crypto);
-<font>xmlSecCryptoDLFunctionsPtr</font>  <a href="xmlsec-dl.html#XMLSECCRYPTODLGETLIBRARYFUNCTIONS">xmlSecCryptoDLGetLibraryFunctions</a>
-                                                        (const <font>xmlChar</font> *crypto);
-<font>int</font>                 <a href="xmlsec-dl.html#XMLSECCRYPTODLUNLOADLIBRARY">xmlSecCryptoDLUnloadLibrary</a>         (const <font>xmlChar</font> *crypto);
-<font>int</font>                 <a href="xmlsec-dl.html#XMLSECCRYPTODLSETFUNCTIONS">xmlSecCryptoDLSetFunctions</a>          (<font>xmlSecCryptoDLFunctionsPtr</font> functions);
-<font>xmlSecCryptoDLFunctionsPtr</font>  <a href="xmlsec-dl.html#XMLSECCRYPTODLGETFUNCTIONS">xmlSecCryptoDLGetFunctions</a>  (void);</pre>
+<pre class="SYNOPSIS"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-dl.html#XMLSECCRYPTODLFUNCTIONSREGISTERKEYDATAANDTRANSFORMS">xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLSECCRYPTODLFUNCTIONS"><span class="TYPE">xmlSecCryptoDLFunctionsPtr</span></gtkdoclink> functions</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-dl.html#XMLSECCRYPTODLINIT">xmlSecCryptoDLInit</a>                  (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-dl.html#XMLSECCRYPTODLSHUTDOWN">xmlSecCryptoDLShutdown</a>              (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-dl.html#XMLSECCRYPTODLLOADLIBRARY">xmlSecCryptoDLLoadLibrary</a>           (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *crypto</code>);
+<gtkdoclink href="XMLSECCRYPTODLFUNCTIONS"><span class="RETURNVALUE">xmlSecCryptoDLFunctionsPtr</span></gtkdoclink><a href="xmlsec-dl.html#XMLSECCRYPTODLGETLIBRARYFUNCTIONS">xmlSecCryptoDLGetLibraryFunctions</a>
+                                                        (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *crypto</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-dl.html#XMLSECCRYPTODLUNLOADLIBRARY">xmlSecCryptoDLUnloadLibrary</a>         (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *crypto</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-dl.html#XMLSECCRYPTODLSETFUNCTIONS">xmlSecCryptoDLSetFunctions</a>          (<code class="PARAMETER"><gtkdoclink href="XMLSECCRYPTODLFUNCTIONS"><span class="TYPE">xmlSecCryptoDLFunctionsPtr</span></gtkdoclink> functions</code>);
+<gtkdoclink href="XMLSECCRYPTODLFUNCTIONS"><span class="RETURNVALUE">xmlSecCryptoDLFunctionsPtr</span></gtkdoclink><a href="xmlsec-dl.html#XMLSECCRYPTODLGETFUNCTIONS">xmlSecCryptoDLGetFunctions</a>  (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-DL.DESCRIPTION"></a><h2>Description</h2>
@@ -109,18 +109,17 @@
 <a name="XMLSEC-DL.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTODLFUNCTIONSREGISTERKEYDATAANDTRANSFORMS"></a><h3>xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms
-                                                        (<font>xmlSecCryptoDLFunctionsPtr</font> functions);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLSECCRYPTODLFUNCTIONS"><span class="TYPE">xmlSecCryptoDLFunctionsPtr</span></gtkdoclink> functions</code>);</pre>
 <p>Registers the key data and transforms klasses from <code class="PARAMETER">functions</code> table in xmlsec.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4338"><span style="white-space: nowrap"><code class="PARAMETER">functions</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the functions table.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5247"><span style="white-space: nowrap"><code class="PARAMETER">functions</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the functions table.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4343"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5252"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -128,45 +127,42 @@
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTODLINIT"></a><h3>xmlSecCryptoDLInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoDLInit                  (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCryptoDLInit                  (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Initializes dynamic loading engine. This is an internal function
 and should not be called by application directly.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN4357"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5268"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTODLSHUTDOWN"></a><h3>xmlSecCryptoDLShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoDLShutdown              (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCryptoDLShutdown              (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Shutdowns dynamic loading engine. This is an internal function
 and should not be called by application directly.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN4371"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5284"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTODLLOADLIBRARY"></a><h3>xmlSecCryptoDLLoadLibrary ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoDLLoadLibrary           (const <font>xmlChar</font> *crypto);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCryptoDLLoadLibrary           (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *crypto</code>);</pre>
 <p>Loads the xmlsec-&lt;crypto&gt; library. This function is NOT thread safe,
 application MUST NOT call <a href="xmlsec-dl.html#XMLSECCRYPTODLLOADLIBRARY"><span class="TYPE">xmlSecCryptoDLLoadLibrary</span></a>, <a href="xmlsec-dl.html#XMLSECCRYPTODLGETLIBRARYFUNCTIONS"><span class="TYPE">xmlSecCryptoDLGetLibraryFunctions</span></a>,
 and <a href="xmlsec-dl.html#XMLSECCRYPTODLUNLOADLIBRARY"><span class="TYPE">xmlSecCryptoDLUnloadLibrary</span></a> functions from multiple threads.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4392"><span style="white-space: nowrap"><code class="PARAMETER">crypto</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the desired crypto library name ("openssl", "nss", ...).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5307"><span style="white-space: nowrap"><code class="PARAMETER">crypto</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired crypto library name ("openssl", "nss", ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4397"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5312"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -174,20 +170,19 @@ and <a href="xmlsec-dl.html#XMLSECCRYPTODLUNLOADLIBRARY"><span class="TYPE">xmlS
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTODLGETLIBRARYFUNCTIONS"></a><h3>xmlSecCryptoDLGetLibraryFunctions ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecCryptoDLFunctionsPtr</font>  xmlSecCryptoDLGetLibraryFunctions
-                                                        (const <font>xmlChar</font> *crypto);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECCRYPTODLFUNCTIONS"><span class="RETURNVALUE">xmlSecCryptoDLFunctionsPtr</span></gtkdoclink>  xmlSecCryptoDLGetLibraryFunctions
+                                                        (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *crypto</code>);</pre>
 <p>Loads the xmlsec-&lt;crypto&gt; library and gets global crypto functions/transforms/keys data/keys store
 table. This function is NOT thread safe, application MUST NOT call <a href="xmlsec-dl.html#XMLSECCRYPTODLLOADLIBRARY"><span class="TYPE">xmlSecCryptoDLLoadLibrary</span></a>,
 <a href="xmlsec-dl.html#XMLSECCRYPTODLGETLIBRARYFUNCTIONS"><span class="TYPE">xmlSecCryptoDLGetLibraryFunctions</span></a>, and <a href="xmlsec-dl.html#XMLSECCRYPTODLUNLOADLIBRARY"><span class="TYPE">xmlSecCryptoDLUnloadLibrary</span></a> functions from multiple threads.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4418"><span style="white-space: nowrap"><code class="PARAMETER">crypto</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the desired crypto library name ("openssl", "nss", ...).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5335"><span style="white-space: nowrap"><code class="PARAMETER">crypto</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired crypto library name ("openssl", "nss", ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4423"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5340"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the table or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -195,20 +190,19 @@ table. This function is NOT thread safe, application MUST NOT call <a href="xmls
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTODLUNLOADLIBRARY"></a><h3>xmlSecCryptoDLUnloadLibrary ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoDLUnloadLibrary         (const <font>xmlChar</font> *crypto);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCryptoDLUnloadLibrary         (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *crypto</code>);</pre>
 <p>Unloads the xmlsec-&lt;crypto&gt; library. All pointers to this library
 functions tables became invalid. This function is NOT thread safe,
 application MUST NOT call <a href="xmlsec-dl.html#XMLSECCRYPTODLLOADLIBRARY"><span class="TYPE">xmlSecCryptoDLLoadLibrary</span></a>, <a href="xmlsec-dl.html#XMLSECCRYPTODLGETLIBRARYFUNCTIONS"><span class="TYPE">xmlSecCryptoDLGetLibraryFunctions</span></a>,
 and <a href="xmlsec-dl.html#XMLSECCRYPTODLUNLOADLIBRARY"><span class="TYPE">xmlSecCryptoDLUnloadLibrary</span></a> functions from multiple threads.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4444"><span style="white-space: nowrap"><code class="PARAMETER">crypto</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the desired crypto library name ("openssl", "nss", ...).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5363"><span style="white-space: nowrap"><code class="PARAMETER">crypto</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired crypto library name ("openssl", "nss", ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4449"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5368"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -216,17 +210,16 @@ and <a href="xmlsec-dl.html#XMLSECCRYPTODLUNLOADLIBRARY"><span class="TYPE">xmlS
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTODLSETFUNCTIONS"></a><h3>xmlSecCryptoDLSetFunctions ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoDLSetFunctions          (<font>xmlSecCryptoDLFunctionsPtr</font> functions);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCryptoDLSetFunctions          (<code class="PARAMETER"><gtkdoclink href="XMLSECCRYPTODLFUNCTIONS"><span class="TYPE">xmlSecCryptoDLFunctionsPtr</span></gtkdoclink> functions</code>);</pre>
 <p>Sets global crypto functions/transforms/keys data/keys store table.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4464"><span style="white-space: nowrap"><code class="PARAMETER">functions</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the new table</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5385"><span style="white-space: nowrap"><code class="PARAMETER">functions</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new table</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4469"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5390"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -234,12 +227,11 @@ and <a href="xmlsec-dl.html#XMLSECCRYPTODLUNLOADLIBRARY"><span class="TYPE">xmlS
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTODLGETFUNCTIONS"></a><h3>xmlSecCryptoDLGetFunctions ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecCryptoDLFunctionsPtr</font>  xmlSecCryptoDLGetFunctions  (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECCRYPTODLFUNCTIONS"><span class="RETURNVALUE">xmlSecCryptoDLFunctionsPtr</span></gtkdoclink>  xmlSecCryptoDLGetFunctions  (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Gets global crypto functions/transforms/keys data/keys store table.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN4483"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5406"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the table.</p></td>
 </tr></tbody></table>
 </div>
diff --git a/docs/api/xmlsec-errors.html b/docs/api/xmlsec-errors.html
index 7aceb83..03c9776 100644
--- a/docs/api/xmlsec-errors.html
+++ b/docs/api/xmlsec-errors.html
@@ -87,91 +87,92 @@
 <h1>
 <a name="XMLSEC-ERRORS"></a>errors</h1>
 <div class="REFNAMEDIV">
-<a name="AEN4493"></a><h2>Name</h2>errors -- Error/log messages support.</div>
+<a name="AEN5416"></a><h2>Name</h2>errors -- Error/log messages support.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-ERRORS.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-XMLSEC-FAILED--CAPS">XMLSEC_ERRORS_R_XMLSEC_FAILED</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MALLOC-FAILED--CAPS">XMLSEC_ERRORS_R_MALLOC_FAILED</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-STRDUP-FAILED--CAPS">XMLSEC_ERRORS_R_STRDUP_FAILED</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CRYPTO-FAILED--CAPS">XMLSEC_ERRORS_R_CRYPTO_FAILED</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-XML-FAILED--CAPS">XMLSEC_ERRORS_R_XML_FAILED</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-XSLT-FAILED--CAPS">XMLSEC_ERRORS_R_XSLT_FAILED</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-IO-FAILED--CAPS">XMLSEC_ERRORS_R_IO_FAILED</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-DISABLED--CAPS">XMLSEC_ERRORS_R_DISABLED</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-NOT-IMPLEMENTED--CAPS">XMLSEC_ERRORS_R_NOT_IMPLEMENTED</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-SIZE--CAPS">XMLSEC_ERRORS_R_INVALID_SIZE</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-DATA--CAPS">XMLSEC_ERRORS_R_INVALID_DATA</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-RESULT--CAPS">XMLSEC_ERRORS_R_INVALID_RESULT</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-TYPE--CAPS">XMLSEC_ERRORS_R_INVALID_TYPE</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-OPERATION--CAPS">XMLSEC_ERRORS_R_INVALID_OPERATION</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-STATUS--CAPS">XMLSEC_ERRORS_R_INVALID_STATUS</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-FORMAT--CAPS">XMLSEC_ERRORS_R_INVALID_FORMAT</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-DATA-NOT-MATCH--CAPS">XMLSEC_ERRORS_R_DATA_NOT_MATCH</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-NODE--CAPS">XMLSEC_ERRORS_R_INVALID_NODE</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-NODE-CONTENT--CAPS">XMLSEC_ERRORS_R_INVALID_NODE_CONTENT</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE--CAPS">XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE--CAPS">XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT--CAPS">XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-UNEXPECTED-NODE--CAPS">XMLSEC_ERRORS_R_UNEXPECTED_NODE</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-NODE-NOT-FOUND--CAPS">XMLSEC_ERRORS_R_NODE_NOT_FOUND</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-TRANSFORM--CAPS">XMLSEC_ERRORS_R_INVALID_TRANSFORM</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY--CAPS">XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-URI-TYPE--CAPS">XMLSEC_ERRORS_R_INVALID_URI_TYPE</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED--CAPS">XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-TRANSFORM-DISABLED--CAPS">XMLSEC_ERRORS_R_TRANSFORM_DISABLED</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-KEY-DATA--CAPS">XMLSEC_ERRORS_R_INVALID_KEY_DATA</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND--CAPS">XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST--CAPS">XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE--CAPS">XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-KEY-NOT-FOUND--CAPS">XMLSEC_ERRORS_R_KEY_NOT_FOUND</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-KEYDATA-DISABLED--CAPS">XMLSEC_ERRORS_R_KEYDATA_DISABLED</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL--CAPS">XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH--CAPS">XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL--CAPS">XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-VERIFY-FAILED--CAPS">XMLSEC_ERRORS_R_CERT_VERIFY_FAILED</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-NOT-FOUND--CAPS">XMLSEC_ERRORS_R_CERT_NOT_FOUND</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-REVOKED--CAPS">XMLSEC_ERRORS_R_CERT_REVOKED</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-ISSUER-FAILED--CAPS">XMLSEC_ERRORS_R_CERT_ISSUER_FAILED</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-NOT-YET-VALID--CAPS">XMLSEC_ERRORS_R_CERT_NOT_YET_VALID</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-HAS-EXPIRED--CAPS">XMLSEC_ERRORS_R_CERT_HAS_EXPIRED</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-DSIG-NO-REFERENCES--CAPS">XMLSEC_ERRORS_R_DSIG_NO_REFERENCES</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE--CAPS">XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-ASSERTION--CAPS">XMLSEC_ERRORS_R_ASSERTION</a>
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-MAX-NUMBER--CAPS">XMLSEC_ERRORS_MAX_NUMBER</a>
-<font>void</font>                (<a href="xmlsec-errors.html#XMLSECERRORSCALLBACK">*xmlSecErrorsCallback</a>)             (const <font>char</font> *file,
-                                                         <font>int</font> line,
-                                                         const <font>char</font> *func,
-                                                         const <font>char</font> *errorObject,
-                                                         const <font>char</font> *errorSubject,
-                                                         <font>int</font> reason,
-                                                         const <font>char</font> *msg);
-<font>void</font>                <a href="xmlsec-errors.html#XMLSECERRORSINIT">xmlSecErrorsInit</a>                    (void);
-<font>void</font>                <a href="xmlsec-errors.html#XMLSECERRORSSHUTDOWN">xmlSecErrorsShutdown</a>                (void);
-<font>void</font>                <a href="xmlsec-errors.html#XMLSECERRORSSETCALLBACK">xmlSecErrorsSetCallback</a>             (<a href="xmlsec-errors.html#XMLSECERRORSCALLBACK">xmlSecErrorsCallback</a> callback);
-<font>void</font>                <a href="xmlsec-errors.html#XMLSECERRORSDEFAULTCALLBACK">xmlSecErrorsDefaultCallback</a>         (const <font>char</font> *file,
-                                                         <font>int</font> line,
-                                                         const <font>char</font> *func,
-                                                         const <font>char</font> *errorObject,
-                                                         const <font>char</font> *errorSubject,
-                                                         <font>int</font> reason,
-                                                         const <font>char</font> *msg);
-<font>void</font>                <a href="xmlsec-errors.html#XMLSECERRORSDEFAULTCALLBACKENABLEOUTPUT">xmlSecErrorsDefaultCallbackEnableOutput</a>
-                                                        (<font>int</font> enabled);
-<font>int</font>                 <a href="xmlsec-errors.html#XMLSECERRORSGETCODE">xmlSecErrorsGetCode</a>                 (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-const <font>char</font>*         <a href="xmlsec-errors.html#XMLSECERRORSGETMSG">xmlSecErrorsGetMsg</a>                  (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-HERE--CAPS">XMLSEC_ERRORS_HERE</a>
+<pre class="SYNOPSIS">#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-XMLSEC-FAILED:CAPS">XMLSEC_ERRORS_R_XMLSEC_FAILED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MALLOC-FAILED:CAPS">XMLSEC_ERRORS_R_MALLOC_FAILED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-STRDUP-FAILED:CAPS">XMLSEC_ERRORS_R_STRDUP_FAILED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CRYPTO-FAILED:CAPS">XMLSEC_ERRORS_R_CRYPTO_FAILED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-XML-FAILED:CAPS">XMLSEC_ERRORS_R_XML_FAILED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-XSLT-FAILED:CAPS">XMLSEC_ERRORS_R_XSLT_FAILED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-IO-FAILED:CAPS">XMLSEC_ERRORS_R_IO_FAILED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-DISABLED:CAPS">XMLSEC_ERRORS_R_DISABLED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-NOT-IMPLEMENTED:CAPS">XMLSEC_ERRORS_R_NOT_IMPLEMENTED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-SIZE:CAPS">XMLSEC_ERRORS_R_INVALID_SIZE</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-DATA:CAPS">XMLSEC_ERRORS_R_INVALID_DATA</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-RESULT:CAPS">XMLSEC_ERRORS_R_INVALID_RESULT</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-TYPE:CAPS">XMLSEC_ERRORS_R_INVALID_TYPE</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-OPERATION:CAPS">XMLSEC_ERRORS_R_INVALID_OPERATION</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-STATUS:CAPS">XMLSEC_ERRORS_R_INVALID_STATUS</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-FORMAT:CAPS">XMLSEC_ERRORS_R_INVALID_FORMAT</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-DATA-NOT-MATCH:CAPS">XMLSEC_ERRORS_R_DATA_NOT_MATCH</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-NODE:CAPS">XMLSEC_ERRORS_R_INVALID_NODE</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-NODE-CONTENT:CAPS">XMLSEC_ERRORS_R_INVALID_NODE_CONTENT</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE:CAPS">XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE:CAPS">XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT:CAPS">XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-UNEXPECTED-NODE:CAPS">XMLSEC_ERRORS_R_UNEXPECTED_NODE</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-NODE-NOT-FOUND:CAPS">XMLSEC_ERRORS_R_NODE_NOT_FOUND</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-TRANSFORM:CAPS">XMLSEC_ERRORS_R_INVALID_TRANSFORM</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY:CAPS">XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-URI-TYPE:CAPS">XMLSEC_ERRORS_R_INVALID_URI_TYPE</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED:CAPS">XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-TRANSFORM-DISABLED:CAPS">XMLSEC_ERRORS_R_TRANSFORM_DISABLED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-KEY-DATA:CAPS">XMLSEC_ERRORS_R_INVALID_KEY_DATA</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND:CAPS">XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST:CAPS">XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE:CAPS">XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-KEY-NOT-FOUND:CAPS">XMLSEC_ERRORS_R_KEY_NOT_FOUND</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-KEYDATA-DISABLED:CAPS">XMLSEC_ERRORS_R_KEYDATA_DISABLED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL:CAPS">XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH:CAPS">XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL:CAPS">XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-VERIFY-FAILED:CAPS">XMLSEC_ERRORS_R_CERT_VERIFY_FAILED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-NOT-FOUND:CAPS">XMLSEC_ERRORS_R_CERT_NOT_FOUND</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-REVOKED:CAPS">XMLSEC_ERRORS_R_CERT_REVOKED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-ISSUER-FAILED:CAPS">XMLSEC_ERRORS_R_CERT_ISSUER_FAILED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-NOT-YET-VALID:CAPS">XMLSEC_ERRORS_R_CERT_NOT_YET_VALID</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-HAS-EXPIRED:CAPS">XMLSEC_ERRORS_R_CERT_HAS_EXPIRED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-DSIG-NO-REFERENCES:CAPS">XMLSEC_ERRORS_R_DSIG_NO_REFERENCES</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE:CAPS">XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-ASSERTION:CAPS">XMLSEC_ERRORS_R_ASSERTION</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-MAX-NUMBER:CAPS">XMLSEC_ERRORS_MAX_NUMBER</a>
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                (<a href="xmlsec-errors.html#XMLSECERRORSCALLBACK">*xmlSecErrorsCallback</a>)             (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *file</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> line</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *func</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorObject</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorSubject</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> reason</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *msg</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-errors.html#XMLSECERRORSINIT">xmlSecErrorsInit</a>                    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-errors.html#XMLSECERRORSSHUTDOWN">xmlSecErrorsShutdown</a>                (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-errors.html#XMLSECERRORSSETCALLBACK">xmlSecErrorsSetCallback</a>             (<code class="PARAMETER"><a href="xmlsec-errors.html#XMLSECERRORSCALLBACK"><span class="TYPE">xmlSecErrorsCallback</span></a> callback</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-errors.html#XMLSECERRORSDEFAULTCALLBACK">xmlSecErrorsDefaultCallback</a>         (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *file</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> line</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *func</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorObject</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorSubject</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> reason</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *msg</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-errors.html#XMLSECERRORSDEFAULTCALLBACKENABLEOUTPUT">xmlSecErrorsDefaultCallbackEnableOutput</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> enabled</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-errors.html#XMLSECERRORSGETCODE">xmlSecErrorsGetCode</a>                 (<code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);
+const <gtkdoclink href="CHAR"><span class="RETURNVALUE">char</span></gtkdoclink>*         <a href="xmlsec-errors.html#XMLSECERRORSGETMSG">xmlSecErrorsGetMsg</a>                  (<code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-HERE:CAPS">XMLSEC_ERRORS_HERE</a>
 #define             <a href="xmlsec-errors.html#XMLSECERRORSSAFESTRING">xmlSecErrorsSafeString</a>              (str)
-#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-NO-MESSAGE--CAPS">XMLSEC_ERRORS_NO_MESSAGE</a>
-<font>void</font>                <a href="xmlsec-errors.html#XMLSECERROR">xmlSecError</a>                         (const <font>char</font> *file,
-                                                         <font>int</font> line,
-                                                         const <font>char</font> *func,
-                                                         const <font>char</font> *errorObject,
-                                                         const <font>char</font> *errorSubject,
-                                                         <font>int</font> reason,
-                                                         const <font>char</font> *msg,
-                                                         ...);
-#define             <a href="xmlsec-errors.html#XMLSECASSERT">xmlSecAssert</a>                        ( p )
-#define             <a href="xmlsec-errors.html#XMLSECASSERT2">xmlSecAssert2</a>                       ( p, ret )</pre>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-NO-MESSAGE:CAPS">XMLSEC_ERRORS_NO_MESSAGE</a>
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-errors.html#XMLSECERROR">xmlSecError</a>                         (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *file</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> line</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *func</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorObject</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorSubject</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> reason</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *msg</code>,
+                                                         <code class="PARAMETER">...</code>);
+#define             <a href="xmlsec-errors.html#XMLSECASSERT">xmlSecAssert</a>                        (p)
+#define             <a href="xmlsec-errors.html#XMLSECASSERT2">xmlSecAssert2</a>                       (p,
+                                                         ret)</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-ERRORS.DESCRIPTION"></a><h2>Description</h2>
@@ -180,489 +181,434 @@ const <font>char</font>*         <a href="xmlsec-errors.html#XMLSECERRORSGETMSG"
 <div class="REFSECT1">
 <a name="XMLSEC-ERRORS.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-XMLSEC-FAILED--CAPS"></a><h3>XMLSEC_ERRORS_R_XMLSEC_FAILED</h3>
+<a name="XMLSEC-ERRORS-R-XMLSEC-FAILED:CAPS"></a><h3>XMLSEC_ERRORS_R_XMLSEC_FAILED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_XMLSEC_FAILED                   1</pre>
 <p>An XMLSec function failed (error subject is the failed function).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-MALLOC-FAILED--CAPS"></a><h3>XMLSEC_ERRORS_R_MALLOC_FAILED</h3>
+<a name="XMLSEC-ERRORS-R-MALLOC-FAILED:CAPS"></a><h3>XMLSEC_ERRORS_R_MALLOC_FAILED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_MALLOC_FAILED                   2</pre>
 <p>Failed to allocate memory error.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-STRDUP-FAILED--CAPS"></a><h3>XMLSEC_ERRORS_R_STRDUP_FAILED</h3>
+<a name="XMLSEC-ERRORS-R-STRDUP-FAILED:CAPS"></a><h3>XMLSEC_ERRORS_R_STRDUP_FAILED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_STRDUP_FAILED                   3</pre>
 <p>Failed to duplicate string error.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-CRYPTO-FAILED--CAPS"></a><h3>XMLSEC_ERRORS_R_CRYPTO_FAILED</h3>
+<a name="XMLSEC-ERRORS-R-CRYPTO-FAILED:CAPS"></a><h3>XMLSEC_ERRORS_R_CRYPTO_FAILED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_CRYPTO_FAILED                   4</pre>
 <p>Crypto (OpenSSL) function failed (error subject is the failed function).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-XML-FAILED--CAPS"></a><h3>XMLSEC_ERRORS_R_XML_FAILED</h3>
+<a name="XMLSEC-ERRORS-R-XML-FAILED:CAPS"></a><h3>XMLSEC_ERRORS_R_XML_FAILED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_XML_FAILED                      5</pre>
 <p>LibXML function failed (error subject is the failed function).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-XSLT-FAILED--CAPS"></a><h3>XMLSEC_ERRORS_R_XSLT_FAILED</h3>
+<a name="XMLSEC-ERRORS-R-XSLT-FAILED:CAPS"></a><h3>XMLSEC_ERRORS_R_XSLT_FAILED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_XSLT_FAILED                     6</pre>
 <p>LibXSLT function failed (error subject is the failed function).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-IO-FAILED--CAPS"></a><h3>XMLSEC_ERRORS_R_IO_FAILED</h3>
+<a name="XMLSEC-ERRORS-R-IO-FAILED:CAPS"></a><h3>XMLSEC_ERRORS_R_IO_FAILED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_IO_FAILED                       7</pre>
 <p>IO operation failed.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-DISABLED--CAPS"></a><h3>XMLSEC_ERRORS_R_DISABLED</h3>
+<a name="XMLSEC-ERRORS-R-DISABLED:CAPS"></a><h3>XMLSEC_ERRORS_R_DISABLED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_DISABLED                        8</pre>
 <p>The feature is disabled during compilation.
 Check './configure --help' for details on how to
 enable it.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-NOT-IMPLEMENTED--CAPS"></a><h3>XMLSEC_ERRORS_R_NOT_IMPLEMENTED</h3>
+<a name="XMLSEC-ERRORS-R-NOT-IMPLEMENTED:CAPS"></a><h3>XMLSEC_ERRORS_R_NOT_IMPLEMENTED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_NOT_IMPLEMENTED                 9</pre>
 <p>Feature is not implemented.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-INVALID-SIZE--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_SIZE</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-SIZE:CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_SIZE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_SIZE                    11</pre>
 <p>Invalid size.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-INVALID-DATA--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_DATA</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-DATA:CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_DATA</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_DATA                    12</pre>
 <p>Invalid data.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-INVALID-RESULT--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_RESULT</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-RESULT:CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_RESULT</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_RESULT                  13</pre>
 <p>Invalid result.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-INVALID-TYPE--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_TYPE</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-TYPE:CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_TYPE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_TYPE                    14</pre>
 <p>Invalid type.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-INVALID-OPERATION--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_OPERATION</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-OPERATION:CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_OPERATION</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_OPERATION               15</pre>
 <p>Invalid operation.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-INVALID-STATUS--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_STATUS</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-STATUS:CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_STATUS</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_STATUS                  16</pre>
 <p>Invalid status.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-INVALID-FORMAT--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_FORMAT</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-FORMAT:CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_FORMAT</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_FORMAT                  17</pre>
 <p>Invalid format.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-DATA-NOT-MATCH--CAPS"></a><h3>XMLSEC_ERRORS_R_DATA_NOT_MATCH</h3>
+<a name="XMLSEC-ERRORS-R-DATA-NOT-MATCH:CAPS"></a><h3>XMLSEC_ERRORS_R_DATA_NOT_MATCH</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_DATA_NOT_MATCH                  18</pre>
 <p>The data do not match our expectation.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-INVALID-NODE--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_NODE</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-NODE:CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_NODE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_NODE                    21</pre>
 <p>Invalid node (error subject is the node name).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-INVALID-NODE-CONTENT--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_NODE_CONTENT</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-NODE-CONTENT:CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_NODE_CONTENT</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_NODE_CONTENT            22</pre>
 <p>Invalid node content (error subject is the node name).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE:CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE          23</pre>
 <p>Invalid node attribute (error subject is the node name).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE--CAPS"></a><h3>XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE</h3>
+<a name="XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE:CAPS"></a><h3>XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE          25</pre>
 <p>Missing node attribute (error subject is the node name).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT--CAPS"></a><h3>XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT</h3>
+<a name="XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT:CAPS"></a><h3>XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT            26</pre>
 <p>Node already present,</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-UNEXPECTED-NODE--CAPS"></a><h3>XMLSEC_ERRORS_R_UNEXPECTED_NODE</h3>
+<a name="XMLSEC-ERRORS-R-UNEXPECTED-NODE:CAPS"></a><h3>XMLSEC_ERRORS_R_UNEXPECTED_NODE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_UNEXPECTED_NODE                 27</pre>
 <p>Unexpected node (error subject is the node name).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-NODE-NOT-FOUND--CAPS"></a><h3>XMLSEC_ERRORS_R_NODE_NOT_FOUND</h3>
+<a name="XMLSEC-ERRORS-R-NODE-NOT-FOUND:CAPS"></a><h3>XMLSEC_ERRORS_R_NODE_NOT_FOUND</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_NODE_NOT_FOUND                  28</pre>
 <p>Node not found (error subject is the required node name).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-INVALID-TRANSFORM--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_TRANSFORM</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-TRANSFORM:CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_TRANSFORM</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_TRANSFORM               31</pre>
 <p>This transform is invlaid here.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY:CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY           32</pre>
 <p>Key is invalid for this transform.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-INVALID-URI-TYPE--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_URI_TYPE</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-URI-TYPE:CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_URI_TYPE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_URI_TYPE                33</pre>
 <p>Invalid URI type.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED--CAPS"></a><h3>XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED</h3>
+<a name="XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED:CAPS"></a><h3>XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED        34</pre>
 <p>The transform requires the input document to be the same as context.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-TRANSFORM-DISABLED--CAPS"></a><h3>XMLSEC_ERRORS_R_TRANSFORM_DISABLED</h3>
+<a name="XMLSEC-ERRORS-R-TRANSFORM-DISABLED:CAPS"></a><h3>XMLSEC_ERRORS_R_TRANSFORM_DISABLED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_TRANSFORM_DISABLED              35</pre>
 <p>The transform is disabled.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-INVALID-KEY-DATA--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_KEY_DATA</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-KEY-DATA:CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_KEY_DATA</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_KEY_DATA                41</pre>
 <p>Key data is invalid.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND--CAPS"></a><h3>XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND</h3>
+<a name="XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND:CAPS"></a><h3>XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND              42</pre>
 <p>Data is not found (error subject is the data name).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST--CAPS"></a><h3>XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST</h3>
+<a name="XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST:CAPS"></a><h3>XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST          43</pre>
 <p>The key data is already exist.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE:CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE           44</pre>
 <p>Invalid key size.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-KEY-NOT-FOUND--CAPS"></a><h3>XMLSEC_ERRORS_R_KEY_NOT_FOUND</h3>
+<a name="XMLSEC-ERRORS-R-KEY-NOT-FOUND:CAPS"></a><h3>XMLSEC_ERRORS_R_KEY_NOT_FOUND</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_KEY_NOT_FOUND                   45</pre>
 <p>Key not found.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-KEYDATA-DISABLED--CAPS"></a><h3>XMLSEC_ERRORS_R_KEYDATA_DISABLED</h3>
+<a name="XMLSEC-ERRORS-R-KEYDATA-DISABLED:CAPS"></a><h3>XMLSEC_ERRORS_R_KEYDATA_DISABLED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_KEYDATA_DISABLED                46</pre>
 <p>The key data type disabled.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL--CAPS"></a><h3>XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL</h3>
+<a name="XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL:CAPS"></a><h3>XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL            51</pre>
 <p>Max allowed retrievals level reached.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH--CAPS"></a><h3>XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH</h3>
+<a name="XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH:CAPS"></a><h3>XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH     52</pre>
 <p>The retrieved key data type does not match the one specified
 in the <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod"; target="_top">&lt;dsig:RetrievalMethod/&gt;</a> node.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL--CAPS"></a><h3>XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL</h3>
+<a name="XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL:CAPS"></a><h3>XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL                61</pre>
 <p>Max EncryptedKey level reached.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-CERT-VERIFY-FAILED--CAPS"></a><h3>XMLSEC_ERRORS_R_CERT_VERIFY_FAILED</h3>
+<a name="XMLSEC-ERRORS-R-CERT-VERIFY-FAILED:CAPS"></a><h3>XMLSEC_ERRORS_R_CERT_VERIFY_FAILED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_CERT_VERIFY_FAILED              71</pre>
 <p>Certificate verification failed.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-CERT-NOT-FOUND--CAPS"></a><h3>XMLSEC_ERRORS_R_CERT_NOT_FOUND</h3>
+<a name="XMLSEC-ERRORS-R-CERT-NOT-FOUND:CAPS"></a><h3>XMLSEC_ERRORS_R_CERT_NOT_FOUND</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_CERT_NOT_FOUND                  72</pre>
 <p>Requested certificate is not found.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-CERT-REVOKED--CAPS"></a><h3>XMLSEC_ERRORS_R_CERT_REVOKED</h3>
+<a name="XMLSEC-ERRORS-R-CERT-REVOKED:CAPS"></a><h3>XMLSEC_ERRORS_R_CERT_REVOKED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_CERT_REVOKED                    73</pre>
 <p>The certificate is revoked.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-CERT-ISSUER-FAILED--CAPS"></a><h3>XMLSEC_ERRORS_R_CERT_ISSUER_FAILED</h3>
+<a name="XMLSEC-ERRORS-R-CERT-ISSUER-FAILED:CAPS"></a><h3>XMLSEC_ERRORS_R_CERT_ISSUER_FAILED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_CERT_ISSUER_FAILED              74</pre>
 <p>Failed to get certificate issuer.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-CERT-NOT-YET-VALID--CAPS"></a><h3>XMLSEC_ERRORS_R_CERT_NOT_YET_VALID</h3>
+<a name="XMLSEC-ERRORS-R-CERT-NOT-YET-VALID:CAPS"></a><h3>XMLSEC_ERRORS_R_CERT_NOT_YET_VALID</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_CERT_NOT_YET_VALID              75</pre>
 <p>"Not valid before" verification failed.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-CERT-HAS-EXPIRED--CAPS"></a><h3>XMLSEC_ERRORS_R_CERT_HAS_EXPIRED</h3>
+<a name="XMLSEC-ERRORS-R-CERT-HAS-EXPIRED:CAPS"></a><h3>XMLSEC_ERRORS_R_CERT_HAS_EXPIRED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_CERT_HAS_EXPIRED                76</pre>
 <p>"Not valid after" verification failed.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-DSIG-NO-REFERENCES--CAPS"></a><h3>XMLSEC_ERRORS_R_DSIG_NO_REFERENCES</h3>
+<a name="XMLSEC-ERRORS-R-DSIG-NO-REFERENCES:CAPS"></a><h3>XMLSEC_ERRORS_R_DSIG_NO_REFERENCES</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_DSIG_NO_REFERENCES              81</pre>
 <p>The &lt;dsig:Reference&gt; nodes not found.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE--CAPS"></a><h3>XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE</h3>
+<a name="XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE:CAPS"></a><h3>XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE          82</pre>
 <p>The &lt;dsig:Reference&gt; validation failed.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-R-ASSERTION--CAPS"></a><h3>XMLSEC_ERRORS_R_ASSERTION</h3>
+<a name="XMLSEC-ERRORS-R-ASSERTION:CAPS"></a><h3>XMLSEC_ERRORS_R_ASSERTION</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_ASSERTION                       100</pre>
 <p>Invalid assertion.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-MAX-NUMBER--CAPS"></a><h3>XMLSEC_ERRORS_MAX_NUMBER</h3>
+<a name="XMLSEC-ERRORS-MAX-NUMBER:CAPS"></a><h3>XMLSEC_ERRORS_MAX_NUMBER</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_MAX_NUMBER                        256</pre>
 <p>The maximum xmlsec errors number.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECERRORSCALLBACK"></a><h3>xmlSecErrorsCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                (*xmlSecErrorsCallback)             (const <font>char</font> *file,
-                                                         <font>int</font> line,
-                                                         const <font>char</font> *func,
-                                                         const <font>char</font> *errorObject,
-                                                         const <font>char</font> *errorSubject,
-                                                         <font>int</font> reason,
-                                                         const <font>char</font> *msg);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                (*xmlSecErrorsCallback)             (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *file</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> line</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *func</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorObject</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorSubject</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> reason</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *msg</code>);</pre>
 <p>The errors reporting callback function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4953"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the error location file name (__FILE__ macro).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5906"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error location file name (__FILE__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4958"><span style="white-space: nowrap"><code class="PARAMETER">line</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the error location line number (__LINE__ macro).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5911"><span style="white-space: nowrap"><code class="PARAMETER">line</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error location line number (__LINE__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4963"><span style="white-space: nowrap"><code class="PARAMETER">func</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the error location function name (__FUNCTION__ macro).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5916"><span style="white-space: nowrap"><code class="PARAMETER">func</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error location function name (__FUNCTION__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4968"><span style="white-space: nowrap"><code class="PARAMETER">errorObject</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the error specific error object</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5921"><span style="white-space: nowrap"><code class="PARAMETER">errorObject</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error specific error object</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4973"><span style="white-space: nowrap"><code class="PARAMETER">errorSubject</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the error specific error subject.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5926"><span style="white-space: nowrap"><code class="PARAMETER">errorSubject</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error specific error subject.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4978"><span style="white-space: nowrap"><code class="PARAMETER">reason</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the error code.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5931"><span style="white-space: nowrap"><code class="PARAMETER">reason</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error code.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4983"><span style="white-space: nowrap"><code class="PARAMETER">msg</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the additional error message.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5936"><span style="white-space: nowrap"><code class="PARAMETER">msg</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the additional error message.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECERRORSINIT"></a><h3>xmlSecErrorsInit ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecErrorsInit                    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecErrorsInit                    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Initializes the errors reporting. It is called from <a href="xmlsec-xmlsec.html#XMLSECINIT"><span class="TYPE">xmlSecInit</span></a> function.
 and applications must not call this function directly.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECERRORSSHUTDOWN"></a><h3>xmlSecErrorsShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecErrorsShutdown                (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecErrorsShutdown                (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Cleanups the errors reporting. It is called from <a href="xmlsec-xmlsec.html#XMLSECSHUTDOWN"><span class="TYPE">xmlSecShutdown</span></a> function.
 and applications must not call this function directly.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECERRORSSETCALLBACK"></a><h3>xmlSecErrorsSetCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecErrorsSetCallback             (<a href="xmlsec-errors.html#XMLSECERRORSCALLBACK">xmlSecErrorsCallback</a> callback);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecErrorsSetCallback             (<code class="PARAMETER"><a href="xmlsec-errors.html#XMLSECERRORSCALLBACK"><span class="TYPE">xmlSecErrorsCallback</span></a> callback</code>);</pre>
 <p>Sets the errors callback function to <code class="PARAMETER">callback</code> that will be called
 every time an error occurs.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN5019"><span style="white-space: nowrap"><code class="PARAMETER">callback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the new errors callback function.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5978"><span style="white-space: nowrap"><code class="PARAMETER">callback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new errors callback function.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECERRORSDEFAULTCALLBACK"></a><h3>xmlSecErrorsDefaultCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecErrorsDefaultCallback         (const <font>char</font> *file,
-                                                         <font>int</font> line,
-                                                         const <font>char</font> *func,
-                                                         const <font>char</font> *errorObject,
-                                                         const <font>char</font> *errorSubject,
-                                                         <font>int</font> reason,
-                                                         const <font>char</font> *msg);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecErrorsDefaultCallback         (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *file</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> line</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *func</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorObject</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorSubject</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> reason</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *msg</code>);</pre>
 <p>The default error reporting callback that utilizes LibXML
 error reporting <gtkdoclink href="XMLGENERICERROR"><span class="TYPE">xmlGenericError</span></gtkdoclink> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5042"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the error location file name (__FILE__ macro).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6015"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error location file name (__FILE__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5047"><span style="white-space: nowrap"><code class="PARAMETER">line</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the error location line number (__LINE__ macro).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6020"><span style="white-space: nowrap"><code class="PARAMETER">line</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error location line number (__LINE__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5052"><span style="white-space: nowrap"><code class="PARAMETER">func</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the error location function name (__FUNCTION__ macro).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6025"><span style="white-space: nowrap"><code class="PARAMETER">func</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error location function name (__FUNCTION__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5057"><span style="white-space: nowrap"><code class="PARAMETER">errorObject</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the error specific error object</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6030"><span style="white-space: nowrap"><code class="PARAMETER">errorObject</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error specific error object</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5062"><span style="white-space: nowrap"><code class="PARAMETER">errorSubject</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the error specific error subject.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6035"><span style="white-space: nowrap"><code class="PARAMETER">errorSubject</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error specific error subject.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5067"><span style="white-space: nowrap"><code class="PARAMETER">reason</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the error code.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6040"><span style="white-space: nowrap"><code class="PARAMETER">reason</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error code.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5072"><span style="white-space: nowrap"><code class="PARAMETER">msg</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the additional error message.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6045"><span style="white-space: nowrap"><code class="PARAMETER">msg</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the additional error message.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECERRORSDEFAULTCALLBACKENABLEOUTPUT"></a><h3>xmlSecErrorsDefaultCallbackEnableOutput ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecErrorsDefaultCallbackEnableOutput
-                                                        (<font>int</font> enabled);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecErrorsDefaultCallbackEnableOutput
+                                                        (<code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> enabled</code>);</pre>
 <p>Enables or disables calling LibXML2 callback from the default
 errors callback.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN5087"><span style="white-space: nowrap"><code class="PARAMETER">enabled</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the flag.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6062"><span style="white-space: nowrap"><code class="PARAMETER">enabled</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECERRORSGETCODE"></a><h3>xmlSecErrorsGetCode ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecErrorsGetCode                 (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecErrorsGetCode                 (<code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);</pre>
 <p>Gets the known error code at position <code class="PARAMETER">pos</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5103"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the error position.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6080"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error position.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5108"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6085"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the known error code or 0 if <code class="PARAMETER">pos</code> is greater than
 total number of known error codes.</p></td>
 </tr>
@@ -671,17 +617,16 @@ total number of known error codes.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECERRORSGETMSG"></a><h3>xmlSecErrorsGetMsg ()</h3>
-<pre class="PROGRAMLISTING">const <font>char</font>*         xmlSecErrorsGetMsg                  (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<pre class="PROGRAMLISTING">const <gtkdoclink href="CHAR"><span class="RETURNVALUE">char</span></gtkdoclink>*         xmlSecErrorsGetMsg                  (<code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);</pre>
 <p>Gets the known error message at position <code class="PARAMETER">pos</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5125"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the error position.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6104"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error position.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5130"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6109"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the known error message or NULL if <code class="PARAMETER">pos</code> is greater than
 total number of known error codes.</p></td>
 </tr>
@@ -689,11 +634,10 @@ total number of known error codes.</p></td>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-HERE--CAPS"></a><h3>XMLSEC_ERRORS_HERE</h3>
+<a name="XMLSEC-ERRORS-HERE:CAPS"></a><h3>XMLSEC_ERRORS_HERE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_HERE                      __FILE__,__LINE__,__XMLSEC_FUNCTION__</pre>
 <p>The macro that specifies the location (file, line and function)
 for the <a href="xmlsec-errors.html#XMLSECERROR"><code class="FUNCTION">xmlSecError()</code></a> function.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
@@ -701,67 +645,64 @@ for the <a href="xmlsec-errors.html#XMLSECERROR"><code class="FUNCTION">xmlSecEr
 <pre class="PROGRAMLISTING">#define             xmlSecErrorsSafeString(str)</pre>
 <p>Macro. Returns <code class="PARAMETER">str</code> if it is not NULL or pointer to "NULL" otherwise.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN5154"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the string.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6131"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the string.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ERRORS-NO-MESSAGE--CAPS"></a><h3>XMLSEC_ERRORS_NO_MESSAGE</h3>
+<a name="XMLSEC-ERRORS-NO-MESSAGE:CAPS"></a><h3>XMLSEC_ERRORS_NO_MESSAGE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_NO_MESSAGE                " "</pre>
 <p>Empty error message " ".</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECERROR"></a><h3>xmlSecError ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecError                         (const <font>char</font> *file,
-                                                         <font>int</font> line,
-                                                         const <font>char</font> *func,
-                                                         const <font>char</font> *errorObject,
-                                                         const <font>char</font> *errorSubject,
-                                                         <font>int</font> reason,
-                                                         const <font>char</font> *msg,
-                                                         ...);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecError                         (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *file</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> line</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *func</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorObject</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorSubject</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> reason</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *msg</code>,
+                                                         <code class="PARAMETER">...</code>);</pre>
 <p>Reports an error to the default (<a href="xmlsec-errors.html#XMLSECERRORSDEFAULTCALLBACK"><span class="TYPE">xmlSecErrorsDefaultCallback</span></a>) or
 application specific callback installed using <a href="xmlsec-errors.html#XMLSECERRORSSETCALLBACK"><span class="TYPE">xmlSecErrorsSetCallback</span></a>
 function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5186"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the error location filename (__FILE__).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6177"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error location filename (__FILE__).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5191"><span style="white-space: nowrap"><code class="PARAMETER">line</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the error location line number (__LINE__).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6182"><span style="white-space: nowrap"><code class="PARAMETER">line</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error location line number (__LINE__).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5196"><span style="white-space: nowrap"><code class="PARAMETER">func</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the error location function (__FUNCTIION__).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6187"><span style="white-space: nowrap"><code class="PARAMETER">func</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error location function (__FUNCTIION__).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5201"><span style="white-space: nowrap"><code class="PARAMETER">errorObject</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the error specific error object</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6192"><span style="white-space: nowrap"><code class="PARAMETER">errorObject</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error specific error object</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5206"><span style="white-space: nowrap"><code class="PARAMETER">errorSubject</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the error specific error subject.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6197"><span style="white-space: nowrap"><code class="PARAMETER">errorSubject</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error specific error subject.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5211"><span style="white-space: nowrap"><code class="PARAMETER">reason</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the error code.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6202"><span style="white-space: nowrap"><code class="PARAMETER">reason</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error code.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5216"><span style="white-space: nowrap"><code class="PARAMETER">msg</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the error message in printf format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6207"><span style="white-space: nowrap"><code class="PARAMETER">msg</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error message in printf format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5221"><span style="white-space: nowrap"><code class="PARAMETER">...</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the parameters for the <code class="PARAMETER">msg</code>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6212"><span style="white-space: nowrap"><code class="PARAMETER">...</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the parameters for the <code class="PARAMETER">msg</code>.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -771,10 +712,9 @@ function.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecAssert( p )</pre>
 <p>Macro. Verifies that <code class="PARAMETER">p</code> is true and calls <gtkdoclink href="RETURN"><code class="FUNCTION">return()</code></gtkdoclink> otherwise.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN5238"><span style="white-space: nowrap"><code class="PARAMETER">p</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the expression.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6228"><span style="white-space: nowrap"><code class="PARAMETER">p</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the expression.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -783,15 +723,14 @@ function.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecAssert2( p, ret )</pre>
 <p>Macro. Verifies that <code class="PARAMETER">p</code> is true and calls return(<code class="PARAMETER">ret</code>) otherwise.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5253"><span style="white-space: nowrap"><code class="PARAMETER">p</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the expression.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6242"><span style="white-space: nowrap"><code class="PARAMETER">p</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the expression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5258"><span style="white-space: nowrap"><code class="PARAMETER">ret</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the return value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6247"><span style="white-space: nowrap"><code class="PARAMETER">ret</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the return value.</p></td>
 </tr>
 </tbody></table>
 </div>
diff --git a/docs/api/xmlsec-gcrypt.sgml b/docs/api/xmlsec-gcrypt.sgml
index b5c2bf2..5c33c60 100644
--- a/docs/api/xmlsec-gcrypt.sgml
+++ b/docs/api/xmlsec-gcrypt.sgml
@@ -1,6 +1,6 @@
 <!doctype book PUBLIC "-//DavenPort//DTD DocBook V3.0//EN" [
-<!ENTITY xmlsec-gnutls-app SYSTEM "sgml/app.sgml">
-<!ENTITY xmlsec-gnutls-crypto SYSTEM "sgml/crypto.sgml">
+<!ENTITY xmlsec-gcrypt-app SYSTEM "sgml/app.sgml">
+<!ENTITY xmlsec-gcrypt-crypto SYSTEM "sgml/crypto.sgml">
 ]>
 <book id="index">
   <bookinfo>
@@ -9,7 +9,7 @@
 
   <chapter>
     <title>[Insert title here]</title>
-    &xmlsec-gnutls-app;
-    &xmlsec-gnutls-crypto;
+    &xmlsec-gcrypt-app;
+    &xmlsec-gcrypt-crypto;
   </chapter>
 </book>
diff --git a/docs/api/xmlsec-gnutls-app.html b/docs/api/xmlsec-gnutls-app.html
index 7f04d91..de72c3b 100644
--- a/docs/api/xmlsec-gnutls-app.html
+++ b/docs/api/xmlsec-gnutls-app.html
@@ -87,59 +87,59 @@
 <h1>
 <a name="XMLSEC-GNUTLS-APP"></a>app</h1>
 <div class="REFNAMEDIV">
-<a name="AEN24280"></a><h2>Name</h2>app -- Application functions implementation for GnuTLS.</div>
+<a name="AEN29838"></a><h2>Name</h2>app -- Application functions implementation for GnuTLS.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-GNUTLS-APP.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS"><font>int</font>                 <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPINIT">xmlSecGnuTLSAppInit</a>                 (const <font>char</font> *config);
-<font>int</font>                 <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPSHUTDOWN">xmlSecGnuTLSAppShutdown</a>             (void);
-<font>int</font>                 <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRINIT">xmlSecGnuTLSAppDefaultKeysMngrInit</a>  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>int</font>                 <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecGnuTLSAppDefaultKeysMngrAdoptKey</a>
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>                 <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRLOAD">xmlSecGnuTLSAppDefaultKeysMngrLoad</a>  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *uri);
-<font>int</font>                 <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRSAVE">xmlSecGnuTLSAppDefaultKeysMngrSave</a>  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>                 <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYSMNGRCERTLOAD">xmlSecGnuTLSAppKeysMngrCertLoad</a>     (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>                 <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYSMNGRCERTLOADMEMORY">xmlSecGnuTLSAppKeysMngrCertLoadMemory</a>
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYLOAD">xmlSecGnuTLSAppKeyLoad</a>              (const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYLOADMEMORY">xmlSecGnuTLSAppKeyLoadMemory</a>        (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPPKCS12LOAD">xmlSecGnuTLSAppPkcs12Load</a>           (const <font>char</font> *filename,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPPKCS12LOADMEMORY">xmlSecGnuTLSAppPkcs12LoadMemory</a>     (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<font>int</font>                 <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYCERTLOAD">xmlSecGnuTLSAppKeyCertLoad</a>          (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>int</font>                 <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYCERTLOADMEMORY">xmlSecGnuTLSAppKeyCertLoadMemory</a>    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>void</font>*               <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPGETDEFAULTPWDCALLBACK">xmlSecGnuTLSAppGetDefaultPwdCallback</a>
-                                                        (void);</pre>
+<pre class="SYNOPSIS"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPINIT">xmlSecGnuTLSAppInit</a>                 (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *config</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPSHUTDOWN">xmlSecGnuTLSAppShutdown</a>             (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRINIT">xmlSecGnuTLSAppDefaultKeysMngrInit</a>  (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecGnuTLSAppDefaultKeysMngrAdoptKey</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRLOAD">xmlSecGnuTLSAppDefaultKeysMngrLoad</a>  (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *uri</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRSAVE">xmlSecGnuTLSAppDefaultKeysMngrSave</a>  (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYSMNGRCERTLOAD">xmlSecGnuTLSAppKeysMngrCertLoad</a>     (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYSMNGRCERTLOADMEMORY">xmlSecGnuTLSAppKeysMngrCertLoadMemory</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYLOAD">xmlSecGnuTLSAppKeyLoad</a>              (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYLOADMEMORY">xmlSecGnuTLSAppKeyLoadMemory</a>        (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPPKCS12LOAD">xmlSecGnuTLSAppPkcs12Load</a>           (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPPKCS12LOADMEMORY">xmlSecGnuTLSAppPkcs12LoadMemory</a>     (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYCERTLOAD">xmlSecGnuTLSAppKeyCertLoad</a>          (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYCERTLOADMEMORY">xmlSecGnuTLSAppKeyCertLoadMemory</a>    (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>*               <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPGETDEFAULTPWDCALLBACK">xmlSecGnuTLSAppGetDefaultPwdCallback</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-GNUTLS-APP.DESCRIPTION"></a><h2>Description</h2>
@@ -149,19 +149,18 @@
 <a name="XMLSEC-GNUTLS-APP.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSAPPINIT"></a><h3>xmlSecGnuTLSAppInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSAppInit                 (const <font>char</font> *config);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSAppInit                 (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *config</code>);</pre>
 <p>General crypto engine initialization. This function is used
 by XMLSec command line utility and called before
 <code class="PARAMETER">xmlSecInit</code> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24377"><span style="white-space: nowrap"><code class="PARAMETER">config</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the path to GnuTLS configuration (unused).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30046"><span style="white-space: nowrap"><code class="PARAMETER">config</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the path to GnuTLS configuration (unused).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24382"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30051"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -169,32 +168,30 @@ by XMLSec command line utility and called before
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSAPPSHUTDOWN"></a><h3>xmlSecGnuTLSAppShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSAppShutdown             (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSAppShutdown             (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after
 <code class="PARAMETER">xmlSecShutdown</code> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24397"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30068"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSAPPDEFAULTKEYSMNGRINIT"></a><h3>xmlSecGnuTLSAppDefaultKeysMngrInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSAppDefaultKeysMngrInit  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSAppDefaultKeysMngrInit  (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);</pre>
 <p>Initializes <code class="PARAMETER">mngr</code> with simple keys store <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREID"><span class="TYPE">xmlSecSimpleKeysStoreId</span></a>
 and a default GnuTLS crypto key data stores.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24415"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30088"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24420"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30093"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -202,24 +199,23 @@ and a default GnuTLS crypto key data stores.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSAPPDEFAULTKEYSMNGRADOPTKEY"></a><h3>xmlSecGnuTLSAppDefaultKeysMngrAdoptKey ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSAppDefaultKeysMngrAdoptKey
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSAppDefaultKeysMngrAdoptKey
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);</pre>
 <p>Adds <code class="PARAMETER">key</code> to the keys manager <code class="PARAMETER">mngr</code> created with <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecGnuTLSAppDefaultKeysMngrInit</span></a>
 function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24440"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30117"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24445"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30122"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24450"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30127"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -227,23 +223,22 @@ function.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSAPPDEFAULTKEYSMNGRLOAD"></a><h3>xmlSecGnuTLSAppDefaultKeysMngrLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSAppDefaultKeysMngrLoad  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *uri);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSAppDefaultKeysMngrLoad  (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *uri</code>);</pre>
 <p>Loads XML keys file from <code class="PARAMETER">uri</code> to the keys manager <code class="PARAMETER">mngr</code> created
 with <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecGnuTLSAppDefaultKeysMngrInit</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24470"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30151"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24475"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the uri.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30156"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the uri.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24480"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30161"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -251,27 +246,26 @@ with <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRINIT"><span c
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSAPPDEFAULTKEYSMNGRSAVE"></a><h3>xmlSecGnuTLSAppDefaultKeysMngrSave ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSAppDefaultKeysMngrSave  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSAppDefaultKeysMngrSave  (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Saves keys from <code class="PARAMETER">mngr</code> to  XML keys file.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24498"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30185"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24503"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the destination filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30190"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the destination filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24508"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the type of keys to save (public/private/symmetric).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30195"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the type of keys to save (public/private/symmetric).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24513"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30200"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -279,34 +273,33 @@ with <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRINIT"><span c
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSAPPKEYSMNGRCERTLOAD"></a><h3>xmlSecGnuTLSAppKeysMngrCertLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSAppKeysMngrCertLoad     (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSAppKeysMngrCertLoad     (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Reads cert from <code class="PARAMETER">filename</code> and adds to the list of trusted or known
 untrusted certs in <code class="PARAMETER">store</code> (not implemented yet).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24533"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30228"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24538"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the certificate file.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30233"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24543"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30238"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24548"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the flag that indicates is the certificate in <code class="PARAMETER">filename</code>
+<td align="LEFT" valign="TOP"><a name="AEN30243"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag that indicates is the certificate in <code class="PARAMETER">filename</code>
                      trusted or not.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24554"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30249"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -314,39 +307,38 @@ untrusted certs in <code class="PARAMETER">store</code> (not implemented yet).</
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSAPPKEYSMNGRCERTLOADMEMORY"></a><h3>xmlSecGnuTLSAppKeysMngrCertLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSAppKeysMngrCertLoadMemory
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSAppKeysMngrCertLoadMemory
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Reads cert from binary buffer <code class="PARAMETER">data</code> and adds to the list of trusted or known
 untrusted certs in <code class="PARAMETER">store</code> (not implemented yet).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24575"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30280"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24580"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the certificate binary data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30285"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24585"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the certificate binary data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30290"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24590"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30295"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24595"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the flag that indicates is the certificate trusted or not.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30300"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag that indicates is the certificate trusted or not.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24600"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30305"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -354,37 +346,36 @@ untrusted certs in <code class="PARAMETER">store</code> (not implemented yet).</
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSAPPKEYLOAD"></a><h3>xmlSecGnuTLSAppKeyLoad ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecGnuTLSAppKeyLoad              (const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecGnuTLSAppKeyLoad              (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key from the a file (not implemented yet).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24619"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the key filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30334"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24624"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the key file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30339"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24629"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the key file password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30344"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24634"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the key password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30349"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24639"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30354"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24644"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30359"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -392,42 +383,41 @@ untrusted certs in <code class="PARAMETER">store</code> (not implemented yet).</
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSAPPKEYLOADMEMORY"></a><h3>xmlSecGnuTLSAppKeyLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecGnuTLSAppKeyLoadMemory        (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecGnuTLSAppKeyLoadMemory        (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key from the memory buffer (not implemented yet).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24664"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the binary key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30391"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24669"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the size of binary key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30396"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the size of binary key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24674"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the key file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30401"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24679"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the key file password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30406"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24684"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the key password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30411"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24689"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30416"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24694"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30421"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -435,35 +425,34 @@ untrusted certs in <code class="PARAMETER">store</code> (not implemented yet).</
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSAPPPKCS12LOAD"></a><h3>xmlSecGnuTLSAppPkcs12Load ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecGnuTLSAppPkcs12Load           (const <font>char</font> *filename,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecGnuTLSAppPkcs12Load           (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key and all associated certificates from the PKCS12 file
 (not implemented yet).
 For uniformity, call xmlSecGnuTLSAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24712"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the PKCS12 key filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30447"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24717"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the PKCS12 file password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30452"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24722"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30457"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24727"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30462"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24732"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30467"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -471,39 +460,38 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSAPPPKCS12LOADMEMORY"></a><h3>xmlSecGnuTLSAppPkcs12LoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecGnuTLSAppPkcs12LoadMemory     (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecGnuTLSAppPkcs12LoadMemory     (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key and all associated certificates from the PKCS12 data in memory buffer.
 For uniformity, call xmlSecGnuTLSAppKeyLoadMemory instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12 (not implemented yet).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24751"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the PKCS12 binary data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30496"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24756"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the PKCS12 binary data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30501"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24761"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the PKCS12 file password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30506"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24766"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30511"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24771"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30516"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24776"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30521"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -511,28 +499,27 @@ in format=xmlSecKeyDataFormatPkcs12 (not implemented yet).</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSAPPKEYCERTLOAD"></a><h3>xmlSecGnuTLSAppKeyCertLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSAppKeyCertLoad          (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSAppKeyCertLoad          (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);</pre>
 <p>Reads the certificate from $<code class="PARAMETER">filename</code> and adds it to key
 (not implemented yet).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24794"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30545"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24799"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the certificate filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30550"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24804"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30555"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24809"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30560"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -540,32 +527,31 @@ in format=xmlSecKeyDataFormatPkcs12 (not implemented yet).</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSAPPKEYCERTLOADMEMORY"></a><h3>xmlSecGnuTLSAppKeyCertLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSAppKeyCertLoadMemory    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSAppKeyCertLoadMemory    (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);</pre>
 <p>Reads the certificate from memory buffer and adds it to key (not implemented yet).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24827"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30586"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24832"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the certificate binary data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30591"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24837"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the certificate binary data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30596"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24842"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30601"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24847"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30606"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -573,13 +559,12 @@ in format=xmlSecKeyDataFormatPkcs12 (not implemented yet).</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSAPPGETDEFAULTPWDCALLBACK"></a><h3>xmlSecGnuTLSAppGetDefaultPwdCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>*               xmlSecGnuTLSAppGetDefaultPwdCallback
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>*               xmlSecGnuTLSAppGetDefaultPwdCallback
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Gets default password callback.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24861"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30622"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> default password callback.</p></td>
 </tr></tbody></table>
 </div>
diff --git a/docs/api/xmlsec-gnutls-crypto.html b/docs/api/xmlsec-gnutls-crypto.html
index dff41e2..6c784bf 100644
--- a/docs/api/xmlsec-gnutls-crypto.html
+++ b/docs/api/xmlsec-gnutls-crypto.html
@@ -6,7 +6,7 @@
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library for GnuTLS API Reference." href="xmlsec-gnutls-ref.html">
 <link rel="PREVIOUS" title="app" href="xmlsec-gnutls-app.html">
-<link rel="NEXT" title="XML Security Library for NSS API Reference." href="xmlsec-nss-ref.html">
+<link rel="NEXT" title="XML Security Library for GCrypt API Reference." href="xmlsec-gcrypt-ref.html">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -82,81 +82,130 @@
 <td><a accesskey="u" href="xmlsec-gnutls-ref.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">XML Security Library Reference Manual</th>
-<td><a accesskey="n" href="xmlsec-nss-ref.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="xmlsec-gcrypt-ref.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr></table>
 <h1>
 <a name="XMLSEC-GNUTLS-CRYPTO"></a>crypto</h1>
 <div class="REFNAMEDIV">
-<a name="AEN24871"></a><h2>Name</h2>crypto -- Crypto transforms implementation for GnuTLS.</div>
+<a name="AEN30632"></a><h2>Name</h2>crypto -- Crypto transforms implementation for GnuTLS.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-GNUTLS-CRYPTO.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS"><font>xmlSecCryptoDLFunctionsPtr</font>  <a href="xmlsec-gnutls-crypto.html#XMLSECCRYPTOGETFUNCTIONS-GNUTLS">xmlSecCryptoGetFunctions_gnutls</a>
-                                                        (void);
-<font>int</font>                 <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSINIT">xmlSecGnuTLSInit</a>                    (void);
-<font>int</font>                 <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSSHUTDOWN">xmlSecGnuTLSShutdown</a>                (void);
-<font>int</font>                 <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYSMNGRINIT">xmlSecGnuTLSKeysMngrInit</a>            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>int</font>                 <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSGENERATERANDOM">xmlSecGnuTLSGenerateRandom</a>          (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
+<pre class="SYNOPSIS"><gtkdoclink href="XMLSECCRYPTODLFUNCTIONS"><span class="RETURNVALUE">xmlSecCryptoDLFunctionsPtr</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECCRYPTOGETFUNCTIONS-GNUTLS">xmlSecCryptoGetFunctions_gnutls</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSINIT">xmlSecGnuTLSInit</a>                    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSSHUTDOWN">xmlSecGnuTLSShutdown</a>                (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYSMNGRINIT">xmlSecGnuTLSKeysMngrInit</a>            (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSGENERATERANDOM">xmlSecGnuTLSGenerateRandom</a>          (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buffer</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);
 #define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAAESID">xmlSecGnuTLSKeyDataAesId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAAESGETKLASS">xmlSecGnuTLSKeyDataAesGetKlass</a>      (void);
-<font>int</font>                 <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAAESSET">xmlSecGnuTLSKeyDataAesSet</a>           (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAAESGETKLASS">xmlSecGnuTLSKeyDataAesGetKlass</a>      (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAAESSET">xmlSecGnuTLSKeyDataAesSet</a>           (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);
 #define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES128CBCID">xmlSecGnuTLSTransformAes128CbcId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES128CBCGETKLASS">xmlSecGnuTLSTransformAes128CbcGetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES128CBCGETKLASS">xmlSecGnuTLSTransformAes128CbcGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES192CBCID">xmlSecGnuTLSTransformAes192CbcId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES192CBCGETKLASS">xmlSecGnuTLSTransformAes192CbcGetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES192CBCGETKLASS">xmlSecGnuTLSTransformAes192CbcGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES256CBCID">xmlSecGnuTLSTransformAes256CbcId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES256CBCGETKLASS">xmlSecGnuTLSTransformAes256CbcGetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES256CBCGETKLASS">xmlSecGnuTLSTransformAes256CbcGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMKWAES128ID">xmlSecGnuTLSTransformKWAes128Id</a>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMKWAES128GETKLASS">xmlSecGnuTLSTransformKWAes128GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMKWAES192ID">xmlSecGnuTLSTransformKWAes192Id</a>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMKWAES192GETKLASS">xmlSecGnuTLSTransformKWAes192GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMKWAES256ID">xmlSecGnuTLSTransformKWAes256Id</a>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMKWAES256GETKLASS">xmlSecGnuTLSTransformKWAes256GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADESID">xmlSecGnuTLSKeyDataDesId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADESGETKLASS">xmlSecGnuTLSKeyDataDesGetKlass</a>      (void);
-<font>int</font>                 <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADESSET">xmlSecGnuTLSKeyDataDesSet</a>           (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADESGETKLASS">xmlSecGnuTLSKeyDataDesGetKlass</a>      (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADESSET">xmlSecGnuTLSKeyDataDesSet</a>           (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);
 #define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMDES3CBCID">xmlSecGnuTLSTransformDes3CbcId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMDES3CBCGETKLASS">xmlSecGnuTLSTransformDes3CbcGetKlass</a>
-                                                        (void);
-<font>int</font>                 <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSHMACGETMINOUTPUTLENGTH">xmlSecGnuTLSHmacGetMinOutputLength</a>  (void);
-<font>void</font>                <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSHMACSETMINOUTPUTLENGTH">xmlSecGnuTLSHmacSetMinOutputLength</a>  (<font>int</font> min_length);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMDES3CBCGETKLASS">xmlSecGnuTLSTransformDes3CbcGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMKWDES3ID">xmlSecGnuTLSTransformKWDes3Id</a>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMKWDES3GETKLASS">xmlSecGnuTLSTransformKWDes3GetKlass</a> (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADSAID">xmlSecGnuTLSKeyDataDsaId</a>
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADSAGETKLASS">xmlSecGnuTLSKeyDataDsaGetKlass</a>      (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADSAADOPTKEY">xmlSecGnuTLSKeyDataDsaAdoptKey</a>      (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="GCRY-SEXP-T"><span class="TYPE">gcry_sexp_t</span></gtkdoclink> dsa_key</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADSAADOPTKEYPAIR">xmlSecGnuTLSKeyDataDsaAdoptKeyPair</a>  (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="GCRY-SEXP-T"><span class="TYPE">gcry_sexp_t</span></gtkdoclink> pub_key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="GCRY-SEXP-T"><span class="TYPE">gcry_sexp_t</span></gtkdoclink> priv_key</code>);
+<gtkdoclink href="GCRY-SEXP-T"><span class="RETURNVALUE">gcry_sexp_t</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADSAGETPUBLICKEY">xmlSecGnuTLSKeyDataDsaGetPublicKey</a>  (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="GCRY-SEXP-T"><span class="RETURNVALUE">gcry_sexp_t</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADSAGETPRIVATEKEY">xmlSecGnuTLSKeyDataDsaGetPrivateKey</a> (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMDSASHA1ID">xmlSecGnuTLSTransformDsaSha1Id</a>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMDSASHA1GETKLASS">xmlSecGnuTLSTransformDsaSha1GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSHMACGETMINOUTPUTLENGTH">xmlSecGnuTLSHmacGetMinOutputLength</a>  (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSHMACSETMINOUTPUTLENGTH">xmlSecGnuTLSHmacSetMinOutputLength</a>  (<code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> min_length</code>);
 #define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAHMACID">xmlSecGnuTLSKeyDataHmacId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAHMACGETKLASS">xmlSecGnuTLSKeyDataHmacGetKlass</a>     (void);
-<font>int</font>                 <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAHMACSET">xmlSecGnuTLSKeyDataHmacSet</a>          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAHMACGETKLASS">xmlSecGnuTLSKeyDataHmacGetKlass</a>     (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAHMACSET">xmlSecGnuTLSKeyDataHmacSet</a>          (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);
 #define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACMD5ID">xmlSecGnuTLSTransformHmacMd5Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACMD5GETKLASS">xmlSecGnuTLSTransformHmacMd5GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACMD5GETKLASS">xmlSecGnuTLSTransformHmacMd5GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACRIPEMD160ID">xmlSecGnuTLSTransformHmacRipemd160Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACRIPEMD160GETKLASS">xmlSecGnuTLSTransformHmacRipemd160GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACRIPEMD160GETKLASS">xmlSecGnuTLSTransformHmacRipemd160GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA1ID">xmlSecGnuTLSTransformHmacSha1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA1GETKLASS">xmlSecGnuTLSTransformHmacSha1GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA1GETKLASS">xmlSecGnuTLSTransformHmacSha1GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA256ID">xmlSecGnuTLSTransformHmacSha256Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA256GETKLASS">xmlSecGnuTLSTransformHmacSha256GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA256GETKLASS">xmlSecGnuTLSTransformHmacSha256GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA384ID">xmlSecGnuTLSTransformHmacSha384Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA384GETKLASS">xmlSecGnuTLSTransformHmacSha384GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA384GETKLASS">xmlSecGnuTLSTransformHmacSha384GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA512ID">xmlSecGnuTLSTransformHmacSha512Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA512GETKLASS">xmlSecGnuTLSTransformHmacSha512GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA512GETKLASS">xmlSecGnuTLSTransformHmacSha512GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATARSAID">xmlSecGnuTLSKeyDataRsaId</a>
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATARSAGETKLASS">xmlSecGnuTLSKeyDataRsaGetKlass</a>      (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATARSAADOPTKEY">xmlSecGnuTLSKeyDataRsaAdoptKey</a>      (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="GCRY-SEXP-T"><span class="TYPE">gcry_sexp_t</span></gtkdoclink> rsa_key</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATARSAADOPTKEYPAIR">xmlSecGnuTLSKeyDataRsaAdoptKeyPair</a>  (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="GCRY-SEXP-T"><span class="TYPE">gcry_sexp_t</span></gtkdoclink> pub_key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="GCRY-SEXP-T"><span class="TYPE">gcry_sexp_t</span></gtkdoclink> priv_key</code>);
+<gtkdoclink href="GCRY-SEXP-T"><span class="RETURNVALUE">gcry_sexp_t</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATARSAGETPUBLICKEY">xmlSecGnuTLSKeyDataRsaGetPublicKey</a>  (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="GCRY-SEXP-T"><span class="RETURNVALUE">gcry_sexp_t</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATARSAGETPRIVATEKEY">xmlSecGnuTLSKeyDataRsaGetPrivateKey</a> (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSAMD5ID">xmlSecGnuTLSTransformRsaMd5Id</a>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSAMD5GETKLASS">xmlSecGnuTLSTransformRsaMd5GetKlass</a> (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSARIPEMD160ID">xmlSecGnuTLSTransformRsaRipemd160Id</a>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSARIPEMD160GETKLASS">xmlSecGnuTLSTransformRsaRipemd160GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSASHA1ID">xmlSecGnuTLSTransformRsaSha1Id</a>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSASHA1GETKLASS">xmlSecGnuTLSTransformRsaSha1GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSASHA256ID">xmlSecGnuTLSTransformRsaSha256Id</a>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSASHA256GETKLASS">xmlSecGnuTLSTransformRsaSha256GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSASHA384ID">xmlSecGnuTLSTransformRsaSha384Id</a>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSASHA384GETKLASS">xmlSecGnuTLSTransformRsaSha384GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSASHA512ID">xmlSecGnuTLSTransformRsaSha512Id</a>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSASHA512GETKLASS">xmlSecGnuTLSTransformRsaSha512GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA1ID">xmlSecGnuTLSTransformSha1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA1GETKLASS">xmlSecGnuTLSTransformSha1GetKlass</a>   (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA1GETKLASS">xmlSecGnuTLSTransformSha1GetKlass</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA256ID">xmlSecGnuTLSTransformSha256Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA256GETKLASS">xmlSecGnuTLSTransformSha256GetKlass</a> (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA256GETKLASS">xmlSecGnuTLSTransformSha256GetKlass</a> (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA384ID">xmlSecGnuTLSTransformSha384Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA384GETKLASS">xmlSecGnuTLSTransformSha384GetKlass</a> (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA384GETKLASS">xmlSecGnuTLSTransformSha384GetKlass</a> (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA512ID">xmlSecGnuTLSTransformSha512Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA512GETKLASS">xmlSecGnuTLSTransformSha512GetKlass</a> (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA512GETKLASS">xmlSecGnuTLSTransformSha512GetKlass</a> (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMMD5ID">xmlSecGnuTLSTransformMd5Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMMD5GETKLASS">xmlSecGnuTLSTransformMd5GetKlass</a>    (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMMD5GETKLASS">xmlSecGnuTLSTransformMd5GetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRIPEMD160ID">xmlSecGnuTLSTransformRipemd160Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRIPEMD160GETKLASS">xmlSecGnuTLSTransformRipemd160GetKlass</a>
-                                                        (void);</pre>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRIPEMD160GETKLASS">xmlSecGnuTLSTransformRipemd160GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-GNUTLS-CRYPTO.DESCRIPTION"></a><h2>Description</h2>
@@ -166,54 +215,50 @@
 <a name="XMLSEC-GNUTLS-CRYPTO.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOGETFUNCTIONS-GNUTLS"></a><h3>xmlSecCryptoGetFunctions_gnutls ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecCryptoDLFunctionsPtr</font>  xmlSecCryptoGetFunctions_gnutls
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECCRYPTODLFUNCTIONS"><span class="RETURNVALUE">xmlSecCryptoDLFunctionsPtr</span></gtkdoclink>  xmlSecCryptoGetFunctions_gnutls
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Gets the pointer to xmlsec-gnutls functions table.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24981"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30989"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the xmlsec-gnutls functions table or NULL if an error occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSINIT"></a><h3>xmlSecGnuTLSInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSInit                    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSInit                    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>XMLSec library specific crypto engine initialization.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24995"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31005"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSSHUTDOWN"></a><h3>xmlSecGnuTLSShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSShutdown                (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSShutdown                (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>XMLSec library specific crypto engine shutdown.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25009"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31021"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSKEYSMNGRINIT"></a><h3>xmlSecGnuTLSKeysMngrInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSKeysMngrInit            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSKeysMngrInit            (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);</pre>
 <p>Adds GnuTLS specific key data stores in keys manager.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25024"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN31038"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25029"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31043"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -221,22 +266,21 @@
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSGENERATERANDOM"></a><h3>xmlSecGnuTLSGenerateRandom ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSGenerateRandom          (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSGenerateRandom          (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buffer</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);</pre>
 <p>Generates <code class="PARAMETER">size</code> random bytes and puts result in <code class="PARAMETER">buffer</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25047"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the destination buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN31065"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the destination buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25052"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the numer of bytes to generate.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN31070"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the numer of bytes to generate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25057"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31075"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -246,44 +290,41 @@
 <a name="XMLSECGNUTLSKEYDATAAESID"></a><h3>xmlSecGnuTLSKeyDataAesId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecGnuTLSKeyDataAesId</pre>
 <p>The AES key data klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSKEYDATAAESGETKLASS"></a><h3>xmlSecGnuTLSKeyDataAesGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecGnuTLSKeyDataAesGetKlass      (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecGnuTLSKeyDataAesGetKlass      (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The AES key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25078"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31097"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> AES key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSKEYDATAAESSET"></a><h3>xmlSecGnuTLSKeyDataAesSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSKeyDataAesSet           (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSKeyDataAesSet           (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);</pre>
 <p>Sets the value of AES key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25095"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to AES key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN31120"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to AES key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25100"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN31125"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25105"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the key value size (in bytes).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN31130"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25110"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31135"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -293,18 +334,16 @@
 <a name="XMLSECGNUTLSTRANSFORMAES128CBCID"></a><h3>xmlSecGnuTLSTransformAes128CbcId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformAes128CbcId</pre>
 <p>The AES128 CBC cipher transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSTRANSFORMAES128CBCGETKLASS"></a><h3>xmlSecGnuTLSTransformAes128CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformAes128CbcGetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformAes128CbcGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>AES 128 CBC encryption transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25131"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31157"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to AES 128 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
@@ -313,18 +352,16 @@
 <a name="XMLSECGNUTLSTRANSFORMAES192CBCID"></a><h3>xmlSecGnuTLSTransformAes192CbcId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformAes192CbcId</pre>
 <p>The AES192 CBC cipher transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSTRANSFORMAES192CBCGETKLASS"></a><h3>xmlSecGnuTLSTransformAes192CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformAes192CbcGetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformAes192CbcGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>AES 192 CBC encryption transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25152"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31179"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to AES 192 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
@@ -333,64 +370,113 @@
 <a name="XMLSECGNUTLSTRANSFORMAES256CBCID"></a><h3>xmlSecGnuTLSTransformAes256CbcId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformAes256CbcId</pre>
 <p>The AES256 CBC cipher transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSTRANSFORMAES256CBCGETKLASS"></a><h3>xmlSecGnuTLSTransformAes256CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformAes256CbcGetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformAes256CbcGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>AES 256 CBC encryption transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25173"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31201"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to AES 256 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMKWAES128ID"></a><h3>xmlSecGnuTLSTransformKWAes128Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformKWAes128Id</pre>
+<p>The AES 128 key wrap transform klass.</p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMKWAES128GETKLASS"></a><h3>xmlSecGnuTLSTransformKWAes128GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformKWAes128GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
+<p>The AES-128 kew wrapper transform klass.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN31223"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> AES-128 kew wrapper transform klass.</p></td>
+</tr></tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMKWAES192ID"></a><h3>xmlSecGnuTLSTransformKWAes192Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformKWAes192Id</pre>
+<p>The AES 192 key wrap transform klass.</p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMKWAES192GETKLASS"></a><h3>xmlSecGnuTLSTransformKWAes192GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformKWAes192GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
+<p>The AES-192 kew wrapper transform klass.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN31245"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> AES-192 kew wrapper transform klass.</p></td>
+</tr></tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMKWAES256ID"></a><h3>xmlSecGnuTLSTransformKWAes256Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformKWAes256Id</pre>
+<p>The AES 256 key wrap transform klass.</p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMKWAES256GETKLASS"></a><h3>xmlSecGnuTLSTransformKWAes256GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformKWAes256GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
+<p>The AES-256 kew wrapper transform klass.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN31267"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> AES-256 kew wrapper transform klass.</p></td>
+</tr></tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
 <a name="XMLSECGNUTLSKEYDATADESID"></a><h3>xmlSecGnuTLSKeyDataDesId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecGnuTLSKeyDataDesId</pre>
 <p>The DES key data klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSKEYDATADESGETKLASS"></a><h3>xmlSecGnuTLSKeyDataDesGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecGnuTLSKeyDataDesGetKlass      (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecGnuTLSKeyDataDesGetKlass      (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The DES key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25194"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31289"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> DES key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSKEYDATADESSET"></a><h3>xmlSecGnuTLSKeyDataDesSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSKeyDataDesSet           (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSKeyDataDesSet           (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);</pre>
 <p>Sets the value of DES key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25211"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to DES key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN31312"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to DES key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25216"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN31317"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25221"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the key value size (in bytes).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN31322"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25226"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31327"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -400,43 +486,174 @@
 <a name="XMLSECGNUTLSTRANSFORMDES3CBCID"></a><h3>xmlSecGnuTLSTransformDes3CbcId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformDes3CbcId</pre>
 <p>The DES3 CBC cipher transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSTRANSFORMDES3CBCGETKLASS"></a><h3>xmlSecGnuTLSTransformDes3CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformDes3CbcGetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformDes3CbcGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Triple DES CBC encryption transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25247"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31349"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to Triple DES encryption transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMKWDES3ID"></a><h3>xmlSecGnuTLSTransformKWDes3Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformKWDes3Id</pre>
+<p>The DES3 KW transform klass.</p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMKWDES3GETKLASS"></a><h3>xmlSecGnuTLSTransformKWDes3GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformKWDes3GetKlass (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
+<p>The Triple DES key wrapper transform klass.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN31371"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> Triple DES key wrapper transform klass.</p></td>
+</tr></tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSKEYDATADSAID"></a><h3>xmlSecGnuTLSKeyDataDsaId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSKeyDataDsaId</pre>
+<p>The DSA key klass.</p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSKEYDATADSAGETKLASS"></a><h3>xmlSecGnuTLSKeyDataDsaGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecGnuTLSKeyDataDsaGetKlass      (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
+<p>The DSA key data klass.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN31393"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to DSA key data klass.</p></td>
+</tr></tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSKEYDATADSAADOPTKEY"></a><h3>xmlSecGnuTLSKeyDataDsaAdoptKey ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSKeyDataDsaAdoptKey      (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="GCRY-SEXP-T"><span class="TYPE">gcry_sexp_t</span></gtkdoclink> dsa_key</code>);</pre>
+<p>Sets the value of DSA key data.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31413"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to DSA key data.</p></td>
+</tr>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31418"><span style="white-space: nowrap"><code class="PARAMETER">dsa_key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to GnuTLS DSA key.</p></td>
+</tr>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31423"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
+</tr>
+</tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSKEYDATADSAADOPTKEYPAIR"></a><h3>xmlSecGnuTLSKeyDataDsaAdoptKeyPair ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSKeyDataDsaAdoptKeyPair  (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="GCRY-SEXP-T"><span class="TYPE">gcry_sexp_t</span></gtkdoclink> pub_key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="GCRY-SEXP-T"><span class="TYPE">gcry_sexp_t</span></gtkdoclink> priv_key</code>);</pre>
+<p>Sets the value of DSA key data.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31446"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to DSA key data.</p></td>
+</tr>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31451"><span style="white-space: nowrap"><code class="PARAMETER">pub_key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to GnuTLS DSA pub key.</p></td>
+</tr>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31456"><span style="white-space: nowrap"><code class="PARAMETER">priv_key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to GnuTLS DSA priv key.</p></td>
+</tr>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31461"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
+</tr>
+</tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSKEYDATADSAGETPUBLICKEY"></a><h3>xmlSecGnuTLSKeyDataDsaGetPublicKey ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="GCRY-SEXP-T"><span class="RETURNVALUE">gcry_sexp_t</span></gtkdoclink>         xmlSecGnuTLSKeyDataDsaGetPublicKey  (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
+<p>Gets the GnuTLS DSA public key from DSA key data.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31478"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to DSA key data.</p></td>
+</tr>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31483"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to GnuTLS public DSA key or NULL if an error occurs.</p></td>
+</tr>
+</tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSKEYDATADSAGETPRIVATEKEY"></a><h3>xmlSecGnuTLSKeyDataDsaGetPrivateKey ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="GCRY-SEXP-T"><span class="RETURNVALUE">gcry_sexp_t</span></gtkdoclink>         xmlSecGnuTLSKeyDataDsaGetPrivateKey (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
+<p>Gets the GnuTLS DSA private key from DSA key data.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31500"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to DSA key data.</p></td>
+</tr>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31505"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to GnuTLS private DSA key or NULL if an error occurs.</p></td>
+</tr>
+</tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMDSASHA1ID"></a><h3>xmlSecGnuTLSTransformDsaSha1Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformDsaSha1Id</pre>
+<p>The DSA SHA1 signature transform klass.</p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMDSASHA1GETKLASS"></a><h3>xmlSecGnuTLSTransformDsaSha1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformDsaSha1GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
+<p></p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN31527"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p></p></td>
+</tr></tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
 <a name="XMLSECGNUTLSHMACGETMINOUTPUTLENGTH"></a><h3>xmlSecGnuTLSHmacGetMinOutputLength ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSHmacGetMinOutputLength  (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSHmacGetMinOutputLength  (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Gets the value of min HMAC length.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25261"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31543"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the min HMAC output length</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSHMACSETMINOUTPUTLENGTH"></a><h3>xmlSecGnuTLSHmacSetMinOutputLength ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecGnuTLSHmacSetMinOutputLength  (<font>int</font> min_length);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecGnuTLSHmacSetMinOutputLength  (<code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> min_length</code>);</pre>
 <p>Sets the min HMAC output length</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25276"><span style="white-space: nowrap"><code class="PARAMETER">min_length</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the new min length</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN31560"><span style="white-space: nowrap"><code class="PARAMETER">min_length</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new min length</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -444,44 +661,41 @@
 <a name="XMLSECGNUTLSKEYDATAHMACID"></a><h3>xmlSecGnuTLSKeyDataHmacId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecGnuTLSKeyDataHmacId</pre>
 <p>The HMAC key klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSKEYDATAHMACGETKLASS"></a><h3>xmlSecGnuTLSKeyDataHmacGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecGnuTLSKeyDataHmacGetKlass     (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecGnuTLSKeyDataHmacGetKlass     (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25297"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31582"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> HMAC key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSKEYDATAHMACSET"></a><h3>xmlSecGnuTLSKeyDataHmacSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSKeyDataHmacSet          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSKeyDataHmacSet          (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);</pre>
 <p>Sets the value of HMAC key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25314"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to HMAC key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN31605"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to HMAC key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25319"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN31610"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25324"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the key value size (in bytes).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN31615"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25329"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31620"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -491,18 +705,16 @@
 <a name="XMLSECGNUTLSTRANSFORMHMACMD5ID"></a><h3>xmlSecGnuTLSTransformHmacMd5Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformHmacMd5Id</pre>
 <p>The HMAC with MD5 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSTRANSFORMHMACMD5GETKLASS"></a><h3>xmlSecGnuTLSTransformHmacMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformHmacMd5GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformHmacMd5GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-MD5 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25350"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31642"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-MD5 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -511,18 +723,16 @@
 <a name="XMLSECGNUTLSTRANSFORMHMACRIPEMD160ID"></a><h3>xmlSecGnuTLSTransformHmacRipemd160Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformHmacRipemd160Id</pre>
 <p>The HMAC with RipeMD160 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSTRANSFORMHMACRIPEMD160GETKLASS"></a><h3>xmlSecGnuTLSTransformHmacRipemd160GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformHmacRipemd160GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformHmacRipemd160GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-RIPEMD160 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25371"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31664"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-RIPEMD160 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -531,18 +741,16 @@
 <a name="XMLSECGNUTLSTRANSFORMHMACSHA1ID"></a><h3>xmlSecGnuTLSTransformHmacSha1Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformHmacSha1Id</pre>
 <p>The HMAC with SHA1 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSTRANSFORMHMACSHA1GETKLASS"></a><h3>xmlSecGnuTLSTransformHmacSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformHmacSha1GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformHmacSha1GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA1 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25392"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31686"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA1 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -551,18 +759,16 @@
 <a name="XMLSECGNUTLSTRANSFORMHMACSHA256ID"></a><h3>xmlSecGnuTLSTransformHmacSha256Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformHmacSha256Id</pre>
 <p>The HMAC with SHA256 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSTRANSFORMHMACSHA256GETKLASS"></a><h3>xmlSecGnuTLSTransformHmacSha256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformHmacSha256GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformHmacSha256GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA256 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25413"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31708"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA256 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -571,18 +777,16 @@
 <a name="XMLSECGNUTLSTRANSFORMHMACSHA384ID"></a><h3>xmlSecGnuTLSTransformHmacSha384Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformHmacSha384Id</pre>
 <p>The HMAC with SHA384 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSTRANSFORMHMACSHA384GETKLASS"></a><h3>xmlSecGnuTLSTransformHmacSha384GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformHmacSha384GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformHmacSha384GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA384 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25434"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31730"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA384 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -591,37 +795,240 @@
 <a name="XMLSECGNUTLSTRANSFORMHMACSHA512ID"></a><h3>xmlSecGnuTLSTransformHmacSha512Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformHmacSha512Id</pre>
 <p>The HMAC with SHA512 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSTRANSFORMHMACSHA512GETKLASS"></a><h3>xmlSecGnuTLSTransformHmacSha512GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformHmacSha512GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformHmacSha512GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA512 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25455"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN31752"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA512 transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
+<a name="XMLSECGNUTLSKEYDATARSAID"></a><h3>xmlSecGnuTLSKeyDataRsaId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSKeyDataRsaId</pre>
+<p>The RSA key klass.</p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSKEYDATARSAGETKLASS"></a><h3>xmlSecGnuTLSKeyDataRsaGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecGnuTLSKeyDataRsaGetKlass      (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
+<p>The GnuTLS RSA key data klass.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN31774"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to GnuTLS RSA key data klass.</p></td>
+</tr></tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSKEYDATARSAADOPTKEY"></a><h3>xmlSecGnuTLSKeyDataRsaAdoptKey ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSKeyDataRsaAdoptKey      (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="GCRY-SEXP-T"><span class="TYPE">gcry_sexp_t</span></gtkdoclink> rsa_key</code>);</pre>
+<p>Sets the value of RSA key data.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31794"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to RSA key data.</p></td>
+</tr>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31799"><span style="white-space: nowrap"><code class="PARAMETER">rsa_key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to GnuTLS RSA key.</p></td>
+</tr>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31804"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
+</tr>
+</tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSKEYDATARSAADOPTKEYPAIR"></a><h3>xmlSecGnuTLSKeyDataRsaAdoptKeyPair ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGnuTLSKeyDataRsaAdoptKeyPair  (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="GCRY-SEXP-T"><span class="TYPE">gcry_sexp_t</span></gtkdoclink> pub_key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="GCRY-SEXP-T"><span class="TYPE">gcry_sexp_t</span></gtkdoclink> priv_key</code>);</pre>
+<p>Sets the value of RSA key data.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31827"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to RSA key data.</p></td>
+</tr>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31832"><span style="white-space: nowrap"><code class="PARAMETER">pub_key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to GnuTLS RSA pub key.</p></td>
+</tr>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31837"><span style="white-space: nowrap"><code class="PARAMETER">priv_key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to GnuTLS RSA priv key.</p></td>
+</tr>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31842"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
+</tr>
+</tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSKEYDATARSAGETPUBLICKEY"></a><h3>xmlSecGnuTLSKeyDataRsaGetPublicKey ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="GCRY-SEXP-T"><span class="RETURNVALUE">gcry_sexp_t</span></gtkdoclink>         xmlSecGnuTLSKeyDataRsaGetPublicKey  (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
+<p>Gets the GnuTLS RSA public key from RSA key data.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31859"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to RSA key data.</p></td>
+</tr>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31864"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to GnuTLS public RSA key or NULL if an error occurs.</p></td>
+</tr>
+</tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSKEYDATARSAGETPRIVATEKEY"></a><h3>xmlSecGnuTLSKeyDataRsaGetPrivateKey ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="GCRY-SEXP-T"><span class="RETURNVALUE">gcry_sexp_t</span></gtkdoclink>         xmlSecGnuTLSKeyDataRsaGetPrivateKey (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
+<p>Gets the GnuTLS RSA private key from RSA key data.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31881"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to RSA key data.</p></td>
+</tr>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN31886"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to GnuTLS private RSA key or NULL if an error occurs.</p></td>
+</tr>
+</tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMRSAMD5ID"></a><h3>xmlSecGnuTLSTransformRsaMd5Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformRsaMd5Id</pre>
+<p>The RSA-MD5 signature transform klass.</p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMRSAMD5GETKLASS"></a><h3>xmlSecGnuTLSTransformRsaMd5GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformRsaMd5GetKlass (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
+<p></p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN31908"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p></p></td>
+</tr></tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMRSARIPEMD160ID"></a><h3>xmlSecGnuTLSTransformRsaRipemd160Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformRsaRipemd160Id</pre>
+<p>The RSA-RIPEMD160 signature transform klass.</p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMRSARIPEMD160GETKLASS"></a><h3>xmlSecGnuTLSTransformRsaRipemd160GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformRsaRipemd160GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
+<p></p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN31930"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p></p></td>
+</tr></tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMRSASHA1ID"></a><h3>xmlSecGnuTLSTransformRsaSha1Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformRsaSha1Id</pre>
+<p>The RSA-SHA1 signature transform klass.</p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMRSASHA1GETKLASS"></a><h3>xmlSecGnuTLSTransformRsaSha1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformRsaSha1GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
+<p></p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN31952"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p></p></td>
+</tr></tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMRSASHA256ID"></a><h3>xmlSecGnuTLSTransformRsaSha256Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformRsaSha256Id</pre>
+<p>The RSA-SHA256 signature transform klass.</p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMRSASHA256GETKLASS"></a><h3>xmlSecGnuTLSTransformRsaSha256GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformRsaSha256GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
+<p></p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN31974"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p></p></td>
+</tr></tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMRSASHA384ID"></a><h3>xmlSecGnuTLSTransformRsaSha384Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformRsaSha384Id</pre>
+<p>The RSA-SHA384 signature transform klass.</p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMRSASHA384GETKLASS"></a><h3>xmlSecGnuTLSTransformRsaSha384GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformRsaSha384GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
+<p></p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN31996"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p></p></td>
+</tr></tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMRSASHA512ID"></a><h3>xmlSecGnuTLSTransformRsaSha512Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformRsaSha512Id</pre>
+<p>The RSA-SHA512 signature transform klass.</p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECGNUTLSTRANSFORMRSASHA512GETKLASS"></a><h3>xmlSecGnuTLSTransformRsaSha512GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformRsaSha512GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
+<p></p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN32018"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p></p></td>
+</tr></tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
 <a name="XMLSECGNUTLSTRANSFORMSHA1ID"></a><h3>xmlSecGnuTLSTransformSha1Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformSha1Id</pre>
 <p>The HMAC with SHA1 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSTRANSFORMSHA1GETKLASS"></a><h3>xmlSecGnuTLSTransformSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformSha1GetKlass   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformSha1GetKlass   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA-1 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25476"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN32040"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA-1 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -630,17 +1037,15 @@
 <a name="XMLSECGNUTLSTRANSFORMSHA256ID"></a><h3>xmlSecGnuTLSTransformSha256Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformSha256Id</pre>
 <p>The HMAC with SHA256 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSTRANSFORMSHA256GETKLASS"></a><h3>xmlSecGnuTLSTransformSha256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformSha256GetKlass (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformSha256GetKlass (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA256 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25497"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN32062"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA256 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -649,17 +1054,15 @@
 <a name="XMLSECGNUTLSTRANSFORMSHA384ID"></a><h3>xmlSecGnuTLSTransformSha384Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformSha384Id</pre>
 <p>The HMAC with SHA384 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSTRANSFORMSHA384GETKLASS"></a><h3>xmlSecGnuTLSTransformSha384GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformSha384GetKlass (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformSha384GetKlass (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA384 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25518"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN32084"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA384 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -668,17 +1071,15 @@
 <a name="XMLSECGNUTLSTRANSFORMSHA512ID"></a><h3>xmlSecGnuTLSTransformSha512Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformSha512Id</pre>
 <p>The HMAC with SHA512 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSTRANSFORMSHA512GETKLASS"></a><h3>xmlSecGnuTLSTransformSha512GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformSha512GetKlass (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformSha512GetKlass (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA512 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25539"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN32106"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA512 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -687,17 +1088,15 @@
 <a name="XMLSECGNUTLSTRANSFORMMD5ID"></a><h3>xmlSecGnuTLSTransformMd5Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformMd5Id</pre>
 <p>The MD5 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSTRANSFORMMD5GETKLASS"></a><h3>xmlSecGnuTLSTransformMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformMd5GetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformMd5GetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>MD5 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25560"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN32128"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to MD5 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -706,25 +1105,23 @@
 <a name="XMLSECGNUTLSTRANSFORMRIPEMD160ID"></a><h3>xmlSecGnuTLSTransformRipemd160Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformRipemd160Id</pre>
 <p>The RIPEMD160 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGNUTLSTRANSFORMRIPEMD160GETKLASS"></a><h3>xmlSecGnuTLSTransformRipemd160GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformRipemd160GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecGnuTLSTransformRipemd160GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>RIPEMD160 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25581"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN32150"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to RIPEMD160 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
 <td align="left"><a accesskey="p" href="xmlsec-gnutls-app.html"><b>&lt;&lt;&lt; app</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-nss-ref.html"><b>XML Security Library for NSS API Reference. &gt;&gt;&gt;</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-gcrypt-ref.html"><b>XML Security Library for GCrypt API Reference. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-index.html b/docs/api/xmlsec-index.html
index afbde15..0942268 100644
--- a/docs/api/xmlsec-index.html
+++ b/docs/api/xmlsec-index.html
@@ -196,6 +196,7 @@
 <li><p><a href="xmlsec-dl.html#XMLSECCRYPTODLSETFUNCTIONS">xmlSecCryptoDLSetFunctions</a></p></li>
 <li><p><a href="xmlsec-dl.html#XMLSECCRYPTODLSHUTDOWN">xmlSecCryptoDLShutdown</a></p></li>
 <li><p><a href="xmlsec-dl.html#XMLSECCRYPTODLUNLOADLIBRARY">xmlSecCryptoDLUnloadLibrary</a></p></li>
+<li><p><font>xmlSecCryptoGetFunctions-gcrypt</font></p></li>
 <li><p><font>xmlSecCryptoGetFunctions-gnutls</font></p></li>
 <li><p><font>xmlSecCryptoGetFunctions-mscrypto</font></p></li>
 <li><p><font>xmlSecCryptoGetFunctions-nss</font></p></li>
@@ -317,6 +318,103 @@
 <li><p><a href="xmlsec-xmltree.html#XMLSECFINDCHILD">xmlSecFindChild</a></p></li>
 <li><p><a href="xmlsec-xmltree.html#XMLSECFINDNODE">xmlSecFindNode</a></p></li>
 <li><p><a href="xmlsec-xmltree.html#XMLSECFINDPARENT">xmlSecFindParent</a></p></li>
+<li><p><font>XMLSEC-FUNC-TO-PTR</font></p></li>
+<li><p><a href="xmlsec-gcrypt-app.html#XMLSECGCRYPTAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecGCryptAppDefaultKeysMngrAdoptKey</a></p></li>
+<li><p><a href="xmlsec-gcrypt-app.html#XMLSECGCRYPTAPPDEFAULTKEYSMNGRINIT">xmlSecGCryptAppDefaultKeysMngrInit</a></p></li>
+<li><p><a href="xmlsec-gcrypt-app.html#XMLSECGCRYPTAPPDEFAULTKEYSMNGRLOAD">xmlSecGCryptAppDefaultKeysMngrLoad</a></p></li>
+<li><p><a href="xmlsec-gcrypt-app.html#XMLSECGCRYPTAPPDEFAULTKEYSMNGRSAVE">xmlSecGCryptAppDefaultKeysMngrSave</a></p></li>
+<li><p><a href="xmlsec-gcrypt-app.html#XMLSECGCRYPTAPPGETDEFAULTPWDCALLBACK">xmlSecGCryptAppGetDefaultPwdCallback</a></p></li>
+<li><p><a href="xmlsec-gcrypt-app.html#XMLSECGCRYPTAPPINIT">xmlSecGCryptAppInit</a></p></li>
+<li><p><a href="xmlsec-gcrypt-app.html#XMLSECGCRYPTAPPKEYCERTLOADMEMORY">xmlSecGCryptAppKeyCertLoadMemory</a></p></li>
+<li><p><a href="xmlsec-gcrypt-app.html#XMLSECGCRYPTAPPKEYCERTLOAD">xmlSecGCryptAppKeyCertLoad</a></p></li>
+<li><p><a href="xmlsec-gcrypt-app.html#XMLSECGCRYPTAPPKEYLOADMEMORY">xmlSecGCryptAppKeyLoadMemory</a></p></li>
+<li><p><a href="xmlsec-gcrypt-app.html#XMLSECGCRYPTAPPKEYLOAD">xmlSecGCryptAppKeyLoad</a></p></li>
+<li><p><a href="xmlsec-gcrypt-app.html#XMLSECGCRYPTAPPKEYSMNGRCERTLOADMEMORY">xmlSecGCryptAppKeysMngrCertLoadMemory</a></p></li>
+<li><p><a href="xmlsec-gcrypt-app.html#XMLSECGCRYPTAPPKEYSMNGRCERTLOAD">xmlSecGCryptAppKeysMngrCertLoad</a></p></li>
+<li><p><a href="xmlsec-gcrypt-app.html#XMLSECGCRYPTAPPPKCS12LOADMEMORY">xmlSecGCryptAppPkcs12LoadMemory</a></p></li>
+<li><p><a href="xmlsec-gcrypt-app.html#XMLSECGCRYPTAPPPKCS12LOAD">xmlSecGCryptAppPkcs12Load</a></p></li>
+<li><p><a href="xmlsec-gcrypt-app.html#XMLSECGCRYPTAPPSHUTDOWN">xmlSecGCryptAppShutdown</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTGENERATERANDOM">xmlSecGCryptGenerateRandom</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTHMACGETMINOUTPUTLENGTH">xmlSecGCryptHmacGetMinOutputLength</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTHMACSETMINOUTPUTLENGTH">xmlSecGCryptHmacSetMinOutputLength</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTINIT">xmlSecGCryptInit</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATAAESGETKLASS">xmlSecGCryptKeyDataAesGetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATAAESID">xmlSecGCryptKeyDataAesId</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATAAESSET">xmlSecGCryptKeyDataAesSet</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATADESGETKLASS">xmlSecGCryptKeyDataDesGetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATADESID">xmlSecGCryptKeyDataDesId</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATADESSET">xmlSecGCryptKeyDataDesSet</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATADSAADOPTKEY">xmlSecGCryptKeyDataDsaAdoptKey</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATADSAADOPTKEYPAIR">xmlSecGCryptKeyDataDsaAdoptKeyPair</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATADSAGETKLASS">xmlSecGCryptKeyDataDsaGetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATADSAGETPRIVATEKEY">xmlSecGCryptKeyDataDsaGetPrivateKey</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATADSAGETPUBLICKEY">xmlSecGCryptKeyDataDsaGetPublicKey</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATADSAID">xmlSecGCryptKeyDataDsaId</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATAHMACGETKLASS">xmlSecGCryptKeyDataHmacGetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATAHMACID">xmlSecGCryptKeyDataHmacId</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATAHMACSET">xmlSecGCryptKeyDataHmacSet</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATARSAADOPTKEY">xmlSecGCryptKeyDataRsaAdoptKey</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATARSAADOPTKEYPAIR">xmlSecGCryptKeyDataRsaAdoptKeyPair</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATARSAGETKLASS">xmlSecGCryptKeyDataRsaGetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATARSAGETPRIVATEKEY">xmlSecGCryptKeyDataRsaGetPrivateKey</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATARSAGETPUBLICKEY">xmlSecGCryptKeyDataRsaGetPublicKey</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYDATARSAID">xmlSecGCryptKeyDataRsaId</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTKEYSMNGRINIT">xmlSecGCryptKeysMngrInit</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTSHUTDOWN">xmlSecGCryptShutdown</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMAES128CBCGETKLASS">xmlSecGCryptTransformAes128CbcGetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMAES128CBCID">xmlSecGCryptTransformAes128CbcId</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMAES192CBCGETKLASS">xmlSecGCryptTransformAes192CbcGetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMAES192CBCID">xmlSecGCryptTransformAes192CbcId</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMAES256CBCGETKLASS">xmlSecGCryptTransformAes256CbcGetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMAES256CBCID">xmlSecGCryptTransformAes256CbcId</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMDES3CBCGETKLASS">xmlSecGCryptTransformDes3CbcGetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMDES3CBCID">xmlSecGCryptTransformDes3CbcId</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMDSASHA1GETKLASS">xmlSecGCryptTransformDsaSha1GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMDSASHA1ID">xmlSecGCryptTransformDsaSha1Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMHMACMD5GETKLASS">xmlSecGCryptTransformHmacMd5GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMHMACMD5ID">xmlSecGCryptTransformHmacMd5Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMHMACRIPEMD160GETKLASS">xmlSecGCryptTransformHmacRipemd160GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMHMACRIPEMD160ID">xmlSecGCryptTransformHmacRipemd160Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMHMACSHA1GETKLASS">xmlSecGCryptTransformHmacSha1GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMHMACSHA1ID">xmlSecGCryptTransformHmacSha1Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMHMACSHA256GETKLASS">xmlSecGCryptTransformHmacSha256GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMHMACSHA256ID">xmlSecGCryptTransformHmacSha256Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMHMACSHA384GETKLASS">xmlSecGCryptTransformHmacSha384GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMHMACSHA384ID">xmlSecGCryptTransformHmacSha384Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMHMACSHA512GETKLASS">xmlSecGCryptTransformHmacSha512GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMHMACSHA512ID">xmlSecGCryptTransformHmacSha512Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMKWAES128GETKLASS">xmlSecGCryptTransformKWAes128GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMKWAES128ID">xmlSecGCryptTransformKWAes128Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMKWAES192GETKLASS">xmlSecGCryptTransformKWAes192GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMKWAES192ID">xmlSecGCryptTransformKWAes192Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMKWAES256GETKLASS">xmlSecGCryptTransformKWAes256GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMKWAES256ID">xmlSecGCryptTransformKWAes256Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMKWDES3GETKLASS">xmlSecGCryptTransformKWDes3GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMKWDES3ID">xmlSecGCryptTransformKWDes3Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMMD5GETKLASS">xmlSecGCryptTransformMd5GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMMD5ID">xmlSecGCryptTransformMd5Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMRIPEMD160GETKLASS">xmlSecGCryptTransformRipemd160GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMRIPEMD160ID">xmlSecGCryptTransformRipemd160Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMRSAMD5GETKLASS">xmlSecGCryptTransformRsaMd5GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMRSAMD5ID">xmlSecGCryptTransformRsaMd5Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMRSARIPEMD160GETKLASS">xmlSecGCryptTransformRsaRipemd160GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMRSARIPEMD160ID">xmlSecGCryptTransformRsaRipemd160Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMRSASHA1GETKLASS">xmlSecGCryptTransformRsaSha1GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMRSASHA1ID">xmlSecGCryptTransformRsaSha1Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMRSASHA256GETKLASS">xmlSecGCryptTransformRsaSha256GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMRSASHA256ID">xmlSecGCryptTransformRsaSha256Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMRSASHA384GETKLASS">xmlSecGCryptTransformRsaSha384GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMRSASHA384ID">xmlSecGCryptTransformRsaSha384Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMRSASHA512GETKLASS">xmlSecGCryptTransformRsaSha512GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMRSASHA512ID">xmlSecGCryptTransformRsaSha512Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMSHA1GETKLASS">xmlSecGCryptTransformSha1GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMSHA1ID">xmlSecGCryptTransformSha1Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMSHA256GETKLASS">xmlSecGCryptTransformSha256GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMSHA256ID">xmlSecGCryptTransformSha256Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMSHA384GETKLASS">xmlSecGCryptTransformSha384GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMSHA384ID">xmlSecGCryptTransformSha384Id</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMSHA512GETKLASS">xmlSecGCryptTransformSha512GetKlass</a></p></li>
+<li><p><a href="xmlsec-gcrypt-crypto.html#XMLSECGCRYPTTRANSFORMSHA512ID">xmlSecGCryptTransformSha512Id</a></p></li>
 <li><p><a href="xmlsec-xmltree.html#XMLSECGENERATEANDADDID">xmlSecGenerateAndAddID</a></p></li>
 <li><p><a href="xmlsec-xmltree.html#XMLSECGENERATEID">xmlSecGenerateID</a></p></li>
 <li><p><a href="xmlsec-xmltree.html#XMLSECGETHEX">xmlSecGetHex</a></p></li>
@@ -349,9 +447,21 @@
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADESGETKLASS">xmlSecGnuTLSKeyDataDesGetKlass</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADESID">xmlSecGnuTLSKeyDataDesId</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADESSET">xmlSecGnuTLSKeyDataDesSet</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADSAADOPTKEY">xmlSecGnuTLSKeyDataDsaAdoptKey</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADSAADOPTKEYPAIR">xmlSecGnuTLSKeyDataDsaAdoptKeyPair</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADSAGETKLASS">xmlSecGnuTLSKeyDataDsaGetKlass</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADSAGETPRIVATEKEY">xmlSecGnuTLSKeyDataDsaGetPrivateKey</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADSAGETPUBLICKEY">xmlSecGnuTLSKeyDataDsaGetPublicKey</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADSAID">xmlSecGnuTLSKeyDataDsaId</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAHMACGETKLASS">xmlSecGnuTLSKeyDataHmacGetKlass</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAHMACID">xmlSecGnuTLSKeyDataHmacId</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAHMACSET">xmlSecGnuTLSKeyDataHmacSet</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATARSAADOPTKEY">xmlSecGnuTLSKeyDataRsaAdoptKey</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATARSAADOPTKEYPAIR">xmlSecGnuTLSKeyDataRsaAdoptKeyPair</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATARSAGETKLASS">xmlSecGnuTLSKeyDataRsaGetKlass</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATARSAGETPRIVATEKEY">xmlSecGnuTLSKeyDataRsaGetPrivateKey</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATARSAGETPUBLICKEY">xmlSecGnuTLSKeyDataRsaGetPublicKey</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATARSAID">xmlSecGnuTLSKeyDataRsaId</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYSMNGRINIT">xmlSecGnuTLSKeysMngrInit</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSSHUTDOWN">xmlSecGnuTLSShutdown</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES128CBCGETKLASS">xmlSecGnuTLSTransformAes128CbcGetKlass</a></p></li>
@@ -362,6 +472,8 @@
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES256CBCID">xmlSecGnuTLSTransformAes256CbcId</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMDES3CBCGETKLASS">xmlSecGnuTLSTransformDes3CbcGetKlass</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMDES3CBCID">xmlSecGnuTLSTransformDes3CbcId</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMDSASHA1GETKLASS">xmlSecGnuTLSTransformDsaSha1GetKlass</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMDSASHA1ID">xmlSecGnuTLSTransformDsaSha1Id</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACMD5GETKLASS">xmlSecGnuTLSTransformHmacMd5GetKlass</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACMD5ID">xmlSecGnuTLSTransformHmacMd5Id</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACRIPEMD160GETKLASS">xmlSecGnuTLSTransformHmacRipemd160GetKlass</a></p></li>
@@ -374,10 +486,30 @@
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA384ID">xmlSecGnuTLSTransformHmacSha384Id</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA512GETKLASS">xmlSecGnuTLSTransformHmacSha512GetKlass</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA512ID">xmlSecGnuTLSTransformHmacSha512Id</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMKWAES128GETKLASS">xmlSecGnuTLSTransformKWAes128GetKlass</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMKWAES128ID">xmlSecGnuTLSTransformKWAes128Id</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMKWAES192GETKLASS">xmlSecGnuTLSTransformKWAes192GetKlass</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMKWAES192ID">xmlSecGnuTLSTransformKWAes192Id</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMKWAES256GETKLASS">xmlSecGnuTLSTransformKWAes256GetKlass</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMKWAES256ID">xmlSecGnuTLSTransformKWAes256Id</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMKWDES3GETKLASS">xmlSecGnuTLSTransformKWDes3GetKlass</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMKWDES3ID">xmlSecGnuTLSTransformKWDes3Id</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMMD5GETKLASS">xmlSecGnuTLSTransformMd5GetKlass</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMMD5ID">xmlSecGnuTLSTransformMd5Id</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRIPEMD160GETKLASS">xmlSecGnuTLSTransformRipemd160GetKlass</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRIPEMD160ID">xmlSecGnuTLSTransformRipemd160Id</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSAMD5GETKLASS">xmlSecGnuTLSTransformRsaMd5GetKlass</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSAMD5ID">xmlSecGnuTLSTransformRsaMd5Id</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSARIPEMD160GETKLASS">xmlSecGnuTLSTransformRsaRipemd160GetKlass</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSARIPEMD160ID">xmlSecGnuTLSTransformRsaRipemd160Id</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSASHA1GETKLASS">xmlSecGnuTLSTransformRsaSha1GetKlass</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSASHA1ID">xmlSecGnuTLSTransformRsaSha1Id</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSASHA256GETKLASS">xmlSecGnuTLSTransformRsaSha256GetKlass</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSASHA256ID">xmlSecGnuTLSTransformRsaSha256Id</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSASHA384GETKLASS">xmlSecGnuTLSTransformRsaSha384GetKlass</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSASHA384ID">xmlSecGnuTLSTransformRsaSha384Id</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSASHA512GETKLASS">xmlSecGnuTLSTransformRsaSha512GetKlass</a></p></li>
+<li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMRSASHA512ID">xmlSecGnuTLSTransformRsaSha512Id</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA1GETKLASS">xmlSecGnuTLSTransformSha1GetKlass</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA1ID">xmlSecGnuTLSTransformSha1Id</a></p></li>
 <li><p><a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA256GETKLASS">xmlSecGnuTLSTransformSha256GetKlass</a></p></li>
@@ -720,10 +852,20 @@
 <li><p><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMHMACSHA384ID">xmlSecMSCryptoTransformHmacSha384Id</a></p></li>
 <li><p><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMHMACSHA512GETKLASS">xmlSecMSCryptoTransformHmacSha512GetKlass</a></p></li>
 <li><p><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMHMACSHA512ID">xmlSecMSCryptoTransformHmacSha512Id</a></p></li>
+<li><p><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMKWAES128GETKLASS">xmlSecMSCryptoTransformKWAes128GetKlass</a></p></li>
+<li><p><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMKWAES128ID">xmlSecMSCryptoTransformKWAes128Id</a></p></li>
+<li><p><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMKWAES192GETKLASS">xmlSecMSCryptoTransformKWAes192GetKlass</a></p></li>
+<li><p><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMKWAES192ID">xmlSecMSCryptoTransformKWAes192Id</a></p></li>
+<li><p><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMKWAES256GETKLASS">xmlSecMSCryptoTransformKWAes256GetKlass</a></p></li>
+<li><p><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMKWAES256ID">xmlSecMSCryptoTransformKWAes256Id</a></p></li>
+<li><p><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMKWDES3GETKLASS">xmlSecMSCryptoTransformKWDes3GetKlass</a></p></li>
+<li><p><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMKWDES3ID">xmlSecMSCryptoTransformKWDes3Id</a></p></li>
 <li><p><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMMD5GETKLASS">xmlSecMSCryptoTransformMd5GetKlass</a></p></li>
 <li><p><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMMD5ID">xmlSecMSCryptoTransformMd5Id</a></p></li>
 <li><p><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSAMD5GETKLASS">xmlSecMSCryptoTransformRsaMd5GetKlass</a></p></li>
 <li><p><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSAMD5ID">xmlSecMSCryptoTransformRsaMd5Id</a></p></li>
+<li><p><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSAOAEPGETKLASS">xmlSecMSCryptoTransformRsaOaepGetKlass</a></p></li>
+<li><p><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSAOAEPID">xmlSecMSCryptoTransformRsaOaepId</a></p></li>
 <li><p><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSAPKCS1GETKLASS">xmlSecMSCryptoTransformRsaPkcs1GetKlass</a></p></li>
 <li><p><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSAPKCS1ID">xmlSecMSCryptoTransformRsaPkcs1Id</a></p></li>
 <li><p><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSASHA1GETKLASS">xmlSecMSCryptoTransformRsaSha1GetKlass</a></p></li>
@@ -1065,6 +1207,8 @@
 <li><p><a href="xmlsec-list.html#XMLSECPTRLISTSETDEFAULTALLOCMODE">xmlSecPtrListSetDefaultAllocMode</a></p></li>
 <li><p><a href="xmlsec-list.html#XMLSECPTRLISTSET">xmlSecPtrListSet</a></p></li>
 <li><p><a href="xmlsec-xmlsec.html#XMLSECPTR">xmlSecPtr</a></p></li>
+<li><p><font>XMLSEC-PTR-TO-FUNC-IMPL</font></p></li>
+<li><p><font>XMLSEC-PTR-TO-FUNC</font></p></li>
 <li><p><a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKDEBUGDUMP">xmlSecQName2BitMaskDebugDump</a></p></li>
 <li><p><a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKDEBUGXMLDUMP">xmlSecQName2BitMaskDebugXmlDump</a></p></li>
 <li><p><a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETBITMASKFROMSTRING">xmlSecQName2BitMaskGetBitMaskFromString</a></p></li>
diff --git a/docs/api/xmlsec-index.sgml b/docs/api/xmlsec-index.sgml
index 2bca744..db3e33f 100644
--- a/docs/api/xmlsec-index.sgml
+++ b/docs/api/xmlsec-index.sgml
@@ -106,6 +106,7 @@
 <listitem><para><link linkend="xmlSecCryptoDLSetFunctions">xmlSecCryptoDLSetFunctions</link></para></listitem>
 <listitem><para><link linkend="xmlSecCryptoDLShutdown">xmlSecCryptoDLShutdown</link></para></listitem>
 <listitem><para><link linkend="xmlSecCryptoDLUnloadLibrary">xmlSecCryptoDLUnloadLibrary</link></para></listitem>
+<listitem><para><link linkend="xmlSecCryptoGetFunctions-gcrypt-CAPS">xmlSecCryptoGetFunctions-gcrypt</link></para></listitem>
 <listitem><para><link linkend="xmlSecCryptoGetFunctions-gnutls-CAPS">xmlSecCryptoGetFunctions-gnutls</link></para></listitem>
 <listitem><para><link linkend="xmlSecCryptoGetFunctions-mscrypto-CAPS">xmlSecCryptoGetFunctions-mscrypto</link></para></listitem>
 <listitem><para><link linkend="xmlSecCryptoGetFunctions-nss-CAPS">xmlSecCryptoGetFunctions-nss</link></para></listitem>
@@ -227,6 +228,103 @@
 <listitem><para><link linkend="xmlSecFindChild">xmlSecFindChild</link></para></listitem>
 <listitem><para><link linkend="xmlSecFindNode">xmlSecFindNode</link></para></listitem>
 <listitem><para><link linkend="xmlSecFindParent">xmlSecFindParent</link></para></listitem>
+<listitem><para><link linkend="XMLSEC-FUNC-TO-PTR-CAPS">XMLSEC-FUNC-TO-PTR</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptAppDefaultKeysMngrAdoptKey">xmlSecGCryptAppDefaultKeysMngrAdoptKey</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptAppDefaultKeysMngrInit">xmlSecGCryptAppDefaultKeysMngrInit</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptAppDefaultKeysMngrLoad">xmlSecGCryptAppDefaultKeysMngrLoad</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptAppDefaultKeysMngrSave">xmlSecGCryptAppDefaultKeysMngrSave</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptAppGetDefaultPwdCallback">xmlSecGCryptAppGetDefaultPwdCallback</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptAppInit">xmlSecGCryptAppInit</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptAppKeyCertLoadMemory">xmlSecGCryptAppKeyCertLoadMemory</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptAppKeyCertLoad">xmlSecGCryptAppKeyCertLoad</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptAppKeyLoadMemory">xmlSecGCryptAppKeyLoadMemory</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptAppKeyLoad">xmlSecGCryptAppKeyLoad</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptAppKeysMngrCertLoadMemory">xmlSecGCryptAppKeysMngrCertLoadMemory</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptAppKeysMngrCertLoad">xmlSecGCryptAppKeysMngrCertLoad</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptAppPkcs12LoadMemory">xmlSecGCryptAppPkcs12LoadMemory</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptAppPkcs12Load">xmlSecGCryptAppPkcs12Load</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptAppShutdown">xmlSecGCryptAppShutdown</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptGenerateRandom">xmlSecGCryptGenerateRandom</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptHmacGetMinOutputLength">xmlSecGCryptHmacGetMinOutputLength</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptHmacSetMinOutputLength">xmlSecGCryptHmacSetMinOutputLength</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptInit">xmlSecGCryptInit</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataAesGetKlass">xmlSecGCryptKeyDataAesGetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataAesId">xmlSecGCryptKeyDataAesId</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataAesSet">xmlSecGCryptKeyDataAesSet</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataDesGetKlass">xmlSecGCryptKeyDataDesGetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataDesId">xmlSecGCryptKeyDataDesId</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataDesSet">xmlSecGCryptKeyDataDesSet</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataDsaAdoptKey">xmlSecGCryptKeyDataDsaAdoptKey</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataDsaAdoptKeyPair">xmlSecGCryptKeyDataDsaAdoptKeyPair</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataDsaGetKlass">xmlSecGCryptKeyDataDsaGetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataDsaGetPrivateKey">xmlSecGCryptKeyDataDsaGetPrivateKey</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataDsaGetPublicKey">xmlSecGCryptKeyDataDsaGetPublicKey</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataDsaId">xmlSecGCryptKeyDataDsaId</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataHmacGetKlass">xmlSecGCryptKeyDataHmacGetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataHmacId">xmlSecGCryptKeyDataHmacId</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataHmacSet">xmlSecGCryptKeyDataHmacSet</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataRsaAdoptKey">xmlSecGCryptKeyDataRsaAdoptKey</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataRsaAdoptKeyPair">xmlSecGCryptKeyDataRsaAdoptKeyPair</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataRsaGetKlass">xmlSecGCryptKeyDataRsaGetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataRsaGetPrivateKey">xmlSecGCryptKeyDataRsaGetPrivateKey</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataRsaGetPublicKey">xmlSecGCryptKeyDataRsaGetPublicKey</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeyDataRsaId">xmlSecGCryptKeyDataRsaId</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptKeysMngrInit">xmlSecGCryptKeysMngrInit</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptShutdown">xmlSecGCryptShutdown</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformAes128CbcGetKlass">xmlSecGCryptTransformAes128CbcGetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformAes128CbcId">xmlSecGCryptTransformAes128CbcId</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformAes192CbcGetKlass">xmlSecGCryptTransformAes192CbcGetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformAes192CbcId">xmlSecGCryptTransformAes192CbcId</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformAes256CbcGetKlass">xmlSecGCryptTransformAes256CbcGetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformAes256CbcId">xmlSecGCryptTransformAes256CbcId</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformDes3CbcGetKlass">xmlSecGCryptTransformDes3CbcGetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformDes3CbcId">xmlSecGCryptTransformDes3CbcId</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformDsaSha1GetKlass">xmlSecGCryptTransformDsaSha1GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformDsaSha1Id">xmlSecGCryptTransformDsaSha1Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformHmacMd5GetKlass">xmlSecGCryptTransformHmacMd5GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformHmacMd5Id">xmlSecGCryptTransformHmacMd5Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformHmacRipemd160GetKlass">xmlSecGCryptTransformHmacRipemd160GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformHmacRipemd160Id">xmlSecGCryptTransformHmacRipemd160Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformHmacSha1GetKlass">xmlSecGCryptTransformHmacSha1GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformHmacSha1Id">xmlSecGCryptTransformHmacSha1Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformHmacSha256GetKlass">xmlSecGCryptTransformHmacSha256GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformHmacSha256Id">xmlSecGCryptTransformHmacSha256Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformHmacSha384GetKlass">xmlSecGCryptTransformHmacSha384GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformHmacSha384Id">xmlSecGCryptTransformHmacSha384Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformHmacSha512GetKlass">xmlSecGCryptTransformHmacSha512GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformHmacSha512Id">xmlSecGCryptTransformHmacSha512Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformKWAes128GetKlass">xmlSecGCryptTransformKWAes128GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformKWAes128Id">xmlSecGCryptTransformKWAes128Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformKWAes192GetKlass">xmlSecGCryptTransformKWAes192GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformKWAes192Id">xmlSecGCryptTransformKWAes192Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformKWAes256GetKlass">xmlSecGCryptTransformKWAes256GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformKWAes256Id">xmlSecGCryptTransformKWAes256Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformKWDes3GetKlass">xmlSecGCryptTransformKWDes3GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformKWDes3Id">xmlSecGCryptTransformKWDes3Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformMd5GetKlass">xmlSecGCryptTransformMd5GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformMd5Id">xmlSecGCryptTransformMd5Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformRipemd160GetKlass">xmlSecGCryptTransformRipemd160GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformRipemd160Id">xmlSecGCryptTransformRipemd160Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformRsaMd5GetKlass">xmlSecGCryptTransformRsaMd5GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformRsaMd5Id">xmlSecGCryptTransformRsaMd5Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformRsaRipemd160GetKlass">xmlSecGCryptTransformRsaRipemd160GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformRsaRipemd160Id">xmlSecGCryptTransformRsaRipemd160Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformRsaSha1GetKlass">xmlSecGCryptTransformRsaSha1GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformRsaSha1Id">xmlSecGCryptTransformRsaSha1Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformRsaSha256GetKlass">xmlSecGCryptTransformRsaSha256GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformRsaSha256Id">xmlSecGCryptTransformRsaSha256Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformRsaSha384GetKlass">xmlSecGCryptTransformRsaSha384GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformRsaSha384Id">xmlSecGCryptTransformRsaSha384Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformRsaSha512GetKlass">xmlSecGCryptTransformRsaSha512GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformRsaSha512Id">xmlSecGCryptTransformRsaSha512Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformSha1GetKlass">xmlSecGCryptTransformSha1GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformSha1Id">xmlSecGCryptTransformSha1Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformSha256GetKlass">xmlSecGCryptTransformSha256GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformSha256Id">xmlSecGCryptTransformSha256Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformSha384GetKlass">xmlSecGCryptTransformSha384GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformSha384Id">xmlSecGCryptTransformSha384Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformSha512GetKlass">xmlSecGCryptTransformSha512GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGCryptTransformSha512Id">xmlSecGCryptTransformSha512Id</link></para></listitem>
 <listitem><para><link linkend="xmlSecGenerateAndAddID">xmlSecGenerateAndAddID</link></para></listitem>
 <listitem><para><link linkend="xmlSecGenerateID">xmlSecGenerateID</link></para></listitem>
 <listitem><para><link linkend="xmlSecGetHex">xmlSecGetHex</link></para></listitem>
@@ -259,9 +357,21 @@
 <listitem><para><link linkend="xmlSecGnuTLSKeyDataDesGetKlass">xmlSecGnuTLSKeyDataDesGetKlass</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSKeyDataDesId">xmlSecGnuTLSKeyDataDesId</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSKeyDataDesSet">xmlSecGnuTLSKeyDataDesSet</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSKeyDataDsaAdoptKey">xmlSecGnuTLSKeyDataDsaAdoptKey</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSKeyDataDsaAdoptKeyPair">xmlSecGnuTLSKeyDataDsaAdoptKeyPair</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSKeyDataDsaGetKlass">xmlSecGnuTLSKeyDataDsaGetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSKeyDataDsaGetPrivateKey">xmlSecGnuTLSKeyDataDsaGetPrivateKey</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSKeyDataDsaGetPublicKey">xmlSecGnuTLSKeyDataDsaGetPublicKey</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSKeyDataDsaId">xmlSecGnuTLSKeyDataDsaId</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSKeyDataHmacGetKlass">xmlSecGnuTLSKeyDataHmacGetKlass</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSKeyDataHmacId">xmlSecGnuTLSKeyDataHmacId</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSKeyDataHmacSet">xmlSecGnuTLSKeyDataHmacSet</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSKeyDataRsaAdoptKey">xmlSecGnuTLSKeyDataRsaAdoptKey</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSKeyDataRsaAdoptKeyPair">xmlSecGnuTLSKeyDataRsaAdoptKeyPair</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSKeyDataRsaGetKlass">xmlSecGnuTLSKeyDataRsaGetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSKeyDataRsaGetPrivateKey">xmlSecGnuTLSKeyDataRsaGetPrivateKey</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSKeyDataRsaGetPublicKey">xmlSecGnuTLSKeyDataRsaGetPublicKey</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSKeyDataRsaId">xmlSecGnuTLSKeyDataRsaId</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSKeysMngrInit">xmlSecGnuTLSKeysMngrInit</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSShutdown">xmlSecGnuTLSShutdown</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSTransformAes128CbcGetKlass">xmlSecGnuTLSTransformAes128CbcGetKlass</link></para></listitem>
@@ -272,6 +382,8 @@
 <listitem><para><link linkend="xmlSecGnuTLSTransformAes256CbcId">xmlSecGnuTLSTransformAes256CbcId</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSTransformDes3CbcGetKlass">xmlSecGnuTLSTransformDes3CbcGetKlass</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSTransformDes3CbcId">xmlSecGnuTLSTransformDes3CbcId</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformDsaSha1GetKlass">xmlSecGnuTLSTransformDsaSha1GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformDsaSha1Id">xmlSecGnuTLSTransformDsaSha1Id</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSTransformHmacMd5GetKlass">xmlSecGnuTLSTransformHmacMd5GetKlass</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSTransformHmacMd5Id">xmlSecGnuTLSTransformHmacMd5Id</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSTransformHmacRipemd160GetKlass">xmlSecGnuTLSTransformHmacRipemd160GetKlass</link></para></listitem>
@@ -284,10 +396,30 @@
 <listitem><para><link linkend="xmlSecGnuTLSTransformHmacSha384Id">xmlSecGnuTLSTransformHmacSha384Id</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSTransformHmacSha512GetKlass">xmlSecGnuTLSTransformHmacSha512GetKlass</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSTransformHmacSha512Id">xmlSecGnuTLSTransformHmacSha512Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformKWAes128GetKlass">xmlSecGnuTLSTransformKWAes128GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformKWAes128Id">xmlSecGnuTLSTransformKWAes128Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformKWAes192GetKlass">xmlSecGnuTLSTransformKWAes192GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformKWAes192Id">xmlSecGnuTLSTransformKWAes192Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformKWAes256GetKlass">xmlSecGnuTLSTransformKWAes256GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformKWAes256Id">xmlSecGnuTLSTransformKWAes256Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformKWDes3GetKlass">xmlSecGnuTLSTransformKWDes3GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformKWDes3Id">xmlSecGnuTLSTransformKWDes3Id</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSTransformMd5GetKlass">xmlSecGnuTLSTransformMd5GetKlass</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSTransformMd5Id">xmlSecGnuTLSTransformMd5Id</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSTransformRipemd160GetKlass">xmlSecGnuTLSTransformRipemd160GetKlass</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSTransformRipemd160Id">xmlSecGnuTLSTransformRipemd160Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformRsaMd5GetKlass">xmlSecGnuTLSTransformRsaMd5GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformRsaMd5Id">xmlSecGnuTLSTransformRsaMd5Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformRsaRipemd160GetKlass">xmlSecGnuTLSTransformRsaRipemd160GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformRsaRipemd160Id">xmlSecGnuTLSTransformRsaRipemd160Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformRsaSha1GetKlass">xmlSecGnuTLSTransformRsaSha1GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformRsaSha1Id">xmlSecGnuTLSTransformRsaSha1Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformRsaSha256GetKlass">xmlSecGnuTLSTransformRsaSha256GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformRsaSha256Id">xmlSecGnuTLSTransformRsaSha256Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformRsaSha384GetKlass">xmlSecGnuTLSTransformRsaSha384GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformRsaSha384Id">xmlSecGnuTLSTransformRsaSha384Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformRsaSha512GetKlass">xmlSecGnuTLSTransformRsaSha512GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecGnuTLSTransformRsaSha512Id">xmlSecGnuTLSTransformRsaSha512Id</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSTransformSha1GetKlass">xmlSecGnuTLSTransformSha1GetKlass</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSTransformSha1Id">xmlSecGnuTLSTransformSha1Id</link></para></listitem>
 <listitem><para><link linkend="xmlSecGnuTLSTransformSha256GetKlass">xmlSecGnuTLSTransformSha256GetKlass</link></para></listitem>
@@ -630,10 +762,20 @@
 <listitem><para><link linkend="xmlSecMSCryptoTransformHmacSha384Id">xmlSecMSCryptoTransformHmacSha384Id</link></para></listitem>
 <listitem><para><link linkend="xmlSecMSCryptoTransformHmacSha512GetKlass">xmlSecMSCryptoTransformHmacSha512GetKlass</link></para></listitem>
 <listitem><para><link linkend="xmlSecMSCryptoTransformHmacSha512Id">xmlSecMSCryptoTransformHmacSha512Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecMSCryptoTransformKWAes128GetKlass">xmlSecMSCryptoTransformKWAes128GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecMSCryptoTransformKWAes128Id">xmlSecMSCryptoTransformKWAes128Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecMSCryptoTransformKWAes192GetKlass">xmlSecMSCryptoTransformKWAes192GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecMSCryptoTransformKWAes192Id">xmlSecMSCryptoTransformKWAes192Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecMSCryptoTransformKWAes256GetKlass">xmlSecMSCryptoTransformKWAes256GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecMSCryptoTransformKWAes256Id">xmlSecMSCryptoTransformKWAes256Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecMSCryptoTransformKWDes3GetKlass">xmlSecMSCryptoTransformKWDes3GetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecMSCryptoTransformKWDes3Id">xmlSecMSCryptoTransformKWDes3Id</link></para></listitem>
 <listitem><para><link linkend="xmlSecMSCryptoTransformMd5GetKlass">xmlSecMSCryptoTransformMd5GetKlass</link></para></listitem>
 <listitem><para><link linkend="xmlSecMSCryptoTransformMd5Id">xmlSecMSCryptoTransformMd5Id</link></para></listitem>
 <listitem><para><link linkend="xmlSecMSCryptoTransformRsaMd5GetKlass">xmlSecMSCryptoTransformRsaMd5GetKlass</link></para></listitem>
 <listitem><para><link linkend="xmlSecMSCryptoTransformRsaMd5Id">xmlSecMSCryptoTransformRsaMd5Id</link></para></listitem>
+<listitem><para><link linkend="xmlSecMSCryptoTransformRsaOaepGetKlass">xmlSecMSCryptoTransformRsaOaepGetKlass</link></para></listitem>
+<listitem><para><link linkend="xmlSecMSCryptoTransformRsaOaepId">xmlSecMSCryptoTransformRsaOaepId</link></para></listitem>
 <listitem><para><link linkend="xmlSecMSCryptoTransformRsaPkcs1GetKlass">xmlSecMSCryptoTransformRsaPkcs1GetKlass</link></para></listitem>
 <listitem><para><link linkend="xmlSecMSCryptoTransformRsaPkcs1Id">xmlSecMSCryptoTransformRsaPkcs1Id</link></para></listitem>
 <listitem><para><link linkend="xmlSecMSCryptoTransformRsaSha1GetKlass">xmlSecMSCryptoTransformRsaSha1GetKlass</link></para></listitem>
@@ -975,6 +1117,8 @@
 <listitem><para><link linkend="xmlSecPtrListSetDefaultAllocMode">xmlSecPtrListSetDefaultAllocMode</link></para></listitem>
 <listitem><para><link linkend="xmlSecPtrListSet">xmlSecPtrListSet</link></para></listitem>
 <listitem><para><link linkend="xmlSecPtr">xmlSecPtr</link></para></listitem>
+<listitem><para><link linkend="XMLSEC-PTR-TO-FUNC-IMPL-CAPS">XMLSEC-PTR-TO-FUNC-IMPL</link></para></listitem>
+<listitem><para><link linkend="XMLSEC-PTR-TO-FUNC-CAPS">XMLSEC-PTR-TO-FUNC</link></para></listitem>
 <listitem><para><link linkend="xmlSecQName2BitMaskDebugDump">xmlSecQName2BitMaskDebugDump</link></para></listitem>
 <listitem><para><link linkend="xmlSecQName2BitMaskDebugXmlDump">xmlSecQName2BitMaskDebugXmlDump</link></para></listitem>
 <listitem><para><link linkend="xmlSecQName2BitMaskGetBitMaskFromString">xmlSecQName2BitMaskGetBitMaskFromString</link></para></listitem>
diff --git a/docs/api/xmlsec-io.html b/docs/api/xmlsec-io.html
index 0bb9497..497676d 100644
--- a/docs/api/xmlsec-io.html
+++ b/docs/api/xmlsec-io.html
@@ -87,21 +87,21 @@
 <h1>
 <a name="XMLSEC-IO"></a>io</h1>
 <div class="REFNAMEDIV">
-<a name="AEN5268"></a><h2>Name</h2>io -- Input/output support.</div>
+<a name="AEN6257"></a><h2>Name</h2>io -- Input/output support.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-IO.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS"><font>int</font>                 <a href="xmlsec-io.html#XMLSECIOINIT">xmlSecIOInit</a>                        (void);
-<font>void</font>                <a href="xmlsec-io.html#XMLSECIOSHUTDOWN">xmlSecIOShutdown</a>                    (void);
-<font>void</font>                <a href="xmlsec-io.html#XMLSECIOCLEANUPCALLBACKS">xmlSecIOCleanupCallbacks</a>            (void);
-<font>int</font>                 <a href="xmlsec-io.html#XMLSECIOREGISTERDEFAULTCALLBACKS">xmlSecIORegisterDefaultCallbacks</a>    (void);
-<font>int</font>                 <a href="xmlsec-io.html#XMLSECIOREGISTERCALLBACKS">xmlSecIORegisterCallbacks</a>           (<font>xmlInputMatchCallback</font> matchFunc,
-                                                         <font>xmlInputOpenCallback</font> openFunc,
-                                                         <font>xmlInputReadCallback</font> readFunc,
-                                                         <font>xmlInputCloseCallback</font> closeFunc);
+<pre class="SYNOPSIS"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-io.html#XMLSECIOINIT">xmlSecIOInit</a>                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-io.html#XMLSECIOSHUTDOWN">xmlSecIOShutdown</a>                    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-io.html#XMLSECIOCLEANUPCALLBACKS">xmlSecIOCleanupCallbacks</a>            (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-io.html#XMLSECIOREGISTERDEFAULTCALLBACKS">xmlSecIORegisterDefaultCallbacks</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-io.html#XMLSECIOREGISTERCALLBACKS">xmlSecIORegisterCallbacks</a>           (<code class="PARAMETER"><gtkdoclink href="XMLINPUTMATCHCALLBACK"><span class="TYPE">xmlInputMatchCallback</span></gtkdoclink> matchFunc</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLINPUTOPENCALLBACK"><span class="TYPE">xmlInputOpenCallback</span></gtkdoclink> openFunc</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLINPUTREADCALLBACK"><span class="TYPE">xmlInputReadCallback</span></gtkdoclink> readFunc</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLINPUTCLOSECALLBACK"><span class="TYPE">xmlInputCloseCallback</span></gtkdoclink> closeFunc</code>);
 #define             <a href="xmlsec-io.html#XMLSECTRANSFORMINPUTURIID">xmlSecTransformInputURIId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-io.html#XMLSECTRANSFORMINPUTURIGETKLASS">xmlSecTransformInputURIGetKlass</a>     (void);
-<font>int</font>                 <a href="xmlsec-io.html#XMLSECTRANSFORMINPUTURIOPEN">xmlSecTransformInputURIOpen</a>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         const <font>xmlChar</font> *uri);</pre>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-io.html#XMLSECTRANSFORMINPUTURIGETKLASS">xmlSecTransformInputURIGetKlass</a>     (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-io.html#XMLSECTRANSFORMINPUTURIOPEN">xmlSecTransformInputURIOpen</a>         (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-IO.DESCRIPTION"></a><h2>Description</h2>
@@ -111,73 +111,68 @@
 <a name="XMLSEC-IO.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
 <a name="XMLSECIOINIT"></a><h3>xmlSecIOInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecIOInit                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecIOInit                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The IO initialization (called from <a href="xmlsec-xmlsec.html#XMLSECINIT"><span class="TYPE">xmlSecInit</span></a> function).
 Applications should not call this function directly.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN5311"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6331"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECIOSHUTDOWN"></a><h3>xmlSecIOShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecIOShutdown                    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecIOShutdown                    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The IO clenaup (called from <a href="xmlsec-xmlsec.html#XMLSECSHUTDOWN"><span class="TYPE">xmlSecShutdown</span></a> function).
 Applications should not call this function directly.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECIOCLEANUPCALLBACKS"></a><h3>xmlSecIOCleanupCallbacks ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecIOCleanupCallbacks            (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecIOCleanupCallbacks            (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Clears the entire input callback table. this includes the
 compiled-in I/O.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECIOREGISTERDEFAULTCALLBACKS"></a><h3>xmlSecIORegisterDefaultCallbacks ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecIORegisterDefaultCallbacks    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecIORegisterDefaultCallbacks    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Registers the default compiled-in I/O handlers.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN5343"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6369"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECIOREGISTERCALLBACKS"></a><h3>xmlSecIORegisterCallbacks ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecIORegisterCallbacks           (<font>xmlInputMatchCallback</font> matchFunc,
-                                                         <font>xmlInputOpenCallback</font> openFunc,
-                                                         <font>xmlInputReadCallback</font> readFunc,
-                                                         <font>xmlInputCloseCallback</font> closeFunc);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecIORegisterCallbacks           (<code class="PARAMETER"><gtkdoclink href="XMLINPUTMATCHCALLBACK"><span class="TYPE">xmlInputMatchCallback</span></gtkdoclink> matchFunc</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLINPUTOPENCALLBACK"><span class="TYPE">xmlInputOpenCallback</span></gtkdoclink> openFunc</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLINPUTREADCALLBACK"><span class="TYPE">xmlInputReadCallback</span></gtkdoclink> readFunc</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLINPUTCLOSECALLBACK"><span class="TYPE">xmlInputCloseCallback</span></gtkdoclink> closeFunc</code>);</pre>
 <p>Register a new set of I/O callback for handling parser input.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5361"><span style="white-space: nowrap"><code class="PARAMETER">matchFunc</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the protocol match callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6395"><span style="white-space: nowrap"><code class="PARAMETER">matchFunc</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the protocol match callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5366"><span style="white-space: nowrap"><code class="PARAMETER">openFunc</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the open stream callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6400"><span style="white-space: nowrap"><code class="PARAMETER">openFunc</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the open stream callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5371"><span style="white-space: nowrap"><code class="PARAMETER">readFunc</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the read from stream callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6405"><span style="white-space: nowrap"><code class="PARAMETER">readFunc</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the read from stream callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5376"><span style="white-space: nowrap"><code class="PARAMETER">closeFunc</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the close stream callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6410"><span style="white-space: nowrap"><code class="PARAMETER">closeFunc</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the close stream callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5381"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6415"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -187,39 +182,36 @@ compiled-in I/O.</p>
 <a name="XMLSECTRANSFORMINPUTURIID"></a><h3>xmlSecTransformInputURIId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecTransformInputURIId</pre>
 <p>The Input URI transform id.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMINPUTURIGETKLASS"></a><h3>xmlSecTransformInputURIGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformInputURIGetKlass     (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformInputURIGetKlass     (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The input uri transform klass. Reads binary data from an uri.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN5402"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6437"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> input URI transform id.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMINPUTURIOPEN"></a><h3>xmlSecTransformInputURIOpen ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformInputURIOpen         (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         const <font>xmlChar</font> *uri);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformInputURIOpen         (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>);</pre>
 <p>Opens the given <code class="PARAMETER">uri</code> for reading.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5419"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to IO transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6458"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to IO transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5424"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the URL to open.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6463"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the URL to open.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5429"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6468"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
diff --git a/docs/api/xmlsec-keyinfo.html b/docs/api/xmlsec-keyinfo.html
index 79559da..26fc923 100644
--- a/docs/api/xmlsec-keyinfo.html
+++ b/docs/api/xmlsec-keyinfo.html
@@ -87,52 +87,52 @@
 <h1>
 <a name="XMLSEC-KEYINFO"></a>keyinfo</h1>
 <div class="REFNAMEDIV">
-<a name="AEN5439"></a><h2>Name</h2>keyinfo -- <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node parser.</div>
+<a name="AEN6478"></a><h2>Name</h2>keyinfo -- <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node parser.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-KEYINFO.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS"><font>int</font>                 <a href="xmlsec-keyinfo.html#XMLSECKEYINFONODEREAD">xmlSecKeyInfoNodeRead</a>               (<font>xmlNodePtr</font> keyInfoNode,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>                 <a href="xmlsec-keyinfo.html#XMLSECKEYINFONODEWRITE">xmlSecKeyInfoNodeWrite</a>              (<font>xmlNodePtr</font> keyInfoNode,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<pre class="SYNOPSIS"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keyinfo.html#XMLSECKEYINFONODEREAD">xmlSecKeyInfoNodeRead</a>               (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> keyInfoNode</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keyinfo.html#XMLSECKEYINFONODEWRITE">xmlSecKeyInfoNodeWrite</a>              (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> keyInfoNode</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
 enum                <a href="xmlsec-keyinfo.html#XMLSECKEYINFOMODE">xmlSecKeyInfoMode</a>;
-#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND--CAPS">XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND</a>
-#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD--CAPS">XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD</a>
-#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN--CAPS">XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN</a>
-#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD--CAPS">XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD</a>
-#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF--CAPS">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF</a>
-#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF--CAPS">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF</a>
-#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD--CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD</a>
-#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS--CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS</a>
-#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT--CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT</a>
-#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT--CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT</a>
-#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION--CAPS">XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION</a>
-#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE--CAPS">XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE</a>
-#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS--CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND:CAPS">XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD:CAPS">XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN:CAPS">XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD:CAPS">XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF:CAPS">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF:CAPS">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD:CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS:CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT:CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT:CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION:CAPS">XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE:CAPS">XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS:CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS</a>
 struct              <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a>;
-<font>xmlSecKeyInfoCtxPtr</font>  <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXCREATE">xmlSecKeyInfoCtxCreate</a>             (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
-<font>void</font>                <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXDESTROY">xmlSecKeyInfoCtxDestroy</a>             (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>                 <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXINITIALIZE">xmlSecKeyInfoCtxInitialize</a>          (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx,
-                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
-<font>void</font>                <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXFINALIZE">xmlSecKeyInfoCtxFinalize</a>            (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>void</font>                <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXRESET">xmlSecKeyInfoCtxReset</a>               (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>                 <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXCOPYUSERPREF">xmlSecKeyInfoCtxCopyUserPref</a>        (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> dst,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> src);
-<font>int</font>                 <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXCREATEENCCTX">xmlSecKeyInfoCtxCreateEncCtx</a>        (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>void</font>                <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXDEBUGDUMP">xmlSecKeyInfoCtxDebugDump</a>           (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx,
-                                                         <font>FILE</font> *output);
-<font>void</font>                <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXDEBUGXMLDUMP">xmlSecKeyInfoCtxDebugXmlDump</a>        (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx,
-                                                         <font>FILE</font> *output);
+<gtkdoclink href="XMLSECKEYINFOCTXPTR"><span class="RETURNVALUE">xmlSecKeyInfoCtxPtr</span></gtkdoclink><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXCREATE">xmlSecKeyInfoCtxCreate</a>             (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> keysMngr</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXDESTROY">xmlSecKeyInfoCtxDestroy</a>             (<code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXINITIALIZE">xmlSecKeyInfoCtxInitialize</a>          (<code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> keysMngr</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXFINALIZE">xmlSecKeyInfoCtxFinalize</a>            (<code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXRESET">xmlSecKeyInfoCtxReset</a>               (<code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXCOPYUSERPREF">xmlSecKeyInfoCtxCopyUserPref</a>        (<code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> dst</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> src</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXCREATEENCCTX">xmlSecKeyInfoCtxCreateEncCtx</a>        (<code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXDEBUGDUMP">xmlSecKeyInfoCtxDebugDump</a>           (<code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXDEBUGXMLDUMP">xmlSecKeyInfoCtxDebugXmlDump</a>        (<code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
 #define             <a href="xmlsec-keyinfo.html#XMLSECKEYDATANAMEID">xmlSecKeyDataNameId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-keyinfo.html#XMLSECKEYDATANAMEGETKLASS">xmlSecKeyDataNameGetKlass</a>           (void);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-keyinfo.html#XMLSECKEYDATANAMEGETKLASS">xmlSecKeyDataNameGetKlass</a>           (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-keyinfo.html#XMLSECKEYDATAVALUEID">xmlSecKeyDataValueId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-keyinfo.html#XMLSECKEYDATAVALUEGETKLASS">xmlSecKeyDataValueGetKlass</a>          (void);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-keyinfo.html#XMLSECKEYDATAVALUEGETKLASS">xmlSecKeyDataValueGetKlass</a>          (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-keyinfo.html#XMLSECKEYDATARETRIEVALMETHODID">xmlSecKeyDataRetrievalMethodId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-keyinfo.html#XMLSECKEYDATARETRIEVALMETHODGETKLASS">xmlSecKeyDataRetrievalMethodGetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-keyinfo.html#XMLSECKEYDATARETRIEVALMETHODGETKLASS">xmlSecKeyDataRetrievalMethodGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-keyinfo.html#XMLSECKEYDATAENCRYPTEDKEYID">xmlSecKeyDataEncryptedKeyId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-keyinfo.html#XMLSECKEYDATAENCRYPTEDKEYGETKLASS">xmlSecKeyDataEncryptedKeyGetKlass</a>   (void);</pre>
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-keyinfo.html#XMLSECKEYDATAENCRYPTEDKEYGETKLASS">xmlSecKeyDataEncryptedKeyGetKlass</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-KEYINFO.DESCRIPTION"></a><h2>Description</h2>
@@ -142,28 +142,27 @@ struct              <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfo
 <a name="XMLSEC-KEYINFO.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
 <a name="XMLSECKEYINFONODEREAD"></a><h3>xmlSecKeyInfoNodeRead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyInfoNodeRead               (<font>xmlNodePtr</font> keyInfoNode,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyInfoNodeRead               (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> keyInfoNode</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Parses the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element <code class="PARAMETER">keyInfoNode</code>, extracts the key data
 and stores into <code class="PARAMETER">key</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5535"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6641"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5541"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to result key object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6647"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to result key object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5546"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6652"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5552"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6658"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or -1 if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -171,27 +170,26 @@ and stores into <code class="PARAMETER">key</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYINFONODEWRITE"></a><h3>xmlSecKeyInfoNodeWrite ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyInfoNodeWrite              (<font>xmlNodePtr</font> keyInfoNode,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyInfoNodeWrite              (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> keyInfoNode</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Writes the <code class="PARAMETER">key</code> into the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element template <code class="PARAMETER">keyInfoNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5572"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6684"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5578"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6690"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5583"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6695"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5589"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6701"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or -1 if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -205,121 +203,107 @@ and stores into <code class="PARAMETER">key</code>.</p>
 } xmlSecKeyInfoMode;</pre>
 <p>The <code class="PARAMETER">xmlSecKeyInfoCtx</code> operation mode (read or write).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECKEYINFOMODEREAD"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyInfoModeRead</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p> read <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo%20"; target="_top">&lt;dsig:KeyInfo /&gt;</a> element.</p></td>
+<td align="LEFT" valign="TOP"><p>read <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo%20"; target="_top">&lt;dsig:KeyInfo /&gt;</a> element.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECKEYINFOMODEWRITE"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyInfoModeWrite</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p> write <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo%20"; target="_top">&lt;dsig:KeyInfo /&gt;</a> element.</p></td>
+<td align="LEFT" valign="TOP"><p>write <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo%20"; target="_top">&lt;dsig:KeyInfo /&gt;</a> element.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND:CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND             0x00000001</pre>
 <p>If flag is set then we will continue reading <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo%20"; target="_top">&lt;dsig:KeyInfo /&gt;</a>
 element even when key is already found.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD:CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD              0x00000002</pre>
 <p>If flag is set then we abort if an unknown <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo%20"; target="_top">&lt;dsig:KeyInfo /&gt;</a>
 child is found.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN:CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN            0x00000004</pre>
 <p>If flags is set then we abort if an unknown key name
 (content of <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyName%20"; target="_top">&lt;dsig:KeyName /&gt;</a> element) is found.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD:CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD     0x00000008</pre>
 <p>If flags is set then we abort if an unknown <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue%20"; target="_top">&lt;dsig:KeyValue /&gt;</a>
 child is found.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF:CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF    0x00000010</pre>
 <p>If flag is set then we abort if an unknown href attribute
 of <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod%20"; target="_top">&lt;dsig:RetrievalMethod /&gt;</a> element is found.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF:CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF   0x00000020</pre>
 <p>If flag is set then we abort if an href attribute <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod%20"; target="_top">&lt;dsig:RetrievalMethod /&gt;</a>
 element does not match the real key data type.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD:CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD     0x00000100</pre>
 <p>If flags is set then we abort if an unknown <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data%20"; target="_top">&lt;dsig:X509Data /&gt;</a>
 child is found.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS:CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS         0x00000200</pre>
 <p>If flag is set then we'll load certificates from <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data%20"; target="_top">&lt;dsig:X509Data /&gt;</a>
 element without verification.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT:CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT      0x00000400</pre>
 <p>If flag is set then we'll stop when we could not resolve reference
 to certificate from <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial%20"; target="_top">&lt;dsig:X509IssuerSerial /&gt;</a>, <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SKI%20"; target="_top">&lt;dsig:X509SKI /&gt;</a> or
 <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName%20"; target="_top">&lt;dsig:X509SubjectName /&gt;</a> elements.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT:CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT      0x00000800</pre>
 <p>If the flag is set then we'll stop when <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data%20"; target="_top">&lt;dsig:X509Data /&gt;</a> element
 processing does not return a verified certificate.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION:CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION 0x00001000</pre>
 <p>If the flag is set then we'll stop when <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey%20"; target="_top">&lt;enc:EncryptedKey /&gt;</a> element
 processing fails.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE:CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE                 0x00002000</pre>
 <p>If the flag is set then we'll stop when we found an empty node.
 Otherwise we just ignore it.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS:CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS        0x00004000</pre>
 <p>If the flag is set then we'll skip strict checking of certs and CRLs</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
@@ -363,116 +347,114 @@ Otherwise we just ignore it.</p>
 };</pre>
 <p>The <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo%20"; target="_top">&lt;dsig:KeyInfo /&gt;</a> reading or writing context.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5728"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">userData</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to user data (xmlsec and xmlsec-crypto
+<td align="LEFT" valign="TOP"><a name="AEN6825"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">userData</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to user data (xmlsec and xmlsec-crypto
                      never touch this).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5734"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the bit mask for flags that control processin.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6832"><span style="white-space: nowrap">unsigned <gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> <code class="STRUCTFIELD">flags</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the bit mask for flags that control processin.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5740"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags2</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>             reserved for future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6839"><span style="white-space: nowrap">unsigned <gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> <code class="STRUCTFIELD">flags2</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5746"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> <code class="STRUCTFIELD">keysMngr</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to current keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6846"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> <code class="STRUCTFIELD">keysMngr</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to current keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5752"><span style="white-space: nowrap"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOMODE">xmlSecKeyInfoMode</a> <code class="STRUCTFIELD">mode</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>               do we read or write <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo%20"; target="_top">&lt;dsig:KeyInfo /&gt;</a> element.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6853"><span style="white-space: nowrap"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOMODE"><span class="TYPE">xmlSecKeyInfoMode</span></a> <code class="STRUCTFIELD">mode</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>do we read or write <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo%20"; target="_top">&lt;dsig:KeyInfo /&gt;</a> element.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5759"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a> <code class="STRUCTFIELD">enabledKeyData</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the list of enabled <code class="PARAMETER">xmlSecKeyDataId</code> (if list is
+<td align="LEFT" valign="TOP"><a name="AEN6861"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrList</span></a> <code class="STRUCTFIELD">enabledKeyData</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the list of enabled <code class="PARAMETER">xmlSecKeyDataId</code> (if list is
                      empty then all data ids are enabled).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5766"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">base64LineSize</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the max columns size for base64 encoding.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6869"><span style="white-space: nowrap"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> <code class="STRUCTFIELD">base64LineSize</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the max columns size for base64 encoding.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5772"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtx</a> <code class="STRUCTFIELD">retrievalMethodCtx</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p> the transforms context for <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod%20"; target="_top">&lt;dsig:RetrievalMethod /&gt;</a>
+<td align="LEFT" valign="TOP"><a name="AEN6876"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtx</span></a> <code class="STRUCTFIELD">retrievalMethodCtx</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transforms context for <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod%20"; target="_top">&lt;dsig:RetrievalMethod /&gt;</a>
                      element processing.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5779"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">maxRetrievalMethodLevel</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p> the max recursion level when processing
+<td align="LEFT" valign="TOP"><a name="AEN6884"><span style="white-space: nowrap"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> <code class="STRUCTFIELD">maxRetrievalMethodLevel</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the max recursion level when processing
                      <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod%20"; target="_top">&lt;dsig:RetrievalMethod /&gt;</a> element; default level is 1
                      (see also <code class="PARAMETER">curRetrievalMethodLevel</code>).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5787"><span style="white-space: nowrap"><a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> <code class="STRUCTFIELD">encCtx</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the encryption context for <a href="http://www.w3.org/TR/xmldsig-core/#sec-EncryptedKey%20"; target="_top">&lt;dsig:EncryptedKey /&gt;</a> element
+<td align="LEFT" valign="TOP"><a name="AEN6893"><span style="white-space: nowrap"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> <code class="STRUCTFIELD">encCtx</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the encryption context for <a href="http://www.w3.org/TR/xmldsig-core/#sec-EncryptedKey%20"; target="_top">&lt;dsig:EncryptedKey /&gt;</a> element
                      processing.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5794"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">maxEncryptedKeyLevel</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p> the max recursion level when processing
+<td align="LEFT" valign="TOP"><a name="AEN6901"><span style="white-space: nowrap"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> <code class="STRUCTFIELD">maxEncryptedKeyLevel</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the max recursion level when processing
                      <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey%20"; target="_top">&lt;enc:EncryptedKey /&gt;</a> element; default level is 1
                      (see <code class="PARAMETER">curEncryptedKeyLevel</code>).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5802"><span style="white-space: nowrap"><font>time_t</font> <code class="STRUCTFIELD">certsVerificationTime</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p> the time to use for X509 certificates verification
+<td align="LEFT" valign="TOP"><a name="AEN6910"><span style="white-space: nowrap"><gtkdoclink href="TIME-T"><span class="TYPE">time_t</span></gtkdoclink> <code class="STRUCTFIELD">certsVerificationTime</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the time to use for X509 certificates verification
                      ("not valid before" and "not valid after" checks);
                      if <code class="PARAMETER">certsVerificationTime</code> is equal to 0 (default)
                      then we verify certificates against the system's
                      clock "now".</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5809"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">certsVerificationDepth</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p> the max certifications chain length (default is 9).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6918"><span style="white-space: nowrap"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> <code class="STRUCTFIELD">certsVerificationDepth</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the max certifications chain length (default is 9).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5815"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">pgpReserved</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>        reserved for PGP.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6925"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">pgpReserved</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for PGP.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5821"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">curRetrievalMethodLevel</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p> the current <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod%20"; target="_top">&lt;dsig:RetrievalMethod /&gt;</a> element
+<td align="LEFT" valign="TOP"><a name="AEN6932"><span style="white-space: nowrap"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> <code class="STRUCTFIELD">curRetrievalMethodLevel</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the current <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod%20"; target="_top">&lt;dsig:RetrievalMethod /&gt;</a> element
                      processing level (see <code class="PARAMETER">maxRetrievalMethodLevel</code>).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5829"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">curEncryptedKeyLevel</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p> the current <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey%20"; target="_top">&lt;enc:EncryptedKey /&gt;</a> element
+<td align="LEFT" valign="TOP"><a name="AEN6941"><span style="white-space: nowrap"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> <code class="STRUCTFIELD">curEncryptedKeyLevel</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the current <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey%20"; target="_top">&lt;enc:EncryptedKey /&gt;</a> element
                      processing level (see <code class="PARAMETER">maxEncryptedKeyLevel</code>).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5837"><span style="white-space: nowrap"><a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReq</a> <code class="STRUCTFIELD">keyReq</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the current key requirements.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6950"><span style="white-space: nowrap"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReq</span></a> <code class="STRUCTFIELD">keyReq</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the current key requirements.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5843"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6957"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5849"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6964"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYINFOCTXCREATE"></a><h3>xmlSecKeyInfoCtxCreate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyInfoCtxPtr</font>  xmlSecKeyInfoCtxCreate             (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYINFOCTXPTR"><span class="RETURNVALUE">xmlSecKeyInfoCtxPtr</span></gtkdoclink>  xmlSecKeyInfoCtxCreate             (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> keysMngr</code>);</pre>
 <p>Allocates and initializes <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.
 Caller is responsible for freeing it by calling <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXDESTROY"><span class="TYPE">xmlSecKeyInfoCtxDestroy</span></a>
 function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5868"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to keys manager (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6986"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5873"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6991"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly allocated object or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -480,35 +462,33 @@ function.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYINFOCTXDESTROY"></a><h3>xmlSecKeyInfoCtxDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyInfoCtxDestroy             (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyInfoCtxDestroy             (<code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Destroys <code class="PARAMETER">keyInfoCtx</code> object created with <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXCREATE"><span class="TYPE">xmlSecKeyInfoCtxCreate</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN5891"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7011"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYINFOCTXINITIALIZE"></a><h3>xmlSecKeyInfoCtxInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyInfoCtxInitialize          (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx,
-                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyInfoCtxInitialize          (<code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> keysMngr</code>);</pre>
 <p>Initializes <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context. Caller is
 responsible for cleaning it up by <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXFINALIZE"><span class="TYPE">xmlSecKeyInfoCtxFinalize</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5911"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7035"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5917"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to keys manager (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7041"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5922"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7046"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success and a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -516,47 +496,44 @@ responsible for cleaning it up by <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXF
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYINFOCTXFINALIZE"></a><h3>xmlSecKeyInfoCtxFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyInfoCtxFinalize            (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyInfoCtxFinalize            (<code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Cleans up the <code class="PARAMETER">keyInfoCtx</code> initialized with <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXINITIALIZE"><span class="TYPE">xmlSecKeyInfoCtxInitialize</span></a>
 function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN5940"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7066"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYINFOCTXRESET"></a><h3>xmlSecKeyInfoCtxReset ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyInfoCtxReset               (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyInfoCtxReset               (<code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Resets the <code class="PARAMETER">keyInfoCtx</code> state. User settings are not changed.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN5957"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7085"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYINFOCTXCOPYUSERPREF"></a><h3>xmlSecKeyInfoCtxCopyUserPref ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyInfoCtxCopyUserPref        (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> dst,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> src);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyInfoCtxCopyUserPref        (<code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> dst</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> src</code>);</pre>
 <p>Copies user preferences from <code class="PARAMETER">src</code> context to <code class="PARAMETER">dst</code> context.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5976"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to destination context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7108"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to destination context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5981"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to source context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7113"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to source context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5986"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7118"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success and a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -564,18 +541,17 @@ function.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYINFOCTXCREATEENCCTX"></a><h3>xmlSecKeyInfoCtxCreateEncCtx ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyInfoCtxCreateEncCtx        (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyInfoCtxCreateEncCtx        (<code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Creates encryption context form processing <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> child
 of <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6003"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7137"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6009"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7143"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success and a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -583,38 +559,36 @@ of <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;ds
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYINFOCTXDEBUGDUMP"></a><h3>xmlSecKeyInfoCtxDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyInfoCtxDebugDump           (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyInfoCtxDebugDump           (<code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints user settings and current context state to <code class="PARAMETER">output</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6026"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7164"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6032"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the output file pointer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7170"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the output file pointer.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYINFOCTXDEBUGXMLDUMP"></a><h3>xmlSecKeyInfoCtxDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyInfoCtxDebugXmlDump        (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyInfoCtxDebugXmlDump        (<code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints user settings and current context state in XML format to <code class="PARAMETER">output</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6049"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7191"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6055"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the output file pointer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7197"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the output file pointer.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -623,12 +597,11 @@ of <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;ds
 <a name="XMLSECKEYDATANAMEID"></a><h3>xmlSecKeyDataNameId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataNameId             xmlSecKeyDataNameGetKlass()</pre>
 <p>The &lt;dsig:KeyName&gt; processing class.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATANAMEGETKLASS"></a><h3>xmlSecKeyDataNameGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataNameGetKlass           (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecKeyDataNameGetKlass           (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyName"; target="_top">&lt;dsig:KeyName/&gt;</a> element key data klass
 (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-KEYNAME"><span class="TYPE">sec-KeyName</span></gtkdoclink>):</p>
 <p>The KeyName element contains a string value (in which white space is
@@ -639,9 +612,8 @@ other protocol-related information that indirectly identifies a key pair.
 (Common uses of KeyName include simple string names for keys, a key index,
 a distinguished name (DN), an email address, etc.)</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN6080"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7223"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyName"; target="_top">&lt;dsig:KeyName/&gt;</a> element processing key data klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -650,20 +622,18 @@ a distinguished name (DN), an email address, etc.)</p>
 <a name="XMLSECKEYDATAVALUEID"></a><h3>xmlSecKeyDataValueId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataValueId            xmlSecKeyDataValueGetKlass()</pre>
 <p>The &lt;dsig:KeyValue&gt; processing class.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAVALUEGETKLASS"></a><h3>xmlSecKeyDataValueGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataValueGetKlass          (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecKeyDataValueGetKlass          (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue"; target="_top">&lt;dsig:KeyValue/&gt;</a> element key data klass
 (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-KEYVALUE"><span class="TYPE">sec-KeyValue</span></gtkdoclink>):</p>
 <p>The KeyValue element contains a single public key that may be useful in
 validating the signature.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN6106"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7250"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue"; target="_top">&lt;dsig:KeyValue/&gt;</a> element processing key data klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -672,13 +642,12 @@ validating the signature.</p>
 <a name="XMLSECKEYDATARETRIEVALMETHODID"></a><h3>xmlSecKeyDataRetrievalMethodId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataRetrievalMethodId  xmlSecKeyDataRetrievalMethodGetKlass()</pre>
 <p>The &lt;dsig:RetrievalMethod&gt; processing class.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATARETRIEVALMETHODGETKLASS"></a><h3>xmlSecKeyDataRetrievalMethodGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataRetrievalMethodGetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecKeyDataRetrievalMethodGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod"; target="_top">&lt;dsig:RetrievalMethod/&gt;</a> element key data klass
 (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-RETRIEVALMETHOD"><span class="TYPE">sec-RetrievalMethod</span></gtkdoclink>):
 A RetrievalMethod element within KeyInfo is used to convey a reference to
@@ -691,9 +660,8 @@ sequence of X509Certificate elements.</p>
 <p>RetrievalMethod uses the same syntax and dereferencing behavior as
 Reference's URI and The Reference Processing Model.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN6132"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7277"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod"; target="_top">&lt;dsig:RetrievalMethod/&gt;</a> element processing key data klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -702,12 +670,11 @@ Reference's URI and The Reference Processing Model.</p>
 <a name="XMLSECKEYDATAENCRYPTEDKEYID"></a><h3>xmlSecKeyDataEncryptedKeyId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataEncryptedKeyId     xmlSecKeyDataEncryptedKeyGetKlass()</pre>
 <p>The &lt;enc:EncryptedKey&gt; processing class.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAENCRYPTEDKEYGETKLASS"></a><h3>xmlSecKeyDataEncryptedKeyGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataEncryptedKeyGetKlass   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecKeyDataEncryptedKeyGetKlass   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> element key data klass
 (http://www.w3.org/TR/xmlenc-core/<gtkdoclink href="SEC-ENCRYPTEDKEY"><span class="TYPE">sec-EncryptedKey</span></gtkdoclink>):</p>
 <p>The EncryptedKey element is used to transport encryption keys from
@@ -718,9 +685,8 @@ is always encrypted to the recipient(s). When EncryptedKey is decrypted the
 resulting octets are made available to the EncryptionMethod algorithm
 without any additional processing.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN6158"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7304"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> element processing key data klass.</p></td>
 </tr></tbody></table>
 </div>
diff --git a/docs/api/xmlsec-keys.html b/docs/api/xmlsec-keys.html
index a222ded..3492917 100644
--- a/docs/api/xmlsec-keys.html
+++ b/docs/api/xmlsec-keys.html
@@ -87,7 +87,7 @@
 <h1>
 <a name="XMLSEC-KEYS"></a>keys</h1>
 <div class="REFNAMEDIV">
-<a name="AEN8602"></a><h2>Name</h2>keys -- Crypto key object definition.</div>
+<a name="AEN10274"></a><h2>Name</h2>keys -- Crypto key object definition.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-KEYS.SYNOPSIS"></a><h2>Synopsis</h2>
 <pre class="SYNOPSIS">typedef             <a href="xmlsec-keys.html#XMLSECKEYUSAGE">xmlSecKeyUsage</a>;
@@ -97,83 +97,84 @@
 #define             <a href="xmlsec-keys.html#XMLSECKEYUSAGEDECRYPT">xmlSecKeyUsageDecrypt</a>
 #define             <a href="xmlsec-keys.html#XMLSECKEYUSAGEKEYEXCHANGE">xmlSecKeyUsageKeyExchange</a>
 #define             <a href="xmlsec-keys.html#XMLSECKEYUSAGEANY">xmlSecKeyUsageAny</a>
-<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYUSEWITHINITIALIZE">xmlSecKeyUseWithInitialize</a>          (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);
-<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYUSEWITHFINALIZE">xmlSecKeyUseWithFinalize</a>            (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);
-<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYUSEWITHRESET">xmlSecKeyUseWithReset</a>               (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);
-<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYUSEWITHCOPY">xmlSecKeyUseWithCopy</a>                (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> dst,
-                                                         <a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> src);
-<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a>  <a href="xmlsec-keys.html#XMLSECKEYUSEWITHCREATE">xmlSecKeyUseWithCreate</a>             (const <font>xmlChar</font> *application,
-                                                         const <font>xmlChar</font> *identifier);
-<font>xmlSecKeyUseWithPtr</font>  <a href="xmlsec-keys.html#XMLSECKEYUSEWITHDUPLICATE">xmlSecKeyUseWithDuplicate</a>          (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);
-<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYUSEWITHDESTROY">xmlSecKeyUseWithDestroy</a>             (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);
-<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYUSEWITHSET">xmlSecKeyUseWithSet</a>                 (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith,
-                                                         const <font>xmlChar</font> *application,
-                                                         const <font>xmlChar</font> *identifier);
-<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYUSEWITHDEBUGDUMP">xmlSecKeyUseWithDebugDump</a>           (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith,
-                                                         <font>FILE</font> *output);
-<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYUSEWITHDEBUGXMLDUMP">xmlSecKeyUseWithDebugXmlDump</a>        (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith,
-                                                         <font>FILE</font> *output);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYUSEWITHINITIALIZE">xmlSecKeyUseWithInitialize</a>          (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="TYPE">xmlSecKeyUseWithPtr</span></a> keyUseWith</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYUSEWITHFINALIZE">xmlSecKeyUseWithFinalize</a>            (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="TYPE">xmlSecKeyUseWithPtr</span></a> keyUseWith</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYUSEWITHRESET">xmlSecKeyUseWithReset</a>               (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="TYPE">xmlSecKeyUseWithPtr</span></a> keyUseWith</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYUSEWITHCOPY">xmlSecKeyUseWithCopy</a>                (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="TYPE">xmlSecKeyUseWithPtr</span></a> dst</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="TYPE">xmlSecKeyUseWithPtr</span></a> src</code>);
+<a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="RETURNVALUE">xmlSecKeyUseWithPtr</span></a>  <a href="xmlsec-keys.html#XMLSECKEYUSEWITHCREATE">xmlSecKeyUseWithCreate</a>             (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *application</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *identifier</code>);
+<gtkdoclink href="XMLSECKEYUSEWITHPTR"><span class="RETURNVALUE">xmlSecKeyUseWithPtr</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYUSEWITHDUPLICATE">xmlSecKeyUseWithDuplicate</a>          (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="TYPE">xmlSecKeyUseWithPtr</span></a> keyUseWith</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYUSEWITHDESTROY">xmlSecKeyUseWithDestroy</a>             (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="TYPE">xmlSecKeyUseWithPtr</span></a> keyUseWith</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYUSEWITHSET">xmlSecKeyUseWithSet</a>                 (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="TYPE">xmlSecKeyUseWithPtr</span></a> keyUseWith</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *application</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *identifier</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYUSEWITHDEBUGDUMP">xmlSecKeyUseWithDebugDump</a>           (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="TYPE">xmlSecKeyUseWithPtr</span></a> keyUseWith</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYUSEWITHDEBUGXMLDUMP">xmlSecKeyUseWithDebugXmlDump</a>        (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="TYPE">xmlSecKeyUseWithPtr</span></a> keyUseWith</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
 struct              <a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWith</a>;
 #define             <a href="xmlsec-keys.html#XMLSECKEYUSEWITHPTRLISTID">xmlSecKeyUseWithPtrListId</a>
-<font>xmlSecPtrListId</font>     <a href="xmlsec-keys.html#XMLSECKEYUSEWITHPTRLISTGETKLASS">xmlSecKeyUseWithPtrListGetKlass</a>     (void);
+<gtkdoclink href="XMLSECPTRLISTID"><span class="RETURNVALUE">xmlSecPtrListId</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYUSEWITHPTRLISTGETKLASS">xmlSecKeyUseWithPtrListGetKlass</a>     (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 struct              <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReq</a>;
-<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYREQINITIALIZE">xmlSecKeyReqInitialize</a>              (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);
-<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYREQFINALIZE">xmlSecKeyReqFinalize</a>                (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);
-<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYREQRESET">xmlSecKeyReqReset</a>                   (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);
-<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYREQCOPY">xmlSecKeyReqCopy</a>                    (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> dst,
-                                                         <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> src);
-<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYREQMATCHKEY">xmlSecKeyReqMatchKey</a>                (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYREQMATCHKEYVALUE">xmlSecKeyReqMatchKeyValue</a>           (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> value);
-<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYREQDEBUGDUMP">xmlSecKeyReqDebugDump</a>               (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
-                                                         <font>FILE</font> *output);
-<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYREQDEBUGXMLDUMP">xmlSecKeyReqDebugXmlDump</a>            (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
-                                                         <font>FILE</font> *output);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYREQINITIALIZE">xmlSecKeyReqInitialize</a>              (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> keyReq</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYREQFINALIZE">xmlSecKeyReqFinalize</a>                (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> keyReq</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYREQRESET">xmlSecKeyReqReset</a>                   (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> keyReq</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYREQCOPY">xmlSecKeyReqCopy</a>                    (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> dst</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> src</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYREQMATCHKEY">xmlSecKeyReqMatchKey</a>                (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> keyReq</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYREQMATCHKEYVALUE">xmlSecKeyReqMatchKeyValue</a>           (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> keyReq</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> value</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYREQDEBUGDUMP">xmlSecKeyReqDebugDump</a>               (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> keyReq</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYREQDEBUGXMLDUMP">xmlSecKeyReqDebugXmlDump</a>            (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> keyReq</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
 struct              <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKey</a>;
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-keys.html#XMLSECKEYCREATE">xmlSecKeyCreate</a>                     (void);
-<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYDESTROY">xmlSecKeyDestroy</a>                    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYEMPTY">xmlSecKeyEmpty</a>                      (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>xmlSecKeyPtr</font>        <a href="xmlsec-keys.html#XMLSECKEYDUPLICATE">xmlSecKeyDuplicate</a>                  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYCOPY">xmlSecKeyCopy</a>                       (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> keyDst,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> keySrc);
-const <font>xmlChar</font>*      <a href="xmlsec-keys.html#XMLSECKEYGETNAME">xmlSecKeyGetName</a>                    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYSETNAME">xmlSecKeySetName</a>                    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <font>xmlChar</font> *name);
-<a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a>   <a href="xmlsec-keys.html#XMLSECKEYGETTYPE">xmlSecKeyGetType</a>                    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>xmlSecKeyDataPtr</font>    <a href="xmlsec-keys.html#XMLSECKEYGETVALUE">xmlSecKeyGetValue</a>                   (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYSETVALUE">xmlSecKeySetValue</a>                   (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> value);
-<font>xmlSecKeyDataPtr</font>    <a href="xmlsec-keys.html#XMLSECKEYGETDATA">xmlSecKeyGetData</a>                    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>xmlSecKeyDataId</font> dataId);
-<font>xmlSecKeyDataPtr</font>    <a href="xmlsec-keys.html#XMLSECKEYENSUREDATA">xmlSecKeyEnsureData</a>                 (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>xmlSecKeyDataId</font> dataId);
-<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYADOPTDATA">xmlSecKeyAdoptData</a>                  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYDEBUGDUMP">xmlSecKeyDebugDump</a>                  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>FILE</font> *output);
-<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYDEBUGXMLDUMP">xmlSecKeyDebugXmlDump</a>               (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>FILE</font> *output);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-keys.html#XMLSECKEYGENERATE">xmlSecKeyGenerate</a>                   (<font>xmlSecKeyDataId</font> dataId,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-keys.html#XMLSECKEYGENERATEBYNAME">xmlSecKeyGenerateByName</a>             (const <font>xmlChar</font> *name,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYMATCH">xmlSecKeyMatch</a>                      (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <font>xmlChar</font> *name,
-                                                         <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-keys.html#XMLSECKEYREADBUFFER">xmlSecKeyReadBuffer</a>                 (<font>xmlSecKeyDataId</font> dataId,
-                                                         <a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a> *buffer);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-keys.html#XMLSECKEYREADBINARYFILE">xmlSecKeyReadBinaryFile</a>             (<font>xmlSecKeyDataId</font> dataId,
-                                                         const <font>char</font> *filename);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-keys.html#XMLSECKEYREADMEMORY">xmlSecKeyReadMemory</a>                 (<font>xmlSecKeyDataId</font> dataId,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-keys.html#XMLSECKEYCREATE">xmlSecKeyCreate</a>                     (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYDESTROY">xmlSecKeyDestroy</a>                    (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYEMPTY">xmlSecKeyEmpty</a>                      (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);
+<gtkdoclink href="XMLSECKEYPTR"><span class="RETURNVALUE">xmlSecKeyPtr</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYDUPLICATE">xmlSecKeyDuplicate</a>                  (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYCOPY">xmlSecKeyCopy</a>                       (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> keyDst</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> keySrc</code>);
+const <gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*      <a href="xmlsec-keys.html#XMLSECKEYGETNAME">xmlSecKeyGetName</a>                    (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYSETNAME">xmlSecKeySetName</a>                    (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>);
+<a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="RETURNVALUE">xmlSecKeyDataType</span></a>   <a href="xmlsec-keys.html#XMLSECKEYGETTYPE">xmlSecKeyGetType</a>                    (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);
+<gtkdoclink href="XMLSECKEYDATAPTR"><span class="RETURNVALUE">xmlSecKeyDataPtr</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYGETVALUE">xmlSecKeyGetValue</a>                   (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYSETVALUE">xmlSecKeySetValue</a>                   (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> value</code>);
+<gtkdoclink href="XMLSECKEYDATAPTR"><span class="RETURNVALUE">xmlSecKeyDataPtr</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYGETDATA">xmlSecKeyGetData</a>                    (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> dataId</code>);
+<gtkdoclink href="XMLSECKEYDATAPTR"><span class="RETURNVALUE">xmlSecKeyDataPtr</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYENSUREDATA">xmlSecKeyEnsureData</a>                 (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> dataId</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYADOPTDATA">xmlSecKeyAdoptData</a>                  (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYDEBUGDUMP">xmlSecKeyDebugDump</a>                  (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYDEBUGXMLDUMP">xmlSecKeyDebugXmlDump</a>               (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-keys.html#XMLSECKEYGENERATE">xmlSecKeyGenerate</a>                   (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> dataId</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> sizeBits</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-keys.html#XMLSECKEYGENERATEBYNAME">xmlSecKeyGenerateByName</a>             (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> sizeBits</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYMATCH">xmlSecKeyMatch</a>                      (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> keyReq</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-keys.html#XMLSECKEYREADBUFFER">xmlSecKeyReadBuffer</a>                 (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> dataId</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBuffer</span></a> *buffer</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-keys.html#XMLSECKEYREADBINARYFILE">xmlSecKeyReadBinaryFile</a>             (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> dataId</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-keys.html#XMLSECKEYREADMEMORY">xmlSecKeyReadMemory</a>                 (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> dataId</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>);
 #define             <a href="xmlsec-keys.html#XMLSECKEYISVALID">xmlSecKeyIsValid</a>                    (key)
-#define             <a href="xmlsec-keys.html#XMLSECKEYCHECKID">xmlSecKeyCheckId</a>                    (key, keyId)
+#define             <a href="xmlsec-keys.html#XMLSECKEYCHECKID">xmlSecKeyCheckId</a>                    (key,
+                                                         keyId)
 #define             <a href="xmlsec-keys.html#XMLSECKEYPTRLISTID">xmlSecKeyPtrListId</a>
-<font>xmlSecPtrListId</font>     <a href="xmlsec-keys.html#XMLSECKEYPTRLISTGETKLASS">xmlSecKeyPtrListGetKlass</a>            (void);</pre>
+<gtkdoclink href="XMLSECPTRLISTID"><span class="RETURNVALUE">xmlSecPtrListId</span></gtkdoclink><a href="xmlsec-keys.html#XMLSECKEYPTRLISTGETKLASS">xmlSecKeyPtrListGetKlass</a>            (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-KEYS.DESCRIPTION"></a><h2>Description</h2>
@@ -185,64 +186,56 @@ const <font>xmlChar</font>*      <a href="xmlsec-keys.html#XMLSECKEYGETNAME">xml
 <a name="XMLSECKEYUSAGE"></a><h3>xmlSecKeyUsage</h3>
 <pre class="PROGRAMLISTING">typedef unsigned int                    xmlSecKeyUsage;</pre>
 <p>The key usage.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYUSAGESIGN"></a><h3>xmlSecKeyUsageSign</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyUsageSign              0x00000001</pre>
 <p>Key can be used in any way.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYUSAGEVERIFY"></a><h3>xmlSecKeyUsageVerify</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyUsageVerify            0x00000002</pre>
 <p>Key for signing.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYUSAGEENCRYPT"></a><h3>xmlSecKeyUsageEncrypt</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyUsageEncrypt           0x00000004</pre>
 <p>Key for signature verification.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYUSAGEDECRYPT"></a><h3>xmlSecKeyUsageDecrypt</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyUsageDecrypt           0x00000008</pre>
 <p>An encryption key.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYUSAGEKEYEXCHANGE"></a><h3>xmlSecKeyUsageKeyExchange</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyUsageKeyExchange       0x00000010</pre>
 <p>The key is used for key exchange.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYUSAGEANY"></a><h3>xmlSecKeyUsageAny</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyUsageAny               0xFFFFFFFF</pre>
 <p>A decryption key.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYUSEWITHINITIALIZE"></a><h3>xmlSecKeyUseWithInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyUseWithInitialize          (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyUseWithInitialize          (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="TYPE">xmlSecKeyUseWithPtr</span></a> keyUseWith</code>);</pre>
 <p>Initializes <code class="PARAMETER">keyUseWith</code> object.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8836"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10684"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to information about key application/user.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8841"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10689"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -250,46 +243,43 @@ const <font>xmlChar</font>*      <a href="xmlsec-keys.html#XMLSECKEYGETNAME">xml
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYUSEWITHFINALIZE"></a><h3>xmlSecKeyUseWithFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyUseWithFinalize            (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyUseWithFinalize            (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="TYPE">xmlSecKeyUseWithPtr</span></a> keyUseWith</code>);</pre>
 <p>Finalizes <code class="PARAMETER">keyUseWith</code> object.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8857"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10707"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to information about key application/user.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYUSEWITHRESET"></a><h3>xmlSecKeyUseWithReset ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyUseWithReset               (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyUseWithReset               (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="TYPE">xmlSecKeyUseWithPtr</span></a> keyUseWith</code>);</pre>
 <p>Resets the <code class="PARAMETER">keyUseWith</code> to its state after initialization.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8873"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10725"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to information about key application/user.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYUSEWITHCOPY"></a><h3>xmlSecKeyUseWithCopy ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyUseWithCopy                (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> dst,
-                                                         <a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> src);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyUseWithCopy                (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="TYPE">xmlSecKeyUseWithPtr</span></a> dst</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="TYPE">xmlSecKeyUseWithPtr</span></a> src</code>);</pre>
 <p>Copies information from <code class="PARAMETER">dst</code> to <code class="PARAMETER">src</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8891"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to destination object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10747"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to destination object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8896"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to source object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10752"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to source object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8901"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10757"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -297,23 +287,22 @@ const <font>xmlChar</font>*      <a href="xmlsec-keys.html#XMLSECKEYGETNAME">xml
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYUSEWITHCREATE"></a><h3>xmlSecKeyUseWithCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a>  xmlSecKeyUseWithCreate             (const <font>xmlChar</font> *application,
-                                                         const <font>xmlChar</font> *identifier);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="RETURNVALUE">xmlSecKeyUseWithPtr</span></a>  xmlSecKeyUseWithCreate             (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *application</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *identifier</code>);</pre>
 <p>Creates new xmlSecKeyUseWith object. The caller is responsible for destroying
 returned object with <code class="PARAMETER">xmlSecKeyUseWithDestroy</code> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8918"><span style="white-space: nowrap"><code class="PARAMETER">application</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the application value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10778"><span style="white-space: nowrap"><code class="PARAMETER">application</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the application value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8923"><span style="white-space: nowrap"><code class="PARAMETER">identifier</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the identifier value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10783"><span style="white-space: nowrap"><code class="PARAMETER">identifier</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the identifier value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8928"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10788"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly created object or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -321,18 +310,17 @@ returned object with <code class="PARAMETER">xmlSecKeyUseWithDestroy</code> func
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYUSEWITHDUPLICATE"></a><h3>xmlSecKeyUseWithDuplicate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyUseWithPtr</font>  xmlSecKeyUseWithDuplicate          (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYUSEWITHPTR"><span class="RETURNVALUE">xmlSecKeyUseWithPtr</span></gtkdoclink>  xmlSecKeyUseWithDuplicate          (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="TYPE">xmlSecKeyUseWithPtr</span></a> keyUseWith</code>);</pre>
 <p>Duplicates <code class="PARAMETER">keyUseWith</code> object. The caller is responsible for destroying
 returned object with <code class="PARAMETER">xmlSecKeyUseWithDestroy</code> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8945"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10807"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to information about key application/user.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8950"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10812"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly created object or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -340,40 +328,38 @@ returned object with <code class="PARAMETER">xmlSecKeyUseWithDestroy</code> func
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYUSEWITHDESTROY"></a><h3>xmlSecKeyUseWithDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyUseWithDestroy             (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyUseWithDestroy             (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="TYPE">xmlSecKeyUseWithPtr</span></a> keyUseWith</code>);</pre>
 <p>Destroys <code class="PARAMETER">keyUseWith</code> created with <code class="PARAMETER">xmlSecKeyUseWithCreate</code> or <code class="PARAMETER">xmlSecKeyUseWithDuplicate</code>
 functions.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8968"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10832"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to information about key application/user.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYUSEWITHSET"></a><h3>xmlSecKeyUseWithSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyUseWithSet                 (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith,
-                                                         const <font>xmlChar</font> *application,
-                                                         const <font>xmlChar</font> *identifier);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyUseWithSet                 (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="TYPE">xmlSecKeyUseWithPtr</span></a> keyUseWith</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *application</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *identifier</code>);</pre>
 <p>Sets <code class="PARAMETER">application</code> and <code class="PARAMETER">identifier</code> in the <code class="PARAMETER">keyUseWith</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8988"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10858"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to information about key application/user.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8993"><span style="white-space: nowrap"><code class="PARAMETER">application</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the new application value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10863"><span style="white-space: nowrap"><code class="PARAMETER">application</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new application value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8998"><span style="white-space: nowrap"><code class="PARAMETER">identifier</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the new identifier value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10868"><span style="white-space: nowrap"><code class="PARAMETER">identifier</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new identifier value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9003"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10873"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -381,38 +367,36 @@ functions.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYUSEWITHDEBUGDUMP"></a><h3>xmlSecKeyUseWithDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyUseWithDebugDump           (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyUseWithDebugDump           (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="TYPE">xmlSecKeyUseWithPtr</span></a> keyUseWith</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints xmlSecKeyUseWith debug information to a file <code class="PARAMETER">output</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9020"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10894"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to information about key application/user.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9025"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10899"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYUSEWITHDEBUGXMLDUMP"></a><h3>xmlSecKeyUseWithDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyUseWithDebugXmlDump        (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyUseWithDebugXmlDump        (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH"><span class="TYPE">xmlSecKeyUseWithPtr</span></a> keyUseWith</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints xmlSecKeyUseWith debug information to a file <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9042"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10920"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to information about key application/user.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9047"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10925"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -428,23 +412,22 @@ functions.</p>
 };</pre>
 <p>Information about application and user of the key.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9060"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">application</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the application.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10937"><span style="white-space: nowrap"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">application</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the application.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9066"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">identifier</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the identifier.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10944"><span style="white-space: nowrap"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">identifier</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the identifier.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9072"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for future use.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10951"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for future use.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9078"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved2</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for future use.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10958"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved2</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for future use.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -453,17 +436,15 @@ functions.</p>
 <a name="XMLSECKEYUSEWITHPTRLISTID"></a><h3>xmlSecKeyUseWithPtrListId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyUseWithPtrListId       xmlSecKeyUseWithPtrListGetKlass()</pre>
 <p>The keys list klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYUSEWITHPTRLISTGETKLASS"></a><h3>xmlSecKeyUseWithPtrListGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font>     xmlSecKeyUseWithPtrListGetKlass     (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECPTRLISTID"><span class="RETURNVALUE">xmlSecPtrListId</span></gtkdoclink>     xmlSecKeyUseWithPtrListGetKlass     (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The key data list klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN9100"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10982"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key data list klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -482,53 +463,51 @@ functions.</p>
 };</pre>
 <p>The key requirements information.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9113"><span style="white-space: nowrap"><font>xmlSecKeyDataId</font> <code class="STRUCTFIELD">keyId</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the desired key value klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10994"><span style="white-space: nowrap"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> <code class="STRUCTFIELD">keyId</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired key value klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9119"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> <code class="STRUCTFIELD">keyType</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the desired key type.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11001"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> <code class="STRUCTFIELD">keyType</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired key type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9125"><span style="white-space: nowrap"><a href="xmlsec-keys.html#XMLSECKEYUSAGE">xmlSecKeyUsage</a> <code class="STRUCTFIELD">keyUsage</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the desired key usage.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11008"><span style="white-space: nowrap"><a href="xmlsec-keys.html#XMLSECKEYUSAGE"><span class="TYPE">xmlSecKeyUsage</span></a> <code class="STRUCTFIELD">keyUsage</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired key usage.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9131"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">keyBitsSize</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the desired key size (in bits!).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11015"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> <code class="STRUCTFIELD">keyBitsSize</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired key size (in bits!).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9137"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a> <code class="STRUCTFIELD">keyUseWithList</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the desired key use with application/identifier information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11022"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrList</span></a> <code class="STRUCTFIELD">keyUseWithList</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired key use with application/identifier information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9143"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for future use.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11029"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for future use.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9149"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved2</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for future use.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11036"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved2</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for future use.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYREQINITIALIZE"></a><h3>xmlSecKeyReqInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyReqInitialize              (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyReqInitialize              (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> keyReq</code>);</pre>
 <p>Initialize key requirements object. Caller is responsible for
 cleaning it with <a href="xmlsec-keys.html#XMLSECKEYREQFINALIZE"><span class="TYPE">xmlSecKeyReqFinalize</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9167"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to key requirements object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11057"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key requirements object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9172"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11062"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -536,47 +515,44 @@ cleaning it with <a href="xmlsec-keys.html#XMLSECKEYREQFINALIZE"><span class="TY
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYREQFINALIZE"></a><h3>xmlSecKeyReqFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyReqFinalize                (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyReqFinalize                (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> keyReq</code>);</pre>
 <p>Cleans the key requirements object initialized with <a href="xmlsec-keys.html#XMLSECKEYREQINITIALIZE"><span class="TYPE">xmlSecKeyReqInitialize</span></a>
 function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN9189"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to key requirements object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11081"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key requirements object.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYREQRESET"></a><h3>xmlSecKeyReqReset ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyReqReset                   (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyReqReset                   (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> keyReq</code>);</pre>
 <p>Resets key requirements object for new key search.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN9204"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to key requirements object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11098"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key requirements object.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYREQCOPY"></a><h3>xmlSecKeyReqCopy ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyReqCopy                    (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> dst,
-                                                         <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> src);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyReqCopy                    (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> dst</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> src</code>);</pre>
 <p>Copies key requirements from <code class="PARAMETER">src</code> object to <code class="PARAMETER">dst</code> object.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9222"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to destination object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11120"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to destination object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9227"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to source object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11125"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to source object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9232"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11130"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success and a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -584,22 +560,21 @@ function.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYREQMATCHKEY"></a><h3>xmlSecKeyReqMatchKey ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyReqMatchKey                (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyReqMatchKey                (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> keyReq</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);</pre>
 <p>Checks whether <code class="PARAMETER">key</code> matches key requirements <code class="PARAMETER">keyReq</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9250"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to key requirements object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11152"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key requirements object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9255"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11157"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9260"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11162"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 1 if key matches requirements, 0 if not and a negative value
 if an error occurs.</p></td>
 </tr>
@@ -608,22 +583,21 @@ if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYREQMATCHKEYVALUE"></a><h3>xmlSecKeyReqMatchKeyValue ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyReqMatchKeyValue           (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> value);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyReqMatchKeyValue           (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> keyReq</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> value</code>);</pre>
 <p>Checks whether <code class="PARAMETER">keyValue</code> matches key requirements <code class="PARAMETER">keyReq</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9278"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to key requirements.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11184"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key requirements.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9283"><span style="white-space: nowrap"><code class="PARAMETER">value</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to key value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11189"><span style="white-space: nowrap"><code class="PARAMETER">value</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9288"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11194"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 1 if key value matches requirements, 0 if not and a negative value
 if an error occurs.</p></td>
 </tr>
@@ -632,38 +606,36 @@ if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYREQDEBUGDUMP"></a><h3>xmlSecKeyReqDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyReqDebugDump               (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyReqDebugDump               (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> keyReq</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints debug information about <code class="PARAMETER">keyReq</code> into <code class="PARAMETER">output</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9306"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to key requirements object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11216"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key requirements object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9311"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11221"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYREQDEBUGXMLDUMP"></a><h3>xmlSecKeyReqDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyReqDebugXmlDump            (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyReqDebugXmlDump            (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> keyReq</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints debug information about <code class="PARAMETER">keyReq</code> into <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9329"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to key requirements object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11243"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key requirements object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9334"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11248"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -680,44 +652,42 @@ if an error occurs.</p></td>
 };</pre>
 <p>The key.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9347"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">name</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the key name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11260"><span style="white-space: nowrap"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">name</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9353"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> <code class="STRUCTFIELD">value</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the key value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11267"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> <code class="STRUCTFIELD">value</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9359"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> <code class="STRUCTFIELD">dataList</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the key data list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11274"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> <code class="STRUCTFIELD">dataList</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key data list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9365"><span style="white-space: nowrap"><a href="xmlsec-keys.html#XMLSECKEYUSAGE">xmlSecKeyUsage</a> <code class="STRUCTFIELD">usage</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the key usage.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11281"><span style="white-space: nowrap"><a href="xmlsec-keys.html#XMLSECKEYUSAGE"><span class="TYPE">xmlSecKeyUsage</span></a> <code class="STRUCTFIELD">usage</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key usage.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9371"><span style="white-space: nowrap"><font>time_t</font> <code class="STRUCTFIELD">notValidBefore</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the start key validity interval.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11288"><span style="white-space: nowrap"><gtkdoclink href="TIME-T"><span class="TYPE">time_t</span></gtkdoclink> <code class="STRUCTFIELD">notValidBefore</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the start key validity interval.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9377"><span style="white-space: nowrap"><font>time_t</font> <code class="STRUCTFIELD">notValidAfter</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>      the end key validity interval.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11295"><span style="white-space: nowrap"><gtkdoclink href="TIME-T"><span class="TYPE">time_t</span></gtkdoclink> <code class="STRUCTFIELD">notValidAfter</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the end key validity interval.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYCREATE"></a><h3>xmlSecKeyCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecKeyCreate                     (void);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecKeyCreate                     (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Allocates and initializes new key. Caller is responsible for
 freeing returned object with <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="TYPE">xmlSecKeyDestroy</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN9394"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11315"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly allocated <code class="PARAMETER">xmlSecKey</code> structure
 or NULL if an error occurs.</p></td>
 </tr></tbody></table>
@@ -725,41 +695,38 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDESTROY"></a><h3>xmlSecKeyDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDestroy                    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyDestroy                    (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);</pre>
 <p>Destroys the key created using <a href="xmlsec-keys.html#XMLSECKEYCREATE"><span class="TYPE">xmlSecKeyCreate</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN9412"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11335"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYEMPTY"></a><h3>xmlSecKeyEmpty ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyEmpty                      (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyEmpty                      (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);</pre>
 <p>Clears the <code class="PARAMETER">key</code> data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN9428"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11353"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDUPLICATE"></a><h3>xmlSecKeyDuplicate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyPtr</font>        xmlSecKeyDuplicate                  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYPTR"><span class="RETURNVALUE">xmlSecKeyPtr</span></gtkdoclink>        xmlSecKeyDuplicate                  (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);</pre>
 <p>Creates a duplicate of the given <code class="PARAMETER">key</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9444"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to the <a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKey</span></a> structure.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11371"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to the <a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKey</span></a> structure.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9451"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11378"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly allocated <a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKey</span></a> structure
 or NULL if an error occurs.</p></td>
 </tr>
@@ -768,22 +735,21 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYCOPY"></a><h3>xmlSecKeyCopy ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyCopy                       (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> keyDst,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> keySrc);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyCopy                       (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> keyDst</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> keySrc</code>);</pre>
 <p>Copies key data from <code class="PARAMETER">keySrc</code> to <code class="PARAMETER">keyDst</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9471"><span style="white-space: nowrap"><code class="PARAMETER">keyDst</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the destination key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11402"><span style="white-space: nowrap"><code class="PARAMETER">keyDst</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the destination key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9476"><span style="white-space: nowrap"><code class="PARAMETER">keySrc</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the source key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11407"><span style="white-space: nowrap"><code class="PARAMETER">keySrc</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the source key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9481"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11412"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -791,17 +757,16 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYGETNAME"></a><h3>xmlSecKeyGetName ()</h3>
-<pre class="PROGRAMLISTING">const <font>xmlChar</font>*      xmlSecKeyGetName                    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<pre class="PROGRAMLISTING">const <gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*      xmlSecKeyGetName                    (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);</pre>
 <p>Gets key name (see also <a href="xmlsec-keys.html#XMLSECKEYSETNAME"><span class="TYPE">xmlSecKeySetName</span></a> function).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9498"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11431"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9503"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11436"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> key name.</p></td>
 </tr>
 </tbody></table>
@@ -809,22 +774,21 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYSETNAME"></a><h3>xmlSecKeySetName ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeySetName                    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <font>xmlChar</font> *name);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeySetName                    (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>);</pre>
 <p>Sets key name (see also <a href="xmlsec-keys.html#XMLSECKEYGETNAME"><span class="TYPE">xmlSecKeyGetName</span></a> function).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9521"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11458"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9526"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the new key name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11463"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new key name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9531"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11468"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -832,17 +796,16 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYGETTYPE"></a><h3>xmlSecKeyGetType ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a>   xmlSecKeyGetType                    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="RETURNVALUE">xmlSecKeyDataType</span></a>   xmlSecKeyGetType                    (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);</pre>
 <p>Gets <code class="PARAMETER">key</code> type.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9547"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11486"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9552"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11491"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> key type.</p></td>
 </tr>
 </tbody></table>
@@ -850,17 +813,16 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYGETVALUE"></a><h3>xmlSecKeyGetValue ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataPtr</font>    xmlSecKeyGetValue                   (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAPTR"><span class="RETURNVALUE">xmlSecKeyDataPtr</span></gtkdoclink>    xmlSecKeyGetValue                   (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);</pre>
 <p>Gets key value (see also <a href="xmlsec-keys.html#XMLSECKEYSETVALUE"><span class="TYPE">xmlSecKeySetValue</span></a> function).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9569"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11510"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9574"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11515"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> key value (crypto material).</p></td>
 </tr>
 </tbody></table>
@@ -868,22 +830,21 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYSETVALUE"></a><h3>xmlSecKeySetValue ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeySetValue                   (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> value);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeySetValue                   (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> value</code>);</pre>
 <p>Sets key value (see also <a href="xmlsec-keys.html#XMLSECKEYGETVALUE"><span class="TYPE">xmlSecKeyGetValue</span></a> function).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9592"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11537"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9597"><span style="white-space: nowrap"><code class="PARAMETER">value</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the new value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11542"><span style="white-space: nowrap"><code class="PARAMETER">value</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9602"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11547"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -891,22 +852,21 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYGETDATA"></a><h3>xmlSecKeyGetData ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataPtr</font>    xmlSecKeyGetData                    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>xmlSecKeyDataId</font> dataId);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAPTR"><span class="RETURNVALUE">xmlSecKeyDataPtr</span></gtkdoclink>    xmlSecKeyGetData                    (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> dataId</code>);</pre>
 <p>Gets key's data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9618"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11567"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9623"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the requested data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11572"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the requested data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9628"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11577"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> additional data associated with the <code class="PARAMETER">key</code> (see also
 <a href="xmlsec-keys.html#XMLSECKEYADOPTDATA"><span class="TYPE">xmlSecKeyAdoptData</span></a> function).</p></td>
 </tr>
@@ -915,22 +875,21 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYENSUREDATA"></a><h3>xmlSecKeyEnsureData ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataPtr</font>    xmlSecKeyEnsureData                 (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>xmlSecKeyDataId</font> dataId);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAPTR"><span class="RETURNVALUE">xmlSecKeyDataPtr</span></gtkdoclink>    xmlSecKeyEnsureData                 (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> dataId</code>);</pre>
 <p>If necessary, creates key data of <code class="PARAMETER">dataId</code> klass and adds to <code class="PARAMETER">key</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9649"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11602"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9654"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the requested data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11607"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the requested data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9659"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11612"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to key data or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -938,23 +897,22 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYADOPTDATA"></a><h3>xmlSecKeyAdoptData ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyAdoptData                  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyAdoptData                  (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Adds <code class="PARAMETER">data</code> to the <code class="PARAMETER">key</code>. The <code class="PARAMETER">data</code> object will be destroyed
 by <code class="PARAMETER">key</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9679"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11636"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9684"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11641"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9689"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11646"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -962,65 +920,62 @@ by <code class="PARAMETER">key</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDEBUGDUMP"></a><h3>xmlSecKeyDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDebugDump                  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyDebugDump                  (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints the information about the <code class="PARAMETER">key</code> to the <code class="PARAMETER">output</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9707"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11668"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9712"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11673"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDEBUGXMLDUMP"></a><h3>xmlSecKeyDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDebugXmlDump               (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyDebugXmlDump               (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints the information about the <code class="PARAMETER">key</code> to the <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9730"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11695"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9735"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11700"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYGENERATE"></a><h3>xmlSecKeyGenerate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecKeyGenerate                   (<font>xmlSecKeyDataId</font> dataId,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecKeyGenerate                   (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> dataId</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> sizeBits</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Generates new key of requested klass <code class="PARAMETER">dataId</code> and <code class="PARAMETER">type</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9754"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the requested key klass (rsa, dsa, aes, ...).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11725"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the requested key klass (rsa, dsa, aes, ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9759"><span style="white-space: nowrap"><code class="PARAMETER">sizeBits</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the new key size (in bits!).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11730"><span style="white-space: nowrap"><code class="PARAMETER">sizeBits</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new key size (in bits!).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9764"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the new key type (session, permanent, ...).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11735"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new key type (session, permanent, ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9769"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11740"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly created key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1028,27 +983,26 @@ by <code class="PARAMETER">key</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYGENERATEBYNAME"></a><h3>xmlSecKeyGenerateByName ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecKeyGenerateByName             (const <font>xmlChar</font> *name,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecKeyGenerateByName             (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> sizeBits</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Generates new key of requested <code class="PARAMETER">klass</code> and <code class="PARAMETER">type</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9788"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the requested key klass name (rsa, dsa, aes, ...).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11765"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the requested key klass name (rsa, dsa, aes, ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9793"><span style="white-space: nowrap"><code class="PARAMETER">sizeBits</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the new key size (in bits!).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11770"><span style="white-space: nowrap"><code class="PARAMETER">sizeBits</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new key size (in bits!).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9798"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the new key type (session, permanent, ...).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11775"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new key type (session, permanent, ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9803"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11780"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly created key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1056,27 +1010,26 @@ by <code class="PARAMETER">key</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYMATCH"></a><h3>xmlSecKeyMatch ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyMatch                      (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <font>xmlChar</font> *name,
-                                                         <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyMatch                      (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> keyReq</code>);</pre>
 <p>Checks whether the <code class="PARAMETER">key</code> matches the given criteria.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9821"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11804"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9826"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to key name (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11809"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key name (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9831"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to key requirements.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11814"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key requirements.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9836"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11819"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 1 if the key satisfies the given criteria or 0 otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1084,22 +1037,21 @@ by <code class="PARAMETER">key</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYREADBUFFER"></a><h3>xmlSecKeyReadBuffer ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecKeyReadBuffer                 (<font>xmlSecKeyDataId</font> dataId,
-                                                         <a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a> *buffer);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecKeyReadBuffer                 (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> dataId</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBuffer</span></a> *buffer</code>);</pre>
 <p>Reads the key value of klass <code class="PARAMETER">dataId</code> from a buffer.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9853"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the key value data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11840"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key value data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9858"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the buffer that contains the binary data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11845"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the buffer that contains the binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9863"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11850"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly created key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1107,22 +1059,21 @@ by <code class="PARAMETER">key</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYREADBINARYFILE"></a><h3>xmlSecKeyReadBinaryFile ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecKeyReadBinaryFile             (<font>xmlSecKeyDataId</font> dataId,
-                                                         const <font>char</font> *filename);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecKeyReadBinaryFile             (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> dataId</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>);</pre>
 <p>Reads the key value of klass <code class="PARAMETER">dataId</code> from a binary file <code class="PARAMETER">filename</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9881"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the key value data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11872"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key value data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9886"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the key binary filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11877"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key binary filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9891"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11882"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly created key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1130,27 +1081,26 @@ by <code class="PARAMETER">key</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYREADMEMORY"></a><h3>xmlSecKeyReadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecKeyReadMemory                 (<font>xmlSecKeyDataId</font> dataId,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecKeyReadMemory                 (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> dataId</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>);</pre>
 <p>Reads the key value of klass <code class="PARAMETER">dataId</code> from a memory block <code class="PARAMETER">data</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9910"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the key value data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11907"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key value data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9915"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the memory containing the key</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11912"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the memory containing the key</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9920"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the size of the memory block</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11917"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the size of the memory block</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9925"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11922"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly created key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1162,10 +1112,9 @@ by <code class="PARAMETER">key</code>.</p>
 <p>Macro. Returns 1 if <code class="PARAMETER">key</code> is not NULL and <code class="PARAMETER">key</code>-&gt;id is not NULL
 or 0 otherwise.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN9940"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11936"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -1174,15 +1123,14 @@ or 0 otherwise.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecKeyCheckId(key, keyId)</pre>
 <p>Macro. Returns 1 if <code class="PARAMETER">key</code> is valid and <code class="PARAMETER">key</code>'s id is equal to <code class="PARAMETER">keyId</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9956"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11951"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9961"><span style="white-space: nowrap"><code class="PARAMETER">keyId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the key Id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11956"><span style="white-space: nowrap"><code class="PARAMETER">keyId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key Id.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -1191,17 +1139,15 @@ or 0 otherwise.</p>
 <a name="XMLSECKEYPTRLISTID"></a><h3>xmlSecKeyPtrListId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyPtrListId      xmlSecKeyPtrListGetKlass()</pre>
 <p>The keys list klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYPTRLISTGETKLASS"></a><h3>xmlSecKeyPtrListGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font>     xmlSecKeyPtrListGetKlass            (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECPTRLISTID"><span class="RETURNVALUE">xmlSecPtrListId</span></gtkdoclink>     xmlSecKeyPtrListGetKlass            (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The keys list klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN9982"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11978"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> keys list id.</p></td>
 </tr></tbody></table>
 </div>
diff --git a/docs/api/xmlsec-keysdata.html b/docs/api/xmlsec-keysdata.html
index 71b2be0..dba74aa 100644
--- a/docs/api/xmlsec-keysdata.html
+++ b/docs/api/xmlsec-keysdata.html
@@ -87,7 +87,7 @@
 <h1>
 <a name="XMLSEC-KEYSDATA"></a>keysdata</h1>
 <div class="REFNAMEDIV">
-<a name="AEN6169"></a><h2>Name</h2>keysdata -- Crypto key data object definition.</div>
+<a name="AEN7315"></a><h2>Name</h2>keysdata -- Crypto key data object definition.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-KEYSDATA.SYNOPSIS"></a><h2>Synopsis</h2>
 <pre class="SYNOPSIS">typedef             <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a>;
@@ -113,149 +113,154 @@ typedef             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDa
 #define             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPETRUSTED">xmlSecKeyDataTypeTrusted</a>
 #define             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPEANY">xmlSecKeyDataTypeAny</a>
 enum                <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a>;
-<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a>    <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDSGET">xmlSecKeyDataIdsGet</a>                 (void);
-<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDSINIT">xmlSecKeyDataIdsInit</a>                (void);
-<font>void</font>                <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDSSHUTDOWN">xmlSecKeyDataIdsShutdown</a>            (void);
-<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDSREGISTERDEFAULT">xmlSecKeyDataIdsRegisterDefault</a>     (void);
-<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDSREGISTER">xmlSecKeyDataIdsRegister</a>            (<font>xmlSecKeyDataId</font> id);
+<a href="xmlsec-list.html#XMLSECPTRLIST"><span class="RETURNVALUE">xmlSecPtrListPtr</span></a>    <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDSGET">xmlSecKeyDataIdsGet</a>                 (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATAIDSINIT">xmlSecKeyDataIdsInit</a>                (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATAIDSSHUTDOWN">xmlSecKeyDataIdsShutdown</a>            (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATAIDSREGISTERDEFAULT">xmlSecKeyDataIdsRegisterDefault</a>     (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATAIDSREGISTER">xmlSecKeyDataIdsRegister</a>            (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>);
 struct              <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyData</a>;
-<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    <a href="xmlsec-keysdata.html#XMLSECKEYDATACREATE">xmlSecKeyDataCreate</a>                 (<font>xmlSecKeyDataId</font> id);
-<font>xmlSecKeyDataPtr</font>    <a href="xmlsec-keysdata.html#XMLSECKEYDATADUPLICATE">xmlSecKeyDataDuplicate</a>              (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>void</font>                <a href="xmlsec-keysdata.html#XMLSECKEYDATADESTROY">xmlSecKeyDataDestroy</a>                (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATAGENERATE">xmlSecKeyDataGenerate</a>               (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a>   <a href="xmlsec-keysdata.html#XMLSECKEYDATAGETTYPE">xmlSecKeyDataGetType</a>                (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-keysdata.html#XMLSECKEYDATAGETSIZE">xmlSecKeyDataGetSize</a>                (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-const <font>xmlChar</font>*      <a href="xmlsec-keysdata.html#XMLSECKEYDATAGETIDENTIFIER">xmlSecKeyDataGetIdentifier</a>          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>void</font>                <a href="xmlsec-keysdata.html#XMLSECKEYDATADEBUGDUMP">xmlSecKeyDataDebugDump</a>              (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>FILE</font> *output);
-<font>void</font>                <a href="xmlsec-keysdata.html#XMLSECKEYDATADEBUGXMLDUMP">xmlSecKeyDataDebugXmlDump</a>           (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>FILE</font> *output);
-<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLREAD">xmlSecKeyDataXmlRead</a>                (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLWRITE">xmlSecKeyDataXmlWrite</a>               (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATABINREAD">xmlSecKeyDataBinRead</a>                (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATABINWRITE">xmlSecKeyDataBinWrite</a>               (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> **buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *bufSize,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="RETURNVALUE">xmlSecKeyDataPtr</span></a>    <a href="xmlsec-keysdata.html#XMLSECKEYDATACREATE">xmlSecKeyDataCreate</a>                 (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>);
+<gtkdoclink href="XMLSECKEYDATAPTR"><span class="RETURNVALUE">xmlSecKeyDataPtr</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATADUPLICATE">xmlSecKeyDataDuplicate</a>              (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATADESTROY">xmlSecKeyDataDestroy</a>                (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATAGENERATE">xmlSecKeyDataGenerate</a>               (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> sizeBits</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="RETURNVALUE">xmlSecKeyDataType</span></a>   <a href="xmlsec-keysdata.html#XMLSECKEYDATAGETTYPE">xmlSecKeyDataGetType</a>                (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          <a href="xmlsec-keysdata.html#XMLSECKEYDATAGETSIZE">xmlSecKeyDataGetSize</a>                (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+const <gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*      <a href="xmlsec-keysdata.html#XMLSECKEYDATAGETIDENTIFIER">xmlSecKeyDataGetIdentifier</a>          (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATADEBUGDUMP">xmlSecKeyDataDebugDump</a>              (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATADEBUGXMLDUMP">xmlSecKeyDataDebugXmlDump</a>           (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLREAD">xmlSecKeyDataXmlRead</a>                (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLWRITE">xmlSecKeyDataXmlWrite</a>               (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATABINREAD">xmlSecKeyDataBinRead</a>                (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATABINWRITE">xmlSecKeyDataBinWrite</a>               (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> **buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> *bufSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
 #define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAGETNAME">xmlSecKeyDataGetName</a>                (data)
 #define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAISVALID">xmlSecKeyDataIsValid</a>                (data)
-#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATACHECKID">xmlSecKeyDataCheckId</a>                (data, dataId)
-#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATACHECKUSAGE">xmlSecKeyDataCheckUsage</a>             (data, usg)
-#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATACHECKSIZE">xmlSecKeyDataCheckSize</a>              (data, size)
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATACHECKID">xmlSecKeyDataCheckId</a>                (data,
+                                                         dataId)
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATACHECKUSAGE">xmlSecKeyDataCheckUsage</a>             (data,
+                                                         usg)
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATACHECKSIZE">xmlSecKeyDataCheckSize</a>              (data,
+                                                         size)
 #define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDUNKNOWN">xmlSecKeyDataIdUnknown</a>
-<font>int</font>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATAINITMETHOD">*xmlSecKeyDataInitMethod</a>)          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATADUPLICATEMETHOD">*xmlSecKeyDataDuplicateMethod</a>)     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> dst,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> src);
-<font>void</font>                (<a href="xmlsec-keysdata.html#XMLSECKEYDATAFINALIZEMETHOD">*xmlSecKeyDataFinalizeMethod</a>)      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLREADMETHOD">*xmlSecKeyDataXmlReadMethod</a>)       (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLWRITEMETHOD">*xmlSecKeyDataXmlWriteMethod</a>)      (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATABINREADMETHOD">*xmlSecKeyDataBinReadMethod</a>)       (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATABINWRITEMETHOD">*xmlSecKeyDataBinWriteMethod</a>)      (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> **buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *bufSize,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATAGENERATEMETHOD">*xmlSecKeyDataGenerateMethod</a>)      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATAGETTYPEMETHOD">*xmlSecKeyDataGetTypeMethod</a>)       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          (<a href="xmlsec-keysdata.html#XMLSECKEYDATAGETSIZEMETHOD">*xmlSecKeyDataGetSizeMethod</a>)       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-const <font>xmlChar</font> *     (<a href="xmlsec-keysdata.html#XMLSECKEYDATAGETIDENTIFIERMETHOD">*xmlSecKeyDataGetIdentifierMethod</a>) (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>void</font>                (<a href="xmlsec-keysdata.html#XMLSECKEYDATADEBUGDUMPMETHOD">*xmlSecKeyDataDebugDumpMethod</a>)     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>FILE</font> *output);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATAINITMETHOD">*xmlSecKeyDataInitMethod</a>)          (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATADUPLICATEMETHOD">*xmlSecKeyDataDuplicateMethod</a>)     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> dst</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> src</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                (<a href="xmlsec-keysdata.html#XMLSECKEYDATAFINALIZEMETHOD">*xmlSecKeyDataFinalizeMethod</a>)      (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLREADMETHOD">*xmlSecKeyDataXmlReadMethod</a>)       (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLWRITEMETHOD">*xmlSecKeyDataXmlWriteMethod</a>)      (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATABINREADMETHOD">*xmlSecKeyDataBinReadMethod</a>)       (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATABINWRITEMETHOD">*xmlSecKeyDataBinWriteMethod</a>)      (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> **buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> *bufSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATAGENERATEMETHOD">*xmlSecKeyDataGenerateMethod</a>)      (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> sizeBits</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="RETURNVALUE">xmlSecKeyDataType</span></a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATAGETTYPEMETHOD">*xmlSecKeyDataGetTypeMethod</a>)       (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          (<a href="xmlsec-keysdata.html#XMLSECKEYDATAGETSIZEMETHOD">*xmlSecKeyDataGetSizeMethod</a>)       (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+const <gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink> *     (<a href="xmlsec-keysdata.html#XMLSECKEYDATAGETIDENTIFIERMETHOD">*xmlSecKeyDataGetIdentifierMethod</a>) (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                (<a href="xmlsec-keysdata.html#XMLSECKEYDATADEBUGDUMPMETHOD">*xmlSecKeyDataDebugDumpMethod</a>)     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
 struct              <a href="xmlsec-keysdata.html#XMLSECKEYDATAKLASS">xmlSecKeyDataKlass</a>;
 #define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAKLASSGETNAME">xmlSecKeyDataKlassGetName</a>           (klass)
 #define             <a href="xmlsec-keysdata.html#XMLSECKEYDATALISTID">xmlSecKeyDataListId</a>
-<font>xmlSecPtrListId</font>     <a href="xmlsec-keysdata.html#XMLSECKEYDATALISTGETKLASS">xmlSecKeyDataListGetKlass</a>           (void);
+<gtkdoclink href="XMLSECPTRLISTID"><span class="RETURNVALUE">xmlSecPtrListId</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATALISTGETKLASS">xmlSecKeyDataListGetKlass</a>           (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTID">xmlSecKeyDataIdListId</a>
-<font>xmlSecPtrListId</font>     <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTGETKLASS">xmlSecKeyDataIdListGetKlass</a>         (void);
-<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTFIND">xmlSecKeyDataIdListFind</a>             (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>xmlSecKeyDataId</font> dataId);
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTFINDBYNODE">xmlSecKeyDataIdListFindByNode</a>       (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         const <font>xmlChar</font> *nodeName,
-                                                         const <font>xmlChar</font> *nodeNs,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> usage);
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTFINDBYHREF">xmlSecKeyDataIdListFindByHref</a>       (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         const <font>xmlChar</font> *href,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> usage);
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTFINDBYNAME">xmlSecKeyDataIdListFindByName</a>       (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         const <font>xmlChar</font> *name,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> usage);
-<font>void</font>                <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTDEBUGDUMP">xmlSecKeyDataIdListDebugDump</a>        (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>FILE</font> *output);
-<font>void</font>                <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTDEBUGXMLDUMP">xmlSecKeyDataIdListDebugXmlDump</a>     (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>FILE</font> *output);
+<gtkdoclink href="XMLSECPTRLISTID"><span class="RETURNVALUE">xmlSecPtrListId</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTGETKLASS">xmlSecKeyDataIdListGetKlass</a>         (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTFIND">xmlSecKeyDataIdListFind</a>             (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> dataId</code>);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTFINDBYNODE">xmlSecKeyDataIdListFindByNode</a>       (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *nodeName</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *nodeNs</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE"><span class="TYPE">xmlSecKeyDataUsage</span></a> usage</code>);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTFINDBYHREF">xmlSecKeyDataIdListFindByHref</a>       (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *href</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE"><span class="TYPE">xmlSecKeyDataUsage</span></a> usage</code>);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTFINDBYNAME">xmlSecKeyDataIdListFindByName</a>       (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE"><span class="TYPE">xmlSecKeyDataUsage</span></a> usage</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTDEBUGDUMP">xmlSecKeyDataIdListDebugDump</a>        (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTDEBUGXMLDUMP">xmlSecKeyDataIdListDebugXmlDump</a>     (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
 #define             <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYSIZE">xmlSecKeyDataBinarySize</a>
-<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEINITIALIZE">xmlSecKeyDataBinaryValueInitialize</a>  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEDUPLICATE">xmlSecKeyDataBinaryValueDuplicate</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> dst,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> src);
-<font>void</font>                <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEFINALIZE">xmlSecKeyDataBinaryValueFinalize</a>    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEXMLREAD">xmlSecKeyDataBinaryValueXmlRead</a>     (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEXMLWRITE">xmlSecKeyDataBinaryValueXmlWrite</a>    (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEBINREAD">xmlSecKeyDataBinaryValueBinRead</a>     (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEBINWRITE">xmlSecKeyDataBinaryValueBinWrite</a>    (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> **buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *bufSize,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>void</font>                <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEDEBUGDUMP">xmlSecKeyDataBinaryValueDebugDump</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>FILE</font> *output);
-<font>void</font>                <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEDEBUGXMLDUMP">xmlSecKeyDataBinaryValueDebugXmlDump</a>
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>FILE</font> *output);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEGETSIZE">xmlSecKeyDataBinaryValueGetSize</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>xmlSecBufferPtr</font>     <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEGETBUFFER">xmlSecKeyDataBinaryValueGetBuffer</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUESETBUFFER">xmlSecKeyDataBinaryValueSetBuffer</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEINITIALIZE">xmlSecKeyDataBinaryValueInitialize</a>  (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEDUPLICATE">xmlSecKeyDataBinaryValueDuplicate</a>   (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> dst</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> src</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEFINALIZE">xmlSecKeyDataBinaryValueFinalize</a>    (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEXMLREAD">xmlSecKeyDataBinaryValueXmlRead</a>     (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEXMLWRITE">xmlSecKeyDataBinaryValueXmlWrite</a>    (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEBINREAD">xmlSecKeyDataBinaryValueBinRead</a>     (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEBINWRITE">xmlSecKeyDataBinaryValueBinWrite</a>    (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> **buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> *bufSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEDEBUGDUMP">xmlSecKeyDataBinaryValueDebugDump</a>   (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEDEBUGXMLDUMP">xmlSecKeyDataBinaryValueDebugXmlDump</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEGETSIZE">xmlSecKeyDataBinaryValueGetSize</a>     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="XMLSECBUFFERPTR"><span class="RETURNVALUE">xmlSecBufferPtr</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEGETBUFFER">xmlSecKeyDataBinaryValueGetBuffer</a>   (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUESETBUFFER">xmlSecKeyDataBinaryValueSetBuffer</a>   (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);
 struct              <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStore</a>;
-<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a>  <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORECREATE">xmlSecKeyDataStoreCreate</a>         (<font>xmlSecKeyDataStoreId</font> id);
-<font>void</font>                <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREDESTROY">xmlSecKeyDataStoreDestroy</a>           (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);
+<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="RETURNVALUE">xmlSecKeyDataStorePtr</span></a>  <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORECREATE">xmlSecKeyDataStoreCreate</a>         (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATASTOREID"><span class="TYPE">xmlSecKeyDataStoreId</span></gtkdoclink> id</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREDESTROY">xmlSecKeyDataStoreDestroy</a>           (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>);
 #define             <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREGETNAME">xmlSecKeyDataStoreGetName</a>           (store)
 #define             <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREISVALID">xmlSecKeyDataStoreIsValid</a>           (store)
-#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORECHECKID">xmlSecKeyDataStoreCheckId</a>           (store, storeId)
-#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORECHECKSIZE">xmlSecKeyDataStoreCheckSize</a>         (store, size)
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORECHECKID">xmlSecKeyDataStoreCheckId</a>           (store,
+                                                         storeId)
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORECHECKSIZE">xmlSecKeyDataStoreCheckSize</a>         (store,
+                                                         size)
 #define             <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREIDUNKNOWN">xmlSecKeyDataStoreIdUnknown</a>
-<font>int</font>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREINITIALIZEMETHOD">*xmlSecKeyDataStoreInitializeMethod</a>)
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);
-<font>void</font>                (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREFINALIZEMETHOD">*xmlSecKeyDataStoreFinalizeMethod</a>) (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREINITIALIZEMETHOD">*xmlSecKeyDataStoreInitializeMethod</a>)
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREFINALIZEMETHOD">*xmlSecKeyDataStoreFinalizeMethod</a>) (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>);
 struct              <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREKLASS">xmlSecKeyDataStoreKlass</a>;
 #define             <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREKLASSGETNAME">xmlSecKeyDataStoreKlassGetName</a>      (klass)
 #define             <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREPTRLISTID">xmlSecKeyDataStorePtrListId</a>
-<font>xmlSecPtrListId</font>     <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREPTRLISTGETKLASS">xmlSecKeyDataStorePtrListGetKlass</a>   (void);</pre>
+<gtkdoclink href="XMLSECPTRLISTID"><span class="RETURNVALUE">xmlSecPtrListId</span></gtkdoclink><a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREPTRLISTGETKLASS">xmlSecKeyDataStorePtrListGetKlass</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-KEYSDATA.DESCRIPTION"></a><h2>Description</h2>
@@ -267,42 +272,36 @@ struct              <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREKLASS">xmlSe
 <a name="XMLSECKEYDATAUSAGE"></a><h3>xmlSecKeyDataUsage</h3>
 <pre class="PROGRAMLISTING">typedef unsigned int                                    xmlSecKeyDataUsage;</pre>
 <p>The bits mask that determines possible keys data usage.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAUSAGEUNKNOWN"></a><h3>xmlSecKeyDataUsageUnknown</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataUsageUnknown                       0x00000</pre>
 <p>The key data usage is unknown.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAUSAGEKEYINFONODEREAD"></a><h3>xmlSecKeyDataUsageKeyInfoNodeRead</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataUsageKeyInfoNodeRead               0x00001</pre>
 <p>The key data could be read from a <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> child.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAUSAGEKEYINFONODEWRITE"></a><h3>xmlSecKeyDataUsageKeyInfoNodeWrite</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataUsageKeyInfoNodeWrite              0x00002</pre>
 <p>The key data could be written to a <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo%20"; target="_top">&lt;dsig:KeyInfo /&gt;</a> child.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAUSAGEKEYVALUENODEREAD"></a><h3>xmlSecKeyDataUsageKeyValueNodeRead</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataUsageKeyValueNodeRead              0x00004</pre>
 <p>The key data could be read from a <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue%20"; target="_top">&lt;dsig:KeyValue /&gt;</a> child.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAUSAGEKEYVALUENODEWRITE"></a><h3>xmlSecKeyDataUsageKeyValueNodeWrite</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataUsageKeyValueNodeWrite             0x00008</pre>
 <p>The key data could be written to a <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue%20"; target="_top">&lt;dsig:KeyValue /&gt;</a> child.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
@@ -310,7 +309,6 @@ struct              <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREKLASS">xmlSe
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataUsageRetrievalMethodNodeXml        0x00010</pre>
 <p>The key data could be retrieved using <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod%20"; target="_top">&lt;dsig:RetrievalMethod /&gt;</a> node
 in XML format.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
@@ -318,28 +316,24 @@ in XML format.</p>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataUsageRetrievalMethodNodeBin        0x00020</pre>
 <p>The key data could be retrieved using <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod%20"; target="_top">&lt;dsig:RetrievalMethod /&gt;</a> node
 in binary format.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAUSAGEANY"></a><h3>xmlSecKeyDataUsageAny</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataUsageAny                           0xFFFFF</pre>
 <p>Any key data usage.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAUSAGEKEYINFONODE"></a><h3>xmlSecKeyDataUsageKeyInfoNode</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecKeyDataUsageKeyInfoNode</pre>
 <p>The key data could be read and written from/to a <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo%20"; target="_top">&lt;dsig:KeyInfo /&gt;</a> child.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAUSAGEKEYVALUENODE"></a><h3>xmlSecKeyDataUsageKeyValueNode</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecKeyDataUsageKeyValueNode</pre>
 <p>The key data could be read and written from/to a <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue%20"; target="_top">&lt;dsig:KeyValue /&gt;</a> child.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
@@ -347,77 +341,66 @@ in binary format.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecKeyDataUsageRetrievalMethodNode</pre>
 <p>The key data could be retrieved using <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod%20"; target="_top">&lt;dsig:RetrievalMethod /&gt;</a> node
 in any format.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATATYPE"></a><h3>xmlSecKeyDataType</h3>
 <pre class="PROGRAMLISTING">typedef unsigned int                            xmlSecKeyDataType;</pre>
 <p>The key data type (public/private, session/permanet, etc.).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATATYPEUNKNOWN"></a><h3>xmlSecKeyDataTypeUnknown</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataTypeUnknown                        0x0000</pre>
 <p>The key data type is unknown (same as <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPENONE"><span class="TYPE">xmlSecKeyDataTypeNone</span></a>).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATATYPENONE"></a><h3>xmlSecKeyDataTypeNone</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataTypeNone                           xmlSecKeyDataTypeUnknown</pre>
 <p>The key data type is unknown (same as <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPEUNKNOWN"><span class="TYPE">xmlSecKeyDataTypeUnknown</span></a>).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATATYPEPUBLIC"></a><h3>xmlSecKeyDataTypePublic</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataTypePublic                         0x0001</pre>
 <p>The key data contain a public key.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATATYPEPRIVATE"></a><h3>xmlSecKeyDataTypePrivate</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataTypePrivate                        0x0002</pre>
 <p>The key data contain a private key.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATATYPESYMMETRIC"></a><h3>xmlSecKeyDataTypeSymmetric</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataTypeSymmetric                      0x0004</pre>
 <p>The key data contain a symmetric key.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATATYPESESSION"></a><h3>xmlSecKeyDataTypeSession</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataTypeSession                        0x0008</pre>
 <p>The key data contain session key (one time key, not stored in keys manager).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATATYPEPERMANENT"></a><h3>xmlSecKeyDataTypePermanent</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataTypePermanent                      0x0010</pre>
 <p>The key data contain permanent key (stored in keys manager).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATATYPETRUSTED"></a><h3>xmlSecKeyDataTypeTrusted</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataTypeTrusted                        0x0100</pre>
 <p>The key data is trusted.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATATYPEANY"></a><h3>xmlSecKeyDataTypeAny</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataTypeAny                            0xFFFF</pre>
 <p>Any key data.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
@@ -435,107 +418,101 @@ in any format.</p>
 } xmlSecKeyDataFormat;</pre>
 <p>The key data format (binary, der, pem, etc.).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECKEYDATAFORMATUNKNOWN"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyDataFormatUnknown</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>         the key data format is unknown.</p></td>
+<td align="LEFT" valign="TOP"><p>the key data format is unknown.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECKEYDATAFORMATBINARY"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyDataFormatBinary</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>          the binary key data.</p></td>
+<td align="LEFT" valign="TOP"><p>the binary key data.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECKEYDATAFORMATPEM"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyDataFormatPem</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>             the PEM key data (cert or public/private key).</p></td>
+<td align="LEFT" valign="TOP"><p>the PEM key data (cert or public/private key).</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECKEYDATAFORMATDER"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyDataFormatDer</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>             the DER key data (cert or public/private key).</p></td>
+<td align="LEFT" valign="TOP"><p>the DER key data (cert or public/private key).</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECKEYDATAFORMATPKCS8PEM"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyDataFormatPkcs8Pem</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>        the PKCS8 PEM private key.</p></td>
+<td align="LEFT" valign="TOP"><p>the PKCS8 PEM private key.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECKEYDATAFORMATPKCS8DER"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyDataFormatPkcs8Der</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>        the PKCS8 DER private key.</p></td>
+<td align="LEFT" valign="TOP"><p>the PKCS8 DER private key.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECKEYDATAFORMATPKCS12"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyDataFormatPkcs12</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>          the PKCS12 format (bag of keys and certs)</p></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 format (bag of keys and certs)</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECKEYDATAFORMATCERTPEM"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyDataFormatCertPem</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>         the PEM cert.</p></td>
+<td align="LEFT" valign="TOP"><p>the PEM cert.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECKEYDATAFORMATCERTDER"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyDataFormatCertDer</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>         the DER cert.</p></td>
+<td align="LEFT" valign="TOP"><p>the DER cert.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAIDSGET"></a><h3>xmlSecKeyDataIdsGet ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a>    xmlSecKeyDataIdsGet                 (void);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="RETURNVALUE">xmlSecPtrListPtr</span></a>    xmlSecKeyDataIdsGet                 (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Gets global registered key data klasses list.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN6676"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8096"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to list of all registered key data klasses.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAIDSINIT"></a><h3>xmlSecKeyDataIdsInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataIdsInit                (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyDataIdsInit                (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Initializes the key data klasses. This function is called from the
 <a href="xmlsec-xmlsec.html#XMLSECINIT"><span class="TYPE">xmlSecInit</span></a> function and the application should not call it directly.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN6692"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8114"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAIDSSHUTDOWN"></a><h3>xmlSecKeyDataIdsShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDataIdsShutdown            (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyDataIdsShutdown            (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Shuts down the keys data klasses. This function is called from the
 <a href="xmlsec-xmlsec.html#XMLSECSHUTDOWN"><span class="TYPE">xmlSecShutdown</span></a> function and the application should not call it directly.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAIDSREGISTERDEFAULT"></a><h3>xmlSecKeyDataIdsRegisterDefault ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataIdsRegisterDefault     (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyDataIdsRegisterDefault     (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Registers default (implemented by XML Security Library)
 key data klasses: <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyName"; target="_top">&lt;dsig:KeyName/&gt;</a> element processing klass,
 <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue"; target="_top">&lt;dsig:KeyValue/&gt;</a> element processing klass, ...</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN6718"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8144"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAIDSREGISTER"></a><h3>xmlSecKeyDataIdsRegister ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataIdsRegister            (<font>xmlSecKeyDataId</font> id);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyDataIdsRegister            (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>);</pre>
 <p>Registers <code class="PARAMETER">id</code> in the global list of key data klasses.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6734"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8162"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6739"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8167"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -550,38 +527,36 @@ key data klasses: <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyName"; targe
 };</pre>
 <p>The key data: key value (crypto material), x509 data, pgp data, etc.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6752"><span style="white-space: nowrap"><font>xmlSecKeyDataId</font> <code class="STRUCTFIELD">id</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the data id (<gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink>).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8179"><span style="white-space: nowrap"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> <code class="STRUCTFIELD">id</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data id (<gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink>).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6760"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8188"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6766"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8195"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATACREATE"></a><h3>xmlSecKeyDataCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    xmlSecKeyDataCreate                 (<font>xmlSecKeyDataId</font> id);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="RETURNVALUE">xmlSecKeyDataPtr</span></a>    xmlSecKeyDataCreate                 (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>);</pre>
 <p>Allocates and initializes new key data of the specified type <code class="PARAMETER">id</code>.
 Caller is responsible for destroing returend object with
 <a href="xmlsec-keysdata.html#XMLSECKEYDATADESTROY"><span class="TYPE">xmlSecKeyDataDestroy</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6785"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the data id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8217"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6790"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8222"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly allocated key data structure
 or NULL if an error occurs.</p></td>
 </tr>
@@ -590,18 +565,17 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATADUPLICATE"></a><h3>xmlSecKeyDataDuplicate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataPtr</font>    xmlSecKeyDataDuplicate              (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAPTR"><span class="RETURNVALUE">xmlSecKeyDataPtr</span></gtkdoclink>    xmlSecKeyDataDuplicate              (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Creates a duplicate of the given <code class="PARAMETER">data</code>. Caller is responsible for
 destroing returend object with <a href="xmlsec-keysdata.html#XMLSECKEYDATADESTROY"><span class="TYPE">xmlSecKeyDataDestroy</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6808"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to the key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8242"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to the key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6813"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8247"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly allocated key data structure
 or NULL if an error occurs.</p></td>
 </tr>
@@ -610,39 +584,37 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATADESTROY"></a><h3>xmlSecKeyDataDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDataDestroy                (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyDataDestroy                (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Destroys the data and frees all allocated memory.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN6828"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to the key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8264"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to the key data.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAGENERATE"></a><h3>xmlSecKeyDataGenerate ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataGenerate               (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyDataGenerate               (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> sizeBits</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Generates new key data of given size and type.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6845"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8287"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6850"><span style="white-space: nowrap"><code class="PARAMETER">sizeBits</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the desired key data size (in bits).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8292"><span style="white-space: nowrap"><code class="PARAMETER">sizeBits</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired key data size (in bits).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6855"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the desired key data type.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8297"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired key data type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6860"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8302"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -650,17 +622,16 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAGETTYPE"></a><h3>xmlSecKeyDataGetType ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a>   xmlSecKeyDataGetType                (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="RETURNVALUE">xmlSecKeyDataType</span></a>   xmlSecKeyDataGetType                (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets key data type.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6875"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8319"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6880"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8324"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> key data type.</p></td>
 </tr>
 </tbody></table>
@@ -668,17 +639,16 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAGETSIZE"></a><h3>xmlSecKeyDataGetSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecKeyDataGetSize                (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          xmlSecKeyDataGetSize                (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets key data size.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6895"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8341"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6900"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8346"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> key data size (in bits).</p></td>
 </tr>
 </tbody></table>
@@ -686,17 +656,16 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAGETIDENTIFIER"></a><h3>xmlSecKeyDataGetIdentifier ()</h3>
-<pre class="PROGRAMLISTING">const <font>xmlChar</font>*      xmlSecKeyDataGetIdentifier          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING">const <gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*      xmlSecKeyDataGetIdentifier          (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets key data identifier string.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6915"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8363"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6920"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8368"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> key data id string.</p></td>
 </tr>
 </tbody></table>
@@ -704,70 +673,67 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATADEBUGDUMP"></a><h3>xmlSecKeyDataDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDataDebugDump              (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyDataDebugDump              (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints key data debug info.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6936"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8388"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6941"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8393"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATADEBUGXMLDUMP"></a><h3>xmlSecKeyDataDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDataDebugXmlDump           (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyDataDebugXmlDump           (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints key data debug info in XML format.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6957"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8413"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6962"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8418"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAXMLREAD"></a><h3>xmlSecKeyDataXmlRead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataXmlRead                (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyDataXmlRead                (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Reads the key data of klass <code class="PARAMETER">id</code> from XML <code class="PARAMETER">node</code> and adds them to <code class="PARAMETER">key</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6983"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8447"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6988"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the destination key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8452"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the destination key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6993"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to an XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8457"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6998"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8462"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7004"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8468"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -775,32 +741,31 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAXMLWRITE"></a><h3>xmlSecKeyDataXmlWrite ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataXmlWrite               (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyDataXmlWrite               (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Writes the key data of klass <code class="PARAMETER">id</code> from <code class="PARAMETER">key</code> to an XML <code class="PARAMETER">node</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7025"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8497"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7030"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the source key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8502"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the source key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7035"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to an XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8507"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7040"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8512"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7046"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8518"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -808,37 +773,36 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATABINREAD"></a><h3>xmlSecKeyDataBinRead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataBinRead                (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyDataBinRead                (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Reads the key data of klass <code class="PARAMETER">id</code> from binary buffer <code class="PARAMETER">buf</code> to <code class="PARAMETER">key</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7068"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8550"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7073"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the destination key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8555"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the destination key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7078"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the input binary buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8560"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input binary buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7083"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the input buffer size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8565"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7088"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8570"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7094"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8576"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -846,37 +810,36 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATABINWRITE"></a><h3>xmlSecKeyDataBinWrite ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataBinWrite               (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> **buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *bufSize,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyDataBinWrite               (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> **buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> *bufSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Writes the key data of klass <code class="PARAMETER">id</code> from the <code class="PARAMETER">key</code> to a binary buffer <code class="PARAMETER">buf</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7116"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8608"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7121"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the source key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8613"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the source key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7126"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the output binary buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8618"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the output binary buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7131"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the output buffer size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8623"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the output buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7136"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8628"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7142"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8634"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -887,10 +850,9 @@ or NULL if an error occurs.</p></td>
 <pre class="PROGRAMLISTING">#define             xmlSecKeyDataGetName(data)</pre>
 <p>Macro. Returns the key data name.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN7155"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8646"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key data.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -900,10 +862,9 @@ or NULL if an error occurs.</p></td>
 <p>Macro. Returns 1 if <code class="PARAMETER">data</code> is not NULL and <code class="PARAMETER">data</code>-&gt;id is not NULL
 or 0 otherwise.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN7170"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8660"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to data.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -912,15 +873,14 @@ or 0 otherwise.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecKeyDataCheckId(data, dataId)</pre>
 <p>Macro. Returns 1 if <code class="PARAMETER">data</code> is valid and <code class="PARAMETER">data</code>'s id is equal to <code class="PARAMETER">dataId</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7186"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8675"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7191"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the data Id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8680"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data Id.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -930,15 +890,14 @@ or 0 otherwise.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecKeyDataCheckUsage(data, usg)</pre>
 <p>Macro. Returns 1 if <code class="PARAMETER">data</code> is valid and could be used for <code class="PARAMETER">usg</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7206"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8694"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7211"><span style="white-space: nowrap"><code class="PARAMETER">usg</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the data usage.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8699"><span style="white-space: nowrap"><code class="PARAMETER">usg</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data usage.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -948,15 +907,14 @@ or 0 otherwise.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecKeyDataCheckSize(data, size)</pre>
 <p>Macro. Returns 1 if <code class="PARAMETER">data</code> is valid and <code class="PARAMETER">data</code>'s object has at least <code class="PARAMETER">size</code> bytes.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7227"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8714"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7232"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the expected size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8719"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the expected size.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -965,22 +923,20 @@ or 0 otherwise.</p>
 <a name="XMLSECKEYDATAIDUNKNOWN"></a><h3>xmlSecKeyDataIdUnknown</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataIdUnknown                  ((xmlSecKeyDataId)NULL)</pre>
 <p>The "unknown" id.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAINITMETHOD"></a><h3>xmlSecKeyDataInitMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecKeyDataInitMethod)          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecKeyDataInitMethod)          (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Key data specific initialization method.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7254"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8742"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7259"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8747"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -988,22 +944,21 @@ or 0 otherwise.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATADUPLICATEMETHOD"></a><h3>xmlSecKeyDataDuplicateMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecKeyDataDuplicateMethod)     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> dst,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> src);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecKeyDataDuplicateMethod)     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> dst</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> src</code>);</pre>
 <p>Key data specific duplication (copy) method.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7275"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to destination key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8767"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to destination key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7280"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the poiniter to source key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8772"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the poiniter to source key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7285"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8777"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1011,45 +966,43 @@ or 0 otherwise.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAFINALIZEMETHOD"></a><h3>xmlSecKeyDataFinalizeMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                (*xmlSecKeyDataFinalizeMethod)      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                (*xmlSecKeyDataFinalizeMethod)      (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Key data specific finalization method. All the objects and resources allocated
 by the key data object must be freed inside this method.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN7300"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8794"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAXMLREADMETHOD"></a><h3>xmlSecKeyDataXmlReadMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecKeyDataXmlReadMethod)       (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecKeyDataXmlReadMethod)       (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Key data specific method for reading XML node.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7318"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the data id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8820"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7323"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8825"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7328"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to data's value XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8830"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to data's value XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7333"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8835"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7339"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8841"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1057,32 +1010,31 @@ by the key data object must be freed inside this method.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAXMLWRITEMETHOD"></a><h3>xmlSecKeyDataXmlWriteMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecKeyDataXmlWriteMethod)      (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecKeyDataXmlWriteMethod)      (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Key data specific method for writing XML node.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7357"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the data id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8867"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7362"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8872"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7367"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to data's value XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8877"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to data's value XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7372"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the &lt;dsig:KeyInfo&gt; node processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8882"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the &lt;dsig:KeyInfo&gt; node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7377"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8887"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1090,37 +1042,36 @@ by the key data object must be freed inside this method.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATABINREADMETHOD"></a><h3>xmlSecKeyDataBinReadMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecKeyDataBinReadMethod)       (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecKeyDataBinReadMethod)       (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Key data specific method for reading binary buffer.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7396"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the data id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8916"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7401"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8921"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7406"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the input buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8926"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7411"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the buffer size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8931"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7416"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8936"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7422"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8942"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1128,37 +1079,36 @@ by the key data object must be freed inside this method.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATABINWRITEMETHOD"></a><h3>xmlSecKeyDataBinWriteMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecKeyDataBinWriteMethod)      (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> **buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *bufSize,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecKeyDataBinWriteMethod)      (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> **buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> *bufSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Key data specific method for reading binary buffer.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7441"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the data id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8971"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7446"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8976"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7451"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the output buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8981"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the output buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7456"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the buffer size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8986"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7461"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8991"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7467"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8997"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1166,27 +1116,26 @@ by the key data object must be freed inside this method.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAGENERATEMETHOD"></a><h3>xmlSecKeyDataGenerateMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecKeyDataGenerateMethod)      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecKeyDataGenerateMethod)      (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> sizeBits</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Key data specific method for generating new key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7484"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9020"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7489"><span style="white-space: nowrap"><code class="PARAMETER">sizeBits</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the key data specific size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9025"><span style="white-space: nowrap"><code class="PARAMETER">sizeBits</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key data specific size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7494"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the required key type (session/permanent, etc.)</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9030"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the required key type (session/permanent, etc.)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7499"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9035"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1194,17 +1143,16 @@ by the key data object must be freed inside this method.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAGETTYPEMETHOD"></a><h3>xmlSecKeyDataGetTypeMethod ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a>   (*xmlSecKeyDataGetTypeMethod)       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="RETURNVALUE">xmlSecKeyDataType</span></a>   (*xmlSecKeyDataGetTypeMethod)       (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Key data specific method to get the key type.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7514"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9052"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7519"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9057"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the key type.</p></td>
 </tr>
 </tbody></table>
@@ -1212,17 +1160,16 @@ by the key data object must be freed inside this method.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAGETSIZEMETHOD"></a><h3>xmlSecKeyDataGetSizeMethod ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          (*xmlSecKeyDataGetSizeMethod)       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          (*xmlSecKeyDataGetSizeMethod)       (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Key data specific method to get the key size.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7534"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9074"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7539"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9079"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the key size in bits.</p></td>
 </tr>
 </tbody></table>
@@ -1230,18 +1177,17 @@ by the key data object must be freed inside this method.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAGETIDENTIFIERMETHOD"></a><h3>xmlSecKeyDataGetIdentifierMethod ()</h3>
-<pre class="PROGRAMLISTING">const <font>xmlChar</font> *     (*xmlSecKeyDataGetIdentifierMethod) (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING">const <gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink> *     (*xmlSecKeyDataGetIdentifierMethod) (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Key data specific method to get the key data identifier string (for example,
 X509 data identifier is the subject of the verified cert).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7554"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9096"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7559"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9101"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the identifier string or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1249,19 +1195,18 @@ X509 data identifier is the subject of the verified cert).</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATADEBUGDUMPMETHOD"></a><h3>xmlSecKeyDataDebugDumpMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                (*xmlSecKeyDataDebugDumpMethod)     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                (*xmlSecKeyDataDebugDumpMethod)     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Key data specific method for printing debug info.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7575"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9121"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7580"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the FILE to print debug info (should be open for writing).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9126"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the FILE to print debug info (should be open for writing).</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -1306,95 +1251,94 @@ X509 data identifier is the subject of the verified cert).</p>
 };</pre>
 <p>The data id (klass).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7593"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">klassSize</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the klass size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9138"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> <code class="STRUCTFIELD">klassSize</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the klass size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7599"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">objSize</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the object size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9145"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> <code class="STRUCTFIELD">objSize</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the object size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7605"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">name</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the object name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9152"><span style="white-space: nowrap">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">name</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the object name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7611"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> <code class="STRUCTFIELD">usage</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the allowed data usage.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9159"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE"><span class="TYPE">xmlSecKeyDataUsage</span></a> <code class="STRUCTFIELD">usage</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the allowed data usage.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7617"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">href</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the identification string (href).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9166"><span style="white-space: nowrap">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">href</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the identification string (href).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7623"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">dataNodeName</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the data's XML node name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9173"><span style="white-space: nowrap">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">dataNodeName</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data's XML node name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7629"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">dataNodeNs</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the data's XML node namespace.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9180"><span style="white-space: nowrap">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">dataNodeNs</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data's XML node namespace.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7635"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAINITMETHOD">xmlSecKeyDataInitMethod</a> <code class="STRUCTFIELD">initialize</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the initialization method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9187"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAINITMETHOD"><span class="TYPE">xmlSecKeyDataInitMethod</span></a> <code class="STRUCTFIELD">initialize</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the initialization method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7641"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATADUPLICATEMETHOD">xmlSecKeyDataDuplicateMethod</a> <code class="STRUCTFIELD">duplicate</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the duplicate (copy) method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9194"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATADUPLICATEMETHOD"><span class="TYPE">xmlSecKeyDataDuplicateMethod</span></a> <code class="STRUCTFIELD">duplicate</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the duplicate (copy) method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7647"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFINALIZEMETHOD">xmlSecKeyDataFinalizeMethod</a> <code class="STRUCTFIELD">finalize</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the finalization (destroy) method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9201"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFINALIZEMETHOD"><span class="TYPE">xmlSecKeyDataFinalizeMethod</span></a> <code class="STRUCTFIELD">finalize</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the finalization (destroy) method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7653"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAGENERATEMETHOD">xmlSecKeyDataGenerateMethod</a> <code class="STRUCTFIELD">generate</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the new data generation method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9208"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAGENERATEMETHOD"><span class="TYPE">xmlSecKeyDataGenerateMethod</span></a> <code class="STRUCTFIELD">generate</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new data generation method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7659"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAGETTYPEMETHOD">xmlSecKeyDataGetTypeMethod</a> <code class="STRUCTFIELD">getType</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the method to access data's type information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9215"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAGETTYPEMETHOD"><span class="TYPE">xmlSecKeyDataGetTypeMethod</span></a> <code class="STRUCTFIELD">getType</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the method to access data's type information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7665"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAGETSIZEMETHOD">xmlSecKeyDataGetSizeMethod</a> <code class="STRUCTFIELD">getSize</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the method to access data's size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9222"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAGETSIZEMETHOD"><span class="TYPE">xmlSecKeyDataGetSizeMethod</span></a> <code class="STRUCTFIELD">getSize</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the method to access data's size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7671"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAGETIDENTIFIERMETHOD">xmlSecKeyDataGetIdentifierMethod</a> <code class="STRUCTFIELD">getIdentifier</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>      the method to access data's string identifier.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9229"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAGETIDENTIFIERMETHOD"><span class="TYPE">xmlSecKeyDataGetIdentifierMethod</span></a> <code class="STRUCTFIELD">getIdentifier</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the method to access data's string identifier.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7677"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLREADMETHOD">xmlSecKeyDataXmlReadMethod</a> <code class="STRUCTFIELD">xmlRead</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the method for reading data from XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9236"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLREADMETHOD"><span class="TYPE">xmlSecKeyDataXmlReadMethod</span></a> <code class="STRUCTFIELD">xmlRead</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the method for reading data from XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7683"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLWRITEMETHOD">xmlSecKeyDataXmlWriteMethod</a> <code class="STRUCTFIELD">xmlWrite</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the method for writing data to XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9243"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLWRITEMETHOD"><span class="TYPE">xmlSecKeyDataXmlWriteMethod</span></a> <code class="STRUCTFIELD">xmlWrite</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the method for writing data to XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7689"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATABINREADMETHOD">xmlSecKeyDataBinReadMethod</a> <code class="STRUCTFIELD">binRead</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the method for reading data from a binary buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9250"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATABINREADMETHOD"><span class="TYPE">xmlSecKeyDataBinReadMethod</span></a> <code class="STRUCTFIELD">binRead</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the method for reading data from a binary buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7695"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATABINWRITEMETHOD">xmlSecKeyDataBinWriteMethod</a> <code class="STRUCTFIELD">binWrite</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the method for writing data to binary buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9257"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATABINWRITEMETHOD"><span class="TYPE">xmlSecKeyDataBinWriteMethod</span></a> <code class="STRUCTFIELD">binWrite</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the method for writing data to binary buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7701"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATADEBUGDUMPMETHOD">xmlSecKeyDataDebugDumpMethod</a> <code class="STRUCTFIELD">debugDump</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the method for printing debug data information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9264"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATADEBUGDUMPMETHOD"><span class="TYPE">xmlSecKeyDataDebugDumpMethod</span></a> <code class="STRUCTFIELD">debugDump</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the method for printing debug data information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7707"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATADEBUGDUMPMETHOD">xmlSecKeyDataDebugDumpMethod</a> <code class="STRUCTFIELD">debugXmlDump</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the method for printing debug data information in XML format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9271"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATADEBUGDUMPMETHOD"><span class="TYPE">xmlSecKeyDataDebugDumpMethod</span></a> <code class="STRUCTFIELD">debugXmlDump</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the method for printing debug data information in XML format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7713"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9278"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7719"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9285"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -1404,10 +1348,9 @@ X509 data identifier is the subject of the verified cert).</p>
 <pre class="PROGRAMLISTING">#define             xmlSecKeyDataKlassGetName(klass)</pre>
 <p>Macro. Returns data klass name.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN7733"><span style="white-space: nowrap"><code class="PARAMETER">klass</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9299"><span style="white-space: nowrap"><code class="PARAMETER">klass</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -1415,17 +1358,15 @@ X509 data identifier is the subject of the verified cert).</p>
 <a name="XMLSECKEYDATALISTID"></a><h3>xmlSecKeyDataListId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataListId     xmlSecKeyDataListGetKlass()</pre>
 <p>The key data klasses list klass id.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATALISTGETKLASS"></a><h3>xmlSecKeyDataListGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font>     xmlSecKeyDataListGetKlass           (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECPTRLISTID"><span class="RETURNVALUE">xmlSecPtrListId</span></gtkdoclink>     xmlSecKeyDataListGetKlass           (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The key data list klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN7754"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9321"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key data list klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1434,39 +1375,36 @@ X509 data identifier is the subject of the verified cert).</p>
 <a name="XMLSECKEYDATAIDLISTID"></a><h3>xmlSecKeyDataIdListId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataIdListId   xmlSecKeyDataIdListGetKlass()</pre>
 <p>The key data list klass id.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAIDLISTGETKLASS"></a><h3>xmlSecKeyDataIdListGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font>     xmlSecKeyDataIdListGetKlass         (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECPTRLISTID"><span class="RETURNVALUE">xmlSecPtrListId</span></gtkdoclink>     xmlSecKeyDataIdListGetKlass         (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The key data id list klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN7775"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9343"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key data id list klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAIDLISTFIND"></a><h3>xmlSecKeyDataIdListFind ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataIdListFind             (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>xmlSecKeyDataId</font> dataId);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyDataIdListFind             (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> dataId</code>);</pre>
 <p>Lookups <code class="PARAMETER">dataId</code> in <code class="PARAMETER">list</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7793"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to key data ids list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9365"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key data ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7798"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9370"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7803"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9375"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 1 if <code class="PARAMETER">dataId</code> is found in the <code class="PARAMETER">list</code>, 0 if not and a negative
 value if an error occurs.</p></td>
 </tr>
@@ -1475,33 +1413,32 @@ value if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAIDLISTFINDBYNODE"></a><h3>xmlSecKeyDataIdListFindByNode ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataIdListFindByNode       (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         const <font>xmlChar</font> *nodeName,
-                                                         const <font>xmlChar</font> *nodeNs,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> usage);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecKeyDataIdListFindByNode       (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *nodeName</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *nodeNs</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE"><span class="TYPE">xmlSecKeyDataUsage</span></a> usage</code>);</pre>
 <p>Lookups data klass in the list with given <code class="PARAMETER">nodeName</code>, <code class="PARAMETER">nodeNs</code> and
 <code class="PARAMETER">usage</code> in the <code class="PARAMETER">list</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7827"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to key data ids list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9407"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key data ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7832"><span style="white-space: nowrap"><code class="PARAMETER">nodeName</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the desired key data klass XML node name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9412"><span style="white-space: nowrap"><code class="PARAMETER">nodeName</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired key data klass XML node name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7837"><span style="white-space: nowrap"><code class="PARAMETER">nodeNs</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the desired key data klass XML node namespace.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9417"><span style="white-space: nowrap"><code class="PARAMETER">nodeNs</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired key data klass XML node namespace.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7842"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the desired key data usage.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9422"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired key data usage.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7847"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9427"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> key data klass is found and NULL otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1509,27 +1446,26 @@ value if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAIDLISTFINDBYHREF"></a><h3>xmlSecKeyDataIdListFindByHref ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataIdListFindByHref       (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         const <font>xmlChar</font> *href,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> usage);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecKeyDataIdListFindByHref       (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *href</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE"><span class="TYPE">xmlSecKeyDataUsage</span></a> usage</code>);</pre>
 <p>Lookups data klass in the list with given <code class="PARAMETER">href</code> and <code class="PARAMETER">usage</code> in <code class="PARAMETER">list</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7867"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to key data ids list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9453"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key data ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7872"><span style="white-space: nowrap"><code class="PARAMETER">href</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the desired key data klass href.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9458"><span style="white-space: nowrap"><code class="PARAMETER">href</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired key data klass href.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7877"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the desired key data usage.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9463"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired key data usage.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7882"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9468"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> key data klass is found and NULL otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1537,27 +1473,26 @@ value if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAIDLISTFINDBYNAME"></a><h3>xmlSecKeyDataIdListFindByName ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataIdListFindByName       (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         const <font>xmlChar</font> *name,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> usage);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecKeyDataIdListFindByName       (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE"><span class="TYPE">xmlSecKeyDataUsage</span></a> usage</code>);</pre>
 <p>Lookups data klass in the list with given <code class="PARAMETER">name</code> and <code class="PARAMETER">usage</code> in <code class="PARAMETER">list</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7902"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to key data ids list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9494"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key data ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7907"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the desired key data klass name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9499"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired key data klass name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7912"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the desired key data usage.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9504"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired key data usage.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7917"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9509"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> key data klass is found and NULL otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1565,38 +1500,36 @@ value if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAIDLISTDEBUGDUMP"></a><h3>xmlSecKeyDataIdListDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDataIdListDebugDump        (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyDataIdListDebugDump        (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints binary key data debug information to <code class="PARAMETER">output</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7934"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to key data ids list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9530"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key data ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7939"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9535"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATAIDLISTDEBUGXMLDUMP"></a><h3>xmlSecKeyDataIdListDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDataIdListDebugXmlDump     (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyDataIdListDebugXmlDump     (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints binary key data debug information to <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7956"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to key data ids list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9556"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key data ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7961"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9561"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -1605,22 +1538,20 @@ value if an error occurs.</p></td>
 <a name="XMLSECKEYDATABINARYSIZE"></a><h3>xmlSecKeyDataBinarySize</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecKeyDataBinarySize</pre>
 <p>The binary key data object size.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATABINARYVALUEINITIALIZE"></a><h3>xmlSecKeyDataBinaryValueInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataBinaryValueInitialize  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyDataBinaryValueInitialize  (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Initializes key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7983"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to binary key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9584"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7988"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9589"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1628,22 +1559,21 @@ value if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATABINARYVALUEDUPLICATE"></a><h3>xmlSecKeyDataBinaryValueDuplicate ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataBinaryValueDuplicate   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> dst,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> src);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyDataBinaryValueDuplicate   (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> dst</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> src</code>);</pre>
 <p>Copies binary key data from <code class="PARAMETER">src</code> to <code class="PARAMETER">dst</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8006"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to destination binary key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9611"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to destination binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8011"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to source binary key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9616"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to source binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8016"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9621"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1651,44 +1581,42 @@ value if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATABINARYVALUEFINALIZE"></a><h3>xmlSecKeyDataBinaryValueFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDataBinaryValueFinalize    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyDataBinaryValueFinalize    (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Cleans up binary key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8031"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to binary key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9638"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to binary key data.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATABINARYVALUEXMLREAD"></a><h3>xmlSecKeyDataBinaryValueXmlRead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataBinaryValueXmlRead     (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyDataBinaryValueXmlRead     (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Reads binary key data from <code class="PARAMETER">node</code> to the key by base64 decoding the <code class="PARAMETER">node</code> content.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8051"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9666"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8056"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to destination key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9671"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to destination key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8061"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to an XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9676"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8066"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9681"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8072"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9687"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1696,33 +1624,32 @@ value if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATABINARYVALUEXMLWRITE"></a><h3>xmlSecKeyDataBinaryValueXmlWrite ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataBinaryValueXmlWrite    (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyDataBinaryValueXmlWrite    (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Base64 encodes binary key data of klass <code class="PARAMETER">id</code> from the <code class="PARAMETER">key</code> and
 sets to the <code class="PARAMETER">node</code> content.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8093"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9716"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8098"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to source key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9721"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to source key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8103"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to an XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9726"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8108"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9731"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8114"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9737"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1730,37 +1657,36 @@ sets to the <code class="PARAMETER">node</code> content.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATABINARYVALUEBINREAD"></a><h3>xmlSecKeyDataBinaryValueBinRead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataBinaryValueBinRead     (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyDataBinaryValueBinRead     (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Reads binary key data of the klass <code class="PARAMETER">id</code> from <code class="PARAMETER">buf</code> to the <code class="PARAMETER">key</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8136"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9769"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8141"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to destination key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9774"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to destination key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8146"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the source binary buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9779"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the source binary buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8151"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the source binary buffer size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9784"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the source binary buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8156"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9789"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8162"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9795"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1768,37 +1694,36 @@ sets to the <code class="PARAMETER">node</code> content.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATABINARYVALUEBINWRITE"></a><h3>xmlSecKeyDataBinaryValueBinWrite ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataBinaryValueBinWrite    (<font>xmlSecKeyDataId</font> id,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> **buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *bufSize,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyDataBinaryValueBinWrite    (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink> id</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> **buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> *bufSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Writes binary key data of klass <code class="PARAMETER">id</code> from the <code class="PARAMETER">key</code> to <code class="PARAMETER">buf</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8184"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9827"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8189"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to source key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9832"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to source key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8194"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the destination binary buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9837"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the destination binary buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8199"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the destination binary buffer size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9842"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the destination binary buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8204"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9847"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8210"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9853"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1806,56 +1731,53 @@ sets to the <code class="PARAMETER">node</code> content.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATABINARYVALUEDEBUGDUMP"></a><h3>xmlSecKeyDataBinaryValueDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDataBinaryValueDebugDump   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyDataBinaryValueDebugDump   (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints binary key data debug information to <code class="PARAMETER">output</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8227"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to binary key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9874"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8232"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9879"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATABINARYVALUEDEBUGXMLDUMP"></a><h3>xmlSecKeyDataBinaryValueDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDataBinaryValueDebugXmlDump
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyDataBinaryValueDebugXmlDump
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints binary key data debug information to <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8249"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to binary key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9900"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8254"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9905"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATABINARYVALUEGETSIZE"></a><h3>xmlSecKeyDataBinaryValueGetSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecKeyDataBinaryValueGetSize     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          xmlSecKeyDataBinaryValueGetSize     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets the binary key data size.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8269"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to binary key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9922"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8274"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9927"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> binary key data size in bits.</p></td>
 </tr>
 </tbody></table>
@@ -1863,17 +1785,16 @@ sets to the <code class="PARAMETER">node</code> content.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATABINARYVALUEGETBUFFER"></a><h3>xmlSecKeyDataBinaryValueGetBuffer ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecBufferPtr</font>     xmlSecKeyDataBinaryValueGetBuffer   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECBUFFERPTR"><span class="RETURNVALUE">xmlSecBufferPtr</span></gtkdoclink>     xmlSecKeyDataBinaryValueGetBuffer   (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets the binary key data buffer.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8289"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to binary key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9944"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8294"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9949"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to binary key data buffer.</p></td>
 </tr>
 </tbody></table>
@@ -1881,27 +1802,26 @@ sets to the <code class="PARAMETER">node</code> content.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATABINARYVALUESETBUFFER"></a><h3>xmlSecKeyDataBinaryValueSetBuffer ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataBinaryValueSetBuffer   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeyDataBinaryValueSetBuffer   (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);</pre>
 <p>Sets the value of <code class="PARAMETER">data</code> to <code class="PARAMETER">buf</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8313"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to binary key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9974"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8318"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to binary buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9979"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to binary buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8323"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the binary buffer size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9984"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the binary buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8328"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9989"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1920,37 +1840,35 @@ sets to the <code class="PARAMETER">node</code> content.</p>
 required for key data processing. For example, X509 data store may hold
 information about trusted (root) certificates.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8341"><span style="white-space: nowrap"><font>xmlSecKeyDataStoreId</font> <code class="STRUCTFIELD">id</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the store id (<gtkdoclink href="XMLSECKEYDATASTOREID"><span class="TYPE">xmlSecKeyDataStoreId</span></gtkdoclink>).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10001"><span style="white-space: nowrap"><gtkdoclink href="XMLSECKEYDATASTOREID"><span class="TYPE">xmlSecKeyDataStoreId</span></gtkdoclink> <code class="STRUCTFIELD">id</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the store id (<gtkdoclink href="XMLSECKEYDATASTOREID"><span class="TYPE">xmlSecKeyDataStoreId</span></gtkdoclink>).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8349"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10010"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8355"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10017"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATASTORECREATE"></a><h3>xmlSecKeyDataStoreCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a>  xmlSecKeyDataStoreCreate         (<font>xmlSecKeyDataStoreId</font> id);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="RETURNVALUE">xmlSecKeyDataStorePtr</span></a>  xmlSecKeyDataStoreCreate         (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATASTOREID"><span class="TYPE">xmlSecKeyDataStoreId</span></gtkdoclink> id</code>);</pre>
 <p>Creates new key data store of the specified klass <code class="PARAMETER">id</code>. Caller is responsible
 for freeng returned object with <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREDESTROY"><span class="TYPE">xmlSecKeyDataStoreDestroy</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8374"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the store id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10039"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the store id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8379"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10044"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly allocated key data store structure
 or NULL if an error occurs.</p></td>
 </tr>
@@ -1959,14 +1877,13 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATASTOREDESTROY"></a><h3>xmlSecKeyDataStoreDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDataStoreDestroy           (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyDataStoreDestroy           (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>);</pre>
 <p>Destroys the key data store created with <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORECREATE"><span class="TYPE">xmlSecKeyDataStoreCreate</span></a>
 function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8396"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to the key data store..</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10063"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to the key data store..</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -1975,10 +1892,9 @@ function.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecKeyDataStoreGetName(store)</pre>
 <p>Macro. Returns key data store name.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8409"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10075"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to store.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -1988,10 +1904,9 @@ function.</p>
 <p>Macro. Returns 1 if <code class="PARAMETER">store</code> is not NULL and <code class="PARAMETER">store</code>-&gt;id is not NULL
 or 0 otherwise.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8424"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10089"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to store.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -2000,15 +1915,14 @@ or 0 otherwise.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecKeyDataStoreCheckId(store, storeId)</pre>
 <p>Macro. Returns 1 if <code class="PARAMETER">store</code> is valid and <code class="PARAMETER">store</code>'s id is equal to <code class="PARAMETER">storeId</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8440"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10104"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8445"><span style="white-space: nowrap"><code class="PARAMETER">storeId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the store Id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10109"><span style="white-space: nowrap"><code class="PARAMETER">storeId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the store Id.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -2018,15 +1932,14 @@ or 0 otherwise.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecKeyDataStoreCheckSize(store, size)</pre>
 <p>Macro. Returns 1 if <code class="PARAMETER">data</code> is valid and <code class="PARAMETER">stores</code>'s object has at least <code class="PARAMETER">size</code> bytes.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8461"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10124"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8466"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the expected size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10129"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the expected size.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -2035,23 +1948,21 @@ or 0 otherwise.</p>
 <a name="XMLSECKEYDATASTOREIDUNKNOWN"></a><h3>xmlSecKeyDataStoreIdUnknown</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataStoreIdUnknown                     NULL</pre>
 <p>The "unknown" id.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATASTOREINITIALIZEMETHOD"></a><h3>xmlSecKeyDataStoreInitializeMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecKeyDataStoreInitializeMethod)
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecKeyDataStoreInitializeMethod)
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>);</pre>
 <p>Key data store specific initialization method.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8488"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the data store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10152"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8493"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10157"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -2059,13 +1970,12 @@ or 0 otherwise.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATASTOREFINALIZEMETHOD"></a><h3>xmlSecKeyDataStoreFinalizeMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                (*xmlSecKeyDataStoreFinalizeMethod) (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                (*xmlSecKeyDataStoreFinalizeMethod) (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>);</pre>
 <p>Key data store specific finalization (destroy) method.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8508"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the data store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10174"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data store.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -2088,35 +1998,34 @@ or 0 otherwise.</p>
 };</pre>
 <p>The data store id (klass).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8521"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">klassSize</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the data store klass size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10186"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> <code class="STRUCTFIELD">klassSize</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data store klass size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8527"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">objSize</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the data store obj size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10193"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> <code class="STRUCTFIELD">objSize</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data store obj size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8533"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">name</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the store's name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10200"><span style="white-space: nowrap">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">name</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the store's name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8539"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREINITIALIZEMETHOD">xmlSecKeyDataStoreInitializeMethod</a> <code class="STRUCTFIELD">initialize</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the store's initialization method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10207"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREINITIALIZEMETHOD"><span class="TYPE">xmlSecKeyDataStoreInitializeMethod</span></a> <code class="STRUCTFIELD">initialize</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the store's initialization method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8545"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREFINALIZEMETHOD">xmlSecKeyDataStoreFinalizeMethod</a> <code class="STRUCTFIELD">finalize</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the store's finalization (destroy) method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10214"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREFINALIZEMETHOD"><span class="TYPE">xmlSecKeyDataStoreFinalizeMethod</span></a> <code class="STRUCTFIELD">finalize</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the store's finalization (destroy) method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8551"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10221"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8557"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10228"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -2126,10 +2035,9 @@ or 0 otherwise.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecKeyDataStoreKlassGetName(klass)</pre>
 <p>Macro. Returns store klass name.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8571"><span style="white-space: nowrap"><code class="PARAMETER">klass</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10242"><span style="white-space: nowrap"><code class="PARAMETER">klass</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to store klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -2137,17 +2045,15 @@ or 0 otherwise.</p>
 <a name="XMLSECKEYDATASTOREPTRLISTID"></a><h3>xmlSecKeyDataStorePtrListId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataStorePtrListId     xmlSecKeyDataStorePtrListGetKlass()</pre>
 <p>The data store list id (klass).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYDATASTOREPTRLISTGETKLASS"></a><h3>xmlSecKeyDataStorePtrListGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font>     xmlSecKeyDataStorePtrListGetKlass   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECPTRLISTID"><span class="RETURNVALUE">xmlSecPtrListId</span></gtkdoclink>     xmlSecKeyDataStorePtrListGetKlass   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Key data stores list.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8592"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10264"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> key data stores list klass.</p></td>
 </tr></tbody></table>
 </div>
diff --git a/docs/api/xmlsec-keysmngr.html b/docs/api/xmlsec-keysmngr.html
index 442bbb2..7111553 100644
--- a/docs/api/xmlsec-keysmngr.html
+++ b/docs/api/xmlsec-keysmngr.html
@@ -87,55 +87,57 @@
 <h1>
 <a name="XMLSEC-KEYSMNGR"></a>keysmngr</h1>
 <div class="REFNAMEDIV">
-<a name="AEN9992"></a><h2>Name</h2>keysmngr -- Keys manager object support.</div>
+<a name="AEN11988"></a><h2>Name</h2>keysmngr -- Keys manager object support.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-KEYSMNGR.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a>   <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRCREATE">xmlSecKeysMngrCreate</a>                (void);
-<font>void</font>                <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRDESTROY">xmlSecKeysMngrDestroy</a>               (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>xmlSecKeyPtr</font>        <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRFINDKEY">xmlSecKeysMngrFindKey</a>               (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>xmlChar</font> *name,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>                 <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRADOPTKEYSSTORE">xmlSecKeysMngrAdoptKeysStore</a>        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);
-<font>xmlSecKeyStorePtr</font>   <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRGETKEYSSTORE">xmlSecKeysMngrGetKeysStore</a>          (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>int</font>                 <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRADOPTDATASTORE">xmlSecKeysMngrAdoptDataStore</a>        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);
-<font>xmlSecKeyDataStorePtr</font>  <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRGETDATASTORE">xmlSecKeysMngrGetDataStore</a>       (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <font>xmlSecKeyDataStoreId</font> id);
-<font>xmlSecKeyPtr</font>        (<a href="xmlsec-keysmngr.html#XMLSECGETKEYCALLBACK">*xmlSecGetKeyCallback</a>)             (<font>xmlNodePtr</font> keyInfoNode,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<pre class="SYNOPSIS"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="RETURNVALUE">xmlSecKeysMngrPtr</span></a>   <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRCREATE">xmlSecKeysMngrCreate</a>                (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRDESTROY">xmlSecKeysMngrDestroy</a>               (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);
+<gtkdoclink href="XMLSECKEYPTR"><span class="RETURNVALUE">xmlSecKeyPtr</span></gtkdoclink><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRFINDKEY">xmlSecKeysMngrFindKey</a>               (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRADOPTKEYSSTORE">xmlSecKeysMngrAdoptKeysStore</a>        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>);
+<gtkdoclink href="XMLSECKEYSTOREPTR"><span class="RETURNVALUE">xmlSecKeyStorePtr</span></gtkdoclink><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRGETKEYSSTORE">xmlSecKeysMngrGetKeysStore</a>          (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRADOPTDATASTORE">xmlSecKeysMngrAdoptDataStore</a>        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>);
+<gtkdoclink href="XMLSECKEYDATASTOREPTR"><span class="RETURNVALUE">xmlSecKeyDataStorePtr</span></gtkdoclink><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRGETDATASTORE">xmlSecKeysMngrGetDataStore</a>       (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATASTOREID"><span class="TYPE">xmlSecKeyDataStoreId</span></gtkdoclink> id</code>);
+<gtkdoclink href="XMLSECKEYPTR"><span class="RETURNVALUE">xmlSecKeyPtr</span></gtkdoclink>        (<a href="xmlsec-keysmngr.html#XMLSECGETKEYCALLBACK">*xmlSecGetKeyCallback</a>)             (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> keyInfoNode</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
 struct              <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngr</a>;
-<font>xmlSecKeyPtr</font>        <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRGETKEY">xmlSecKeysMngrGetKey</a>                (<font>xmlNodePtr</font> keyInfoNode,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<gtkdoclink href="XMLSECKEYPTR"><span class="RETURNVALUE">xmlSecKeyPtr</span></gtkdoclink><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRGETKEY">xmlSecKeysMngrGetKey</a>                (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> keyInfoNode</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
 struct              <a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStore</a>;
-<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a>   <a href="xmlsec-keysmngr.html#XMLSECKEYSTORECREATE">xmlSecKeyStoreCreate</a>                (<font>xmlSecKeyStoreId</font> id);
-<font>void</font>                <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREDESTROY">xmlSecKeyStoreDestroy</a>               (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);
-<font>xmlSecKeyPtr</font>        <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREFINDKEY">xmlSecKeyStoreFindKey</a>               (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         const <font>xmlChar</font> *name,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="RETURNVALUE">xmlSecKeyStorePtr</span></a>   <a href="xmlsec-keysmngr.html#XMLSECKEYSTORECREATE">xmlSecKeyStoreCreate</a>                (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYSTOREID"><span class="TYPE">xmlSecKeyStoreId</span></gtkdoclink> id</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-keysmngr.html#XMLSECKEYSTOREDESTROY">xmlSecKeyStoreDestroy</a>               (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>);
+<gtkdoclink href="XMLSECKEYPTR"><span class="RETURNVALUE">xmlSecKeyPtr</span></gtkdoclink><a href="xmlsec-keysmngr.html#XMLSECKEYSTOREFINDKEY">xmlSecKeyStoreFindKey</a>               (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
 #define             <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREGETNAME">xmlSecKeyStoreGetName</a>               (store)
 #define             <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREISVALID">xmlSecKeyStoreIsValid</a>               (store)
-#define             <a href="xmlsec-keysmngr.html#XMLSECKEYSTORECHECKID">xmlSecKeyStoreCheckId</a>               (store, storeId)
-#define             <a href="xmlsec-keysmngr.html#XMLSECKEYSTORECHECKSIZE">xmlSecKeyStoreCheckSize</a>             (store, size)
+#define             <a href="xmlsec-keysmngr.html#XMLSECKEYSTORECHECKID">xmlSecKeyStoreCheckId</a>               (store,
+                                                         storeId)
+#define             <a href="xmlsec-keysmngr.html#XMLSECKEYSTORECHECKSIZE">xmlSecKeyStoreCheckSize</a>             (store,
+                                                         size)
 #define             <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREIDUNKNOWN">xmlSecKeyStoreIdUnknown</a>
-<font>int</font>                 (<a href="xmlsec-keysmngr.html#XMLSECKEYSTOREINITIALIZEMETHOD">*xmlSecKeyStoreInitializeMethod</a>)   (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);
-<font>void</font>                (<a href="xmlsec-keysmngr.html#XMLSECKEYSTOREFINALIZEMETHOD">*xmlSecKeyStoreFinalizeMethod</a>)     (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);
-<font>xmlSecKeyPtr</font>        (<a href="xmlsec-keysmngr.html#XMLSECKEYSTOREFINDKEYMETHOD">*xmlSecKeyStoreFindKeyMethod</a>)      (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         const <font>xmlChar</font> *name,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-keysmngr.html#XMLSECKEYSTOREINITIALIZEMETHOD">*xmlSecKeyStoreInitializeMethod</a>)   (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                (<a href="xmlsec-keysmngr.html#XMLSECKEYSTOREFINALIZEMETHOD">*xmlSecKeyStoreFinalizeMethod</a>)     (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>);
+<gtkdoclink href="XMLSECKEYPTR"><span class="RETURNVALUE">xmlSecKeyPtr</span></gtkdoclink>        (<a href="xmlsec-keysmngr.html#XMLSECKEYSTOREFINDKEYMETHOD">*xmlSecKeyStoreFindKeyMethod</a>)      (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);
 struct              <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREKLASS">xmlSecKeyStoreKlass</a>;
 #define             <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREKLASSGETNAME">xmlSecKeyStoreKlassGetName</a>          (klass)
 #define             <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREID">xmlSecSimpleKeysStoreId</a>
-<font>xmlSecKeyStoreId</font>    <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREGETKLASS">xmlSecSimpleKeysStoreGetKlass</a>       (void);
-<font>int</font>                 <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREADOPTKEY">xmlSecSimpleKeysStoreAdoptKey</a>       (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>                 <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTORELOAD">xmlSecSimpleKeysStoreLoad</a>           (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         const <font>char</font> *uri,
-                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
-<font>int</font>                 <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTORESAVE">xmlSecSimpleKeysStoreSave</a>           (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>xmlSecPtrListPtr</font>    <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREGETKEYS">xmlSecSimpleKeysStoreGetKeys</a>        (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);</pre>
+<gtkdoclink href="XMLSECKEYSTOREID"><span class="RETURNVALUE">xmlSecKeyStoreId</span></gtkdoclink><a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREGETKLASS">xmlSecSimpleKeysStoreGetKlass</a>       (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREADOPTKEY">xmlSecSimpleKeysStoreAdoptKey</a>       (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTORELOAD">xmlSecSimpleKeysStoreLoad</a>           (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *uri</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> keysMngr</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTORESAVE">xmlSecSimpleKeysStoreSave</a>           (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<gtkdoclink href="XMLSECPTRLISTPTR"><span class="RETURNVALUE">xmlSecPtrListPtr</span></gtkdoclink><a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREGETKEYS">xmlSecSimpleKeysStoreGetKeys</a>        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-KEYSMNGR.DESCRIPTION"></a><h2>Description</h2>
@@ -145,13 +147,12 @@ struct              <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREKLASS">xmlSecKey
 <a name="XMLSEC-KEYSMNGR.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
 <a name="XMLSECKEYSMNGRCREATE"></a><h3>xmlSecKeysMngrCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a>   xmlSecKeysMngrCreate                (void);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="RETURNVALUE">xmlSecKeysMngrPtr</span></a>   xmlSecKeysMngrCreate                (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Creates new keys manager. Caller is responsible for freeing it with
 <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRDESTROY"><span class="TYPE">xmlSecKeysMngrDestroy</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10098"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12188"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly allocated keys manager or NULL if
 an error occurs.</p></td>
 </tr></tbody></table>
@@ -159,40 +160,38 @@ an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYSMNGRDESTROY"></a><h3>xmlSecKeysMngrDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeysMngrDestroy               (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeysMngrDestroy               (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);</pre>
 <p>Destroys keys manager created with <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRCREATE"><span class="TYPE">xmlSecKeysMngrCreate</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10115"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12207"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYSMNGRFINDKEY"></a><h3>xmlSecKeysMngrFindKey ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyPtr</font>        xmlSecKeysMngrFindKey               (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>xmlChar</font> *name,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYPTR"><span class="RETURNVALUE">xmlSecKeyPtr</span></gtkdoclink>        xmlSecKeysMngrFindKey               (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Lookups key in the keys manager keys store. The caller is responsible
 for destroying the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="TYPE">xmlSecKeyDestroy</span></a> method.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10134"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12232"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10139"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the desired key name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12237"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired key name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10144"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12242"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10150"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12248"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to a key or NULL if key is not found or an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -200,22 +199,21 @@ for destroying the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYSMNGRADOPTKEYSSTORE"></a><h3>xmlSecKeysMngrAdoptKeysStore ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeysMngrAdoptKeysStore        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeysMngrAdoptKeysStore        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>);</pre>
 <p>Adopts keys store in the keys manager <code class="PARAMETER">mngr</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10167"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12269"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10172"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to keys store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12274"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10177"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12279"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -223,17 +221,16 @@ for destroying the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYSMNGRGETKEYSSTORE"></a><h3>xmlSecKeysMngrGetKeysStore ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyStorePtr</font>   xmlSecKeysMngrGetKeysStore          (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYSTOREPTR"><span class="RETURNVALUE">xmlSecKeyStorePtr</span></gtkdoclink>   xmlSecKeysMngrGetKeysStore          (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);</pre>
 <p>Gets the keys store.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10192"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12296"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10197"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12301"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the keys store in the keys manager <code class="PARAMETER">mngr</code> or NULL if
 there is no store or an error occurs.</p></td>
 </tr>
@@ -242,22 +239,21 @@ there is no store or an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYSMNGRADOPTDATASTORE"></a><h3>xmlSecKeysMngrAdoptDataStore ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeysMngrAdoptDataStore        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecKeysMngrAdoptDataStore        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>);</pre>
 <p>Adopts data store in the keys manager.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10214"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12322"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10219"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to data store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12327"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to data store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10224"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12332"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -265,22 +261,21 @@ there is no store or an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYSMNGRGETDATASTORE"></a><h3>xmlSecKeysMngrGetDataStore ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataStorePtr</font>  xmlSecKeysMngrGetDataStore       (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <font>xmlSecKeyDataStoreId</font> id);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATASTOREPTR"><span class="RETURNVALUE">xmlSecKeyDataStorePtr</span></gtkdoclink>  xmlSecKeysMngrGetDataStore       (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECKEYDATASTOREID"><span class="TYPE">xmlSecKeyDataStoreId</span></gtkdoclink> id</code>);</pre>
 <p>Lookups the data store of given klass <code class="PARAMETER">id</code> in the keys manager.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10241"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12353"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10246"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the desired data store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12358"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10251"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12363"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to data store or NULL if it is not found or an error
 occurs.</p></td>
 </tr>
@@ -289,22 +284,21 @@ occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGETKEYCALLBACK"></a><h3>xmlSecGetKeyCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyPtr</font>        (*xmlSecGetKeyCallback)             (<font>xmlNodePtr</font> keyInfoNode,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYPTR"><span class="RETURNVALUE">xmlSecKeyPtr</span></gtkdoclink>        (*xmlSecGetKeyCallback)             (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> keyInfoNode</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Reads the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <code class="PARAMETER">keyInfoNode</code> and extracts the key.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10269"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12385"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10275"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12391"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10281"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12397"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to key or NULL if the key is not found or
 an error occurs.</p></td>
 </tr>
@@ -320,41 +314,39 @@ an error occurs.</p></td>
 };</pre>
 <p>The keys manager structure.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10294"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> <code class="STRUCTFIELD">keysStore</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the key store (list of keys known to keys manager).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12409"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> <code class="STRUCTFIELD">keysStore</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key store (list of keys known to keys manager).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10300"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a> <code class="STRUCTFIELD">storesList</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the list of key data stores known to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12416"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrList</span></a> <code class="STRUCTFIELD">storesList</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the list of key data stores known to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10306"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECGETKEYCALLBACK">xmlSecGetKeyCallback</a> <code class="STRUCTFIELD">getKey</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                     the callback used to read <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12423"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECGETKEYCALLBACK"><span class="TYPE">xmlSecGetKeyCallback</span></a> <code class="STRUCTFIELD">getKey</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the callback used to read <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYSMNGRGETKEY"></a><h3>xmlSecKeysMngrGetKey ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyPtr</font>        xmlSecKeysMngrGetKey                (<font>xmlNodePtr</font> keyInfoNode,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYPTR"><span class="RETURNVALUE">xmlSecKeyPtr</span></gtkdoclink>        xmlSecKeysMngrGetKey                (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> keyInfoNode</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Reads the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <code class="PARAMETER">keyInfoNode</code> and extracts the key.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10326"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12448"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10332"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12454"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10338"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12460"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to key or NULL if the key is not found or
 an error occurs.</p></td>
 </tr>
@@ -372,37 +364,35 @@ an error occurs.</p></td>
 };</pre>
 <p>The keys store.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10351"><span style="white-space: nowrap"><font>xmlSecKeyStoreId</font> <code class="STRUCTFIELD">id</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the store id (<gtkdoclink href="XMLSECKEYSTOREID"><span class="TYPE">xmlSecKeyStoreId</span></gtkdoclink>).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12472"><span style="white-space: nowrap"><gtkdoclink href="XMLSECKEYSTOREID"><span class="TYPE">xmlSecKeyStoreId</span></gtkdoclink> <code class="STRUCTFIELD">id</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the store id (<gtkdoclink href="XMLSECKEYSTOREID"><span class="TYPE">xmlSecKeyStoreId</span></gtkdoclink>).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10359"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12481"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10365"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12488"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYSTORECREATE"></a><h3>xmlSecKeyStoreCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a>   xmlSecKeyStoreCreate                (<font>xmlSecKeyStoreId</font> id);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="RETURNVALUE">xmlSecKeyStorePtr</span></a>   xmlSecKeyStoreCreate                (<code class="PARAMETER"><gtkdoclink href="XMLSECKEYSTOREID"><span class="TYPE">xmlSecKeyStoreId</span></gtkdoclink> id</code>);</pre>
 <p>Creates new store of the specified klass <code class="PARAMETER">klass</code>. Caller is responsible
 for freeing the returned store by calling <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREDESTROY"><span class="TYPE">xmlSecKeyStoreDestroy</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10384"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the key store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12510"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10389"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12515"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly allocated keys store or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -410,40 +400,38 @@ for freeing the returned store by calling <a href="xmlsec-keysmngr.html#XMLSECKE
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYSTOREDESTROY"></a><h3>xmlSecKeyStoreDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyStoreDestroy               (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecKeyStoreDestroy               (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>);</pre>
 <p>Destroys the store created with <a href="xmlsec-keysmngr.html#XMLSECKEYSTORECREATE"><span class="TYPE">xmlSecKeyStoreCreate</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10406"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to keys store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12534"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys store.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYSTOREFINDKEY"></a><h3>xmlSecKeyStoreFindKey ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyPtr</font>        xmlSecKeyStoreFindKey               (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         const <font>xmlChar</font> *name,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYPTR"><span class="RETURNVALUE">xmlSecKeyPtr</span></gtkdoclink>        xmlSecKeyStoreFindKey               (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Lookups key in the store. The caller is responsible for destroying
 the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="TYPE">xmlSecKeyDestroy</span></a> method.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10425"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to keys store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12559"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10430"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the desired key name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12564"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired key name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10435"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12569"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10441"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12575"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to a key or NULL if key is not found or an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -454,10 +442,9 @@ the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="
 <pre class="PROGRAMLISTING">#define             xmlSecKeyStoreGetName(store)</pre>
 <p>Macro. Returns key store name.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10454"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12587"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to store.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -467,10 +454,9 @@ the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="
 <p>Macro. Returns 1 if <code class="PARAMETER">store</code> is not NULL and <code class="PARAMETER">store</code>-&gt;id is not NULL
 or 0 otherwise.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10469"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12601"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to store.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -479,15 +465,14 @@ or 0 otherwise.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecKeyStoreCheckId(store, storeId)</pre>
 <p>Macro. Returns 1 if <code class="PARAMETER">store</code> is valid and <code class="PARAMETER">store</code>'s id is equal to <code class="PARAMETER">storeId</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10485"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12616"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10490"><span style="white-space: nowrap"><code class="PARAMETER">storeId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the store Id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12621"><span style="white-space: nowrap"><code class="PARAMETER">storeId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the store Id.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -497,15 +482,14 @@ or 0 otherwise.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecKeyStoreCheckSize(store, size)</pre>
 <p>Macro. Returns 1 if <code class="PARAMETER">store</code> is valid and <code class="PARAMETER">stores</code>'s object has at least <code class="PARAMETER">size</code> bytes.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10506"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12636"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10511"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the expected size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12641"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the expected size.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -514,22 +498,20 @@ or 0 otherwise.</p>
 <a name="XMLSECKEYSTOREIDUNKNOWN"></a><h3>xmlSecKeyStoreIdUnknown</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyStoreIdUnknown                         ((xmlSecKeyDataStoreId)NULL)</pre>
 <p>The "unknown" id.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYSTOREINITIALIZEMETHOD"></a><h3>xmlSecKeyStoreInitializeMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecKeyStoreInitializeMethod)   (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecKeyStoreInitializeMethod)   (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>);</pre>
 <p>Keys store specific initialization method.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10533"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12664"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10538"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12669"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -537,40 +519,38 @@ or 0 otherwise.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYSTOREFINALIZEMETHOD"></a><h3>xmlSecKeyStoreFinalizeMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                (*xmlSecKeyStoreFinalizeMethod)     (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                (*xmlSecKeyStoreFinalizeMethod)     (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>);</pre>
 <p>Keys store specific finalization (destroy) method.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10553"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12686"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the store.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECKEYSTOREFINDKEYMETHOD"></a><h3>xmlSecKeyStoreFindKeyMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyPtr</font>        (*xmlSecKeyStoreFindKeyMethod)      (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         const <font>xmlChar</font> *name,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYPTR"><span class="RETURNVALUE">xmlSecKeyPtr</span></gtkdoclink>        (*xmlSecKeyStoreFindKeyMethod)      (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Keys store specific find method. The caller is responsible for destroying
 the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="TYPE">xmlSecKeyDestroy</span></a> method.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10572"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12711"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10577"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the desired key name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12716"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired key name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10582"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to key info context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12721"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key info context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10587"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12726"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to a key or NULL if key is not found or an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -596,39 +576,38 @@ the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="
 };</pre>
 <p>The keys store id (klass).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10600"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">klassSize</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the store klass size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12738"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> <code class="STRUCTFIELD">klassSize</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the store klass size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10606"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">objSize</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the store obj size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12745"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> <code class="STRUCTFIELD">objSize</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the store obj size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10612"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">name</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the store's name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12752"><span style="white-space: nowrap">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">name</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the store's name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10618"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECKEYSTOREINITIALIZEMETHOD">xmlSecKeyStoreInitializeMethod</a> <code class="STRUCTFIELD">initialize</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the store's initialization method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12759"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECKEYSTOREINITIALIZEMETHOD"><span class="TYPE">xmlSecKeyStoreInitializeMethod</span></a> <code class="STRUCTFIELD">initialize</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the store's initialization method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10624"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECKEYSTOREFINALIZEMETHOD">xmlSecKeyStoreFinalizeMethod</a> <code class="STRUCTFIELD">finalize</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the store's finalization (destroy) method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12766"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECKEYSTOREFINALIZEMETHOD"><span class="TYPE">xmlSecKeyStoreFinalizeMethod</span></a> <code class="STRUCTFIELD">finalize</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the store's finalization (destroy) method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10630"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECKEYSTOREFINDKEYMETHOD">xmlSecKeyStoreFindKeyMethod</a> <code class="STRUCTFIELD">findKey</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the store's find method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12773"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECKEYSTOREFINDKEYMETHOD"><span class="TYPE">xmlSecKeyStoreFindKeyMethod</span></a> <code class="STRUCTFIELD">findKey</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the store's find method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10636"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12780"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10642"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12787"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -638,10 +617,9 @@ the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="
 <pre class="PROGRAMLISTING">#define             xmlSecKeyStoreKlassGetName(klass)</pre>
 <p>Macro. Returns store klass name.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10656"><span style="white-space: nowrap"><code class="PARAMETER">klass</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12801"><span style="white-space: nowrap"><code class="PARAMETER">klass</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to store klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -649,39 +627,36 @@ the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="
 <a name="XMLSECSIMPLEKEYSSTOREID"></a><h3>xmlSecSimpleKeysStoreId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecSimpleKeysStoreId         xmlSecSimpleKeysStoreGetKlass()</pre>
 <p>A simple keys store klass id.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECSIMPLEKEYSSTOREGETKLASS"></a><h3>xmlSecSimpleKeysStoreGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyStoreId</font>    xmlSecSimpleKeysStoreGetKlass       (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYSTOREID"><span class="RETURNVALUE">xmlSecKeyStoreId</span></gtkdoclink>    xmlSecSimpleKeysStoreGetKlass       (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The simple list based keys store klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10677"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12823"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> simple list based keys store klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECSIMPLEKEYSSTOREADOPTKEY"></a><h3>xmlSecSimpleKeysStoreAdoptKey ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecSimpleKeysStoreAdoptKey       (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecSimpleKeysStoreAdoptKey       (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);</pre>
 <p>Adds <code class="PARAMETER">key</code> to the <code class="PARAMETER">store</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10695"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to simple keys store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12845"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to simple keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10700"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12850"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10705"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12855"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -689,27 +664,26 @@ the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECSIMPLEKEYSSTORELOAD"></a><h3>xmlSecSimpleKeysStoreLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecSimpleKeysStoreLoad           (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         const <font>char</font> *uri,
-                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecSimpleKeysStoreLoad           (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *uri</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> keysMngr</code>);</pre>
 <p>Reads keys from an XML file.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10722"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to simple keys store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12878"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to simple keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10727"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12883"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10732"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to associated keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12888"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to associated keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10737"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12893"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -717,27 +691,26 @@ the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECSIMPLEKEYSSTORESAVE"></a><h3>xmlSecSimpleKeysStoreSave ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecSimpleKeysStoreSave           (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecSimpleKeysStoreSave           (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Writes keys from <code class="PARAMETER">store</code> to an XML file.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10755"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to simple keys store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12917"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to simple keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10760"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12922"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10765"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the saved keys type (public, private, ...).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12927"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the saved keys type (public, private, ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10770"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12932"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -745,17 +718,16 @@ the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECSIMPLEKEYSSTOREGETKEYS"></a><h3>xmlSecSimpleKeysStoreGetKeys ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecPtrListPtr</font>    xmlSecSimpleKeysStoreGetKeys        (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECPTRLISTPTR"><span class="RETURNVALUE">xmlSecPtrListPtr</span></gtkdoclink>    xmlSecSimpleKeysStoreGetKeys        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>);</pre>
 <p>Gets list of keys from simple keys store.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10785"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to simple keys store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12949"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to simple keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10790"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12954"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the list of keys stored in the keys store or NULL
 if an error occurs.</p></td>
 </tr>
diff --git a/docs/api/xmlsec-list.html b/docs/api/xmlsec-list.html
index e08ed73..05556d1 100644
--- a/docs/api/xmlsec-list.html
+++ b/docs/api/xmlsec-list.html
@@ -87,47 +87,48 @@
 <h1>
 <a name="XMLSEC-LIST"></a>list</h1>
 <div class="REFNAMEDIV">
-<a name="AEN10800"></a><h2>Name</h2>list -- Generic list structure implementation.</div>
+<a name="AEN12964"></a><h2>Name</h2>list -- Generic list structure implementation.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-LIST.SYNOPSIS"></a><h2>Synopsis</h2>
 <pre class="SYNOPSIS">struct              <a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a>;
-<font>void</font>                <a href="xmlsec-list.html#XMLSECPTRLISTSETDEFAULTALLOCMODE">xmlSecPtrListSetDefaultAllocMode</a>    (<a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a> defAllocMode,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> defInitialSize);
-<font>int</font>                 <a href="xmlsec-list.html#XMLSECPTRLISTINITIALIZE">xmlSecPtrListInitialize</a>             (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>xmlSecPtrListId</font> id);
-<font>void</font>                <a href="xmlsec-list.html#XMLSECPTRLISTFINALIZE">xmlSecPtrListFinalize</a>               (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);
-<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a>    <a href="xmlsec-list.html#XMLSECPTRLISTCREATE">xmlSecPtrListCreate</a>                 (<font>xmlSecPtrListId</font> id);
-<font>void</font>                <a href="xmlsec-list.html#XMLSECPTRLISTDESTROY">xmlSecPtrListDestroy</a>                (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);
-<font>void</font>                <a href="xmlsec-list.html#XMLSECPTRLISTEMPTY">xmlSecPtrListEmpty</a>                  (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);
-<font>int</font>                 <a href="xmlsec-list.html#XMLSECPTRLISTCOPY">xmlSecPtrListCopy</a>                   (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> dst,
-                                                         <a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> src);
-<font>xmlSecPtrListPtr</font>    <a href="xmlsec-list.html#XMLSECPTRLISTDUPLICATE">xmlSecPtrListDuplicate</a>              (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-list.html#XMLSECPTRLISTGETSIZE">xmlSecPtrListGetSize</a>                (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);
-<a href="xmlsec-xmlsec.html#XMLSECPTR">xmlSecPtr</a>           <a href="xmlsec-list.html#XMLSECPTRLISTGETITEM">xmlSecPtrListGetItem</a>                (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-<font>int</font>                 <a href="xmlsec-list.html#XMLSECPTRLISTADD">xmlSecPtrListAdd</a>                    (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>xmlSecPtr</font> item);
-<font>int</font>                 <a href="xmlsec-list.html#XMLSECPTRLISTSET">xmlSecPtrListSet</a>                    (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>xmlSecPtr</font> item,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-<font>int</font>                 <a href="xmlsec-list.html#XMLSECPTRLISTREMOVE">xmlSecPtrListRemove</a>                 (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-<font>void</font>                <a href="xmlsec-list.html#XMLSECPTRLISTDEBUGDUMP">xmlSecPtrListDebugDump</a>              (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>FILE</font> *output);
-<font>void</font>                <a href="xmlsec-list.html#XMLSECPTRLISTDEBUGXMLDUMP">xmlSecPtrListDebugXmlDump</a>           (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>FILE</font> *output);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-list.html#XMLSECPTRLISTSETDEFAULTALLOCMODE">xmlSecPtrListSetDefaultAllocMode</a>    (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECALLOCMODE"><span class="TYPE">xmlSecAllocMode</span></a> defAllocMode</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> defInitialSize</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-list.html#XMLSECPTRLISTINITIALIZE">xmlSecPtrListInitialize</a>             (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECPTRLISTID"><span class="TYPE">xmlSecPtrListId</span></gtkdoclink> id</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-list.html#XMLSECPTRLISTFINALIZE">xmlSecPtrListFinalize</a>               (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>);
+<a href="xmlsec-list.html#XMLSECPTRLIST"><span class="RETURNVALUE">xmlSecPtrListPtr</span></a>    <a href="xmlsec-list.html#XMLSECPTRLISTCREATE">xmlSecPtrListCreate</a>                 (<code class="PARAMETER"><gtkdoclink href="XMLSECPTRLISTID"><span class="TYPE">xmlSecPtrListId</span></gtkdoclink> id</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-list.html#XMLSECPTRLISTDESTROY">xmlSecPtrListDestroy</a>                (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-list.html#XMLSECPTRLISTEMPTY">xmlSecPtrListEmpty</a>                  (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-list.html#XMLSECPTRLISTCOPY">xmlSecPtrListCopy</a>                   (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> dst</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> src</code>);
+<gtkdoclink href="XMLSECPTRLISTPTR"><span class="RETURNVALUE">xmlSecPtrListPtr</span></gtkdoclink><a href="xmlsec-list.html#XMLSECPTRLISTDUPLICATE">xmlSecPtrListDuplicate</a>              (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          <a href="xmlsec-list.html#XMLSECPTRLISTGETSIZE">xmlSecPtrListGetSize</a>                (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>);
+<a href="xmlsec-xmlsec.html#XMLSECPTR"><span class="RETURNVALUE">xmlSecPtr</span></a>           <a href="xmlsec-list.html#XMLSECPTRLISTGETITEM">xmlSecPtrListGetItem</a>                (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-list.html#XMLSECPTRLISTADD">xmlSecPtrListAdd</a>                    (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSEC"><span class="TYPE">xmlSecPtr</span></gtkdoclink> item</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-list.html#XMLSECPTRLISTSET">xmlSecPtrListSet</a>                    (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSEC"><span class="TYPE">xmlSecPtr</span></gtkdoclink> item</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-list.html#XMLSECPTRLISTREMOVE">xmlSecPtrListRemove</a>                 (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-list.html#XMLSECPTRLISTDEBUGDUMP">xmlSecPtrListDebugDump</a>              (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-list.html#XMLSECPTRLISTDEBUGXMLDUMP">xmlSecPtrListDebugXmlDump</a>           (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
 #define             <a href="xmlsec-list.html#XMLSECPTRLISTGETNAME">xmlSecPtrListGetName</a>                (list)
 #define             <a href="xmlsec-list.html#XMLSECPTRLISTISVALID">xmlSecPtrListIsValid</a>                (list)
-#define             <a href="xmlsec-list.html#XMLSECPTRLISTCHECKID">xmlSecPtrListCheckId</a>                (list, dataId)
+#define             <a href="xmlsec-list.html#XMLSECPTRLISTCHECKID">xmlSecPtrListCheckId</a>                (list,
+                                                         dataId)
 #define             <a href="xmlsec-list.html#XMLSECPTRLISTIDUNKNOWN">xmlSecPtrListIdUnknown</a>
-<a href="xmlsec-xmlsec.html#XMLSECPTR">xmlSecPtr</a>           (<a href="xmlsec-list.html#XMLSECPTRDUPLICATEITEMMETHOD">*xmlSecPtrDuplicateItemMethod</a>)     (<font>xmlSecPtr</font> ptr);
-<font>void</font>                (<a href="xmlsec-list.html#XMLSECPTRDESTROYITEMMETHOD">*xmlSecPtrDestroyItemMethod</a>)       (<font>xmlSecPtr</font> ptr);
-<font>void</font>                (<a href="xmlsec-list.html#XMLSECPTRDEBUGDUMPITEMMETHOD">*xmlSecPtrDebugDumpItemMethod</a>)     (<font>xmlSecPtr</font> ptr,
-                                                         <font>FILE</font> *output);
+<a href="xmlsec-xmlsec.html#XMLSECPTR"><span class="RETURNVALUE">xmlSecPtr</span></a>           (<a href="xmlsec-list.html#XMLSECPTRDUPLICATEITEMMETHOD">*xmlSecPtrDuplicateItemMethod</a>)     (<code class="PARAMETER"><gtkdoclink href="XMLSEC"><span class="TYPE">xmlSecPtr</span></gtkdoclink> ptr</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                (<a href="xmlsec-list.html#XMLSECPTRDESTROYITEMMETHOD">*xmlSecPtrDestroyItemMethod</a>)       (<code class="PARAMETER"><gtkdoclink href="XMLSEC"><span class="TYPE">xmlSecPtr</span></gtkdoclink> ptr</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                (<a href="xmlsec-list.html#XMLSECPTRDEBUGDUMPITEMMETHOD">*xmlSecPtrDebugDumpItemMethod</a>)     (<code class="PARAMETER"><gtkdoclink href="XMLSEC"><span class="TYPE">xmlSecPtr</span></gtkdoclink> ptr</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
 struct              <a href="xmlsec-list.html#XMLSECPTRLISTKLASS">xmlSecPtrListKlass</a>;
 #define             <a href="xmlsec-list.html#XMLSECPTRLISTKLASSGETNAME">xmlSecPtrListKlassGetName</a>           (klass)
 #define             <a href="xmlsec-list.html#XMLSECSTRINGLISTID">xmlSecStringListId</a>
-<font>xmlSecPtrListId</font>     <a href="xmlsec-list.html#XMLSECSTRINGLISTGETKLASS">xmlSecStringListGetKlass</a>            (void);</pre>
+<gtkdoclink href="XMLSECPTRLISTID"><span class="RETURNVALUE">xmlSecPtrListId</span></gtkdoclink><a href="xmlsec-list.html#XMLSECSTRINGLISTGETKLASS">xmlSecStringListGetKlass</a>            (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-LIST.DESCRIPTION"></a><h2>Description</h2>
@@ -147,69 +148,66 @@ struct              <a href="xmlsec-list.html#XMLSECPTRLISTKLASS">xmlSecPtrListK
 };</pre>
 <p>The pointers list.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10894"><span style="white-space: nowrap"><font>xmlSecPtrListId</font> <code class="STRUCTFIELD">id</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                         the list items description.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13136"><span style="white-space: nowrap"><gtkdoclink href="XMLSECPTRLISTID"><span class="TYPE">xmlSecPtrListId</span></gtkdoclink> <code class="STRUCTFIELD">id</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the list items description.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10900"><span style="white-space: nowrap"><font>xmlSecPtr</font> *<code class="STRUCTFIELD">data</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the list data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13143"><span style="white-space: nowrap"><gtkdoclink href="XMLSEC"><span class="TYPE">xmlSecPtr</span></gtkdoclink> *<code class="STRUCTFIELD">data</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the list data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10906"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">use</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                        the current list size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13150"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> <code class="STRUCTFIELD">use</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the current list size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10912"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">max</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                        the max (allocated) list size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13157"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> <code class="STRUCTFIELD">max</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the max (allocated) list size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10918"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a> <code class="STRUCTFIELD">allocMode</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the memory allocation mode.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13164"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECALLOCMODE"><span class="TYPE">xmlSecAllocMode</span></a> <code class="STRUCTFIELD">allocMode</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the memory allocation mode.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPTRLISTSETDEFAULTALLOCMODE"></a><h3>xmlSecPtrListSetDefaultAllocMode ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecPtrListSetDefaultAllocMode    (<a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a> defAllocMode,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> defInitialSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecPtrListSetDefaultAllocMode    (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECALLOCMODE"><span class="TYPE">xmlSecAllocMode</span></a> defAllocMode</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> defInitialSize</code>);</pre>
 <p>Sets new default allocation mode and minimal initial list size.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10935"><span style="white-space: nowrap"><code class="PARAMETER">defAllocMode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the new default memory allocation mode.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13186"><span style="white-space: nowrap"><code class="PARAMETER">defAllocMode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new default memory allocation mode.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10940"><span style="white-space: nowrap"><code class="PARAMETER">defInitialSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the new default minimal initial size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13191"><span style="white-space: nowrap"><code class="PARAMETER">defInitialSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new default minimal initial size.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPTRLISTINITIALIZE"></a><h3>xmlSecPtrListInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecPtrListInitialize             (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>xmlSecPtrListId</font> id);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecPtrListInitialize             (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECPTRLISTID"><span class="TYPE">xmlSecPtrListId</span></gtkdoclink> id</code>);</pre>
 <p>Initializes the list of given klass. Caller is responsible
 for cleaning up by calling <a href="xmlsec-list.html#XMLSECPTRLISTFINALIZE"><span class="TYPE">xmlSecPtrListFinalize</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10958"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13213"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10963"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the list klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13218"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the list klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10968"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13223"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -217,31 +215,29 @@ for cleaning up by calling <a href="xmlsec-list.html#XMLSECPTRLISTFINALIZE"><spa
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPTRLISTFINALIZE"></a><h3>xmlSecPtrListFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecPtrListFinalize               (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecPtrListFinalize               (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>);</pre>
 <p>Cleans up the list initialized with <a href="xmlsec-list.html#XMLSECPTRLISTINITIALIZE"><span class="TYPE">xmlSecPtrListInitialize</span></a>
 function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10985"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13242"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to list.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPTRLISTCREATE"></a><h3>xmlSecPtrListCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a>    xmlSecPtrListCreate                 (<font>xmlSecPtrListId</font> id);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="RETURNVALUE">xmlSecPtrListPtr</span></a>    xmlSecPtrListCreate                 (<code class="PARAMETER"><gtkdoclink href="XMLSECPTRLISTID"><span class="TYPE">xmlSecPtrListId</span></gtkdoclink> id</code>);</pre>
 <p>Creates new list object. Caller is responsible for freeing returned list
 by calling <a href="xmlsec-list.html#XMLSECPTRLISTDESTROY"><span class="TYPE">xmlSecPtrListDestroy</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11002"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the list klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13261"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the list klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11007"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13266"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly allocated list or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -249,48 +245,45 @@ by calling <a href="xmlsec-list.html#XMLSECPTRLISTDESTROY"><span class="TYPE">xm
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPTRLISTDESTROY"></a><h3>xmlSecPtrListDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecPtrListDestroy                (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecPtrListDestroy                (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>);</pre>
 <p>Destroys <code class="PARAMETER">list</code> created with <a href="xmlsec-list.html#XMLSECPTRLISTCREATE"><span class="TYPE">xmlSecPtrListCreate</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11025"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13286"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to list.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPTRLISTEMPTY"></a><h3>xmlSecPtrListEmpty ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecPtrListEmpty                  (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecPtrListEmpty                  (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>);</pre>
 <p>Remove all items from <code class="PARAMETER">list</code> (if any).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11041"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13304"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to list.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPTRLISTCOPY"></a><h3>xmlSecPtrListCopy ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecPtrListCopy                   (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> dst,
-                                                         <a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> src);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecPtrListCopy                   (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> dst</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> src</code>);</pre>
 <p>Copies <code class="PARAMETER">src</code> list items to <code class="PARAMETER">dst</code> list using <gtkdoclink href="DUPLICATEITEM"><span class="TYPE">duplicateItem</span></gtkdoclink> method
 of the list klass. If <gtkdoclink href="DUPLICATEITEM"><span class="TYPE">duplicateItem</span></gtkdoclink> method is NULL then
 we jsut copy pointers to items.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11063"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to destination list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13330"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to destination list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11068"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to source list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13335"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to source list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11073"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13340"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -298,17 +291,16 @@ we jsut copy pointers to items.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPTRLISTDUPLICATE"></a><h3>xmlSecPtrListDuplicate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecPtrListPtr</font>    xmlSecPtrListDuplicate              (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECPTRLISTPTR"><span class="RETURNVALUE">xmlSecPtrListPtr</span></gtkdoclink>    xmlSecPtrListDuplicate              (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>);</pre>
 <p>Creates a new copy of <code class="PARAMETER">list</code> and all its items.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11089"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13358"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11094"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13363"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly allocated list or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -316,17 +308,16 @@ we jsut copy pointers to items.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPTRLISTGETSIZE"></a><h3>xmlSecPtrListGetSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecPtrListGetSize                (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          xmlSecPtrListGetSize                (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>);</pre>
 <p>Gets list size.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11109"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13380"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11114"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13385"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the number of itmes in <code class="PARAMETER">list</code>.</p></td>
 </tr>
 </tbody></table>
@@ -334,22 +325,21 @@ we jsut copy pointers to items.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPTRLISTGETITEM"></a><h3>xmlSecPtrListGetItem ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECPTR">xmlSecPtr</a>           xmlSecPtrListGetItem                (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECPTR"><span class="RETURNVALUE">xmlSecPtr</span></a>           xmlSecPtrListGetItem                (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);</pre>
 <p>Gets item from the list.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11131"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13406"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11136"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the item position.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13411"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the item position.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11141"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13416"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the list item at position <code class="PARAMETER">pos</code> or NULL if <code class="PARAMETER">pos</code> is greater
 than the number of items in the list or an error occurs.</p></td>
 </tr>
@@ -358,22 +348,21 @@ than the number of items in the list or an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPTRLISTADD"></a><h3>xmlSecPtrListAdd ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecPtrListAdd                    (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>xmlSecPtr</font> item);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecPtrListAdd                    (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSEC"><span class="TYPE">xmlSecPtr</span></gtkdoclink> item</code>);</pre>
 <p>Adds <code class="PARAMETER">item</code> to the end of the <code class="PARAMETER">list</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11161"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13440"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11166"><span style="white-space: nowrap"><code class="PARAMETER">item</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the item.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13445"><span style="white-space: nowrap"><code class="PARAMETER">item</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the item.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11171"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13450"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -381,28 +370,27 @@ than the number of items in the list or an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPTRLISTSET"></a><h3>xmlSecPtrListSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecPtrListSet                    (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>xmlSecPtr</font> item,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecPtrListSet                    (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSEC"><span class="TYPE">xmlSecPtr</span></gtkdoclink> item</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);</pre>
 <p>Sets the value of list item at position <code class="PARAMETER">pos</code>. The old value
 is destroyed.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11189"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13474"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11194"><span style="white-space: nowrap"><code class="PARAMETER">item</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the item.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13479"><span style="white-space: nowrap"><code class="PARAMETER">item</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the item.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11199"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pos.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13484"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pos.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11204"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13489"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -410,22 +398,21 @@ is destroyed.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPTRLISTREMOVE"></a><h3>xmlSecPtrListRemove ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecPtrListRemove                 (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecPtrListRemove                 (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);</pre>
 <p>Destroys list item at the position <code class="PARAMETER">pos</code> and sets it value to NULL.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11221"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13510"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11226"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the position.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13515"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the position.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11231"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13520"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -433,38 +420,36 @@ is destroyed.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPTRLISTDEBUGDUMP"></a><h3>xmlSecPtrListDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecPtrListDebugDump              (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecPtrListDebugDump              (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints debug information about <code class="PARAMETER">list</code> to the <code class="PARAMETER">output</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11249"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13542"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11254"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13547"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPTRLISTDEBUGXMLDUMP"></a><h3>xmlSecPtrListDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecPtrListDebugXmlDump           (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecPtrListDebugXmlDump           (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints debug information about <code class="PARAMETER">list</code> to the <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11272"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13569"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11277"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13574"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -474,10 +459,9 @@ is destroyed.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecPtrListGetName(list)</pre>
 <p>Macro. Returns lists's name.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11290"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the ponter to list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13586"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the ponter to list.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -487,10 +471,9 @@ is destroyed.</p>
 <p>Macro. Returns 1 if <code class="PARAMETER">list</code> is not NULL and <code class="PARAMETER">list</code>-&gt;id is not NULL
 or 0 otherwise.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11305"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13600"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to list.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -499,15 +482,14 @@ or 0 otherwise.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecPtrListCheckId(list, dataId)</pre>
 <p>Macro. Returns 1 if <code class="PARAMETER">list</code> is valid and <code class="PARAMETER">list</code>'s id is equal to <code class="PARAMETER">dataId</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11321"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13615"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11326"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the list Id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13620"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the list Id.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -516,22 +498,20 @@ or 0 otherwise.</p>
 <a name="XMLSECPTRLISTIDUNKNOWN"></a><h3>xmlSecPtrListIdUnknown</h3>
 <pre class="PROGRAMLISTING">#define xmlSecPtrListIdUnknown                  NULL</pre>
 <p>The "unknown" id.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPTRDUPLICATEITEMMETHOD"></a><h3>xmlSecPtrDuplicateItemMethod ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECPTR">xmlSecPtr</a>           (*xmlSecPtrDuplicateItemMethod)     (<font>xmlSecPtr</font> ptr);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECPTR"><span class="RETURNVALUE">xmlSecPtr</span></a>           (*xmlSecPtrDuplicateItemMethod)     (<code class="PARAMETER"><gtkdoclink href="XMLSEC"><span class="TYPE">xmlSecPtr</span></gtkdoclink> ptr</code>);</pre>
 <p>Duplicates item <code class="PARAMETER">ptr</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11349"><span style="white-space: nowrap"><code class="PARAMETER">ptr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the poinetr to list item.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13644"><span style="white-space: nowrap"><code class="PARAMETER">ptr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the poinetr to list item.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11354"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13649"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to new item copy or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -539,31 +519,29 @@ or 0 otherwise.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPTRDESTROYITEMMETHOD"></a><h3>xmlSecPtrDestroyItemMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                (*xmlSecPtrDestroyItemMethod)       (<font>xmlSecPtr</font> ptr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                (*xmlSecPtrDestroyItemMethod)       (<code class="PARAMETER"><gtkdoclink href="XMLSEC"><span class="TYPE">xmlSecPtr</span></gtkdoclink> ptr</code>);</pre>
 <p>Destroys list item <code class="PARAMETER">ptr</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11370"><span style="white-space: nowrap"><code class="PARAMETER">ptr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the poinetr to list item.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13667"><span style="white-space: nowrap"><code class="PARAMETER">ptr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the poinetr to list item.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPTRDEBUGDUMPITEMMETHOD"></a><h3>xmlSecPtrDebugDumpItemMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                (*xmlSecPtrDebugDumpItemMethod)     (<font>xmlSecPtr</font> ptr,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                (*xmlSecPtrDebugDumpItemMethod)     (<code class="PARAMETER"><gtkdoclink href="XMLSEC"><span class="TYPE">xmlSecPtr</span></gtkdoclink> ptr</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints debug information about <code class="PARAMETER">item</code> to <code class="PARAMETER">output</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11388"><span style="white-space: nowrap"><code class="PARAMETER">ptr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the poinetr to list item.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13689"><span style="white-space: nowrap"><code class="PARAMETER">ptr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the poinetr to list item.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11393"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13694"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -579,27 +557,26 @@ or 0 otherwise.</p>
 };</pre>
 <p>List klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11406"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">name</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the list klass name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13706"><span style="white-space: nowrap">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">name</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the list klass name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11412"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRDUPLICATEITEMMETHOD">xmlSecPtrDuplicateItemMethod</a> <code class="STRUCTFIELD">duplicateItem</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>      the duplciate item method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13713"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRDUPLICATEITEMMETHOD"><span class="TYPE">xmlSecPtrDuplicateItemMethod</span></a> <code class="STRUCTFIELD">duplicateItem</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the duplciate item method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11418"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRDESTROYITEMMETHOD">xmlSecPtrDestroyItemMethod</a> <code class="STRUCTFIELD">destroyItem</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the destroy item method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13720"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRDESTROYITEMMETHOD"><span class="TYPE">xmlSecPtrDestroyItemMethod</span></a> <code class="STRUCTFIELD">destroyItem</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the destroy item method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11424"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRDEBUGDUMPITEMMETHOD">xmlSecPtrDebugDumpItemMethod</a> <code class="STRUCTFIELD">debugDumpItem</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>      the debug dump item method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13727"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRDEBUGDUMPITEMMETHOD"><span class="TYPE">xmlSecPtrDebugDumpItemMethod</span></a> <code class="STRUCTFIELD">debugDumpItem</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the debug dump item method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11430"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRDEBUGDUMPITEMMETHOD">xmlSecPtrDebugDumpItemMethod</a> <code class="STRUCTFIELD">debugXmlDumpItem</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>   the debug dump item in xml format method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13734"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRDEBUGDUMPITEMMETHOD"><span class="TYPE">xmlSecPtrDebugDumpItemMethod</span></a> <code class="STRUCTFIELD">debugXmlDumpItem</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the debug dump item in xml format method.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -609,10 +586,9 @@ or 0 otherwise.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecPtrListKlassGetName(klass)</pre>
 <p>Macro. Returns the list klass name.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11444"><span style="white-space: nowrap"><code class="PARAMETER">klass</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the list klass.
+<td align="LEFT" valign="TOP"><a name="AEN13748"><span style="white-space: nowrap"><code class="PARAMETER">klass</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the list klass.
 2</p></td>
 </tr></tbody></table>
 </div>
@@ -621,17 +597,15 @@ or 0 otherwise.</p>
 <a name="XMLSECSTRINGLISTID"></a><h3>xmlSecStringListId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecStringListId</pre>
 <p>Strings list klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECSTRINGLISTGETKLASS"></a><h3>xmlSecStringListGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font>     xmlSecStringListGetKlass            (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECPTRLISTID"><span class="RETURNVALUE">xmlSecPtrListId</span></gtkdoclink>     xmlSecStringListGetKlass            (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The strins list class.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11465"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13770"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> strings list klass.</p></td>
 </tr></tbody></table>
 </div>
diff --git a/docs/api/xmlsec-membuf.html b/docs/api/xmlsec-membuf.html
index 66d7c16..53b88c3 100644
--- a/docs/api/xmlsec-membuf.html
+++ b/docs/api/xmlsec-membuf.html
@@ -87,12 +87,12 @@
 <h1>
 <a name="XMLSEC-MEMBUF"></a>membuf</h1>
 <div class="REFNAMEDIV">
-<a name="AEN11475"></a><h2>Name</h2>membuf -- Memory buffer transform implementation.</div>
+<a name="AEN13780"></a><h2>Name</h2>membuf -- Memory buffer transform implementation.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-MEMBUF.SYNOPSIS"></a><h2>Synopsis</h2>
 <pre class="SYNOPSIS">#define             <a href="xmlsec-membuf.html#XMLSECTRANSFORMMEMBUFID">xmlSecTransformMemBufId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-membuf.html#XMLSECTRANSFORMMEMBUFGETKLASS">xmlSecTransformMemBufGetKlass</a>       (void);
-<font>xmlSecBufferPtr</font>     <a href="xmlsec-membuf.html#XMLSECTRANSFORMMEMBUFGETBUFFER">xmlSecTransformMemBufGetBuffer</a>      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-membuf.html#XMLSECTRANSFORMMEMBUFGETKLASS">xmlSecTransformMemBufGetKlass</a>       (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="XMLSECBUFFERPTR"><span class="RETURNVALUE">xmlSecBufferPtr</span></gtkdoclink><a href="xmlsec-membuf.html#XMLSECTRANSFORMMEMBUFGETBUFFER">xmlSecTransformMemBufGetBuffer</a>      (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-MEMBUF.DESCRIPTION"></a><h2>Description</h2>
@@ -104,34 +104,31 @@
 <a name="XMLSECTRANSFORMMEMBUFID"></a><h3>xmlSecTransformMemBufId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecTransformMemBufId</pre>
 <p>The Memory Buffer transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMMEMBUFGETKLASS"></a><h3>xmlSecTransformMemBufGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformMemBufGetKlass       (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformMemBufGetKlass       (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The memory buffer transorm (used to store the data that go through it).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11508"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13820"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> memory buffer transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMMEMBUFGETBUFFER"></a><h3>xmlSecTransformMemBufGetBuffer ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecBufferPtr</font>     xmlSecTransformMemBufGetBuffer      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECBUFFERPTR"><span class="RETURNVALUE">xmlSecBufferPtr</span></gtkdoclink>     xmlSecTransformMemBufGetBuffer      (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>);</pre>
 <p>Gets the pointer to memory buffer transform buffer.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11523"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to memory buffer transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13837"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to memory buffer transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11528"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13842"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the transform's <a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBuffer</span></a>.</p></td>
 </tr>
 </tbody></table>
diff --git a/docs/api/xmlsec-mscrypto-app.html b/docs/api/xmlsec-mscrypto-app.html
index 0c1c5c1..6eea6e5 100644
--- a/docs/api/xmlsec-mscrypto-app.html
+++ b/docs/api/xmlsec-mscrypto-app.html
@@ -87,81 +87,81 @@
 <h1>
 <a name="XMLSEC-MSCRYPTO-APP"></a>app</h1>
 <div class="REFNAMEDIV">
-<a name="AEN28373"></a><h2>Name</h2>app -- Application functions implementation for MS Crypto.</div>
+<a name="AEN38013"></a><h2>Name</h2>app -- Application functions implementation for MS Crypto.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-MSCRYPTO-APP.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS"><font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPINIT">xmlSecMSCryptoAppInit</a>               (const <font>char</font> *config);
-<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPSHUTDOWN">xmlSecMSCryptoAppShutdown</a>           (void);
-<font>LPCTSTR</font>             <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPGETCERTSTORENAME">xmlSecMSCryptoAppGetCertStoreName</a>   (void);
-<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT">xmlSecMSCryptoAppDefaultKeysMngrInit</a>
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecMSCryptoAppDefaultKeysMngrAdoptKey</a>
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRLOAD">xmlSecMSCryptoAppDefaultKeysMngrLoad</a>
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *uri);
-<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRSAVE">xmlSecMSCryptoAppDefaultKeysMngrSave</a>
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRPRIVATEKEYLOAD">xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad</a>
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <font>HCRYPTKEY</font> hKey);
-<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRPUBLICKEYLOAD">xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad</a>
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <font>HCRYPTKEY</font> hKey);
-<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRSYMKEYLOAD">xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad</a>
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <font>HCRYPTKEY</font> hKey);
-<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTKEYSTORE">xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore</a>
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <font>HCERTSTORE</font> keyStore);
-<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTTRUSTEDSTORE">xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore</a>
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <font>HCERTSTORE</font> trustedStore);
-<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTUNTRUSTEDSTORE">xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore</a>
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <font>HCERTSTORE</font> untrustedStore);
-<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYSMNGRCERTLOAD">xmlSecMSCryptoAppKeysMngrCertLoad</a>   (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYSMNGRCERTLOADMEMORY">xmlSecMSCryptoAppKeysMngrCertLoadMemory</a>
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYLOAD">xmlSecMSCryptoAppKeyLoad</a>            (const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYLOADMEMORY">xmlSecMSCryptoAppKeyLoadMemory</a>      (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPPKCS12LOAD">xmlSecMSCryptoAppPkcs12Load</a>         (const <font>char</font> *filename,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPPKCS12LOADMEMORY">xmlSecMSCryptoAppPkcs12LoadMemory</a>   (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYCERTLOAD">xmlSecMSCryptoAppKeyCertLoad</a>        (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYCERTLOADMEMORY">xmlSecMSCryptoAppKeyCertLoadMemory</a>  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>void</font>*               <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPGETDEFAULTPWDCALLBACK">xmlSecMSCryptoAppGetDefaultPwdCallback</a>
-                                                        (void);</pre>
+<pre class="SYNOPSIS"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPINIT">xmlSecMSCryptoAppInit</a>               (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *config</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPSHUTDOWN">xmlSecMSCryptoAppShutdown</a>           (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="LPCTSTR:CAPS"><span class="RETURNVALUE">LPCTSTR</span></gtkdoclink><a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPGETCERTSTORENAME">xmlSecMSCryptoAppGetCertStoreName</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT">xmlSecMSCryptoAppDefaultKeysMngrInit</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecMSCryptoAppDefaultKeysMngrAdoptKey</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRLOAD">xmlSecMSCryptoAppDefaultKeysMngrLoad</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *uri</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRSAVE">xmlSecMSCryptoAppDefaultKeysMngrSave</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRPRIVATEKEYLOAD">xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="HCRYPTKEY:CAPS"><span class="TYPE">HCRYPTKEY</span></gtkdoclink> hKey</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRPUBLICKEYLOAD">xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="HCRYPTKEY:CAPS"><span class="TYPE">HCRYPTKEY</span></gtkdoclink> hKey</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRSYMKEYLOAD">xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="HCRYPTKEY:CAPS"><span class="TYPE">HCRYPTKEY</span></gtkdoclink> hKey</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTKEYSTORE">xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="HCERTSTORE:CAPS"><span class="TYPE">HCERTSTORE</span></gtkdoclink> keyStore</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTTRUSTEDSTORE">xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="HCERTSTORE:CAPS"><span class="TYPE">HCERTSTORE</span></gtkdoclink> trustedStore</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTUNTRUSTEDSTORE">xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="HCERTSTORE:CAPS"><span class="TYPE">HCERTSTORE</span></gtkdoclink> untrustedStore</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYSMNGRCERTLOAD">xmlSecMSCryptoAppKeysMngrCertLoad</a>   (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYSMNGRCERTLOADMEMORY">xmlSecMSCryptoAppKeysMngrCertLoadMemory</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYLOAD">xmlSecMSCryptoAppKeyLoad</a>            (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYLOADMEMORY">xmlSecMSCryptoAppKeyLoadMemory</a>      (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPPKCS12LOAD">xmlSecMSCryptoAppPkcs12Load</a>         (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPPKCS12LOADMEMORY">xmlSecMSCryptoAppPkcs12LoadMemory</a>   (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYCERTLOAD">xmlSecMSCryptoAppKeyCertLoad</a>        (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYCERTLOADMEMORY">xmlSecMSCryptoAppKeyCertLoadMemory</a>  (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>*               <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPGETDEFAULTPWDCALLBACK">xmlSecMSCryptoAppGetDefaultPwdCallback</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-MSCRYPTO-APP.DESCRIPTION"></a><h2>Description</h2>
@@ -171,19 +171,18 @@
 <a name="XMLSEC-MSCRYPTO-APP.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPINIT"></a><h3>xmlSecMSCryptoAppInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppInit               (const <font>char</font> *config);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoAppInit               (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *config</code>);</pre>
 <p>General crypto engine initialization. This function is used
 by XMLSec command line utility and called before
 <code class="PARAMETER">xmlSecInit</code> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28496"><span style="white-space: nowrap"><code class="PARAMETER">config</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the name of another then the default ms certificate store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38280"><span style="white-space: nowrap"><code class="PARAMETER">config</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the name of another then the default ms certificate store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28501"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN38285"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -191,45 +190,42 @@ by XMLSec command line utility and called before
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPSHUTDOWN"></a><h3>xmlSecMSCryptoAppShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppShutdown           (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoAppShutdown           (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after
 <code class="PARAMETER">xmlSecShutdown</code> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN28516"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN38302"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPGETCERTSTORENAME"></a><h3>xmlSecMSCryptoAppGetCertStoreName ()</h3>
-<pre class="PROGRAMLISTING"><font>LPCTSTR</font>             xmlSecMSCryptoAppGetCertStoreName   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="LPCTSTR:CAPS"><span class="RETURNVALUE">LPCTSTR</span></gtkdoclink>             xmlSecMSCryptoAppGetCertStoreName   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Gets the MS Crypto certs store name set by <code class="PARAMETER">xmlSecMSCryptoAppInit</code> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN28531"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN38319"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the MS Crypto certs name used by xmlsec-mscrypto.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT"></a><h3>xmlSecMSCryptoAppDefaultKeysMngrInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppDefaultKeysMngrInit
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoAppDefaultKeysMngrInit
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);</pre>
 <p>Initializes <code class="PARAMETER">mngr</code> with simple keys store <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREID"><span class="TYPE">xmlSecSimpleKeysStoreId</span></a>
 and a default MSCrypto crypto key data stores.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28549"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38339"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28554"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN38344"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -237,24 +233,23 @@ and a default MSCrypto crypto key data stores.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTKEY"></a><h3>xmlSecMSCryptoAppDefaultKeysMngrAdoptKey ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptKey
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptKey
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);</pre>
 <p>Adds <code class="PARAMETER">key</code> to the keys manager <code class="PARAMETER">mngr</code> created with <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecMSCryptoAppDefaultKeysMngrInit</span></a>
 function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28574"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38368"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28579"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38373"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28584"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN38378"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -262,24 +257,23 @@ function.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRLOAD"></a><h3>xmlSecMSCryptoAppDefaultKeysMngrLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppDefaultKeysMngrLoad
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *uri);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoAppDefaultKeysMngrLoad
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *uri</code>);</pre>
 <p>Loads XML keys file from <code class="PARAMETER">uri</code> to the keys manager <code class="PARAMETER">mngr</code> created
 with <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecMSCryptoAppDefaultKeysMngrInit</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28604"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38402"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28609"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the uri.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38407"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the uri.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28614"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN38412"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -287,28 +281,27 @@ with <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT"><sp
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRSAVE"></a><h3>xmlSecMSCryptoAppDefaultKeysMngrSave ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppDefaultKeysMngrSave
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoAppDefaultKeysMngrSave
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Saves keys from <code class="PARAMETER">mngr</code> to  XML keys file.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28632"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38436"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28637"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>   the destination filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38441"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the destination filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28642"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the type of keys to save (public/private/symmetric).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38446"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the type of keys to save (public/private/symmetric).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28647"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN38451"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -316,23 +309,22 @@ with <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT"><sp
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRPRIVATEKEYLOAD"></a><h3>xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <font>HCRYPTKEY</font> hKey);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="HCRYPTKEY:CAPS"><span class="TYPE">HCRYPTKEY</span></gtkdoclink> hKey</code>);</pre>
 <p>Adds private key <code class="PARAMETER">hKey</code> to the keys manager <code class="PARAMETER">mngr</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28665"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38473"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28670"><span style="white-space: nowrap"><code class="PARAMETER">hKey</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the key handle.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38478"><span style="white-space: nowrap"><code class="PARAMETER">hKey</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key handle.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28675"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN38483"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -340,23 +332,22 @@ with <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT"><sp
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRPUBLICKEYLOAD"></a><h3>xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <font>HCRYPTKEY</font> hKey);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="HCRYPTKEY:CAPS"><span class="TYPE">HCRYPTKEY</span></gtkdoclink> hKey</code>);</pre>
 <p>Adds public key <code class="PARAMETER">hKey</code> to the keys manager <code class="PARAMETER">mngr</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28693"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38505"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28698"><span style="white-space: nowrap"><code class="PARAMETER">hKey</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the key handle.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38510"><span style="white-space: nowrap"><code class="PARAMETER">hKey</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key handle.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28703"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN38515"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -364,23 +355,22 @@ with <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT"><sp
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRSYMKEYLOAD"></a><h3>xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <font>HCRYPTKEY</font> hKey);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="HCRYPTKEY:CAPS"><span class="TYPE">HCRYPTKEY</span></gtkdoclink> hKey</code>);</pre>
 <p>Adds symmetric key <code class="PARAMETER">hKey</code> to the keys manager <code class="PARAMETER">mngr</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28721"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38537"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28726"><span style="white-space: nowrap"><code class="PARAMETER">hKey</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the key handle.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38542"><span style="white-space: nowrap"><code class="PARAMETER">hKey</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key handle.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28731"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN38547"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -388,23 +378,22 @@ with <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT"><sp
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTKEYSTORE"></a><h3>xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <font>HCERTSTORE</font> keyStore);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="HCERTSTORE:CAPS"><span class="TYPE">HCERTSTORE</span></gtkdoclink> keyStore</code>);</pre>
 <p>Adds <code class="PARAMETER">keyStore</code> to the list of key stores in the keys manager <code class="PARAMETER">mngr</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28749"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38569"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28754"><span style="white-space: nowrap"><code class="PARAMETER">keyStore</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to keys store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38574"><span style="white-space: nowrap"><code class="PARAMETER">keyStore</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28759"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN38579"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -412,23 +401,22 @@ with <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT"><sp
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTTRUSTEDSTORE"></a><h3>xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <font>HCERTSTORE</font> trustedStore);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="HCERTSTORE:CAPS"><span class="TYPE">HCERTSTORE</span></gtkdoclink> trustedStore</code>);</pre>
 <p>Adds <code class="PARAMETER">trustedStore</code> to the list of trusted cert stores in the keys manager <code class="PARAMETER">mngr</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28777"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38601"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28782"><span style="white-space: nowrap"><code class="PARAMETER">trustedStore</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to certs store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38606"><span style="white-space: nowrap"><code class="PARAMETER">trustedStore</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to certs store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28787"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN38611"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -436,23 +424,22 @@ with <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT"><sp
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTUNTRUSTEDSTORE"></a><h3>xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <font>HCERTSTORE</font> untrustedStore);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="HCERTSTORE:CAPS"><span class="TYPE">HCERTSTORE</span></gtkdoclink> untrustedStore</code>);</pre>
 <p>Adds <code class="PARAMETER">trustedStore</code> to the list of un-trusted cert stores in the keys manager <code class="PARAMETER">mngr</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28805"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38633"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28810"><span style="white-space: nowrap"><code class="PARAMETER">untrustedStore</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the pointer to certs store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38638"><span style="white-space: nowrap"><code class="PARAMETER">untrustedStore</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to certs store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28815"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN38643"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -460,34 +447,33 @@ with <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT"><sp
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPKEYSMNGRCERTLOAD"></a><h3>xmlSecMSCryptoAppKeysMngrCertLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppKeysMngrCertLoad   (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoAppKeysMngrCertLoad   (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Reads cert from <code class="PARAMETER">filename</code> and adds to the list of trusted or known
 untrusted certs in <code class="PARAMETER">store</code> (not implemented yet).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28835"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38671"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28840"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the certificate file.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38676"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28845"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38681"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28850"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the flag that indicates is the certificate in <code class="PARAMETER">filename</code>
+<td align="LEFT" valign="TOP"><a name="AEN38686"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag that indicates is the certificate in <code class="PARAMETER">filename</code>
                      trusted or not.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28856"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN38692"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -495,40 +481,39 @@ untrusted certs in <code class="PARAMETER">store</code> (not implemented yet).</
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPKEYSMNGRCERTLOADMEMORY"></a><h3>xmlSecMSCryptoAppKeysMngrCertLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppKeysMngrCertLoadMemory
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoAppKeysMngrCertLoadMemory
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Reads cert from <code class="PARAMETER">data</code> and adds to the list of trusted or known
 untrusted certs in <code class="PARAMETER">store</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28877"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38723"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28882"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the binary certificate.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38728"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the binary certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28887"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           size of binary certificate (data)</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38733"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>size of binary certificate (data)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28892"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38738"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28897"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the flag that indicates is the certificate in <code class="PARAMETER">filename</code>
+<td align="LEFT" valign="TOP"><a name="AEN38743"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag that indicates is the certificate in <code class="PARAMETER">filename</code>
                      trusted or not.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28903"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN38749"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -536,37 +521,36 @@ untrusted certs in <code class="PARAMETER">store</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPKEYLOAD"></a><h3>xmlSecMSCryptoAppKeyLoad ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecMSCryptoAppKeyLoad            (const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecMSCryptoAppKeyLoad            (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key from the a file.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28922"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the key filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38778"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28927"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the key file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38783"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28932"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the key file password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38788"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28937"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the key password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38793"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28942"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38798"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28947"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN38803"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -574,42 +558,41 @@ untrusted certs in <code class="PARAMETER">store</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPKEYLOADMEMORY"></a><h3>xmlSecMSCryptoAppKeyLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecMSCryptoAppKeyLoadMemory      (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecMSCryptoAppKeyLoadMemory      (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key from the a file.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28967"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the key binary data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38835"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28972"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the key data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38840"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28977"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the key format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38845"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28982"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the key password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38850"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28987"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the key password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38855"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28992"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38860"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28997"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN38865"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -617,32 +600,31 @@ untrusted certs in <code class="PARAMETER">store</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPPKCS12LOAD"></a><h3>xmlSecMSCryptoAppPkcs12Load ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecMSCryptoAppPkcs12Load         (const <font>char</font> *filename,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecMSCryptoAppPkcs12Load         (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key and all associated certificates from the PKCS12 file</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29015"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the PKCS12 key filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38891"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29020"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the PKCS12 file password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38896"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29025"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38901"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29030"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38906"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29035"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN38911"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -650,37 +632,36 @@ untrusted certs in <code class="PARAMETER">store</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPPKCS12LOADMEMORY"></a><h3>xmlSecMSCryptoAppPkcs12LoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecMSCryptoAppPkcs12LoadMemory   (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecMSCryptoAppPkcs12LoadMemory   (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key and all associated certificates from the PKCS12 binary</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29054"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the binary PKCS12 key in data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38940"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the binary PKCS12 key in data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29059"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           size of binary pkcs12 data</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38945"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>size of binary pkcs12 data</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29064"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the PKCS12 file password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38950"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29069"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38955"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29074"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38960"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29079"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN38965"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -688,27 +669,26 @@ untrusted certs in <code class="PARAMETER">store</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPKEYCERTLOAD"></a><h3>xmlSecMSCryptoAppKeyCertLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppKeyCertLoad        (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoAppKeyCertLoad        (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);</pre>
 <p>Reads the certificate from $<code class="PARAMETER">filename</code> and adds it to key.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29097"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38989"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29102"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the certificate filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38994"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29107"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN38999"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29112"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39004"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -716,32 +696,31 @@ untrusted certs in <code class="PARAMETER">store</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPKEYCERTLOADMEMORY"></a><h3>xmlSecMSCryptoAppKeyCertLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppKeyCertLoadMemory  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoAppKeyCertLoadMemory  (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);</pre>
 <p>Reads the certificate from $<code class="PARAMETER">data</code> and adds it to key.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29131"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39031"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29136"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the binary certificate.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39036"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the binary certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29141"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           size of certificate binary (data)</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39041"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>size of certificate binary (data)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29146"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39046"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29151"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39051"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -749,13 +728,12 @@ untrusted certs in <code class="PARAMETER">store</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOAPPGETDEFAULTPWDCALLBACK"></a><h3>xmlSecMSCryptoAppGetDefaultPwdCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>*               xmlSecMSCryptoAppGetDefaultPwdCallback
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>*               xmlSecMSCryptoAppGetDefaultPwdCallback
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Gets default password callback.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN29165"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39067"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> default password callback.</p></td>
 </tr></tbody></table>
 </div>
diff --git a/docs/api/xmlsec-mscrypto-certkeys.html b/docs/api/xmlsec-mscrypto-certkeys.html
index 6af7fa1..5894da5 100644
--- a/docs/api/xmlsec-mscrypto-certkeys.html
+++ b/docs/api/xmlsec-mscrypto-certkeys.html
@@ -87,20 +87,20 @@
 <h1>
 <a name="XMLSEC-MSCRYPTO-CERTKEYS"></a>certkeys</h1>
 <div class="REFNAMEDIV">
-<a name="AEN29175"></a><h2>Name</h2>certkeys -- MS Crypto certificates helper functions.</div>
+<a name="AEN39077"></a><h2>Name</h2>certkeys -- MS Crypto certificates helper functions.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-MSCRYPTO-CERTKEYS.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS"><font>PCCERT_CONTEXT</font>      <a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOKEYDATAGETCERT">xmlSecMSCryptoKeyDataGetCert</a>        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>HCRYPTKEY</font>           <a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOKEYDATAGETKEY">xmlSecMSCryptoKeyDataGetKey</a>         (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>HCRYPTKEY</font>           <a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOKEYDATAGETDECRYPTKEY">xmlSecMSCryptoKeyDataGetDecryptKey</a>  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>PCCERT_CONTEXT</font>      <a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOCERTDUP">xmlSecMSCryptoCertDup</a>               (<font>PCCERT_CONTEXT</font> pCert);
-<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    <a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOCERTADOPT">xmlSecMSCryptoCertAdopt</a>             (<font>PCCERT_CONTEXT</font> pCert,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>HCRYPTPROV</font>          <a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOKEYDATAGETMSCRYPTOPROVIDER">xmlSecMSCryptoKeyDataGetMSCryptoProvider</a>
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>DWORD</font>               <a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOKEYDATAGETMSCRYPTOKEYSPEC">xmlSecMSCryptoKeyDataGetMSCryptoKeySpec</a>
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="SYNOPSIS"><gtkdoclink href="PCCERT-CONTEXT:CAPS"><span class="RETURNVALUE">PCCERT_CONTEXT</span></gtkdoclink><a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOKEYDATAGETCERT">xmlSecMSCryptoKeyDataGetCert</a>        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="HCRYPTKEY:CAPS"><span class="RETURNVALUE">HCRYPTKEY</span></gtkdoclink><a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOKEYDATAGETKEY">xmlSecMSCryptoKeyDataGetKey</a>         (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<gtkdoclink href="HCRYPTKEY:CAPS"><span class="RETURNVALUE">HCRYPTKEY</span></gtkdoclink><a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOKEYDATAGETDECRYPTKEY">xmlSecMSCryptoKeyDataGetDecryptKey</a>  (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="PCCERT-CONTEXT:CAPS"><span class="RETURNVALUE">PCCERT_CONTEXT</span></gtkdoclink><a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOCERTDUP">xmlSecMSCryptoCertDup</a>               (<code class="PARAMETER"><gtkdoclink href="PCCERT-CONTEXT:CAPS"><span class="TYPE">PCCERT_CONTEXT</span></gtkdoclink> pCert</code>);
+<a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="RETURNVALUE">xmlSecKeyDataPtr</span></a>    <a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOCERTADOPT">xmlSecMSCryptoCertAdopt</a>             (<code class="PARAMETER"><gtkdoclink href="PCCERT-CONTEXT:CAPS"><span class="TYPE">PCCERT_CONTEXT</span></gtkdoclink> pCert</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<gtkdoclink href="HCRYPTPROV:CAPS"><span class="RETURNVALUE">HCRYPTPROV</span></gtkdoclink><a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOKEYDATAGETMSCRYPTOPROVIDER">xmlSecMSCryptoKeyDataGetMSCryptoProvider</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="DWORD:CAPS"><span class="RETURNVALUE">DWORD</span></gtkdoclink><a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOKEYDATAGETMSCRYPTOKEYSPEC">xmlSecMSCryptoKeyDataGetMSCryptoKeySpec</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-MSCRYPTO-CERTKEYS.DESCRIPTION"></a><h2>Description</h2>
@@ -110,18 +110,17 @@
 <a name="XMLSEC-MSCRYPTO-CERTKEYS.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATAGETCERT"></a><h3>xmlSecMSCryptoKeyDataGetCert ()</h3>
-<pre class="PROGRAMLISTING"><font>PCCERT_CONTEXT</font>      xmlSecMSCryptoKeyDataGetCert        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="PCCERT-CONTEXT:CAPS"><span class="RETURNVALUE">PCCERT_CONTEXT</span></gtkdoclink>      xmlSecMSCryptoKeyDataGetCert        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Native MSCrypto certificate retrieval from xmlsec keydata. The
 returned PCCERT_CONTEXT must not be released by the caller.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29219"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the key data to retrieve certificate from.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39148"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key data to retrieve certificate from.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29224"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39153"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> PCCERT_CONTEXT on success or NULL otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -129,23 +128,22 @@ returned PCCERT_CONTEXT must not be released by the caller.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATAGETKEY"></a><h3>xmlSecMSCryptoKeyDataGetKey ()</h3>
-<pre class="PROGRAMLISTING"><font>HCRYPTKEY</font>           xmlSecMSCryptoKeyDataGetKey         (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="HCRYPTKEY:CAPS"><span class="RETURNVALUE">HCRYPTKEY</span></gtkdoclink>           xmlSecMSCryptoKeyDataGetKey         (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Native MSCrypto key retrieval from xmlsec keydata. The
 returned HKEY must not be destroyed by the caller.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29240"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the key data to retrieve certificate from.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39173"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key data to retrieve certificate from.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29245"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              type of key requested (public/private)</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39178"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>type of key requested (public/private)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29250"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39183"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> HKEY on success or NULL otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -153,18 +151,17 @@ returned HKEY must not be destroyed by the caller.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATAGETDECRYPTKEY"></a><h3>xmlSecMSCryptoKeyDataGetDecryptKey ()</h3>
-<pre class="PROGRAMLISTING"><font>HCRYPTKEY</font>           xmlSecMSCryptoKeyDataGetDecryptKey  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="HCRYPTKEY:CAPS"><span class="RETURNVALUE">HCRYPTKEY</span></gtkdoclink>           xmlSecMSCryptoKeyDataGetDecryptKey  (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Native MSCrypto decrypt key retrieval from xmlsec keydata. The
 returned HKEY must not be destroyed by the caller.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29265"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the key data pointer</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39200"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key data pointer</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29270"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39205"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> HKEY on success or NULL otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -172,17 +169,16 @@ returned HKEY must not be destroyed by the caller.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOCERTDUP"></a><h3>xmlSecMSCryptoCertDup ()</h3>
-<pre class="PROGRAMLISTING"><font>PCCERT_CONTEXT</font>      xmlSecMSCryptoCertDup               (<font>PCCERT_CONTEXT</font> pCert);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="PCCERT-CONTEXT:CAPS"><span class="RETURNVALUE">PCCERT_CONTEXT</span></gtkdoclink>      xmlSecMSCryptoCertDup               (<code class="PARAMETER"><gtkdoclink href="PCCERT-CONTEXT:CAPS"><span class="TYPE">PCCERT_CONTEXT</span></gtkdoclink> pCert</code>);</pre>
 <p>Duplicates the <code class="PARAMETER">pCert</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29286"><span style="white-space: nowrap"><code class="PARAMETER">pCert</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to cert.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39223"><span style="white-space: nowrap"><code class="PARAMETER">pCert</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to cert.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29291"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39228"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly created PCCERT_CONTEXT object or
 NULL if an error occurs.</p></td>
 </tr>
@@ -191,22 +187,21 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOCERTADOPT"></a><h3>xmlSecMSCryptoCertAdopt ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    xmlSecMSCryptoCertAdopt             (<font>PCCERT_CONTEXT</font> pCert,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="RETURNVALUE">xmlSecKeyDataPtr</span></a>    xmlSecMSCryptoCertAdopt             (<code class="PARAMETER"><gtkdoclink href="PCCERT-CONTEXT:CAPS"><span class="TYPE">PCCERT_CONTEXT</span></gtkdoclink> pCert</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Creates key data value from the cert.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29307"><span style="white-space: nowrap"><code class="PARAMETER">pCert</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to cert.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39248"><span style="white-space: nowrap"><code class="PARAMETER">pCert</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to cert.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29312"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the expected key type.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39253"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the expected key type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29317"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39258"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly created xmlsec key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -214,18 +209,17 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATAGETMSCRYPTOPROVIDER"></a><h3>xmlSecMSCryptoKeyDataGetMSCryptoProvider ()</h3>
-<pre class="PROGRAMLISTING"><font>HCRYPTPROV</font>          xmlSecMSCryptoKeyDataGetMSCryptoProvider
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="HCRYPTPROV:CAPS"><span class="RETURNVALUE">HCRYPTPROV</span></gtkdoclink>          xmlSecMSCryptoKeyDataGetMSCryptoProvider
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets crypto provider handle</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29332"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the key data</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39275"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key data</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29337"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39280"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the crypto provider handler or 0 if there is an error.</p></td>
 </tr>
 </tbody></table>
@@ -233,18 +227,17 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATAGETMSCRYPTOKEYSPEC"></a><h3>xmlSecMSCryptoKeyDataGetMSCryptoKeySpec ()</h3>
-<pre class="PROGRAMLISTING"><font>DWORD</font>               xmlSecMSCryptoKeyDataGetMSCryptoKeySpec
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="DWORD:CAPS"><span class="RETURNVALUE">DWORD</span></gtkdoclink>               xmlSecMSCryptoKeyDataGetMSCryptoKeySpec
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets key spec info.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29352"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the key data</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39297"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key data</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29357"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39302"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the key spec info from key data</p></td>
 </tr>
 </tbody></table>
diff --git a/docs/api/xmlsec-mscrypto-crypto.html b/docs/api/xmlsec-mscrypto-crypto.html
index f63475d..f7a3850 100644
--- a/docs/api/xmlsec-mscrypto-crypto.html
+++ b/docs/api/xmlsec-mscrypto-crypto.html
@@ -87,121 +87,136 @@
 <h1>
 <a name="XMLSEC-MSCRYPTO-CRYPTO"></a>crypto</h1>
 <div class="REFNAMEDIV">
-<a name="AEN29367"></a><h2>Name</h2>crypto -- Crypto transforms implementation for MS Crypto.</div>
+<a name="AEN39312"></a><h2>Name</h2>crypto -- Crypto transforms implementation for MS Crypto.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-MSCRYPTO-CRYPTO.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS"><font>xmlSecCryptoDLFunctionsPtr</font>  <a href="xmlsec-mscrypto-crypto.html#XMLSECCRYPTOGETFUNCTIONS-MSCRYPTO">xmlSecCryptoGetFunctions_mscrypto</a>
-                                                        (void);
-<font>int</font>                 <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOINIT">xmlSecMSCryptoInit</a>                  (void);
-<font>int</font>                 <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOSHUTDOWN">xmlSecMSCryptoShutdown</a>              (void);
-<font>int</font>                 <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYSMNGRINIT">xmlSecMSCryptoKeysMngrInit</a>          (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>int</font>                 <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOGENERATERANDOM">xmlSecMSCryptoGenerateRandom</a>        (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
-                                                         <font>size_t</font> size);
-<font>void</font>                <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOERRORSDEFAULTCALLBACK">xmlSecMSCryptoErrorsDefaultCallback</a> (const <font>char</font> *file,
-                                                         <font>int</font> line,
-                                                         const <font>char</font> *func,
-                                                         const <font>char</font> *errorObject,
-                                                         const <font>char</font> *errorSubject,
-                                                         <font>int</font> reason,
-                                                         const <font>char</font> *msg);
-<font>LPWSTR</font>              <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOCONVERTLOCALETOUNICODE">xmlSecMSCryptoConvertLocaleToUnicode</a>
-                                                        (const <font>char</font> *str);
-<font>LPWSTR</font>              <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOCONVERTUTF8TOUNICODE">xmlSecMSCryptoConvertUtf8ToUnicode</a>  (const <font>xmlChar</font> *str);
-<font>xmlChar</font>*            <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOCONVERTUNICODETOUTF8">xmlSecMSCryptoConvertUnicodeToUtf8</a>  (<font>LPCWSTR</font> str);
-<font>xmlChar</font>*            <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOCONVERTLOCALETOUTF8">xmlSecMSCryptoConvertLocaleToUtf8</a>   (const <font>char</font> *str);
-<font>char</font>*               <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOCONVERTUTF8TOLOCALE">xmlSecMSCryptoConvertUtf8ToLocale</a>   (const <font>xmlChar</font> *str);
-<font>xmlChar</font>*            <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOCONVERTTSTRTOUTF8">xmlSecMSCryptoConvertTstrToUtf8</a>     (<font>LPCTSTR</font> str);
-<font>LPTSTR</font>              <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOCONVERTUTF8TOTSTR">xmlSecMSCryptoConvertUtf8ToTstr</a>     (const <font>xmlChar</font> *str);
+<pre class="SYNOPSIS"><gtkdoclink href="XMLSECCRYPTODLFUNCTIONS"><span class="RETURNVALUE">xmlSecCryptoDLFunctionsPtr</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECCRYPTOGETFUNCTIONS-MSCRYPTO">xmlSecCryptoGetFunctions_mscrypto</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOINIT">xmlSecMSCryptoInit</a>                  (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOSHUTDOWN">xmlSecMSCryptoShutdown</a>              (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYSMNGRINIT">xmlSecMSCryptoKeysMngrInit</a>          (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOGENERATERANDOM">xmlSecMSCryptoGenerateRandom</a>        (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buffer</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="SIZE-T"><span class="TYPE">size_t</span></gtkdoclink> size</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOERRORSDEFAULTCALLBACK">xmlSecMSCryptoErrorsDefaultCallback</a> (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *file</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> line</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *func</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorObject</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorSubject</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> reason</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *msg</code>);
+<gtkdoclink href="LPWSTR:CAPS"><span class="RETURNVALUE">LPWSTR</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOCONVERTLOCALETOUNICODE">xmlSecMSCryptoConvertLocaleToUnicode</a>
+                                                        (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *str</code>);
+<gtkdoclink href="LPWSTR:CAPS"><span class="RETURNVALUE">LPWSTR</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOCONVERTUTF8TOUNICODE">xmlSecMSCryptoConvertUtf8ToUnicode</a>  (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *str</code>);
+<gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*            <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOCONVERTUNICODETOUTF8">xmlSecMSCryptoConvertUnicodeToUtf8</a>  (<code class="PARAMETER"><gtkdoclink href="LPCWSTR:CAPS"><span class="TYPE">LPCWSTR</span></gtkdoclink> str</code>);
+<gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*            <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOCONVERTLOCALETOUTF8">xmlSecMSCryptoConvertLocaleToUtf8</a>   (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *str</code>);
+<gtkdoclink href="CHAR"><span class="RETURNVALUE">char</span></gtkdoclink>*               <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOCONVERTUTF8TOLOCALE">xmlSecMSCryptoConvertUtf8ToLocale</a>   (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *str</code>);
+<gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*            <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOCONVERTTSTRTOUTF8">xmlSecMSCryptoConvertTstrToUtf8</a>     (<code class="PARAMETER"><gtkdoclink href="LPCTSTR:CAPS"><span class="TYPE">LPCTSTR</span></gtkdoclink> str</code>);
+<gtkdoclink href="LPTSTR:CAPS"><span class="RETURNVALUE">LPTSTR</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOCONVERTUTF8TOTSTR">xmlSecMSCryptoConvertUtf8ToTstr</a>     (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *str</code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATADSAID">xmlSecMSCryptoKeyDataDsaId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATADSAGETKLASS">xmlSecMSCryptoKeyDataDsaGetKlass</a>    (void);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATADSAGETKLASS">xmlSecMSCryptoKeyDataDsaGetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMDSASHA1ID">xmlSecMSCryptoTransformDsaSha1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMDSASHA1GETKLASS">xmlSecMSCryptoTransformDsaSha1GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMDSASHA1GETKLASS">xmlSecMSCryptoTransformDsaSha1GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAGOST2001ID">xmlSecMSCryptoKeyDataGost2001Id</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAGOST2001GETKLASS">xmlSecMSCryptoKeyDataGost2001GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAGOST2001GETKLASS">xmlSecMSCryptoKeyDataGost2001GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMGOST2001GOSTR3411-94ID">xmlSecMSCryptoTransformGost2001GostR3411_94Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMGOST2001GOSTR3411-94GETKLASS">xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMGOST2001GOSTR3411-94GETKLASS">xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATARSAID">xmlSecMSCryptoKeyDataRsaId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATARSAGETKLASS">xmlSecMSCryptoKeyDataRsaGetKlass</a>    (void);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATARSAGETKLASS">xmlSecMSCryptoKeyDataRsaGetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSAMD5ID">xmlSecMSCryptoTransformRsaMd5Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSAMD5GETKLASS">xmlSecMSCryptoTransformRsaMd5GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSAMD5GETKLASS">xmlSecMSCryptoTransformRsaMd5GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSASHA1ID">xmlSecMSCryptoTransformRsaSha1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSASHA1GETKLASS">xmlSecMSCryptoTransformRsaSha1GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSASHA1GETKLASS">xmlSecMSCryptoTransformRsaSha1GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSASHA256ID">xmlSecMSCryptoTransformRsaSha256Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSASHA256GETKLASS">xmlSecMSCryptoTransformRsaSha256GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSASHA256GETKLASS">xmlSecMSCryptoTransformRsaSha256GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSASHA384ID">xmlSecMSCryptoTransformRsaSha384Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSASHA384GETKLASS">xmlSecMSCryptoTransformRsaSha384GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSASHA384GETKLASS">xmlSecMSCryptoTransformRsaSha384GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSASHA512ID">xmlSecMSCryptoTransformRsaSha512Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSASHA512GETKLASS">xmlSecMSCryptoTransformRsaSha512GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSASHA512GETKLASS">xmlSecMSCryptoTransformRsaSha512GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSAPKCS1ID">xmlSecMSCryptoTransformRsaPkcs1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSAPKCS1GETKLASS">xmlSecMSCryptoTransformRsaPkcs1GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSAPKCS1GETKLASS">xmlSecMSCryptoTransformRsaPkcs1GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+#define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSAOAEPID">xmlSecMSCryptoTransformRsaOaepId</a>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSAOAEPGETKLASS">xmlSecMSCryptoTransformRsaOaepGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMMD5ID">xmlSecMSCryptoTransformMd5Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMMD5GETKLASS">xmlSecMSCryptoTransformMd5GetKlass</a>  (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMMD5GETKLASS">xmlSecMSCryptoTransformMd5GetKlass</a>  (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMSHA1ID">xmlSecMSCryptoTransformSha1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMSHA1GETKLASS">xmlSecMSCryptoTransformSha1GetKlass</a> (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMSHA1GETKLASS">xmlSecMSCryptoTransformSha1GetKlass</a> (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMSHA256ID">xmlSecMSCryptoTransformSha256Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMSHA256GETKLASS">xmlSecMSCryptoTransformSha256GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMSHA256GETKLASS">xmlSecMSCryptoTransformSha256GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMSHA384ID">xmlSecMSCryptoTransformSha384Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMSHA384GETKLASS">xmlSecMSCryptoTransformSha384GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMSHA384GETKLASS">xmlSecMSCryptoTransformSha384GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMSHA512ID">xmlSecMSCryptoTransformSha512Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMSHA512GETKLASS">xmlSecMSCryptoTransformSha512GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMSHA512GETKLASS">xmlSecMSCryptoTransformSha512GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMGOSTR3411-94ID">xmlSecMSCryptoTransformGostR3411_94Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMGOSTR3411-94GETKLASS">xmlSecMSCryptoTransformGostR3411_94GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMGOSTR3411-94GETKLASS">xmlSecMSCryptoTransformGostR3411_94GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAAESID">xmlSecMSCryptoKeyDataAesId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAAESGETKLASS">xmlSecMSCryptoKeyDataAesGetKlass</a>    (void);
-<font>int</font>                 <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAAESSET">xmlSecMSCryptoKeyDataAesSet</a>         (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAAESGETKLASS">xmlSecMSCryptoKeyDataAesGetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAAESSET">xmlSecMSCryptoKeyDataAesSet</a>         (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES128CBCID">xmlSecMSCryptoTransformAes128CbcId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES128CBCGETKLASS">xmlSecMSCryptoTransformAes128CbcGetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES128CBCGETKLASS">xmlSecMSCryptoTransformAes128CbcGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES192CBCID">xmlSecMSCryptoTransformAes192CbcId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES192CBCGETKLASS">xmlSecMSCryptoTransformAes192CbcGetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES192CBCGETKLASS">xmlSecMSCryptoTransformAes192CbcGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES256CBCID">xmlSecMSCryptoTransformAes256CbcId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES256CBCGETKLASS">xmlSecMSCryptoTransformAes256CbcGetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES256CBCGETKLASS">xmlSecMSCryptoTransformAes256CbcGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+#define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMKWAES128ID">xmlSecMSCryptoTransformKWAes128Id</a>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMKWAES128GETKLASS">xmlSecMSCryptoTransformKWAes128GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+#define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMKWAES192ID">xmlSecMSCryptoTransformKWAes192Id</a>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMKWAES192GETKLASS">xmlSecMSCryptoTransformKWAes192GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+#define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMKWAES256ID">xmlSecMSCryptoTransformKWAes256Id</a>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMKWAES256GETKLASS">xmlSecMSCryptoTransformKWAes256GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATADESID">xmlSecMSCryptoKeyDataDesId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATADESGETKLASS">xmlSecMSCryptoKeyDataDesGetKlass</a>    (void);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATADESGETKLASS">xmlSecMSCryptoKeyDataDesGetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMDES3CBCID">xmlSecMSCryptoTransformDes3CbcId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMDES3CBCGETKLASS">xmlSecMSCryptoTransformDes3CbcGetKlass</a>
-                                                        (void);
-<font>int</font>                 <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOHMACGETMINOUTPUTLENGTH">xmlSecMSCryptoHmacGetMinOutputLength</a>
-                                                        (void);
-<font>void</font>                <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOHMACSETMINOUTPUTLENGTH">xmlSecMSCryptoHmacSetMinOutputLength</a>
-                                                        (<font>int</font> min_length);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMDES3CBCGETKLASS">xmlSecMSCryptoTransformDes3CbcGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+#define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMKWDES3ID">xmlSecMSCryptoTransformKWDes3Id</a>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMKWDES3GETKLASS">xmlSecMSCryptoTransformKWDes3GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOHMACGETMINOUTPUTLENGTH">xmlSecMSCryptoHmacGetMinOutputLength</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOHMACSETMINOUTPUTLENGTH">xmlSecMSCryptoHmacSetMinOutputLength</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> min_length</code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAHMACID">xmlSecMSCryptoKeyDataHmacId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAHMACGETKLASS">xmlSecMSCryptoKeyDataHmacGetKlass</a>   (void);
-<font>int</font>                 <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAHMACSET">xmlSecMSCryptoKeyDataHmacSet</a>        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAHMACGETKLASS">xmlSecMSCryptoKeyDataHmacGetKlass</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAHMACSET">xmlSecMSCryptoKeyDataHmacSet</a>        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMHMACMD5ID">xmlSecMSCryptoTransformHmacMd5Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMHMACMD5GETKLASS">xmlSecMSCryptoTransformHmacMd5GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMHMACMD5GETKLASS">xmlSecMSCryptoTransformHmacMd5GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMHMACSHA1ID">xmlSecMSCryptoTransformHmacSha1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMHMACSHA1GETKLASS">xmlSecMSCryptoTransformHmacSha1GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMHMACSHA1GETKLASS">xmlSecMSCryptoTransformHmacSha1GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMHMACSHA256ID">xmlSecMSCryptoTransformHmacSha256Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMHMACSHA256GETKLASS">xmlSecMSCryptoTransformHmacSha256GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMHMACSHA256GETKLASS">xmlSecMSCryptoTransformHmacSha256GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMHMACSHA384ID">xmlSecMSCryptoTransformHmacSha384Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMHMACSHA384GETKLASS">xmlSecMSCryptoTransformHmacSha384GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMHMACSHA384GETKLASS">xmlSecMSCryptoTransformHmacSha384GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMHMACSHA512ID">xmlSecMSCryptoTransformHmacSha512Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMHMACSHA512GETKLASS">xmlSecMSCryptoTransformHmacSha512GetKlass</a>
-                                                        (void);</pre>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMHMACSHA512GETKLASS">xmlSecMSCryptoTransformHmacSha512GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-MSCRYPTO-CRYPTO.DESCRIPTION"></a><h2>Description</h2>
@@ -211,54 +226,50 @@
 <a name="XMLSEC-MSCRYPTO-CRYPTO.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOGETFUNCTIONS-MSCRYPTO"></a><h3>xmlSecCryptoGetFunctions_mscrypto ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecCryptoDLFunctionsPtr</font>  xmlSecCryptoGetFunctions_mscrypto
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECCRYPTODLFUNCTIONS"><span class="RETURNVALUE">xmlSecCryptoDLFunctionsPtr</span></gtkdoclink>  xmlSecCryptoGetFunctions_mscrypto
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Gets MSCrypto specific functions table.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN29532"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39669"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> xmlsec-mscrypto functions table.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOINIT"></a><h3>xmlSecMSCryptoInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoInit                  (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoInit                  (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>XMLSec library specific crypto engine initialization.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN29546"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39685"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOSHUTDOWN"></a><h3>xmlSecMSCryptoShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoShutdown              (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoShutdown              (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>XMLSec library specific crypto engine shutdown.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN29560"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39701"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYSMNGRINIT"></a><h3>xmlSecMSCryptoKeysMngrInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoKeysMngrInit          (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoKeysMngrInit          (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);</pre>
 <p>Adds MSCrypto specific key data stores in keys manager.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29575"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39718"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29580"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39723"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -266,23 +277,22 @@
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOGENERATERANDOM"></a><h3>xmlSecMSCryptoGenerateRandom ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoGenerateRandom        (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
-                                                         <font>size_t</font> size);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoGenerateRandom        (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buffer</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="SIZE-T"><span class="TYPE">size_t</span></gtkdoclink> size</code>);</pre>
 <p>Generates <code class="PARAMETER">size</code> random bytes and puts result in <code class="PARAMETER">buffer</code>
 (not implemented yet).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29598"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the destination buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39745"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the destination buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29603"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the numer of bytes to generate.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39750"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the numer of bytes to generate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29608"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39755"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -290,62 +300,60 @@
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOERRORSDEFAULTCALLBACK"></a><h3>xmlSecMSCryptoErrorsDefaultCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecMSCryptoErrorsDefaultCallback (const <font>char</font> *file,
-                                                         <font>int</font> line,
-                                                         const <font>char</font> *func,
-                                                         const <font>char</font> *errorObject,
-                                                         const <font>char</font> *errorSubject,
-                                                         <font>int</font> reason,
-                                                         const <font>char</font> *msg);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecMSCryptoErrorsDefaultCallback (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *file</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> line</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *func</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorObject</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorSubject</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> reason</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *msg</code>);</pre>
 <p>The default errors reporting callback function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29629"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the error location file name (__FILE__ macro).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39790"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error location file name (__FILE__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29634"><span style="white-space: nowrap"><code class="PARAMETER">line</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the error location line number (__LINE__ macro).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39795"><span style="white-space: nowrap"><code class="PARAMETER">line</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error location line number (__LINE__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29639"><span style="white-space: nowrap"><code class="PARAMETER">func</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the error location function name (__FUNCTION__ macro).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39800"><span style="white-space: nowrap"><code class="PARAMETER">func</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error location function name (__FUNCTION__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29644"><span style="white-space: nowrap"><code class="PARAMETER">errorObject</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the error specific error object</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39805"><span style="white-space: nowrap"><code class="PARAMETER">errorObject</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error specific error object</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29649"><span style="white-space: nowrap"><code class="PARAMETER">errorSubject</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the error specific error subject.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39810"><span style="white-space: nowrap"><code class="PARAMETER">errorSubject</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error specific error subject.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29654"><span style="white-space: nowrap"><code class="PARAMETER">reason</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the error code.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39815"><span style="white-space: nowrap"><code class="PARAMETER">reason</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error code.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29659"><span style="white-space: nowrap"><code class="PARAMETER">msg</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the additional error message.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39820"><span style="white-space: nowrap"><code class="PARAMETER">msg</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the additional error message.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOCONVERTLOCALETOUNICODE"></a><h3>xmlSecMSCryptoConvertLocaleToUnicode ()</h3>
-<pre class="PROGRAMLISTING"><font>LPWSTR</font>              xmlSecMSCryptoConvertLocaleToUnicode
-                                                        (const <font>char</font> *str);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="LPWSTR:CAPS"><span class="RETURNVALUE">LPWSTR</span></gtkdoclink>              xmlSecMSCryptoConvertLocaleToUnicode
+                                                        (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *str</code>);</pre>
 <p>Converts input string from current system locale to Unicode.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29674"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the string to convert.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39837"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the string to convert.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29679"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39842"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> a pointer to newly allocated string (must be freed with xmlFree) or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -353,17 +361,16 @@
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOCONVERTUTF8TOUNICODE"></a><h3>xmlSecMSCryptoConvertUtf8ToUnicode ()</h3>
-<pre class="PROGRAMLISTING"><font>LPWSTR</font>              xmlSecMSCryptoConvertUtf8ToUnicode  (const <font>xmlChar</font> *str);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="LPWSTR:CAPS"><span class="RETURNVALUE">LPWSTR</span></gtkdoclink>              xmlSecMSCryptoConvertUtf8ToUnicode  (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *str</code>);</pre>
 <p>Converts input string from UTF8 to Unicode.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29694"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the string to convert.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39859"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the string to convert.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29699"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39864"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> a pointer to newly allocated string (must be freed with xmlFree) or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -371,17 +378,16 @@
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOCONVERTUNICODETOUTF8"></a><h3>xmlSecMSCryptoConvertUnicodeToUtf8 ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlChar</font>*            xmlSecMSCryptoConvertUnicodeToUtf8  (<font>LPCWSTR</font> str);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*            xmlSecMSCryptoConvertUnicodeToUtf8  (<code class="PARAMETER"><gtkdoclink href="LPCWSTR:CAPS"><span class="TYPE">LPCWSTR</span></gtkdoclink> str</code>);</pre>
 <p>Converts input string from Unicode to UTF8.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29714"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the string to convert.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39881"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the string to convert.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29719"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39886"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> a pointer to newly allocated string (must be freed with xmlFree) or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -389,17 +395,16 @@
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOCONVERTLOCALETOUTF8"></a><h3>xmlSecMSCryptoConvertLocaleToUtf8 ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlChar</font>*            xmlSecMSCryptoConvertLocaleToUtf8   (const <font>char</font> *str);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*            xmlSecMSCryptoConvertLocaleToUtf8   (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *str</code>);</pre>
 <p>Converts input string from locale to UTF8.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29734"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the string to convert.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39903"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the string to convert.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29739"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39908"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> a pointer to newly allocated string (must be freed with xmlFree) or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -407,17 +412,16 @@
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOCONVERTUTF8TOLOCALE"></a><h3>xmlSecMSCryptoConvertUtf8ToLocale ()</h3>
-<pre class="PROGRAMLISTING"><font>char</font>*               xmlSecMSCryptoConvertUtf8ToLocale   (const <font>xmlChar</font> *str);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="CHAR"><span class="RETURNVALUE">char</span></gtkdoclink>*               xmlSecMSCryptoConvertUtf8ToLocale   (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *str</code>);</pre>
 <p>Converts input string from UTF8 to locale.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29754"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the string to convert.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39925"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the string to convert.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29759"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39930"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> a pointer to newly allocated string (must be freed with xmlFree) or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -425,17 +429,16 @@
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOCONVERTTSTRTOUTF8"></a><h3>xmlSecMSCryptoConvertTstrToUtf8 ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlChar</font>*            xmlSecMSCryptoConvertTstrToUtf8     (<font>LPCTSTR</font> str);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*            xmlSecMSCryptoConvertTstrToUtf8     (<code class="PARAMETER"><gtkdoclink href="LPCTSTR:CAPS"><span class="TYPE">LPCTSTR</span></gtkdoclink> str</code>);</pre>
 <p>Converts input string from TSTR (locale or Unicode) to UTF8.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29774"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the string to convert.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39947"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the string to convert.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29779"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39952"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> a pointer to newly allocated string (must be freed with xmlFree) or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -443,17 +446,16 @@
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOCONVERTUTF8TOTSTR"></a><h3>xmlSecMSCryptoConvertUtf8ToTstr ()</h3>
-<pre class="PROGRAMLISTING"><font>LPTSTR</font>              xmlSecMSCryptoConvertUtf8ToTstr     (const <font>xmlChar</font> *str);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="LPTSTR:CAPS"><span class="RETURNVALUE">LPTSTR</span></gtkdoclink>              xmlSecMSCryptoConvertUtf8ToTstr     (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *str</code>);</pre>
 <p>Converts input string from UTF8 to TSTR (locale or Unicode).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29794"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the string to convert.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN39969"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the string to convert.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29799"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39974"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> a pointer to newly allocated string (must be freed with xmlFree) or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -463,17 +465,15 @@
 <a name="XMLSECMSCRYPTOKEYDATADSAID"></a><h3>xmlSecMSCryptoKeyDataDsaId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoKeyDataDsaId</pre>
 <p>The DSA key klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATADSAGETKLASS"></a><h3>xmlSecMSCryptoKeyDataDsaGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecMSCryptoKeyDataDsaGetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecMSCryptoKeyDataDsaGetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The DSA key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN29820"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN39996"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to DSA key data klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -482,18 +482,16 @@
 <a name="XMLSECMSCRYPTOTRANSFORMDSASHA1ID"></a><h3>xmlSecMSCryptoTransformDsaSha1Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformDsaSha1Id</pre>
 <p>The DSA SHA1 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMDSASHA1GETKLASS"></a><h3>xmlSecMSCryptoTransformDsaSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformDsaSha1GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformDsaSha1GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The DSA-SHA1 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN29841"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40018"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> DSA-SHA1 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -502,18 +500,16 @@
 <a name="XMLSECMSCRYPTOKEYDATAGOST2001ID"></a><h3>xmlSecMSCryptoKeyDataGost2001Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoKeyDataGost2001Id</pre>
 <p>The GOST2001 key klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATAGOST2001GETKLASS"></a><h3>xmlSecMSCryptoKeyDataGost2001GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecMSCryptoKeyDataGost2001GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecMSCryptoKeyDataGost2001GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The GOST2001 key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN29862"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40040"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to GOST2001 key data klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -522,18 +518,16 @@
 <a name="XMLSECMSCRYPTOTRANSFORMGOST2001GOSTR3411-94ID"></a><h3>xmlSecMSCryptoTransformGost2001GostR3411_94Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformGost2001GostR3411_94Id</pre>
 <p>The GOST2001 GOSTR3411_94 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMGOST2001GOSTR3411-94GETKLASS"></a><h3>xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The GOST2001-GOSTR3411_94 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN29883"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40062"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> GOST2001-GOSTR3411_94 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -542,17 +536,15 @@
 <a name="XMLSECMSCRYPTOKEYDATARSAID"></a><h3>xmlSecMSCryptoKeyDataRsaId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoKeyDataRsaId</pre>
 <p>The RSA key klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATARSAGETKLASS"></a><h3>xmlSecMSCryptoKeyDataRsaGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecMSCryptoKeyDataRsaGetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecMSCryptoKeyDataRsaGetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The MSCrypto RSA CertKey data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN29904"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40084"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to MSCrypto RSA key data klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -561,18 +553,16 @@
 <a name="XMLSECMSCRYPTOTRANSFORMRSAMD5ID"></a><h3>xmlSecMSCryptoTransformRsaMd5Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformRsaMd5Id</pre>
 <p>The RSA-MD5 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMRSAMD5GETKLASS"></a><h3>xmlSecMSCryptoTransformRsaMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformRsaMd5GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformRsaMd5GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-MD5 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN29925"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40106"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-MD5 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -581,18 +571,16 @@
 <a name="XMLSECMSCRYPTOTRANSFORMRSASHA1ID"></a><h3>xmlSecMSCryptoTransformRsaSha1Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformRsaSha1Id</pre>
 <p>The RSA-SHA1 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMRSASHA1GETKLASS"></a><h3>xmlSecMSCryptoTransformRsaSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformRsaSha1GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformRsaSha1GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-SHA1 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN29946"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40128"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-SHA1 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -601,18 +589,16 @@
 <a name="XMLSECMSCRYPTOTRANSFORMRSASHA256ID"></a><h3>xmlSecMSCryptoTransformRsaSha256Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformRsaSha256Id</pre>
 <p>The RSA-SHA256 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMRSASHA256GETKLASS"></a><h3>xmlSecMSCryptoTransformRsaSha256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformRsaSha256GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformRsaSha256GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-SHA256 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN29967"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40150"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-SHA256 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -621,18 +607,16 @@
 <a name="XMLSECMSCRYPTOTRANSFORMRSASHA384ID"></a><h3>xmlSecMSCryptoTransformRsaSha384Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformRsaSha384Id</pre>
 <p>The RSA-SHA384 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMRSASHA384GETKLASS"></a><h3>xmlSecMSCryptoTransformRsaSha384GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformRsaSha384GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformRsaSha384GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-SHA384 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN29988"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40172"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-SHA384 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -641,18 +625,16 @@
 <a name="XMLSECMSCRYPTOTRANSFORMRSASHA512ID"></a><h3>xmlSecMSCryptoTransformRsaSha512Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformRsaSha512Id</pre>
 <p>The RSA-SHA512 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMRSASHA512GETKLASS"></a><h3>xmlSecMSCryptoTransformRsaSha512GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformRsaSha512GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformRsaSha512GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-SHA512 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30009"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40194"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-SHA512 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -661,37 +643,51 @@
 <a name="XMLSECMSCRYPTOTRANSFORMRSAPKCS1ID"></a><h3>xmlSecMSCryptoTransformRsaPkcs1Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformRsaPkcs1Id</pre>
 <p>The RSA PKCS1 key transport transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMRSAPKCS1GETKLASS"></a><h3>xmlSecMSCryptoTransformRsaPkcs1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformRsaPkcs1GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformRsaPkcs1GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-PKCS1 key transport transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30030"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40216"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-PKCS1 key transport transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
+<a name="XMLSECMSCRYPTOTRANSFORMRSAOAEPID"></a><h3>xmlSecMSCryptoTransformRsaOaepId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformRsaOaepId</pre>
+<p>The RSA PKCS1 key transport transform klass.</p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECMSCRYPTOTRANSFORMRSAOAEPGETKLASS"></a><h3>xmlSecMSCryptoTransformRsaOaepGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformRsaOaepGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
+<p>The RSA-OAEP key transport transform klass.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN40238"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-OAEP key transport transform klass.</p></td>
+</tr></tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMMD5ID"></a><h3>xmlSecMSCryptoTransformMd5Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformMd5Id</pre>
 <p>The MD5 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMMD5GETKLASS"></a><h3>xmlSecMSCryptoTransformMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformMd5GetKlass  (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformMd5GetKlass  (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA-1 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30051"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40260"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA-1 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -700,17 +696,15 @@
 <a name="XMLSECMSCRYPTOTRANSFORMSHA1ID"></a><h3>xmlSecMSCryptoTransformSha1Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformSha1Id</pre>
 <p>The SHA1 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMSHA1GETKLASS"></a><h3>xmlSecMSCryptoTransformSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformSha1GetKlass (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformSha1GetKlass (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA-1 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30072"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40282"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA-1 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -719,18 +713,16 @@
 <a name="XMLSECMSCRYPTOTRANSFORMSHA256ID"></a><h3>xmlSecMSCryptoTransformSha256Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformSha256Id</pre>
 <p>The SHA256 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMSHA256GETKLASS"></a><h3>xmlSecMSCryptoTransformSha256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformSha256GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformSha256GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA-256 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30093"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40304"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA-256 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -739,18 +731,16 @@
 <a name="XMLSECMSCRYPTOTRANSFORMSHA384ID"></a><h3>xmlSecMSCryptoTransformSha384Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformSha384Id</pre>
 <p>The SHA384 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMSHA384GETKLASS"></a><h3>xmlSecMSCryptoTransformSha384GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformSha384GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformSha384GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA-384 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30114"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40326"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA-384 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -759,18 +749,16 @@
 <a name="XMLSECMSCRYPTOTRANSFORMSHA512ID"></a><h3>xmlSecMSCryptoTransformSha512Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformSha512Id</pre>
 <p>The SHA512 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMSHA512GETKLASS"></a><h3>xmlSecMSCryptoTransformSha512GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformSha512GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformSha512GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA-512 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30135"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40348"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA-512 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -779,18 +767,16 @@
 <a name="XMLSECMSCRYPTOTRANSFORMGOSTR3411-94ID"></a><h3>xmlSecMSCryptoTransformGostR3411_94Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformGostR3411_94Id</pre>
 <p>The GOSTR3411_94 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMGOSTR3411-94GETKLASS"></a><h3>xmlSecMSCryptoTransformGostR3411_94GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformGostR3411_94GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformGostR3411_94GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>GOSTR3411_94 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30156"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40370"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to GOSTR3411_94 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -799,44 +785,41 @@
 <a name="XMLSECMSCRYPTOKEYDATAAESID"></a><h3>xmlSecMSCryptoKeyDataAesId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoKeyDataAesId</pre>
 <p>The AES key data klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATAAESGETKLASS"></a><h3>xmlSecMSCryptoKeyDataAesGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecMSCryptoKeyDataAesGetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecMSCryptoKeyDataAesGetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The AES key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30177"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40392"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> AES key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATAAESSET"></a><h3>xmlSecMSCryptoKeyDataAesSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoKeyDataAesSet         (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoKeyDataAesSet         (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);</pre>
 <p>Sets the value of AES key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30194"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to AES key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN40415"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to AES key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30199"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN40420"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30204"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the key value size (in bytes).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN40425"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30209"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40430"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -846,18 +829,16 @@
 <a name="XMLSECMSCRYPTOTRANSFORMAES128CBCID"></a><h3>xmlSecMSCryptoTransformAes128CbcId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformAes128CbcId</pre>
 <p>The AES128 CBC cipher transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMAES128CBCGETKLASS"></a><h3>xmlSecMSCryptoTransformAes128CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformAes128CbcGetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformAes128CbcGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>AES 128 CBC encryption transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30230"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40452"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to AES 128 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
@@ -866,18 +847,16 @@
 <a name="XMLSECMSCRYPTOTRANSFORMAES192CBCID"></a><h3>xmlSecMSCryptoTransformAes192CbcId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformAes192CbcId</pre>
 <p>The AES192 CBC cipher transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMAES192CBCGETKLASS"></a><h3>xmlSecMSCryptoTransformAes192CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformAes192CbcGetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformAes192CbcGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>AES 192 CBC encryption transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30251"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40474"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to AES 192 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
@@ -886,37 +865,87 @@
 <a name="XMLSECMSCRYPTOTRANSFORMAES256CBCID"></a><h3>xmlSecMSCryptoTransformAes256CbcId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformAes256CbcId</pre>
 <p>The AES256 CBC cipher transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMAES256CBCGETKLASS"></a><h3>xmlSecMSCryptoTransformAes256CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformAes256CbcGetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformAes256CbcGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>AES 256 CBC encryption transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30272"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40496"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to AES 256 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
+<a name="XMLSECMSCRYPTOTRANSFORMKWAES128ID"></a><h3>xmlSecMSCryptoTransformKWAes128Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformKWAes128Id</pre>
+<p>The AES 128 key wrap transform klass.</p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECMSCRYPTOTRANSFORMKWAES128GETKLASS"></a><h3>xmlSecMSCryptoTransformKWAes128GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformKWAes128GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
+<p>The AES-128 kew wrapper transform klass.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN40518"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> AES-128 kew wrapper transform klass.</p></td>
+</tr></tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECMSCRYPTOTRANSFORMKWAES192ID"></a><h3>xmlSecMSCryptoTransformKWAes192Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformKWAes192Id</pre>
+<p>The AES 192 key wrap transform klass.</p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECMSCRYPTOTRANSFORMKWAES192GETKLASS"></a><h3>xmlSecMSCryptoTransformKWAes192GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformKWAes192GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
+<p>The AES-192 kew wrapper transform klass.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN40540"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> AES-192 kew wrapper transform klass.</p></td>
+</tr></tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECMSCRYPTOTRANSFORMKWAES256ID"></a><h3>xmlSecMSCryptoTransformKWAes256Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformKWAes256Id</pre>
+<p>The AES 256 key wrap transform klass.</p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECMSCRYPTOTRANSFORMKWAES256GETKLASS"></a><h3>xmlSecMSCryptoTransformKWAes256GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformKWAes256GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
+<p>The AES-256 kew wrapper transform klass.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN40562"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> AES-256 kew wrapper transform klass.</p></td>
+</tr></tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATADESID"></a><h3>xmlSecMSCryptoKeyDataDesId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoKeyDataDesId</pre>
 <p>The DES key data klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATADESGETKLASS"></a><h3>xmlSecMSCryptoKeyDataDesGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecMSCryptoKeyDataDesGetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecMSCryptoKeyDataDesGetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The DES key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30293"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40584"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> DES key data klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -925,45 +954,59 @@
 <a name="XMLSECMSCRYPTOTRANSFORMDES3CBCID"></a><h3>xmlSecMSCryptoTransformDes3CbcId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformDes3CbcId</pre>
 <p>The DES3 CBC cipher transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMDES3CBCGETKLASS"></a><h3>xmlSecMSCryptoTransformDes3CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformDes3CbcGetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformDes3CbcGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Triple DES CBC encryption transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30314"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40606"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to Triple DES encryption transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
+<a name="XMLSECMSCRYPTOTRANSFORMKWDES3ID"></a><h3>xmlSecMSCryptoTransformKWDes3Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformKWDes3Id</pre>
+<p>The DES3 KW transform klass.</p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECMSCRYPTOTRANSFORMKWDES3GETKLASS"></a><h3>xmlSecMSCryptoTransformKWDes3GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformKWDes3GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
+<p>The Triple DES key wrapper transform klass.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN40628"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> Triple DES key wrapper transform klass.</p></td>
+</tr></tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
 <a name="XMLSECMSCRYPTOHMACGETMINOUTPUTLENGTH"></a><h3>xmlSecMSCryptoHmacGetMinOutputLength ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoHmacGetMinOutputLength
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoHmacGetMinOutputLength
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Gets the value of min HMAC length.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30328"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40644"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the min HMAC output length</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOHMACSETMINOUTPUTLENGTH"></a><h3>xmlSecMSCryptoHmacSetMinOutputLength ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecMSCryptoHmacSetMinOutputLength
-                                                        (<font>int</font> min_length);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecMSCryptoHmacSetMinOutputLength
+                                                        (<code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> min_length</code>);</pre>
 <p>Sets the min HMAC output length</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30343"><span style="white-space: nowrap"><code class="PARAMETER">min_length</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the new min length</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN40661"><span style="white-space: nowrap"><code class="PARAMETER">min_length</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new min length</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -971,44 +1014,41 @@
 <a name="XMLSECMSCRYPTOKEYDATAHMACID"></a><h3>xmlSecMSCryptoKeyDataHmacId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoKeyDataHmacId</pre>
 <p>The DHMAC key klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATAHMACGETKLASS"></a><h3>xmlSecMSCryptoKeyDataHmacGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecMSCryptoKeyDataHmacGetKlass   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecMSCryptoKeyDataHmacGetKlass   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30364"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40683"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> HMAC key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATAHMACSET"></a><h3>xmlSecMSCryptoKeyDataHmacSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoKeyDataHmacSet        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoKeyDataHmacSet        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);</pre>
 <p>Sets the value of HMAC key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30381"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to HMAC key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN40706"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to HMAC key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30386"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN40711"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30391"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the key value size (in bytes).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN40716"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30396"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40721"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1018,18 +1058,16 @@
 <a name="XMLSECMSCRYPTOTRANSFORMHMACMD5ID"></a><h3>xmlSecMSCryptoTransformHmacMd5Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformHmacMd5Id</pre>
 <p>The HMAC with MD5 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMHMACMD5GETKLASS"></a><h3>xmlSecMSCryptoTransformHmacMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformHmacMd5GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformHmacMd5GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-MD5 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30417"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40743"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-MD5 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1038,18 +1076,16 @@
 <a name="XMLSECMSCRYPTOTRANSFORMHMACSHA1ID"></a><h3>xmlSecMSCryptoTransformHmacSha1Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformHmacSha1Id</pre>
 <p>The HMAC with SHA1 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMHMACSHA1GETKLASS"></a><h3>xmlSecMSCryptoTransformHmacSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformHmacSha1GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformHmacSha1GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA1 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30438"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40765"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA1 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1058,18 +1094,16 @@
 <a name="XMLSECMSCRYPTOTRANSFORMHMACSHA256ID"></a><h3>xmlSecMSCryptoTransformHmacSha256Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformHmacSha256Id</pre>
 <p>The HMAC with SHA256 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMHMACSHA256GETKLASS"></a><h3>xmlSecMSCryptoTransformHmacSha256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformHmacSha256GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformHmacSha256GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA256 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30459"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40787"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA256 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1078,18 +1112,16 @@
 <a name="XMLSECMSCRYPTOTRANSFORMHMACSHA384ID"></a><h3>xmlSecMSCryptoTransformHmacSha384Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformHmacSha384Id</pre>
 <p>The HMAC with SHA384 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMHMACSHA384GETKLASS"></a><h3>xmlSecMSCryptoTransformHmacSha384GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformHmacSha384GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformHmacSha384GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA384 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30480"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40809"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA384 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1098,18 +1130,16 @@
 <a name="XMLSECMSCRYPTOTRANSFORMHMACSHA512ID"></a><h3>xmlSecMSCryptoTransformHmacSha512Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformHmacSha512Id</pre>
 <p>The HMAC with SHA512 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOTRANSFORMHMACSHA512GETKLASS"></a><h3>xmlSecMSCryptoTransformHmacSha512GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformHmacSha512GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecMSCryptoTransformHmacSha512GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA512 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30501"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40831"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA512 transform klass.</p></td>
 </tr></tbody></table>
 </div>
diff --git a/docs/api/xmlsec-mscrypto-keysstore.html b/docs/api/xmlsec-mscrypto-keysstore.html
index e2315b4..3e1e361 100644
--- a/docs/api/xmlsec-mscrypto-keysstore.html
+++ b/docs/api/xmlsec-mscrypto-keysstore.html
@@ -87,19 +87,19 @@
 <h1>
 <a name="XMLSEC-MSCRYPTO-KEYSSTORE"></a>keysstore</h1>
 <div class="REFNAMEDIV">
-<a name="AEN30511"></a><h2>Name</h2>keysstore -- Keys store implementation for MS Crypto.</div>
+<a name="AEN40841"></a><h2>Name</h2>keysstore -- Keys store implementation for MS Crypto.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-MSCRYPTO-KEYSSTORE.SYNOPSIS"></a><h2>Synopsis</h2>
 <pre class="SYNOPSIS">#define             <a href="xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTOREID">xmlSecMSCryptoKeysStoreId</a>
-<font>xmlSecKeyStoreId</font>    <a href="xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTOREGETKLASS">xmlSecMSCryptoKeysStoreGetKlass</a>     (void);
-<font>int</font>                 <a href="xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTOREADOPTKEY">xmlSecMSCryptoKeysStoreAdoptKey</a>     (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>                 <a href="xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTORELOAD">xmlSecMSCryptoKeysStoreLoad</a>         (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         const <font>char</font> *uri,
-                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
-<font>int</font>                 <a href="xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTORESAVE">xmlSecMSCryptoKeysStoreSave</a>         (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<gtkdoclink href="XMLSECKEYSTOREID"><span class="RETURNVALUE">xmlSecKeyStoreId</span></gtkdoclink><a href="xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTOREGETKLASS">xmlSecMSCryptoKeysStoreGetKlass</a>     (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTOREADOPTKEY">xmlSecMSCryptoKeysStoreAdoptKey</a>     (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTORELOAD">xmlSecMSCryptoKeysStoreLoad</a>         (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *uri</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> keysMngr</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTORESAVE">xmlSecMSCryptoKeysStoreSave</a>         (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-MSCRYPTO-KEYSSTORE.DESCRIPTION"></a><h2>Description</h2>
@@ -111,39 +111,36 @@
 <a name="XMLSECMSCRYPTOKEYSSTOREID"></a><h3>xmlSecMSCryptoKeysStoreId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecMSCryptoKeysStoreId       xmlSecMSCryptoKeysStoreGetKlass()</pre>
 <p>A MSCrypto keys store klass id.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYSSTOREGETKLASS"></a><h3>xmlSecMSCryptoKeysStoreGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyStoreId</font>    xmlSecMSCryptoKeysStoreGetKlass     (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYSTOREID"><span class="RETURNVALUE">xmlSecKeyStoreId</span></gtkdoclink>    xmlSecMSCryptoKeysStoreGetKlass     (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The MSCrypto list based keys store klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30555"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40908"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> MSCrypto list based keys store klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYSSTOREADOPTKEY"></a><h3>xmlSecMSCryptoKeysStoreAdoptKey ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoKeysStoreAdoptKey     (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoKeysStoreAdoptKey     (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);</pre>
 <p>Adds <code class="PARAMETER">key</code> to the <code class="PARAMETER">store</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30573"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to MSCrypto keys store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN40930"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to MSCrypto keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30578"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN40935"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30583"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40940"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -151,27 +148,26 @@
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYSSTORELOAD"></a><h3>xmlSecMSCryptoKeysStoreLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoKeysStoreLoad         (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         const <font>char</font> *uri,
-                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoKeysStoreLoad         (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *uri</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> keysMngr</code>);</pre>
 <p>Reads keys from an XML file.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30600"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to MSCrypto keys store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN40963"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to MSCrypto keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30605"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN40968"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30610"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to associated keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN40973"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to associated keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30615"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN40978"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -179,27 +175,26 @@
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYSSTORESAVE"></a><h3>xmlSecMSCryptoKeysStoreSave ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoKeysStoreSave         (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoKeysStoreSave         (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Writes keys from <code class="PARAMETER">store</code> to an XML file.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30633"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to MSCrypto keys store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41002"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to MSCrypto keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30638"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41007"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30643"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the saved keys type (public, private, ...).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41012"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the saved keys type (public, private, ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30648"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN41017"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
diff --git a/docs/api/xmlsec-mscrypto-x509.html b/docs/api/xmlsec-mscrypto-x509.html
index f3a5a51..ab19284 100644
--- a/docs/api/xmlsec-mscrypto-x509.html
+++ b/docs/api/xmlsec-mscrypto-x509.html
@@ -87,47 +87,47 @@
 <h1>
 <a name="XMLSEC-MSCRYPTO-X509"></a>x509</h1>
 <div class="REFNAMEDIV">
-<a name="AEN30658"></a><h2>Name</h2>x509 -- X509 certificates support implementation for MS Crypto.</div>
+<a name="AEN41027"></a><h2>Name</h2>x509 -- X509 certificates support implementation for MS Crypto.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-MSCRYPTO-X509.SYNOPSIS"></a><h2>Synopsis</h2>
 <pre class="SYNOPSIS">#define             <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509ID">xmlSecMSCryptoKeyDataX509Id</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETKLASS">xmlSecMSCryptoKeyDataX509GetKlass</a>   (void);
-<font>PCCERT_CONTEXT</font>      <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETKEYCERT">xmlSecMSCryptoKeyDataX509GetKeyCert</a> (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>                 <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509ADOPTKEYCERT">xmlSecMSCryptoKeyDataX509AdoptKeyCert</a>
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>PCCERT_CONTEXT</font> cert);
-<font>int</font>                 <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509ADOPTCERT">xmlSecMSCryptoKeyDataX509AdoptCert</a>  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>PCCERT_CONTEXT</font> cert);
-<font>PCCERT_CONTEXT</font>      <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETCERT">xmlSecMSCryptoKeyDataX509GetCert</a>    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETCERTSSIZE">xmlSecMSCryptoKeyDataX509GetCertsSize</a>
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>                 <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509ADOPTCRL">xmlSecMSCryptoKeyDataX509AdoptCrl</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>PCCRL_CONTEXT</font> crl);
-<font>PCCRL_CONTEXT</font>       <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETCRL">xmlSecMSCryptoKeyDataX509GetCrl</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETCRLSSIZE">xmlSecMSCryptoKeyDataX509GetCrlsSize</a>
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETKLASS">xmlSecMSCryptoKeyDataX509GetKlass</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="PCCERT-CONTEXT:CAPS"><span class="RETURNVALUE">PCCERT_CONTEXT</span></gtkdoclink><a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETKEYCERT">xmlSecMSCryptoKeyDataX509GetKeyCert</a> (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509ADOPTKEYCERT">xmlSecMSCryptoKeyDataX509AdoptKeyCert</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="PCCERT-CONTEXT:CAPS"><span class="TYPE">PCCERT_CONTEXT</span></gtkdoclink> cert</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509ADOPTCERT">xmlSecMSCryptoKeyDataX509AdoptCert</a>  (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="PCCERT-CONTEXT:CAPS"><span class="TYPE">PCCERT_CONTEXT</span></gtkdoclink> cert</code>);
+<gtkdoclink href="PCCERT-CONTEXT:CAPS"><span class="RETURNVALUE">PCCERT_CONTEXT</span></gtkdoclink><a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETCERT">xmlSecMSCryptoKeyDataX509GetCert</a>    (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETCERTSSIZE">xmlSecMSCryptoKeyDataX509GetCertsSize</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509ADOPTCRL">xmlSecMSCryptoKeyDataX509AdoptCrl</a>   (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="PCCRL-CONTEXT:CAPS"><span class="TYPE">PCCRL_CONTEXT</span></gtkdoclink> crl</code>);
+<gtkdoclink href="PCCRL-CONTEXT:CAPS"><span class="RETURNVALUE">PCCRL_CONTEXT</span></gtkdoclink><a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETCRL">xmlSecMSCryptoKeyDataX509GetCrl</a>     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETCRLSSIZE">xmlSecMSCryptoKeyDataX509GetCrlsSize</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
 #define             <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATARAWX509CERTID">xmlSecMSCryptoKeyDataRawX509CertId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATARAWX509CERTGETKLASS">xmlSecMSCryptoKeyDataRawX509CertGetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATARAWX509CERTGETKLASS">xmlSecMSCryptoKeyDataRawX509CertGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREID">xmlSecMSCryptoX509StoreId</a>
-<font>xmlSecKeyDataStoreId</font>  <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREGETKLASS">xmlSecMSCryptoX509StoreGetKlass</a>   (void);
-<font>int</font>                 <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREADOPTCERT">xmlSecMSCryptoX509StoreAdoptCert</a>    (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>PCCERT_CONTEXT</font> cert,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>                 <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREADOPTKEYSTORE">xmlSecMSCryptoX509StoreAdoptKeyStore</a>
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>HCERTSTORE</font> keyStore);
-<font>int</font>                 <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREADOPTTRUSTEDSTORE">xmlSecMSCryptoX509StoreAdoptTrustedStore</a>
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>HCERTSTORE</font> trustedStore);
-<font>int</font>                 <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREADOPTUNTRUSTEDSTORE">xmlSecMSCryptoX509StoreAdoptUntrustedStore</a>
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>HCERTSTORE</font> untrustedStore);
-<font>void</font>                <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREENABLESYSTEMTRUSTEDCERTS">xmlSecMSCryptoX509StoreEnableSystemTrustedCerts</a>
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>int</font> val);</pre>
+<gtkdoclink href="XMLSECKEYDATASTOREID"><span class="RETURNVALUE">xmlSecKeyDataStoreId</span></gtkdoclink><a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREGETKLASS">xmlSecMSCryptoX509StoreGetKlass</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREADOPTCERT">xmlSecMSCryptoX509StoreAdoptCert</a>    (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="PCCERT-CONTEXT:CAPS"><span class="TYPE">PCCERT_CONTEXT</span></gtkdoclink> cert</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREADOPTKEYSTORE">xmlSecMSCryptoX509StoreAdoptKeyStore</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="HCERTSTORE:CAPS"><span class="TYPE">HCERTSTORE</span></gtkdoclink> keyStore</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREADOPTTRUSTEDSTORE">xmlSecMSCryptoX509StoreAdoptTrustedStore</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="HCERTSTORE:CAPS"><span class="TYPE">HCERTSTORE</span></gtkdoclink> trustedStore</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREADOPTUNTRUSTEDSTORE">xmlSecMSCryptoX509StoreAdoptUntrustedStore</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="HCERTSTORE:CAPS"><span class="TYPE">HCERTSTORE</span></gtkdoclink> untrustedStore</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREENABLESYSTEMTRUSTEDCERTS">xmlSecMSCryptoX509StoreEnableSystemTrustedCerts</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> val</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-MSCRYPTO-X509.DESCRIPTION"></a><h2>Description</h2>
@@ -139,34 +139,31 @@
 <a name="XMLSECMSCRYPTOKEYDATAX509ID"></a><h3>xmlSecMSCryptoKeyDataX509Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoKeyDataX509Id</pre>
 <p>The MSCrypto X509 data klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATAX509GETKLASS"></a><h3>xmlSecMSCryptoKeyDataX509GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecMSCryptoKeyDataX509GetKlass   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecMSCryptoKeyDataX509GetKlass   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The MSCrypto X509 key data klass (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-X509DATA"><span class="TYPE">sec-X509Data</span></gtkdoclink>).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30746"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN41186"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the X509 data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATAX509GETKEYCERT"></a><h3>xmlSecMSCryptoKeyDataX509GetKeyCert ()</h3>
-<pre class="PROGRAMLISTING"><font>PCCERT_CONTEXT</font>      xmlSecMSCryptoKeyDataX509GetKeyCert (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="PCCERT-CONTEXT:CAPS"><span class="RETURNVALUE">PCCERT_CONTEXT</span></gtkdoclink>      xmlSecMSCryptoKeyDataX509GetKeyCert (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets the certificate from which the key was extracted.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30761"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41203"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30766"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN41208"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the key's certificate or NULL if key data was not used for key
 extraction or an error occurs.</p></td>
 </tr>
@@ -175,23 +172,22 @@ extraction or an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATAX509ADOPTKEYCERT"></a><h3>xmlSecMSCryptoKeyDataX509AdoptKeyCert ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoKeyDataX509AdoptKeyCert
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>PCCERT_CONTEXT</font> cert);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoKeyDataX509AdoptKeyCert
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="PCCERT-CONTEXT:CAPS"><span class="TYPE">PCCERT_CONTEXT</span></gtkdoclink> cert</code>);</pre>
 <p>Sets the key's certificate in <code class="PARAMETER">data</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30783"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41229"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30788"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to MSCRYPTO X509 certificate.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41234"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to MSCRYPTO X509 certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30793"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN41239"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -199,22 +195,21 @@ extraction or an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATAX509ADOPTCERT"></a><h3>xmlSecMSCryptoKeyDataX509AdoptCert ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoKeyDataX509AdoptCert  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>PCCERT_CONTEXT</font> cert);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoKeyDataX509AdoptCert  (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="PCCERT-CONTEXT:CAPS"><span class="TYPE">PCCERT_CONTEXT</span></gtkdoclink> cert</code>);</pre>
 <p>Adds certificate to the X509 key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30809"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41259"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30814"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to MSCRYPTO X509 certificate.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41264"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to MSCRYPTO X509 certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30819"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN41269"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -222,22 +217,21 @@ extraction or an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATAX509GETCERT"></a><h3>xmlSecMSCryptoKeyDataX509GetCert ()</h3>
-<pre class="PROGRAMLISTING"><font>PCCERT_CONTEXT</font>      xmlSecMSCryptoKeyDataX509GetCert    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="PCCERT-CONTEXT:CAPS"><span class="RETURNVALUE">PCCERT_CONTEXT</span></gtkdoclink>      xmlSecMSCryptoKeyDataX509GetCert    (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);</pre>
 <p>Gets a certificate from X509 key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30835"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41289"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30840"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the desired certificate position.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41294"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired certificate position.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30845"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN41299"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to certificate or NULL if <code class="PARAMETER">pos</code> is larger than the
 number of certificates in <code class="PARAMETER">data</code> or an error occurs.</p></td>
 </tr>
@@ -246,18 +240,17 @@ number of certificates in <code class="PARAMETER">data</code> or an error occurs
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATAX509GETCERTSSIZE"></a><h3>xmlSecMSCryptoKeyDataX509GetCertsSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecMSCryptoKeyDataX509GetCertsSize
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          xmlSecMSCryptoKeyDataX509GetCertsSize
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets the number of certificates in <code class="PARAMETER">data</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30863"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41319"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30868"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN41324"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> te number of certificates in <code class="PARAMETER">data</code>.</p></td>
 </tr>
 </tbody></table>
@@ -265,22 +258,21 @@ number of certificates in <code class="PARAMETER">data</code> or an error occurs
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATAX509ADOPTCRL"></a><h3>xmlSecMSCryptoKeyDataX509AdoptCrl ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoKeyDataX509AdoptCrl   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>PCCRL_CONTEXT</font> crl);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoKeyDataX509AdoptCrl   (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="PCCRL-CONTEXT:CAPS"><span class="TYPE">PCCRL_CONTEXT</span></gtkdoclink> crl</code>);</pre>
 <p>Adds CRL to the X509 key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30885"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41345"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30890"><span style="white-space: nowrap"><code class="PARAMETER">crl</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to MSCrypto X509 CRL.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41350"><span style="white-space: nowrap"><code class="PARAMETER">crl</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to MSCrypto X509 CRL.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30895"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN41355"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -288,22 +280,21 @@ number of certificates in <code class="PARAMETER">data</code> or an error occurs
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATAX509GETCRL"></a><h3>xmlSecMSCryptoKeyDataX509GetCrl ()</h3>
-<pre class="PROGRAMLISTING"><font>PCCRL_CONTEXT</font>       xmlSecMSCryptoKeyDataX509GetCrl     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="PCCRL-CONTEXT:CAPS"><span class="RETURNVALUE">PCCRL_CONTEXT</span></gtkdoclink>       xmlSecMSCryptoKeyDataX509GetCrl     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);</pre>
 <p>Gets a CRL from X509 key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30911"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41375"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30916"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the desired CRL position.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41380"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired CRL position.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30921"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN41385"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to CRL or NULL if <code class="PARAMETER">pos</code> is larger than the
 number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></td>
 </tr>
@@ -312,18 +303,17 @@ number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></t
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATAX509GETCRLSSIZE"></a><h3>xmlSecMSCryptoKeyDataX509GetCrlsSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecMSCryptoKeyDataX509GetCrlsSize
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          xmlSecMSCryptoKeyDataX509GetCrlsSize
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets the number of CRLs in <code class="PARAMETER">data</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30939"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41405"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30944"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN41410"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> te number of CRLs in <code class="PARAMETER">data</code>.</p></td>
 </tr>
 </tbody></table>
@@ -333,18 +323,16 @@ number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></t
 <a name="XMLSECMSCRYPTOKEYDATARAWX509CERTID"></a><h3>xmlSecMSCryptoKeyDataRawX509CertId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoKeyDataRawX509CertId</pre>
 <p>The MSCrypto raw X509 certificate klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOKEYDATARAWX509CERTGETKLASS"></a><h3>xmlSecMSCryptoKeyDataRawX509CertGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecMSCryptoKeyDataRawX509CertGetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecMSCryptoKeyDataRawX509CertGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The raw X509 certificates key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30966"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN41433"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> raw X509 certificates key data klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -353,44 +341,41 @@ number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></t
 <a name="XMLSECMSCRYPTOX509STOREID"></a><h3>xmlSecMSCryptoX509StoreId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecMSCryptoX509StoreId</pre>
 <p>The MSCrypto X509 store klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOX509STOREGETKLASS"></a><h3>xmlSecMSCryptoX509StoreGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataStoreId</font>  xmlSecMSCryptoX509StoreGetKlass   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATASTOREID"><span class="RETURNVALUE">xmlSecKeyDataStoreId</span></gtkdoclink>  xmlSecMSCryptoX509StoreGetKlass   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The MSCrypto X509 certificates key data store klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30987"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN41455"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to MSCrypto X509 certificates key data store klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOX509STOREADOPTCERT"></a><h3>xmlSecMSCryptoX509StoreAdoptCert ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoX509StoreAdoptCert    (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>PCCERT_CONTEXT</font> cert,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoX509StoreAdoptCert    (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="PCCERT-CONTEXT:CAPS"><span class="TYPE">PCCERT_CONTEXT</span></gtkdoclink> cert</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Adds trusted (root) or untrusted certificate to the store.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31004"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to X509 key data store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41478"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31009"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to PCCERT_CONTEXT X509 certificate.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41483"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to PCCERT_CONTEXT X509 certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31014"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the certificate type (trusted/untrusted).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41488"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate type (trusted/untrusted).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31019"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN41493"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -398,23 +383,22 @@ number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></t
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOX509STOREADOPTKEYSTORE"></a><h3>xmlSecMSCryptoX509StoreAdoptKeyStore ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoX509StoreAdoptKeyStore
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>HCERTSTORE</font> keyStore);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoX509StoreAdoptKeyStore
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="HCERTSTORE:CAPS"><span class="TYPE">HCERTSTORE</span></gtkdoclink> keyStore</code>);</pre>
 <p>Adds <code class="PARAMETER">keyStore</code> to the list of key stores.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31036"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to X509 key data store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41514"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31041"><span style="white-space: nowrap"><code class="PARAMETER">keyStore</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to keys store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41519"><span style="white-space: nowrap"><code class="PARAMETER">keyStore</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31046"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN41524"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -422,23 +406,22 @@ number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></t
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOX509STOREADOPTTRUSTEDSTORE"></a><h3>xmlSecMSCryptoX509StoreAdoptTrustedStore ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoX509StoreAdoptTrustedStore
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>HCERTSTORE</font> trustedStore);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoX509StoreAdoptTrustedStore
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="HCERTSTORE:CAPS"><span class="TYPE">HCERTSTORE</span></gtkdoclink> trustedStore</code>);</pre>
 <p>Adds <code class="PARAMETER">trustedStore</code> to the list of trusted certs stores.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31063"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to X509 key data store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41545"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31068"><span style="white-space: nowrap"><code class="PARAMETER">trustedStore</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to certs store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41550"><span style="white-space: nowrap"><code class="PARAMETER">trustedStore</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to certs store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31073"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN41555"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -446,23 +429,22 @@ number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></t
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOX509STOREADOPTUNTRUSTEDSTORE"></a><h3>xmlSecMSCryptoX509StoreAdoptUntrustedStore ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoX509StoreAdoptUntrustedStore
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>HCERTSTORE</font> untrustedStore);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecMSCryptoX509StoreAdoptUntrustedStore
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="HCERTSTORE:CAPS"><span class="TYPE">HCERTSTORE</span></gtkdoclink> untrustedStore</code>);</pre>
 <p>Adds <code class="PARAMETER">trustedStore</code> to the list of un-trusted certs stores.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31090"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to X509 key data store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41576"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31095"><span style="white-space: nowrap"><code class="PARAMETER">untrustedStore</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the pointer to certs store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41581"><span style="white-space: nowrap"><code class="PARAMETER">untrustedStore</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to certs store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31100"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN41586"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -470,20 +452,19 @@ number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></t
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECMSCRYPTOX509STOREENABLESYSTEMTRUSTEDCERTS"></a><h3>xmlSecMSCryptoX509StoreEnableSystemTrustedCerts ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecMSCryptoX509StoreEnableSystemTrustedCerts
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>int</font> val);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecMSCryptoX509StoreEnableSystemTrustedCerts
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> val</code>);</pre>
 <p>Enables/disables the system trusted certs.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31116"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to X509 key data store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41606"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31121"><span style="white-space: nowrap"><code class="PARAMETER">val</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the enable/disable flag</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN41611"><span style="white-space: nowrap"><code class="PARAMETER">val</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the enable/disable flag</p></td>
 </tr>
 </tbody></table>
 </div>
diff --git a/docs/api/xmlsec-nodeset.html b/docs/api/xmlsec-nodeset.html
index 89ebbf7..54e0d2d 100644
--- a/docs/api/xmlsec-nodeset.html
+++ b/docs/api/xmlsec-nodeset.html
@@ -87,41 +87,41 @@
 <h1>
 <a name="XMLSEC-NODESET"></a>nodeset</h1>
 <div class="REFNAMEDIV">
-<a name="AEN11540"></a><h2>Name</h2>nodeset -- Nodeset object implementation.</div>
+<a name="AEN13854"></a><h2>Name</h2>nodeset -- Nodeset object implementation.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-NODESET.SYNOPSIS"></a><h2>Synopsis</h2>
 <pre class="SYNOPSIS">enum                <a href="xmlsec-nodeset.html#XMLSECNODESETTYPE">xmlSecNodeSetType</a>;
 enum                <a href="xmlsec-nodeset.html#XMLSECNODESETOP">xmlSecNodeSetOp</a>;
 struct              <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSet</a>;
-<font>int</font>                 (<a href="xmlsec-nodeset.html#XMLSECNODESETWALKCALLBACK">*xmlSecNodeSetWalkCallback</a>)        (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                                         <font>xmlNodePtr</font> cur,
-                                                         <font>xmlNodePtr</font> parent,
-                                                         <font>void</font> *data);
-<font>xmlSecNodeSetPtr</font>    <a href="xmlsec-nodeset.html#XMLSECNODESETCREATE">xmlSecNodeSetCreate</a>                 (<font>xmlDocPtr</font> doc,
-                                                         <font>xmlNodeSetPtr</font> nodes,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESETTYPE">xmlSecNodeSetType</a> type);
-<font>void</font>                <a href="xmlsec-nodeset.html#XMLSECNODESETDESTROY">xmlSecNodeSetDestroy</a>                (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset);
-<font>void</font>                <a href="xmlsec-nodeset.html#XMLSECNODESETDOCDESTROY">xmlSecNodeSetDocDestroy</a>             (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset);
-<font>int</font>                 <a href="xmlsec-nodeset.html#XMLSECNODESETCONTAINS">xmlSecNodeSetContains</a>               (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <font>xmlNodePtr</font> parent);
-<font>xmlSecNodeSetPtr</font>    <a href="xmlsec-nodeset.html#XMLSECNODESETADD">xmlSecNodeSetAdd</a>                    (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> newNSet,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESETOP">xmlSecNodeSetOp</a> op);
-<font>xmlSecNodeSetPtr</font>    <a href="xmlsec-nodeset.html#XMLSECNODESETADDLIST">xmlSecNodeSetAddList</a>                (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> newNSet,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESETOP">xmlSecNodeSetOp</a> op);
-<font>xmlSecNodeSetPtr</font>    <a href="xmlsec-nodeset.html#XMLSECNODESETGETCHILDREN">xmlSecNodeSetGetChildren</a>            (<font>xmlDocPtr</font> doc,
-                                                         const <font>xmlNodePtr</font> parent,
-                                                         <font>int</font> withComments,
-                                                         <font>int</font> invert);
-<font>int</font>                 <a href="xmlsec-nodeset.html#XMLSECNODESETWALK">xmlSecNodeSetWalk</a>                   (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESETWALKCALLBACK">xmlSecNodeSetWalkCallback</a> walkFunc,
-                                                         <font>void</font> *data);
-<font>int</font>                 <a href="xmlsec-nodeset.html#XMLSECNODESETDUMPTEXTNODES">xmlSecNodeSetDumpTextNodes</a>          (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                                         <font>xmlOutputBufferPtr</font> out);
-<font>void</font>                <a href="xmlsec-nodeset.html#XMLSECNODESETDEBUGDUMP">xmlSecNodeSetDebugDump</a>              (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                                         <font>FILE</font> *output);</pre>
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-nodeset.html#XMLSECNODESETWALKCALLBACK">*xmlSecNodeSetWalkCallback</a>)        (<code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nset</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> parent</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *data</code>);
+<gtkdoclink href="XMLSECNODESETPTR"><span class="RETURNVALUE">xmlSecNodeSetPtr</span></gtkdoclink><a href="xmlsec-nodeset.html#XMLSECNODESETCREATE">xmlSecNodeSetCreate</a>                 (<code class="PARAMETER"><gtkdoclink href="XMLDOC"><span class="TYPE">xmlDocPtr</span></gtkdoclink> doc</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODESET"><span class="TYPE">xmlNodeSetPtr</span></gtkdoclink> nodes</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESETTYPE"><span class="TYPE">xmlSecNodeSetType</span></a> type</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-nodeset.html#XMLSECNODESETDESTROY">xmlSecNodeSetDestroy</a>                (<code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nset</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-nodeset.html#XMLSECNODESETDOCDESTROY">xmlSecNodeSetDocDestroy</a>             (<code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nset</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nodeset.html#XMLSECNODESETCONTAINS">xmlSecNodeSetContains</a>               (<code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nset</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> parent</code>);
+<gtkdoclink href="XMLSECNODESETPTR"><span class="RETURNVALUE">xmlSecNodeSetPtr</span></gtkdoclink><a href="xmlsec-nodeset.html#XMLSECNODESETADD">xmlSecNodeSetAdd</a>                    (<code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nset</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> newNSet</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESETOP"><span class="TYPE">xmlSecNodeSetOp</span></a> op</code>);
+<gtkdoclink href="XMLSECNODESETPTR"><span class="RETURNVALUE">xmlSecNodeSetPtr</span></gtkdoclink><a href="xmlsec-nodeset.html#XMLSECNODESETADDLIST">xmlSecNodeSetAddList</a>                (<code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nset</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> newNSet</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESETOP"><span class="TYPE">xmlSecNodeSetOp</span></a> op</code>);
+<gtkdoclink href="XMLSECNODESETPTR"><span class="RETURNVALUE">xmlSecNodeSetPtr</span></gtkdoclink><a href="xmlsec-nodeset.html#XMLSECNODESETGETCHILDREN">xmlSecNodeSetGetChildren</a>            (<code class="PARAMETER"><gtkdoclink href="XMLDOC"><span class="TYPE">xmlDocPtr</span></gtkdoclink> doc</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> parent</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> withComments</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> invert</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nodeset.html#XMLSECNODESETWALK">xmlSecNodeSetWalk</a>                   (<code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nset</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESETWALKCALLBACK"><span class="TYPE">xmlSecNodeSetWalkCallback</span></a> walkFunc</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *data</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nodeset.html#XMLSECNODESETDUMPTEXTNODES">xmlSecNodeSetDumpTextNodes</a>          (<code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nset</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLOUTPUTBUFFER"><span class="TYPE">xmlOutputBufferPtr</span></gtkdoclink> out</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-nodeset.html#XMLSECNODESETDEBUGDUMP">xmlSecNodeSetDebugDump</a>              (<code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nset</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-NODESET.DESCRIPTION"></a><h2>Description</h2>
@@ -142,39 +142,38 @@ struct              <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSet</a
 } xmlSecNodeSetType;</pre>
 <p>The basic nodes sets types.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECNODESETNORMAL"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecNodeSetNormal</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>        nodes set = nodes in the list.</p></td>
+<td align="LEFT" valign="TOP"><p>nodes set = nodes in the list.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECNODESETINVERT"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecNodeSetInvert</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>        nodes set = all document nodes minus nodes in the list.</p></td>
+<td align="LEFT" valign="TOP"><p>nodes set = all document nodes minus nodes in the list.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECNODESETTREE"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecNodeSetTree</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>          nodes set = nodes in the list and all their subtress.</p></td>
+<td align="LEFT" valign="TOP"><p>nodes set = nodes in the list and all their subtress.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECNODESETTREEWITHOUTCOMMENTS"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecNodeSetTreeWithoutComments</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>           nodes set = nodes in the list and
+<td align="LEFT" valign="TOP"><p>nodes set = nodes in the list and
                              all their subtress but no comment nodes.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECNODESETTREEINVERT"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecNodeSetTreeInvert</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>    nodes set = all document nodes minus nodes in the
+<td align="LEFT" valign="TOP"><p>nodes set = all document nodes minus nodes in the
                              list and all their subtress.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECNODESETTREEWITHOUTCOMMENTSINVERT"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecNodeSetTreeWithoutCommentsInvert</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>     nodes set = all document nodes
+<td align="LEFT" valign="TOP"><p>nodes set = all document nodes
                              minus (nodes in the list and all their subtress
                              plus all comment nodes).</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECNODESETLIST"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecNodeSetList</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>          nodes set = all nodes in the chidren list of nodes sets.</p></td>
+<td align="LEFT" valign="TOP"><p>nodes set = all nodes in the chidren list of nodes sets.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -188,19 +187,18 @@ struct              <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSet</a
 } xmlSecNodeSetOp;</pre>
 <p>The simple nodes sets operations.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECNODESETINTERSECTION"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecNodeSetIntersection</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>  intersection.</p></td>
+<td align="LEFT" valign="TOP"><p>intersection.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECNODESETSUBTRACTION"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecNodeSetSubtraction</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>   subtraction.</p></td>
+<td align="LEFT" valign="TOP"><p>subtraction.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECNODESETUNION"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecNodeSetUnion</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>         union.</p></td>
+<td align="LEFT" valign="TOP"><p>union.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -219,40 +217,39 @@ struct              <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSet</a
 };</pre>
 <p>The enchanced nodes set.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11679"><span style="white-space: nowrap"><font>xmlNodeSetPtr</font> <code class="STRUCTFIELD">nodes</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                      the nodes list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14059"><span style="white-space: nowrap"><gtkdoclink href="XMLNODESET"><span class="TYPE">xmlNodeSetPtr</span></gtkdoclink> <code class="STRUCTFIELD">nodes</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the nodes list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11685"><span style="white-space: nowrap"><font>xmlDocPtr</font> <code class="STRUCTFIELD">doc</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                        the parent XML document.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14066"><span style="white-space: nowrap"><gtkdoclink href="XMLDOC"><span class="TYPE">xmlDocPtr</span></gtkdoclink> <code class="STRUCTFIELD">doc</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the parent XML document.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11691"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">destroyDoc</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the flag: if set to 1 then <code class="PARAMETER">doc</code> will
+<td align="LEFT" valign="TOP"><a name="AEN14073"><span style="white-space: nowrap"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> <code class="STRUCTFIELD">destroyDoc</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag: if set to 1 then <code class="PARAMETER">doc</code> will
                              be destroyed when node set is destroyed.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11698"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESETTYPE">xmlSecNodeSetType</a> <code class="STRUCTFIELD">type</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the nodes set type.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14081"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESETTYPE"><span class="TYPE">xmlSecNodeSetType</span></a> <code class="STRUCTFIELD">type</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the nodes set type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11704"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESETOP">xmlSecNodeSetOp</a> <code class="STRUCTFIELD">op</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                         the operation type.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14088"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESETOP"><span class="TYPE">xmlSecNodeSetOp</span></a> <code class="STRUCTFIELD">op</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the operation type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11710"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> <code class="STRUCTFIELD">next</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the next nodes set.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14095"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> <code class="STRUCTFIELD">next</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the next nodes set.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11716"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> <code class="STRUCTFIELD">prev</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the previous nodes set.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14102"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> <code class="STRUCTFIELD">prev</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the previous nodes set.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11722"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> <code class="STRUCTFIELD">children</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                   the children list (valid only if type
+<td align="LEFT" valign="TOP"><a name="AEN14109"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> <code class="STRUCTFIELD">children</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the children list (valid only if type
                              equal to <a href="xmlsec-nodeset.html#XMLSECNODESETLIST"><span class="TYPE">xmlSecNodeSetList</span></a>).</p></td>
 </tr>
 </tbody></table>
@@ -260,32 +257,31 @@ struct              <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSet</a
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNODESETWALKCALLBACK"></a><h3>xmlSecNodeSetWalkCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecNodeSetWalkCallback)        (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                                         <font>xmlNodePtr</font> cur,
-                                                         <font>xmlNodePtr</font> parent,
-                                                         <font>void</font> *data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecNodeSetWalkCallback)        (<code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nset</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> parent</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *data</code>);</pre>
 <p>The callback function called once per each node in the nodes set.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11743"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the pointer to <a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSet</span></a> structure.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14139"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSet</span></a> structure.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11750"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                        the pointer current XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14146"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer current XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11755"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                     the pointer to the <code class="PARAMETER">cur</code> parent node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14151"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to the <code class="PARAMETER">cur</code> parent node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11761"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the pointer to application specific data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14157"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to application specific data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11766"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14162"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs
 an walk procedure should be interrupted.</p></td>
 </tr>
@@ -294,28 +290,27 @@ an walk procedure should be interrupted.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNODESETCREATE"></a><h3>xmlSecNodeSetCreate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecNodeSetPtr</font>    xmlSecNodeSetCreate                 (<font>xmlDocPtr</font> doc,
-                                                         <font>xmlNodeSetPtr</font> nodes,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESETTYPE">xmlSecNodeSetType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECNODESETPTR"><span class="RETURNVALUE">xmlSecNodeSetPtr</span></gtkdoclink>    xmlSecNodeSetCreate                 (<code class="PARAMETER"><gtkdoclink href="XMLDOC"><span class="TYPE">xmlDocPtr</span></gtkdoclink> doc</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODESET"><span class="TYPE">xmlNodeSetPtr</span></gtkdoclink> nodes</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESETTYPE"><span class="TYPE">xmlSecNodeSetType</span></a> type</code>);</pre>
 <p>Creates new nodes set. Caller is responsible for freeng returend object
 by calling <a href="xmlsec-nodeset.html#XMLSECNODESETDESTROY"><span class="TYPE">xmlSecNodeSetDestroy</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11785"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to parent XML document.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14187"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to parent XML document.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11790"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the list of nodes.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14192"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the list of nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11795"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the nodes set type.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14197"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the nodes set type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11800"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14202"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly allocated node set or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -323,51 +318,48 @@ by calling <a href="xmlsec-nodeset.html#XMLSECNODESETDESTROY"><span class="TYPE"
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNODESETDESTROY"></a><h3>xmlSecNodeSetDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecNodeSetDestroy                (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecNodeSetDestroy                (<code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nset</code>);</pre>
 <p>Destroys the nodes set created with <a href="xmlsec-nodeset.html#XMLSECNODESETCREATE"><span class="TYPE">xmlSecNodeSetCreate</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11817"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to node set.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14221"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to node set.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNODESETDOCDESTROY"></a><h3>xmlSecNodeSetDocDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecNodeSetDocDestroy             (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecNodeSetDocDestroy             (<code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nset</code>);</pre>
 <p>Instructs node set to destroy nodes parent doc when node set is destroyed.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11832"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to node set.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14238"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to node set.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNODESETCONTAINS"></a><h3>xmlSecNodeSetContains ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNodeSetContains               (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <font>xmlNodePtr</font> parent);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNodeSetContains               (<code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nset</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> parent</code>);</pre>
 <p>Checks whether the <code class="PARAMETER">node</code> is in the nodes set or not.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11850"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to node set.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14262"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to node set.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11855"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to XML node to check.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14267"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to XML node to check.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11860"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to <code class="PARAMETER">node</code> parent node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14272"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <code class="PARAMETER">node</code> parent node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11866"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14278"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 1 if the <code class="PARAMETER">node</code> is in the nodes set <code class="PARAMETER">nset</code>, 0 if it is not
 and a negative value if an error occurs.</p></td>
 </tr>
@@ -376,27 +368,26 @@ and a negative value if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNODESETADD"></a><h3>xmlSecNodeSetAdd ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecNodeSetPtr</font>    xmlSecNodeSetAdd                    (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> newNSet,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESETOP">xmlSecNodeSetOp</a> op);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECNODESETPTR"><span class="RETURNVALUE">xmlSecNodeSetPtr</span></gtkdoclink>    xmlSecNodeSetAdd                    (<code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nset</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> newNSet</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESETOP"><span class="TYPE">xmlSecNodeSetOp</span></a> op</code>);</pre>
 <p>Adds <code class="PARAMETER">newNSet</code> to the <code class="PARAMETER">nset</code> using operation <code class="PARAMETER">op</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11888"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to currrent nodes set (or NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14306"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to currrent nodes set (or NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11893"><span style="white-space: nowrap"><code class="PARAMETER">newNSet</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to new nodes set.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14311"><span style="white-space: nowrap"><code class="PARAMETER">newNSet</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to new nodes set.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11898"><span style="white-space: nowrap"><code class="PARAMETER">op</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the operation type.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14316"><span style="white-space: nowrap"><code class="PARAMETER">op</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the operation type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11903"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14321"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to combined nodes set or NULL if an error
 occurs.</p></td>
 </tr>
@@ -405,27 +396,26 @@ occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNODESETADDLIST"></a><h3>xmlSecNodeSetAddList ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecNodeSetPtr</font>    xmlSecNodeSetAddList                (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> newNSet,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESETOP">xmlSecNodeSetOp</a> op);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECNODESETPTR"><span class="RETURNVALUE">xmlSecNodeSetPtr</span></gtkdoclink>    xmlSecNodeSetAddList                (<code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nset</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> newNSet</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESETOP"><span class="TYPE">xmlSecNodeSetOp</span></a> op</code>);</pre>
 <p>Adds <code class="PARAMETER">newNSet</code> to the <code class="PARAMETER">nset</code> as child using operation <code class="PARAMETER">op</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11923"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to currrent nodes set (or NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14347"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to currrent nodes set (or NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11928"><span style="white-space: nowrap"><code class="PARAMETER">newNSet</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to new nodes set.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14352"><span style="white-space: nowrap"><code class="PARAMETER">newNSet</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to new nodes set.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11933"><span style="white-space: nowrap"><code class="PARAMETER">op</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the operation type.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14357"><span style="white-space: nowrap"><code class="PARAMETER">op</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the operation type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11938"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14362"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to combined nodes set or NULL if an error
 occurs.</p></td>
 </tr>
@@ -434,10 +424,10 @@ occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNODESETGETCHILDREN"></a><h3>xmlSecNodeSetGetChildren ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecNodeSetPtr</font>    xmlSecNodeSetGetChildren            (<font>xmlDocPtr</font> doc,
-                                                         const <font>xmlNodePtr</font> parent,
-                                                         <font>int</font> withComments,
-                                                         <font>int</font> invert);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECNODESETPTR"><span class="RETURNVALUE">xmlSecNodeSetPtr</span></gtkdoclink>    xmlSecNodeSetGetChildren            (<code class="PARAMETER"><gtkdoclink href="XMLDOC"><span class="TYPE">xmlDocPtr</span></gtkdoclink> doc</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> parent</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> withComments</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> invert</code>);</pre>
 <p>Creates a new nodes set that contains:
  - if <code class="PARAMETER">withComments</code> is not 0 and <code class="PARAMETER">invert</code> is 0:
    all nodes in the <code class="PARAMETER">parent</code> subtree;
@@ -449,26 +439,25 @@ occurs.</p></td>
    all nodes in the <code class="PARAMETER">doc</code> except nodes in the <code class="PARAMETER">parent</code> subtree
    and comment nodes.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11970"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to an XML document.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14402"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to an XML document.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11975"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to parent XML node or NULL if we want to include all document nodes.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14407"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to parent XML node or NULL if we want to include all document nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11980"><span style="white-space: nowrap"><code class="PARAMETER">withComments</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the flag include  comments or not.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14412"><span style="white-space: nowrap"><code class="PARAMETER">withComments</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag include  comments or not.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11985"><span style="white-space: nowrap"><code class="PARAMETER">invert</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the "invert" flag.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14417"><span style="white-space: nowrap"><code class="PARAMETER">invert</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the "invert" flag.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11990"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14422"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the newly created <a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSet</span></a> structure
 or NULL if an error occurs.</p></td>
 </tr>
@@ -477,29 +466,28 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNODESETWALK"></a><h3>xmlSecNodeSetWalk ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNodeSetWalk                   (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESETWALKCALLBACK">xmlSecNodeSetWalkCallback</a> walkFunc,
-                                                         <font>void</font> *data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNodeSetWalk                   (<code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nset</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESETWALKCALLBACK"><span class="TYPE">xmlSecNodeSetWalkCallback</span></a> walkFunc</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *data</code>);</pre>
 <p>Calls the function <code class="PARAMETER">walkFunc</code> once per each node in the nodes set <code class="PARAMETER">nset</code>.
 If the <code class="PARAMETER">walkFunc</code> returns a negative value, then the walk procedure
 is interrupted.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12012"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to node set.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14450"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to node set.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12017"><span style="white-space: nowrap"><code class="PARAMETER">walkFunc</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the callback functions.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14455"><span style="white-space: nowrap"><code class="PARAMETER">walkFunc</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the callback functions.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12022"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the application specific data passed to the <code class="PARAMETER">walkFunc</code>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14460"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the application specific data passed to the <code class="PARAMETER">walkFunc</code>.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12028"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14466"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -507,22 +495,21 @@ is interrupted.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNODESETDUMPTEXTNODES"></a><h3>xmlSecNodeSetDumpTextNodes ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNodeSetDumpTextNodes          (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                                         <font>xmlOutputBufferPtr</font> out);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNodeSetDumpTextNodes          (<code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nset</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLOUTPUTBUFFER"><span class="TYPE">xmlOutputBufferPtr</span></gtkdoclink> out</code>);</pre>
 <p>Dumps content of all the text nodes from <code class="PARAMETER">nset</code> to <code class="PARAMETER">out</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12046"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to node set.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14488"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to node set.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12051"><span style="white-space: nowrap"><code class="PARAMETER">out</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the output buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14493"><span style="white-space: nowrap"><code class="PARAMETER">out</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the output buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12056"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14498"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -530,19 +517,18 @@ is interrupted.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNODESETDEBUGDUMP"></a><h3>xmlSecNodeSetDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecNodeSetDebugDump              (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecNodeSetDebugDump              (<code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nset</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints information about <code class="PARAMETER">nset</code> to the <code class="PARAMETER">output</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12074"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to node set.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14520"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to node set.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12079"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14525"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
diff --git a/docs/api/xmlsec-notes-compiling-unix.html b/docs/api/xmlsec-notes-compiling-unix.html
index 3541dc8..476552e 100644
--- a/docs/api/xmlsec-notes-compiling-unix.html
+++ b/docs/api/xmlsec-notes-compiling-unix.html
@@ -174,7 +174,7 @@ clean:
 		</p>
 <div class="EXAMPLE">
 <a name="AEN86"></a><p><b>Example 6. Using xmlsec1-config script in a Makefile
-		    to select crypto engine (gnutls) at linking time.</b></p>
+		    to select crypto engine (e.g. gnutls) at linking time.</b></p>
 <pre class="PROGRAMLISTING">PROGRAM = test
 PROGRAM_FILES = test.c
 
diff --git a/docs/api/xmlsec-notes-init-shutdown.html b/docs/api/xmlsec-notes-init-shutdown.html
index 63bf65e..a86c318 100644
--- a/docs/api/xmlsec-notes-init-shutdown.html
+++ b/docs/api/xmlsec-notes-init-shutdown.html
@@ -95,7 +95,7 @@
 <ul>
 <li><p>libxml library;</p></li>
 <li><p>libxslt library;</p></li>
-<li><p>crypto library (OpenSSL, GnuTLS, NSS, ...);</p></li>
+<li><p>crypto library (OpenSSL, GnuTLS, GCrypt, NSS, ...);</p></li>
 <li><p>xmlsec library 
 		(<a href="xmlsec-xmlsec.html#XMLSECINIT">xmlSecInit</a> 
 		and <a href="xmlsec-xmlsec.html#XMLSECSHUTDOWN">xmlSecShutdown</a> 
diff --git a/docs/api/xmlsec-notes-new-crypto-skeleton.html b/docs/api/xmlsec-notes-new-crypto-skeleton.html
index fcdebf4..979bbe3 100644
--- a/docs/api/xmlsec-notes-new-crypto-skeleton.html
+++ b/docs/api/xmlsec-notes-new-crypto-skeleton.html
@@ -239,7 +239,7 @@ src/mycrypto/Makefile
 	library):
 	<div class="EXAMPLE">
 <a name="AEN532"></a><p><b>Example 5. Compiling the results.</b></p>
-<pre class="PROGRAMLISTING">./autogen.sh --without-openssl --without-nss --without-gnutls \
+<pre class="PROGRAMLISTING">./autogen.sh --without-openssl --without-nss --without-gnutls --without-gcrypt \
     	     --with-mycrypto=$HOME --disable-tmpl-tests
 make	
 	    </pre>
diff --git a/docs/api/xmlsec-notes-new-crypto.html b/docs/api/xmlsec-notes-new-crypto.html
index e6e7685..ef8b4d0 100644
--- a/docs/api/xmlsec-notes-new-crypto.html
+++ b/docs/api/xmlsec-notes-new-crypto.html
@@ -102,7 +102,7 @@
 <h1 class="SECT1"><a name="XMLSEC-NOTES-NEW-CRYPTO-OVERVIEW">Overview.</a></h1>
 <p>XML Security Library can support practicaly any cryptographic
     library. Currently, it has "out-of-the-box" support for OpenSSL,
-    NSS and GnuTLS. If your favorite library is not supported yet then
+    MSCrypto, NSS, GnuTLS and GCrypt. If your favorite library is not supported yet then
     you can write necessary code yourself. If you and your company
     (university, ...) are willing to share the results of your work I would 
     be happy to add support for new libraries to the main XML Security 
@@ -111,7 +111,7 @@
     <a href="xmlsec-notes-structure.html">separates</a> 
     the cryptographic library (engine) 
     specific code in an "xmlsec-&lt;crypto&gt;" library (where "&lt;crypto&gt;" is 
-    "openssl", "gnutls", "nss", etc.) which includes following items:
+    "openssl", "mscrypt", "gnutls", "gcrypt", "nss", etc.) which includes following items:
     </p>
 <p></p>
 <ul>
diff --git a/docs/api/xmlsec-notes-overview.html b/docs/api/xmlsec-notes-overview.html
index ba56bbe..c27b9be 100644
--- a/docs/api/xmlsec-notes-overview.html
+++ b/docs/api/xmlsec-notes-overview.html
@@ -90,7 +90,7 @@
 <p>XML Security Library provides support for XML Digital Signature 
 	and XML Encryption. It is based on LibXML/LibXSLT and can use
 	practicaly any crypto library (currently there is "out of the box" 
-	support for OpenSSL, GnuTLS and NSS).
+	support for OpenSSL, MSCrypto, GnuTLS, GCrypt and NSS).
 	</p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
diff --git a/docs/api/xmlsec-notes-structure.html b/docs/api/xmlsec-notes-structure.html
index f9dd86b..ba89d19 100644
--- a/docs/api/xmlsec-notes-structure.html
+++ b/docs/api/xmlsec-notes-structure.html
@@ -89,7 +89,8 @@
 <a name="XMLSEC-NOTES-STRUCTURE"></a>XML Security Library Structure.</h1>
 <p>In order to provide the an ability to use different crypto engines, 
 	the XML Security Library is splitted in two parts: core library (xmlsec)
-	and crypto library (xmlsec-openssl, xmlsec-gnutls, xmlsec-nss, ...). 
+	and crypto library (xmlsec-openssl, xmlsec-mscrypt, xmlsec-gnutls, 
+	xmlsec-gcrypt, xmlsec-nss, ...).
 	</p>
 <div class="FIGURE">
 <a name="AEN28"></a><p><b>Figure 1. The library structure and dependencies.</b></p>
diff --git a/docs/api/xmlsec-nss-app.html b/docs/api/xmlsec-nss-app.html
index d27be7a..f60da18 100644
--- a/docs/api/xmlsec-nss-app.html
+++ b/docs/api/xmlsec-nss-app.html
@@ -87,74 +87,74 @@
 <h1>
 <a name="XMLSEC-NSS-APP"></a>app</h1>
 <div class="REFNAMEDIV">
-<a name="AEN25594"></a><h2>Name</h2>app -- Application functions implementation for NSS.</div>
+<a name="AEN34488"></a><h2>Name</h2>app -- Application functions implementation for NSS.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-NSS-APP.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS"><font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPINIT">xmlSecNssAppInit</a>                    (const <font>char</font> *config);
-<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPSHUTDOWN">xmlSecNssAppShutdown</a>                (void);
-<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRINIT">xmlSecNssAppDefaultKeysMngrInit</a>     (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecNssAppDefaultKeysMngrAdoptKey</a> (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRLOAD">xmlSecNssAppDefaultKeysMngrLoad</a>     (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *uri);
-<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRSAVE">xmlSecNssAppDefaultKeysMngrSave</a>     (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYSMNGRCERTLOAD">xmlSecNssAppKeysMngrCertLoad</a>        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYSMNGRCERTLOADMEMORY">xmlSecNssAppKeysMngrCertLoadMemory</a>  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYSMNGRCERTLOADSECITEM">xmlSecNssAppKeysMngrCertLoadSECItem</a> (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <font>SECItem</font> *secItem,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYLOAD">xmlSecNssAppKeyLoad</a>                 (const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYLOADMEMORY">xmlSecNssAppKeyLoadMemory</a>           (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYLOADSECITEM">xmlSecNssAppKeyLoadSECItem</a>          (<font>SECItem</font> *secItem,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPPKCS12LOAD">xmlSecNssAppPkcs12Load</a>              (const <font>char</font> *filename,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPPKCS12LOADMEMORY">xmlSecNssAppPkcs12LoadMemory</a>        (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPPKCS12LOADSECITEM">xmlSecNssAppPkcs12LoadSECItem</a>       (<font>SECItem</font> *secItem,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYCERTLOAD">xmlSecNssAppKeyCertLoad</a>             (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYCERTLOADMEMORY">xmlSecNssAppKeyCertLoadMemory</a>       (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYCERTLOADSECITEM">xmlSecNssAppKeyCertLoadSECItem</a>      (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>SECItem</font> *secItem,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYFROMCERTLOADSECITEM">xmlSecNssAppKeyFromCertLoadSECItem</a>  (<font>SECItem</font> *secItem,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>void</font>*               <a href="xmlsec-nss-app.html#XMLSECNSSAPPGETDEFAULTPWDCALLBACK">xmlSecNssAppGetDefaultPwdCallback</a>   (void);</pre>
+<pre class="SYNOPSIS"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-app.html#XMLSECNSSAPPINIT">xmlSecNssAppInit</a>                    (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *config</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-app.html#XMLSECNSSAPPSHUTDOWN">xmlSecNssAppShutdown</a>                (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRINIT">xmlSecNssAppDefaultKeysMngrInit</a>     (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecNssAppDefaultKeysMngrAdoptKey</a> (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRLOAD">xmlSecNssAppDefaultKeysMngrLoad</a>     (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *uri</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRSAVE">xmlSecNssAppDefaultKeysMngrSave</a>     (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYSMNGRCERTLOAD">xmlSecNssAppKeysMngrCertLoad</a>        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYSMNGRCERTLOADMEMORY">xmlSecNssAppKeysMngrCertLoadMemory</a>  (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYSMNGRCERTLOADSECITEM">xmlSecNssAppKeysMngrCertLoadSECItem</a> (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="SECITEM"><span class="TYPE">SECItem</span></gtkdoclink> *secItem</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYLOAD">xmlSecNssAppKeyLoad</a>                 (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYLOADMEMORY">xmlSecNssAppKeyLoadMemory</a>           (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYLOADSECITEM">xmlSecNssAppKeyLoadSECItem</a>          (<code class="PARAMETER"><gtkdoclink href="SECITEM"><span class="TYPE">SECItem</span></gtkdoclink> *secItem</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPPKCS12LOAD">xmlSecNssAppPkcs12Load</a>              (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPPKCS12LOADMEMORY">xmlSecNssAppPkcs12LoadMemory</a>        (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPPKCS12LOADSECITEM">xmlSecNssAppPkcs12LoadSECItem</a>       (<code class="PARAMETER"><gtkdoclink href="SECITEM"><span class="TYPE">SECItem</span></gtkdoclink> *secItem</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYCERTLOAD">xmlSecNssAppKeyCertLoad</a>             (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYCERTLOADMEMORY">xmlSecNssAppKeyCertLoadMemory</a>       (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYCERTLOADSECITEM">xmlSecNssAppKeyCertLoadSECItem</a>      (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="SECITEM"><span class="TYPE">SECItem</span></gtkdoclink> *secItem</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYFROMCERTLOADSECITEM">xmlSecNssAppKeyFromCertLoadSECItem</a>  (<code class="PARAMETER"><gtkdoclink href="SECITEM"><span class="TYPE">SECItem</span></gtkdoclink> *secItem</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>*               <a href="xmlsec-nss-app.html#XMLSECNSSAPPGETDEFAULTPWDCALLBACK">xmlSecNssAppGetDefaultPwdCallback</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-NSS-APP.DESCRIPTION"></a><h2>Description</h2>
@@ -164,19 +164,18 @@
 <a name="XMLSEC-NSS-APP.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
 <a name="XMLSECNSSAPPINIT"></a><h3>xmlSecNssAppInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppInit                    (const <font>char</font> *config);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssAppInit                    (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *config</code>);</pre>
 <p>General crypto engine initialization. This function is used
 by XMLSec command line utility and called before
 <code class="PARAMETER">xmlSecInit</code> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25719"><span style="white-space: nowrap"><code class="PARAMETER">config</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the path to NSS database files.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN34765"><span style="white-space: nowrap"><code class="PARAMETER">config</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the path to NSS database files.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25724"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN34770"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -184,32 +183,30 @@ by XMLSec command line utility and called before
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSAPPSHUTDOWN"></a><h3>xmlSecNssAppShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppShutdown                (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssAppShutdown                (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after
 <code class="PARAMETER">xmlSecShutdown</code> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25739"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN34787"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSAPPDEFAULTKEYSMNGRINIT"></a><h3>xmlSecNssAppDefaultKeysMngrInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppDefaultKeysMngrInit     (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssAppDefaultKeysMngrInit     (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);</pre>
 <p>Initializes <code class="PARAMETER">mngr</code> with NSS keys store <a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTOREID"><span class="TYPE">xmlSecNssKeysStoreId</span></a>
 and a default NSS crypto key data stores.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25757"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN34807"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25762"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN34812"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -217,23 +214,22 @@ and a default NSS crypto key data stores.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSAPPDEFAULTKEYSMNGRADOPTKEY"></a><h3>xmlSecNssAppDefaultKeysMngrAdoptKey ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppDefaultKeysMngrAdoptKey (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssAppDefaultKeysMngrAdoptKey (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);</pre>
 <p>Adds <code class="PARAMETER">key</code> to the keys manager <code class="PARAMETER">mngr</code> created with <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecNssAppDefaultKeysMngrInit</span></a>
 function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25782"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN34836"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25787"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN34841"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25792"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN34846"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -241,23 +237,22 @@ function.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSAPPDEFAULTKEYSMNGRLOAD"></a><h3>xmlSecNssAppDefaultKeysMngrLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppDefaultKeysMngrLoad     (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *uri);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssAppDefaultKeysMngrLoad     (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *uri</code>);</pre>
 <p>Loads XML keys file from <code class="PARAMETER">uri</code> to the keys manager <code class="PARAMETER">mngr</code> created
 with <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecNssAppDefaultKeysMngrInit</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25812"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN34870"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25817"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the uri.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN34875"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the uri.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25822"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN34880"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -265,27 +260,26 @@ with <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRINIT"><span class="
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSAPPDEFAULTKEYSMNGRSAVE"></a><h3>xmlSecNssAppDefaultKeysMngrSave ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppDefaultKeysMngrSave     (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssAppDefaultKeysMngrSave     (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Saves keys from <code class="PARAMETER">mngr</code> to  XML keys file.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25840"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN34904"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25845"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the destination filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN34909"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the destination filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25850"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the type of keys to save (public/private/symmetric).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN34914"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the type of keys to save (public/private/symmetric).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25855"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN34919"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -293,33 +287,32 @@ with <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRINIT"><span class="
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSAPPKEYSMNGRCERTLOAD"></a><h3>xmlSecNssAppKeysMngrCertLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppKeysMngrCertLoad        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssAppKeysMngrCertLoad        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Reads cert from <code class="PARAMETER">filename</code> and adds to the list of trusted or known
 untrusted certs in <code class="PARAMETER">store</code></p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25875"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN34947"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25880"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the certificate file.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN34952"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25885"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate file format (PEM or DER).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN34957"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file format (PEM or DER).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25890"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the certificate type (trusted/untrusted).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN34962"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate type (trusted/untrusted).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25895"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN34967"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -327,38 +320,37 @@ untrusted certs in <code class="PARAMETER">store</code></p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSAPPKEYSMNGRCERTLOADMEMORY"></a><h3>xmlSecNssAppKeysMngrCertLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppKeysMngrCertLoadMemory  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssAppKeysMngrCertLoadMemory  (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Reads cert from <code class="PARAMETER">data</code> and adds to the list of trusted or known
 untrusted certs in <code class="PARAMETER">store</code></p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25916"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN34998"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25921"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the key binary data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35003"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25926"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the key binary data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35008"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25931"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate format (PEM or DER).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35013"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate format (PEM or DER).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25936"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the certificate type (trusted/untrusted).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35018"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate type (trusted/untrusted).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25941"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN35023"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -366,33 +358,32 @@ untrusted certs in <code class="PARAMETER">store</code></p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSAPPKEYSMNGRCERTLOADSECITEM"></a><h3>xmlSecNssAppKeysMngrCertLoadSECItem ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppKeysMngrCertLoadSECItem (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <font>SECItem</font> *secItem,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssAppKeysMngrCertLoadSECItem (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="SECITEM"><span class="TYPE">SECItem</span></gtkdoclink> *secItem</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Reads cert from <code class="PARAMETER">secItem</code> and adds to the list of trusted or known
 untrusted certs in <code class="PARAMETER">store</code></p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25961"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35051"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25966"><span style="white-space: nowrap"><code class="PARAMETER">secItem</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to SECItem.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35056"><span style="white-space: nowrap"><code class="PARAMETER">secItem</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to SECItem.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25971"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate format (PEM or DER).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35061"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate format (PEM or DER).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25976"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the certificate type (trusted/untrusted).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35066"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate type (trusted/untrusted).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25981"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN35071"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -400,37 +391,36 @@ untrusted certs in <code class="PARAMETER">store</code></p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSAPPKEYLOAD"></a><h3>xmlSecNssAppKeyLoad ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecNssAppKeyLoad                 (const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecNssAppKeyLoad                 (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key from a file</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26000"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the key filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35100"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26005"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the key file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35105"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26010"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the key file password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35110"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26015"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the key password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35115"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26020"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35120"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26025"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN35125"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -438,42 +428,41 @@ untrusted certs in <code class="PARAMETER">store</code></p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSAPPKEYLOADMEMORY"></a><h3>xmlSecNssAppKeyLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecNssAppKeyLoadMemory           (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecNssAppKeyLoadMemory           (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key from a binary <code class="PARAMETER">data</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26046"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the key binary data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35158"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26051"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the key binary data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35163"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26056"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the key data format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35168"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key data format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26061"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the key data2 password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35173"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key data2 password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26066"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the key password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35178"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26071"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35183"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26076"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN35188"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -481,37 +470,36 @@ untrusted certs in <code class="PARAMETER">store</code></p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSAPPKEYLOADSECITEM"></a><h3>xmlSecNssAppKeyLoadSECItem ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecNssAppKeyLoadSECItem          (<font>SECItem</font> *secItem,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecNssAppKeyLoadSECItem          (<code class="PARAMETER"><gtkdoclink href="SECITEM"><span class="TYPE">SECItem</span></gtkdoclink> *secItem</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key from a file</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26095"><span style="white-space: nowrap"><code class="PARAMETER">secItem</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to sec item.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35217"><span style="white-space: nowrap"><code class="PARAMETER">secItem</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to sec item.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26100"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the key format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35222"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26105"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the key password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35227"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26110"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the key password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35232"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26115"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35237"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26120"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN35242"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -519,34 +507,33 @@ untrusted certs in <code class="PARAMETER">store</code></p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSAPPPKCS12LOAD"></a><h3>xmlSecNssAppPkcs12Load ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecNssAppPkcs12Load              (const <font>char</font> *filename,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecNssAppPkcs12Load              (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key and all associated certificates from the PKCS12 file.
 For uniformity, call xmlSecNssAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26138"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the PKCS12 key filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35268"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26143"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the PKCS12 file password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35273"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26148"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35278"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26153"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35283"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26158"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN35288"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -554,39 +541,38 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSAPPPKCS12LOADMEMORY"></a><h3>xmlSecNssAppPkcs12LoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecNssAppPkcs12LoadMemory        (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecNssAppPkcs12LoadMemory        (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key and all associated certificates from the PKCS12 binary data.
 For uniformity, call xmlSecNssAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26177"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the key binary data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35317"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26182"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the key binary data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35322"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26187"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the PKCS12 password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35327"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26192"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35332"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26197"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35337"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26202"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN35342"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -594,34 +580,33 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSAPPPKCS12LOADSECITEM"></a><h3>xmlSecNssAppPkcs12LoadSECItem ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecNssAppPkcs12LoadSECItem       (<font>SECItem</font> *secItem,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecNssAppPkcs12LoadSECItem       (<code class="PARAMETER"><gtkdoclink href="SECITEM"><span class="TYPE">SECItem</span></gtkdoclink> *secItem</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key and all associated certificates from the PKCS12 SECItem.
 For uniformity, call xmlSecNssAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26220"><span style="white-space: nowrap"><code class="PARAMETER">secItem</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the <code class="PARAMETER">SECItem</code> object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35368"><span style="white-space: nowrap"><code class="PARAMETER">secItem</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the <code class="PARAMETER">SECItem</code> object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26226"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the PKCS12 file password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35374"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26231"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35379"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26236"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35384"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26241"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN35389"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -629,27 +614,26 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSAPPKEYCERTLOAD"></a><h3>xmlSecNssAppKeyCertLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppKeyCertLoad             (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssAppKeyCertLoad             (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);</pre>
 <p>Reads the certificate from $<code class="PARAMETER">filename</code> and adds it to key</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26259"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35413"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26264"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the certificate filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35418"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26269"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35423"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26274"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN35428"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -657,32 +641,31 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSAPPKEYCERTLOADMEMORY"></a><h3>xmlSecNssAppKeyCertLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppKeyCertLoadMemory       (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssAppKeyCertLoadMemory       (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);</pre>
 <p>Reads the certificate from <code class="PARAMETER">data</code> and adds it to key</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26293"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35455"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26298"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the key binary data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35460"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26303"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the key binary data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35465"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26308"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35470"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26313"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN35475"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -690,27 +673,26 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSAPPKEYCERTLOADSECITEM"></a><h3>xmlSecNssAppKeyCertLoadSECItem ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppKeyCertLoadSECItem      (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>SECItem</font> *secItem,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssAppKeyCertLoadSECItem      (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="SECITEM"><span class="TYPE">SECItem</span></gtkdoclink> *secItem</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);</pre>
 <p>Reads the certificate from <code class="PARAMETER">secItem</code> and adds it to key</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26331"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35499"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26336"><span style="white-space: nowrap"><code class="PARAMETER">secItem</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to SECItem.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35504"><span style="white-space: nowrap"><code class="PARAMETER">secItem</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to SECItem.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26341"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35509"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26346"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN35514"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -718,22 +700,21 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSAPPKEYFROMCERTLOADSECITEM"></a><h3>xmlSecNssAppKeyFromCertLoadSECItem ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecNssAppKeyFromCertLoadSECItem  (<font>SECItem</font> *secItem,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecNssAppKeyFromCertLoadSECItem  (<code class="PARAMETER"><gtkdoclink href="SECITEM"><span class="TYPE">SECItem</span></gtkdoclink> *secItem</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);</pre>
 <p>Loads public key from cert.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26362"><span style="white-space: nowrap"><code class="PARAMETER">secItem</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the <code class="PARAMETER">SECItem</code> object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35534"><span style="white-space: nowrap"><code class="PARAMETER">secItem</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the <code class="PARAMETER">SECItem</code> object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26368"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the cert format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35540"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the cert format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26373"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN35545"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -741,12 +722,11 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSAPPGETDEFAULTPWDCALLBACK"></a><h3>xmlSecNssAppGetDefaultPwdCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>*               xmlSecNssAppGetDefaultPwdCallback   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>*               xmlSecNssAppGetDefaultPwdCallback   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Gets default password callback.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26387"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN35561"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> default password callback.</p></td>
 </tr></tbody></table>
 </div>
diff --git a/docs/api/xmlsec-nss-bignum.html b/docs/api/xmlsec-nss-bignum.html
index 6cc7a23..fd29407 100644
--- a/docs/api/xmlsec-nss-bignum.html
+++ b/docs/api/xmlsec-nss-bignum.html
@@ -87,15 +87,15 @@
 <h1>
 <a name="XMLSEC-NSS-BIGNUM"></a>bignum</h1>
 <div class="REFNAMEDIV">
-<a name="AEN26397"></a><h2>Name</h2>bignum -- Big numbers helper functions.</div>
+<a name="AEN35571"></a><h2>Name</h2>bignum -- Big numbers helper functions.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-NSS-BIGNUM.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS"><font>SECItem</font>*            <a href="xmlsec-nss-bignum.html#XMLSECNSSNODEGETBIGNUMVALUE">xmlSecNssNodeGetBigNumValue</a>         (<font>PRArenaPool</font> *arena,
-                                                         const <font>xmlNodePtr</font> cur,
-                                                         <font>SECItem</font> *a);
-<font>int</font>                 <a href="xmlsec-nss-bignum.html#XMLSECNSSNODESETBIGNUMVALUE">xmlSecNssNodeSetBigNumValue</a>         (<font>xmlNodePtr</font> cur,
-                                                         const <font>SECItem</font> *a,
-                                                         <font>int</font> addLineBreaks);</pre>
+<pre class="SYNOPSIS"><gtkdoclink href="SECITEM"><span class="RETURNVALUE">SECItem</span></gtkdoclink>*            <a href="xmlsec-nss-bignum.html#XMLSECNSSNODEGETBIGNUMVALUE">xmlSecNssNodeGetBigNumValue</a>         (<code class="PARAMETER"><gtkdoclink href="PRARENAPOOL"><span class="TYPE">PRArenaPool</span></gtkdoclink> *arena</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="SECITEM"><span class="TYPE">SECItem</span></gtkdoclink> *a</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-bignum.html#XMLSECNSSNODESETBIGNUMVALUE">xmlSecNssNodeSetBigNumValue</a>         (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="SECITEM"><span class="TYPE">SECItem</span></gtkdoclink> *a</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> addLineBreaks</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-NSS-BIGNUM.DESCRIPTION"></a><h2>Description</h2>
@@ -105,30 +105,29 @@
 <a name="XMLSEC-NSS-BIGNUM.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
 <a name="XMLSECNSSNODEGETBIGNUMVALUE"></a><h3>xmlSecNssNodeGetBigNumValue ()</h3>
-<pre class="PROGRAMLISTING"><font>SECItem</font>*            xmlSecNssNodeGetBigNumValue         (<font>PRArenaPool</font> *arena,
-                                                         const <font>xmlNodePtr</font> cur,
-                                                         <font>SECItem</font> *a);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="SECITEM"><span class="RETURNVALUE">SECItem</span></gtkdoclink>*            xmlSecNssNodeGetBigNumValue         (<code class="PARAMETER"><gtkdoclink href="PRARENAPOOL"><span class="TYPE">PRArenaPool</span></gtkdoclink> *arena</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="SECITEM"><span class="TYPE">SECItem</span></gtkdoclink> *a</code>);</pre>
 <p>Converts the node content from CryptoBinary format
 (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-CRYPTOBINARY"><span class="TYPE">sec-CryptoBinary</span></gtkdoclink>)
 to a SECItem. If no SECItem object provided then a new
 one is created (caller is responsible for freeing it).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26432"><span style="white-space: nowrap"><code class="PARAMETER">arena</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the arena from which to allocate memory</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35626"><span style="white-space: nowrap"><code class="PARAMETER">arena</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the arena from which to allocate memory</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26437"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the poitner to an XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35631"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the poitner to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26442"><span style="white-space: nowrap"><code class="PARAMETER">a</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> a SECItem object to hold the BigNum value</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35636"><span style="white-space: nowrap"><code class="PARAMETER">a</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>a SECItem object to hold the BigNum value</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26447"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN35641"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> a pointer to SECItem produced from CryptoBinary string
 or NULL if an error occurs.</p></td>
 </tr>
@@ -137,33 +136,32 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSNODESETBIGNUMVALUE"></a><h3>xmlSecNssNodeSetBigNumValue ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssNodeSetBigNumValue         (<font>xmlNodePtr</font> cur,
-                                                         const <font>SECItem</font> *a,
-                                                         <font>int</font> addLineBreaks);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssNodeSetBigNumValue         (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="SECITEM"><span class="TYPE">SECItem</span></gtkdoclink> *a</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> addLineBreaks</code>);</pre>
 <p>Converts SECItem to CryptoBinary string
 (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-CRYPTOBINARY"><span class="TYPE">sec-CryptoBinary</span></gtkdoclink>)
 and sets it as the content of the given node. If the
 addLineBreaks is set then line breaks are added
 before and after the CryptoBinary string.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26466"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the pointer to an XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35666"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26471"><span style="white-space: nowrap"><code class="PARAMETER">a</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> a SECItem containing the BigNum value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN35671"><span style="white-space: nowrap"><code class="PARAMETER">a</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>a SECItem containing the BigNum value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26476"><span style="white-space: nowrap"><code class="PARAMETER">addLineBreaks</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> if the flag is equal to 1 then
+<td align="LEFT" valign="TOP"><a name="AEN35676"><span style="white-space: nowrap"><code class="PARAMETER">addLineBreaks</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>if the flag is equal to 1 then
              linebreaks will be added before and after
              new buffer content.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26481"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN35681"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or -1 otherwise.</p></td>
 </tr>
 </tbody></table>
diff --git a/docs/api/xmlsec-nss-crypto.html b/docs/api/xmlsec-nss-crypto.html
index 8130aad..4c059f4 100644
--- a/docs/api/xmlsec-nss-crypto.html
+++ b/docs/api/xmlsec-nss-crypto.html
@@ -87,103 +87,103 @@
 <h1>
 <a name="XMLSEC-NSS-CRYPTO"></a>crypto</h1>
 <div class="REFNAMEDIV">
-<a name="AEN26491"></a><h2>Name</h2>crypto -- Crypto transforms implementation for NSS.</div>
+<a name="AEN35691"></a><h2>Name</h2>crypto -- Crypto transforms implementation for NSS.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-NSS-CRYPTO.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS"><font>xmlSecCryptoDLFunctionsPtr</font>  <a href="xmlsec-nss-crypto.html#XMLSECCRYPTOGETFUNCTIONS-NSS">xmlSecCryptoGetFunctions_nss</a>
-                                                        (void);
-<font>int</font>                 <a href="xmlsec-nss-crypto.html#XMLSECNSSINIT">xmlSecNssInit</a>                       (void);
-<font>int</font>                 <a href="xmlsec-nss-crypto.html#XMLSECNSSSHUTDOWN">xmlSecNssShutdown</a>                   (void);
-<font>int</font>                 <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYSMNGRINIT">xmlSecNssKeysMngrInit</a>               (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>int</font>                 <a href="xmlsec-nss-crypto.html#XMLSECNSSGENERATERANDOM">xmlSecNssGenerateRandom</a>             (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>void</font>                <a href="xmlsec-nss-crypto.html#XMLSECNSSERRORSDEFAULTCALLBACK">xmlSecNssErrorsDefaultCallback</a>      (const <font>char</font> *file,
-                                                         <font>int</font> line,
-                                                         const <font>char</font> *func,
-                                                         const <font>char</font> *errorObject,
-                                                         const <font>char</font> *errorSubject,
-                                                         <font>int</font> reason,
-                                                         const <font>char</font> *msg);
-<font>PK11SlotInfo</font> *      <a href="xmlsec-nss-crypto.html#XMLSECNSSGETINTERNALKEYSLOT">xmlSecNssGetInternalKeySlot</a>         (void);
+<pre class="SYNOPSIS"><gtkdoclink href="XMLSECCRYPTODLFUNCTIONS"><span class="RETURNVALUE">xmlSecCryptoDLFunctionsPtr</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECCRYPTOGETFUNCTIONS-NSS">xmlSecCryptoGetFunctions_nss</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSINIT">xmlSecNssInit</a>                       (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSSHUTDOWN">xmlSecNssShutdown</a>                   (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSKEYSMNGRINIT">xmlSecNssKeysMngrInit</a>               (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSGENERATERANDOM">xmlSecNssGenerateRandom</a>             (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buffer</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSERRORSDEFAULTCALLBACK">xmlSecNssErrorsDefaultCallback</a>      (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *file</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> line</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *func</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorObject</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorSubject</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> reason</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *msg</code>);
+<gtkdoclink href="PK11SLOTINFO"><span class="RETURNVALUE">PK11SlotInfo</span></gtkdoclink> *      <a href="xmlsec-nss-crypto.html#XMLSECNSSGETINTERNALKEYSLOT">xmlSecNssGetInternalKeySlot</a>         (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAAESID">xmlSecNssKeyDataAesId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAAESGETKLASS">xmlSecNssKeyDataAesGetKlass</a>         (void);
-<font>int</font>                 <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAAESSET">xmlSecNssKeyDataAesSet</a>              (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAAESGETKLASS">xmlSecNssKeyDataAesGetKlass</a>         (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAAESSET">xmlSecNssKeyDataAesSet</a>              (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES128CBCID">xmlSecNssTransformAes128CbcId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES128CBCGETKLASS">xmlSecNssTransformAes128CbcGetKlass</a> (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES128CBCGETKLASS">xmlSecNssTransformAes128CbcGetKlass</a> (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES192CBCID">xmlSecNssTransformAes192CbcId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES192CBCGETKLASS">xmlSecNssTransformAes192CbcGetKlass</a> (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES192CBCGETKLASS">xmlSecNssTransformAes192CbcGetKlass</a> (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES256CBCID">xmlSecNssTransformAes256CbcId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES256CBCGETKLASS">xmlSecNssTransformAes256CbcGetKlass</a> (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES256CBCGETKLASS">xmlSecNssTransformAes256CbcGetKlass</a> (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES128ID">xmlSecNssTransformKWAes128Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES128GETKLASS">xmlSecNssTransformKWAes128GetKlass</a>  (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES128GETKLASS">xmlSecNssTransformKWAes128GetKlass</a>  (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES192ID">xmlSecNssTransformKWAes192Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES192GETKLASS">xmlSecNssTransformKWAes192GetKlass</a>  (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES192GETKLASS">xmlSecNssTransformKWAes192GetKlass</a>  (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES256ID">xmlSecNssTransformKWAes256Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES256GETKLASS">xmlSecNssTransformKWAes256GetKlass</a>  (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES256GETKLASS">xmlSecNssTransformKWAes256GetKlass</a>  (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATADESID">xmlSecNssKeyDataDesId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATADESGETKLASS">xmlSecNssKeyDataDesGetKlass</a>         (void);
-<font>int</font>                 <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATADESSET">xmlSecNssKeyDataDesSet</a>              (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATADESGETKLASS">xmlSecNssKeyDataDesGetKlass</a>         (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATADESSET">xmlSecNssKeyDataDesSet</a>              (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMDES3CBCID">xmlSecNssTransformDes3CbcId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMDES3CBCGETKLASS">xmlSecNssTransformDes3CbcGetKlass</a>   (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMDES3CBCGETKLASS">xmlSecNssTransformDes3CbcGetKlass</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWDES3ID">xmlSecNssTransformKWDes3Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWDES3GETKLASS">xmlSecNssTransformKWDes3GetKlass</a>    (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWDES3GETKLASS">xmlSecNssTransformKWDes3GetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATADSAID">xmlSecNssKeyDataDsaId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATADSAGETKLASS">xmlSecNssKeyDataDsaGetKlass</a>         (void);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATADSAGETKLASS">xmlSecNssKeyDataDsaGetKlass</a>         (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMDSASHA1ID">xmlSecNssTransformDsaSha1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMDSASHA1GETKLASS">xmlSecNssTransformDsaSha1GetKlass</a>   (void);
-<font>int</font>                 <a href="xmlsec-nss-crypto.html#XMLSECNSSHMACGETMINOUTPUTLENGTH">xmlSecNssHmacGetMinOutputLength</a>     (void);
-<font>void</font>                <a href="xmlsec-nss-crypto.html#XMLSECNSSHMACSETMINOUTPUTLENGTH">xmlSecNssHmacSetMinOutputLength</a>     (<font>int</font> min_length);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMDSASHA1GETKLASS">xmlSecNssTransformDsaSha1GetKlass</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSHMACGETMINOUTPUTLENGTH">xmlSecNssHmacGetMinOutputLength</a>     (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSHMACSETMINOUTPUTLENGTH">xmlSecNssHmacSetMinOutputLength</a>     (<code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> min_length</code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAHMACID">xmlSecNssKeyDataHmacId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAHMACGETKLASS">xmlSecNssKeyDataHmacGetKlass</a>        (void);
-<font>int</font>                 <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAHMACSET">xmlSecNssKeyDataHmacSet</a>             (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAHMACGETKLASS">xmlSecNssKeyDataHmacGetKlass</a>        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAHMACSET">xmlSecNssKeyDataHmacSet</a>             (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACMD5ID">xmlSecNssTransformHmacMd5Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACMD5GETKLASS">xmlSecNssTransformHmacMd5GetKlass</a>   (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACMD5GETKLASS">xmlSecNssTransformHmacMd5GetKlass</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACRIPEMD160ID">xmlSecNssTransformHmacRipemd160Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACRIPEMD160GETKLASS">xmlSecNssTransformHmacRipemd160GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACRIPEMD160GETKLASS">xmlSecNssTransformHmacRipemd160GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACSHA1ID">xmlSecNssTransformHmacSha1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACSHA1GETKLASS">xmlSecNssTransformHmacSha1GetKlass</a>  (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACSHA1GETKLASS">xmlSecNssTransformHmacSha1GetKlass</a>  (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACSHA256ID">xmlSecNssTransformHmacSha256Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACSHA256GETKLASS">xmlSecNssTransformHmacSha256GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACSHA256GETKLASS">xmlSecNssTransformHmacSha256GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACSHA384ID">xmlSecNssTransformHmacSha384Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACSHA384GETKLASS">xmlSecNssTransformHmacSha384GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACSHA384GETKLASS">xmlSecNssTransformHmacSha384GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACSHA512ID">xmlSecNssTransformHmacSha512Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACSHA512GETKLASS">xmlSecNssTransformHmacSha512GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACSHA512GETKLASS">xmlSecNssTransformHmacSha512GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATARSAID">xmlSecNssKeyDataRsaId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATARSAGETKLASS">xmlSecNssKeyDataRsaGetKlass</a>         (void);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATARSAGETKLASS">xmlSecNssKeyDataRsaGetKlass</a>         (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAMD5ID">xmlSecNssTransformRsaMd5Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAMD5GETKLASS">xmlSecNssTransformRsaMd5GetKlass</a>    (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAMD5GETKLASS">xmlSecNssTransformRsaMd5GetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSASHA1ID">xmlSecNssTransformRsaSha1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSASHA1GETKLASS">xmlSecNssTransformRsaSha1GetKlass</a>   (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSASHA1GETKLASS">xmlSecNssTransformRsaSha1GetKlass</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSASHA256ID">xmlSecNssTransformRsaSha256Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSASHA256GETKLASS">xmlSecNssTransformRsaSha256GetKlass</a> (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSASHA256GETKLASS">xmlSecNssTransformRsaSha256GetKlass</a> (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSASHA384ID">xmlSecNssTransformRsaSha384Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSASHA384GETKLASS">xmlSecNssTransformRsaSha384GetKlass</a> (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSASHA384GETKLASS">xmlSecNssTransformRsaSha384GetKlass</a> (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSASHA512ID">xmlSecNssTransformRsaSha512Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSASHA512GETKLASS">xmlSecNssTransformRsaSha512GetKlass</a> (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSASHA512GETKLASS">xmlSecNssTransformRsaSha512GetKlass</a> (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAPKCS1ID">xmlSecNssTransformRsaPkcs1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAPKCS1GETKLASS">xmlSecNssTransformRsaPkcs1GetKlass</a>  (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAPKCS1GETKLASS">xmlSecNssTransformRsaPkcs1GetKlass</a>  (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAOAEPID">xmlSecNssTransformRsaOaepId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAOAEPGETKLASS">xmlSecNssTransformRsaOaepGetKlass</a>   (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAOAEPGETKLASS">xmlSecNssTransformRsaOaepGetKlass</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMSHA1ID">xmlSecNssTransformSha1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMSHA1GETKLASS">xmlSecNssTransformSha1GetKlass</a>      (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMSHA1GETKLASS">xmlSecNssTransformSha1GetKlass</a>      (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMSHA256ID">xmlSecNssTransformSha256Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMSHA256GETKLASS">xmlSecNssTransformSha256GetKlass</a>    (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMSHA256GETKLASS">xmlSecNssTransformSha256GetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMSHA384ID">xmlSecNssTransformSha384Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMSHA384GETKLASS">xmlSecNssTransformSha384GetKlass</a>    (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMSHA384GETKLASS">xmlSecNssTransformSha384GetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMSHA512ID">xmlSecNssTransformSha512Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMSHA512GETKLASS">xmlSecNssTransformSha512GetKlass</a>    (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMSHA512GETKLASS">xmlSecNssTransformSha512GetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMMD5ID">xmlSecNssTransformMd5Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMMD5GETKLASS">xmlSecNssTransformMd5GetKlass</a>       (void);</pre>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMMD5GETKLASS">xmlSecNssTransformMd5GetKlass</a>       (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-NSS-CRYPTO.DESCRIPTION"></a><h2>Description</h2>
@@ -193,54 +193,50 @@
 <a name="XMLSEC-NSS-CRYPTO.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOGETFUNCTIONS-NSS"></a><h3>xmlSecCryptoGetFunctions_nss ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecCryptoDLFunctionsPtr</font>  xmlSecCryptoGetFunctions_nss
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECCRYPTODLFUNCTIONS"><span class="RETURNVALUE">xmlSecCryptoDLFunctionsPtr</span></gtkdoclink>  xmlSecCryptoGetFunctions_nss
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Gets the pointer to xmlsec-nss functions table.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26651"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36011"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the xmlsec-nss functions table or NULL if an error occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSINIT"></a><h3>xmlSecNssInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssInit                       (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssInit                       (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>XMLSec library specific crypto engine initialization.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26665"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36027"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSSHUTDOWN"></a><h3>xmlSecNssShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssShutdown                   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssShutdown                   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>XMLSec library specific crypto engine shutdown.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26679"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36043"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYSMNGRINIT"></a><h3>xmlSecNssKeysMngrInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssKeysMngrInit               (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssKeysMngrInit               (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);</pre>
 <p>Adds NSS specific key data stores in keys manager.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26694"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN36060"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26699"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36065"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -248,22 +244,21 @@
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSGENERATERANDOM"></a><h3>xmlSecNssGenerateRandom ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssGenerateRandom             (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssGenerateRandom             (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buffer</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);</pre>
 <p>Generates <code class="PARAMETER">size</code> random bytes and puts result in <code class="PARAMETER">buffer</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26717"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the destination buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN36087"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the destination buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26722"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the numer of bytes to generate.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN36092"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the numer of bytes to generate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26727"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36097"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -271,56 +266,54 @@
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSERRORSDEFAULTCALLBACK"></a><h3>xmlSecNssErrorsDefaultCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecNssErrorsDefaultCallback      (const <font>char</font> *file,
-                                                         <font>int</font> line,
-                                                         const <font>char</font> *func,
-                                                         const <font>char</font> *errorObject,
-                                                         const <font>char</font> *errorSubject,
-                                                         <font>int</font> reason,
-                                                         const <font>char</font> *msg);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecNssErrorsDefaultCallback      (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *file</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> line</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *func</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorObject</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorSubject</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> reason</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *msg</code>);</pre>
 <p>The default errors reporting callback function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26748"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the error location file name (__FILE__ macro).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN36132"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error location file name (__FILE__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26753"><span style="white-space: nowrap"><code class="PARAMETER">line</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the error location line number (__LINE__ macro).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN36137"><span style="white-space: nowrap"><code class="PARAMETER">line</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error location line number (__LINE__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26758"><span style="white-space: nowrap"><code class="PARAMETER">func</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the error location function name (__FUNCTION__ macro).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN36142"><span style="white-space: nowrap"><code class="PARAMETER">func</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error location function name (__FUNCTION__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26763"><span style="white-space: nowrap"><code class="PARAMETER">errorObject</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the error specific error object</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN36147"><span style="white-space: nowrap"><code class="PARAMETER">errorObject</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error specific error object</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26768"><span style="white-space: nowrap"><code class="PARAMETER">errorSubject</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the error specific error subject.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN36152"><span style="white-space: nowrap"><code class="PARAMETER">errorSubject</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error specific error subject.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26773"><span style="white-space: nowrap"><code class="PARAMETER">reason</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the error code.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN36157"><span style="white-space: nowrap"><code class="PARAMETER">reason</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error code.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26778"><span style="white-space: nowrap"><code class="PARAMETER">msg</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the additional error message.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN36162"><span style="white-space: nowrap"><code class="PARAMETER">msg</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the additional error message.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSGETINTERNALKEYSLOT"></a><h3>xmlSecNssGetInternalKeySlot ()</h3>
-<pre class="PROGRAMLISTING"><font>PK11SlotInfo</font> *      xmlSecNssGetInternalKeySlot         (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="PK11SLOTINFO"><span class="RETURNVALUE">PK11SlotInfo</span></gtkdoclink> *      xmlSecNssGetInternalKeySlot         (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Gets internal NSS key slot.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26792"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36178"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> internal key slot and initializes it if needed.</p></td>
 </tr></tbody></table>
 </div>
@@ -329,44 +322,41 @@
 <a name="XMLSECNSSKEYDATAAESID"></a><h3>xmlSecNssKeyDataAesId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssKeyDataAesId</pre>
 <p>The AES key data klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYDATAAESGETKLASS"></a><h3>xmlSecNssKeyDataAesGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecNssKeyDataAesGetKlass         (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecNssKeyDataAesGetKlass         (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The AES key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26813"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36200"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> AES key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYDATAAESSET"></a><h3>xmlSecNssKeyDataAesSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssKeyDataAesSet              (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssKeyDataAesSet              (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);</pre>
 <p>Sets the value of AES key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26830"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to AES key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN36223"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to AES key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26835"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN36228"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26840"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the key value size (in bytes).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN36233"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26845"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36238"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -376,17 +366,15 @@
 <a name="XMLSECNSSTRANSFORMAES128CBCID"></a><h3>xmlSecNssTransformAes128CbcId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformAes128CbcId</pre>
 <p>The AES128 CBC cipher transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMAES128CBCGETKLASS"></a><h3>xmlSecNssTransformAes128CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformAes128CbcGetKlass (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformAes128CbcGetKlass (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>AES 128 CBC encryption transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26866"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36260"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to AES 128 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
@@ -395,17 +383,15 @@
 <a name="XMLSECNSSTRANSFORMAES192CBCID"></a><h3>xmlSecNssTransformAes192CbcId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformAes192CbcId</pre>
 <p>The AES192 CBC cipher transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMAES192CBCGETKLASS"></a><h3>xmlSecNssTransformAes192CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformAes192CbcGetKlass (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformAes192CbcGetKlass (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>AES 192 CBC encryption transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26887"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36282"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to AES 192 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
@@ -414,17 +400,15 @@
 <a name="XMLSECNSSTRANSFORMAES256CBCID"></a><h3>xmlSecNssTransformAes256CbcId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformAes256CbcId</pre>
 <p>The AES256 CBC cipher transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMAES256CBCGETKLASS"></a><h3>xmlSecNssTransformAes256CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformAes256CbcGetKlass (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformAes256CbcGetKlass (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>AES 256 CBC encryption transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26908"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36304"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to AES 256 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
@@ -433,17 +417,15 @@
 <a name="XMLSECNSSTRANSFORMKWAES128ID"></a><h3>xmlSecNssTransformKWAes128Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformKWAes128Id</pre>
 <p>The AES 128 key wrap transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMKWAES128GETKLASS"></a><h3>xmlSecNssTransformKWAes128GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformKWAes128GetKlass  (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformKWAes128GetKlass  (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The AES-128 key wrapper transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26929"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36326"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> AES-128 key wrapper transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -452,17 +434,15 @@
 <a name="XMLSECNSSTRANSFORMKWAES192ID"></a><h3>xmlSecNssTransformKWAes192Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformKWAes192Id</pre>
 <p>The AES 192 key wrap transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMKWAES192GETKLASS"></a><h3>xmlSecNssTransformKWAes192GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformKWAes192GetKlass  (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformKWAes192GetKlass  (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The AES-192 key wrapper transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26950"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36348"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> AES-192 key wrapper transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -471,17 +451,15 @@
 <a name="XMLSECNSSTRANSFORMKWAES256ID"></a><h3>xmlSecNssTransformKWAes256Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformKWAes256Id</pre>
 <p>The AES 256 key wrap transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMKWAES256GETKLASS"></a><h3>xmlSecNssTransformKWAes256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformKWAes256GetKlass  (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformKWAes256GetKlass  (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The AES-256 key wrapper transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26971"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36370"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> AES-256 key wrapper transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -490,44 +468,41 @@
 <a name="XMLSECNSSKEYDATADESID"></a><h3>xmlSecNssKeyDataDesId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssKeyDataDesId</pre>
 <p>The DES key data klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYDATADESGETKLASS"></a><h3>xmlSecNssKeyDataDesGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecNssKeyDataDesGetKlass         (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecNssKeyDataDesGetKlass         (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The DES key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26992"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36392"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> DES key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYDATADESSET"></a><h3>xmlSecNssKeyDataDesSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssKeyDataDesSet              (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssKeyDataDesSet              (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);</pre>
 <p>Sets the value of DES key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27009"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to DES key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN36415"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to DES key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27014"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN36420"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27019"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the key value size (in bytes).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN36425"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27024"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36430"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -537,17 +512,15 @@
 <a name="XMLSECNSSTRANSFORMDES3CBCID"></a><h3>xmlSecNssTransformDes3CbcId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformDes3CbcId</pre>
 <p>The Triple DES CBC cipher transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMDES3CBCGETKLASS"></a><h3>xmlSecNssTransformDes3CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformDes3CbcGetKlass   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformDes3CbcGetKlass   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Triple DES CBC encryption transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27045"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36452"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to Triple DES encryption transform.</p></td>
 </tr></tbody></table>
 </div>
@@ -555,18 +528,16 @@
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMKWDES3ID"></a><h3>xmlSecNssTransformKWDes3Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformKWDes3Id</pre>
-<p>The DES3 CBC cipher transform klass.</p>
-<p></p>
+<p>The DES3 KW transform klass.</p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMKWDES3GETKLASS"></a><h3>xmlSecNssTransformKWDes3GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformKWDes3GetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformKWDes3GetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The Triple DES key wrapper transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27066"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36474"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> Triple DES key wrapper transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -575,17 +546,15 @@
 <a name="XMLSECNSSKEYDATADSAID"></a><h3>xmlSecNssKeyDataDsaId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssKeyDataDsaId</pre>
 <p>The DSA key klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYDATADSAGETKLASS"></a><h3>xmlSecNssKeyDataDsaGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecNssKeyDataDsaGetKlass         (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecNssKeyDataDsaGetKlass         (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The DSA key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27087"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36496"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to DSA key data klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -594,42 +563,38 @@
 <a name="XMLSECNSSTRANSFORMDSASHA1ID"></a><h3>xmlSecNssTransformDsaSha1Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformDsaSha1Id</pre>
 <p>The DSA SHA1 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMDSASHA1GETKLASS"></a><h3>xmlSecNssTransformDsaSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformDsaSha1GetKlass   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformDsaSha1GetKlass   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The DSA-SHA1 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27108"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36518"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> DSA-SHA1 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSHMACGETMINOUTPUTLENGTH"></a><h3>xmlSecNssHmacGetMinOutputLength ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssHmacGetMinOutputLength     (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssHmacGetMinOutputLength     (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Gets the value of min HMAC length.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27122"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36534"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the min HMAC output length</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSHMACSETMINOUTPUTLENGTH"></a><h3>xmlSecNssHmacSetMinOutputLength ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecNssHmacSetMinOutputLength     (<font>int</font> min_length);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecNssHmacSetMinOutputLength     (<code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> min_length</code>);</pre>
 <p>Sets the min HMAC output length</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27137"><span style="white-space: nowrap"><code class="PARAMETER">min_length</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the new min length</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN36551"><span style="white-space: nowrap"><code class="PARAMETER">min_length</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new min length</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -637,44 +602,41 @@
 <a name="XMLSECNSSKEYDATAHMACID"></a><h3>xmlSecNssKeyDataHmacId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssKeyDataHmacId</pre>
 <p>The DHMAC key data klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYDATAHMACGETKLASS"></a><h3>xmlSecNssKeyDataHmacGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecNssKeyDataHmacGetKlass        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecNssKeyDataHmacGetKlass        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27158"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36573"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> HMAC key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYDATAHMACSET"></a><h3>xmlSecNssKeyDataHmacSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssKeyDataHmacSet             (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssKeyDataHmacSet             (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);</pre>
 <p>Sets the value of HMAC key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27175"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to HMAC key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN36596"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to HMAC key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27180"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN36601"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27185"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the key value size (in bytes).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN36606"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27190"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36611"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -684,17 +646,15 @@
 <a name="XMLSECNSSTRANSFORMHMACMD5ID"></a><h3>xmlSecNssTransformHmacMd5Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformHmacMd5Id</pre>
 <p>The HMAC with MD5 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMHMACMD5GETKLASS"></a><h3>xmlSecNssTransformHmacMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformHmacMd5GetKlass   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformHmacMd5GetKlass   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-MD5 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27211"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36633"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-MD5 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -703,18 +663,16 @@
 <a name="XMLSECNSSTRANSFORMHMACRIPEMD160ID"></a><h3>xmlSecNssTransformHmacRipemd160Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformHmacRipemd160Id</pre>
 <p>The HMAC with RipeMD160 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMHMACRIPEMD160GETKLASS"></a><h3>xmlSecNssTransformHmacRipemd160GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformHmacRipemd160GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformHmacRipemd160GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-RIPEMD160 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27232"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36655"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-RIPEMD160 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -723,17 +681,15 @@
 <a name="XMLSECNSSTRANSFORMHMACSHA1ID"></a><h3>xmlSecNssTransformHmacSha1Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformHmacSha1Id</pre>
 <p>The HMAC with SHA1 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMHMACSHA1GETKLASS"></a><h3>xmlSecNssTransformHmacSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformHmacSha1GetKlass  (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformHmacSha1GetKlass  (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA1 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27253"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36677"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA1 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -742,18 +698,16 @@
 <a name="XMLSECNSSTRANSFORMHMACSHA256ID"></a><h3>xmlSecNssTransformHmacSha256Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformHmacSha256Id</pre>
 <p>The HMAC with SHA256 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMHMACSHA256GETKLASS"></a><h3>xmlSecNssTransformHmacSha256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformHmacSha256GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformHmacSha256GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA256 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27274"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36699"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA256 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -762,18 +716,16 @@
 <a name="XMLSECNSSTRANSFORMHMACSHA384ID"></a><h3>xmlSecNssTransformHmacSha384Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformHmacSha384Id</pre>
 <p>The HMAC with SHA384 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMHMACSHA384GETKLASS"></a><h3>xmlSecNssTransformHmacSha384GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformHmacSha384GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformHmacSha384GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA384 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27295"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36721"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA384 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -782,18 +734,16 @@
 <a name="XMLSECNSSTRANSFORMHMACSHA512ID"></a><h3>xmlSecNssTransformHmacSha512Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformHmacSha512Id</pre>
 <p>The HMAC with SHA512 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMHMACSHA512GETKLASS"></a><h3>xmlSecNssTransformHmacSha512GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformHmacSha512GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformHmacSha512GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA512 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27316"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36743"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA512 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -802,17 +752,15 @@
 <a name="XMLSECNSSKEYDATARSAID"></a><h3>xmlSecNssKeyDataRsaId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssKeyDataRsaId</pre>
 <p>The RSA key klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYDATARSAGETKLASS"></a><h3>xmlSecNssKeyDataRsaGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecNssKeyDataRsaGetKlass         (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecNssKeyDataRsaGetKlass         (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27337"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36765"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to RSA key data klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -821,17 +769,15 @@
 <a name="XMLSECNSSTRANSFORMRSAMD5ID"></a><h3>xmlSecNssTransformRsaMd5Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformRsaMd5Id</pre>
 <p>The RSA-MD5 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMRSAMD5GETKLASS"></a><h3>xmlSecNssTransformRsaMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformRsaMd5GetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformRsaMd5GetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-MD5 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27358"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36787"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-MD5 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -840,17 +786,15 @@
 <a name="XMLSECNSSTRANSFORMRSASHA1ID"></a><h3>xmlSecNssTransformRsaSha1Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformRsaSha1Id</pre>
 <p>The RSA-SHA1 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMRSASHA1GETKLASS"></a><h3>xmlSecNssTransformRsaSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformRsaSha1GetKlass   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformRsaSha1GetKlass   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-SHA1 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27379"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36809"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-SHA1 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -859,17 +803,15 @@
 <a name="XMLSECNSSTRANSFORMRSASHA256ID"></a><h3>xmlSecNssTransformRsaSha256Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformRsaSha256Id</pre>
 <p>The RSA-SHA256 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMRSASHA256GETKLASS"></a><h3>xmlSecNssTransformRsaSha256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformRsaSha256GetKlass (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformRsaSha256GetKlass (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-SHA256 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27400"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36831"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-SHA256 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -878,17 +820,15 @@
 <a name="XMLSECNSSTRANSFORMRSASHA384ID"></a><h3>xmlSecNssTransformRsaSha384Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformRsaSha384Id</pre>
 <p>The RSA-SHA384 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMRSASHA384GETKLASS"></a><h3>xmlSecNssTransformRsaSha384GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformRsaSha384GetKlass (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformRsaSha384GetKlass (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-SHA384 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27421"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36853"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-SHA384 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -897,17 +837,15 @@
 <a name="XMLSECNSSTRANSFORMRSASHA512ID"></a><h3>xmlSecNssTransformRsaSha512Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformRsaSha512Id</pre>
 <p>The RSA-SHA512 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMRSASHA512GETKLASS"></a><h3>xmlSecNssTransformRsaSha512GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformRsaSha512GetKlass (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformRsaSha512GetKlass (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-SHA512 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27442"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36875"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-SHA512 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -916,17 +854,15 @@
 <a name="XMLSECNSSTRANSFORMRSAPKCS1ID"></a><h3>xmlSecNssTransformRsaPkcs1Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformRsaPkcs1Id</pre>
 <p>The RSA PKCS1 key transport transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMRSAPKCS1GETKLASS"></a><h3>xmlSecNssTransformRsaPkcs1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformRsaPkcs1GetKlass  (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformRsaPkcs1GetKlass  (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-PKCS1 key transport transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27463"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36897"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-PKCS1 key transport transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -935,17 +871,15 @@
 <a name="XMLSECNSSTRANSFORMRSAOAEPID"></a><h3>xmlSecNssTransformRsaOaepId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformRsaOaepId</pre>
 <p>The RSA OAEP key transport transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMRSAOAEPGETKLASS"></a><h3>xmlSecNssTransformRsaOaepGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformRsaOaepGetKlass   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformRsaOaepGetKlass   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-PKCS1 key transport transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27484"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36919"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-PKCS1 key transport transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -954,17 +888,15 @@
 <a name="XMLSECNSSTRANSFORMSHA1ID"></a><h3>xmlSecNssTransformSha1Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformSha1Id</pre>
 <p>The SHA1 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMSHA1GETKLASS"></a><h3>xmlSecNssTransformSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformSha1GetKlass      (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformSha1GetKlass      (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA-1 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27505"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36941"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA-1 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -973,17 +905,15 @@
 <a name="XMLSECNSSTRANSFORMSHA256ID"></a><h3>xmlSecNssTransformSha256Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformSha256Id</pre>
 <p>The SHA256 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMSHA256GETKLASS"></a><h3>xmlSecNssTransformSha256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformSha256GetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformSha256GetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA256 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27526"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36963"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA256 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -992,17 +922,15 @@
 <a name="XMLSECNSSTRANSFORMSHA384ID"></a><h3>xmlSecNssTransformSha384Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformSha384Id</pre>
 <p>The SHA384 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMSHA384GETKLASS"></a><h3>xmlSecNssTransformSha384GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformSha384GetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformSha384GetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA384 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27547"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN36985"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA384 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1011,17 +939,15 @@
 <a name="XMLSECNSSTRANSFORMSHA512ID"></a><h3>xmlSecNssTransformSha512Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformSha512Id</pre>
 <p>The SHA512 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMSHA512GETKLASS"></a><h3>xmlSecNssTransformSha512GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformSha512GetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformSha512GetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA512 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27568"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37007"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA512 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1030,17 +956,15 @@
 <a name="XMLSECNSSTRANSFORMMD5ID"></a><h3>xmlSecNssTransformMd5Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssTransformMd5Id</pre>
 <p>The MD5 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSTRANSFORMMD5GETKLASS"></a><h3>xmlSecNssTransformMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformMd5GetKlass       (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecNssTransformMd5GetKlass       (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>MD5 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27589"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37029"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to MD5 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
diff --git a/docs/api/xmlsec-nss-keysstore.html b/docs/api/xmlsec-nss-keysstore.html
index 28a39fb..c64f308 100644
--- a/docs/api/xmlsec-nss-keysstore.html
+++ b/docs/api/xmlsec-nss-keysstore.html
@@ -87,19 +87,19 @@
 <h1>
 <a name="XMLSEC-NSS-KEYSSTORE"></a>keysstore</h1>
 <div class="REFNAMEDIV">
-<a name="AEN27599"></a><h2>Name</h2>keysstore -- Keys store implementation for NSS.</div>
+<a name="AEN37039"></a><h2>Name</h2>keysstore -- Keys store implementation for NSS.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-NSS-KEYSSTORE.SYNOPSIS"></a><h2>Synopsis</h2>
 <pre class="SYNOPSIS">#define             <a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTOREID">xmlSecNssKeysStoreId</a>
-<font>xmlSecKeyStoreId</font>    <a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTOREGETKLASS">xmlSecNssKeysStoreGetKlass</a>          (void);
-<font>int</font>                 <a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTOREADOPTKEY">xmlSecNssKeysStoreAdoptKey</a>          (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>                 <a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTORELOAD">xmlSecNssKeysStoreLoad</a>              (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         const <font>char</font> *uri,
-                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
-<font>int</font>                 <a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTORESAVE">xmlSecNssKeysStoreSave</a>              (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<gtkdoclink href="XMLSECKEYSTOREID"><span class="RETURNVALUE">xmlSecKeyStoreId</span></gtkdoclink><a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTOREGETKLASS">xmlSecNssKeysStoreGetKlass</a>          (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTOREADOPTKEY">xmlSecNssKeysStoreAdoptKey</a>          (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTORELOAD">xmlSecNssKeysStoreLoad</a>              (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *uri</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> keysMngr</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTORESAVE">xmlSecNssKeysStoreSave</a>              (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-NSS-KEYSSTORE.DESCRIPTION"></a><h2>Description</h2>
@@ -111,39 +111,36 @@
 <a name="XMLSECNSSKEYSSTOREID"></a><h3>xmlSecNssKeysStoreId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecNssKeysStoreId            xmlSecNssKeysStoreGetKlass()</pre>
 <p>A Nss keys store klass id.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYSSTOREGETKLASS"></a><h3>xmlSecNssKeysStoreGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyStoreId</font>    xmlSecNssKeysStoreGetKlass          (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYSTOREID"><span class="RETURNVALUE">xmlSecKeyStoreId</span></gtkdoclink>    xmlSecNssKeysStoreGetKlass          (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The Nss list based keys store klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27643"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37106"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> Nss list based keys store klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYSSTOREADOPTKEY"></a><h3>xmlSecNssKeysStoreAdoptKey ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssKeysStoreAdoptKey          (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssKeysStoreAdoptKey          (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);</pre>
 <p>Adds <code class="PARAMETER">key</code> to the <code class="PARAMETER">store</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27661"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to Nss keys store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37128"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to Nss keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27666"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37133"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27671"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37138"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -151,27 +148,26 @@
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYSSTORELOAD"></a><h3>xmlSecNssKeysStoreLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssKeysStoreLoad              (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         const <font>char</font> *uri,
-                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssKeysStoreLoad              (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *uri</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> keysMngr</code>);</pre>
 <p>Reads keys from an XML file.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27688"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to Nss keys store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37161"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to Nss keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27693"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37166"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27698"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to associated keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37171"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to associated keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27703"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37176"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -179,27 +175,26 @@
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYSSTORESAVE"></a><h3>xmlSecNssKeysStoreSave ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssKeysStoreSave              (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssKeysStoreSave              (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE"><span class="TYPE">xmlSecKeyStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Writes keys from <code class="PARAMETER">store</code> to an XML file.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27721"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to Nss keys store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37200"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to Nss keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27726"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37205"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27731"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the saved keys type (public, private, ...).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37210"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the saved keys type (public, private, ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27736"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37215"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
diff --git a/docs/api/xmlsec-nss-pkikeys.html b/docs/api/xmlsec-nss-pkikeys.html
index 5124827..649e486 100644
--- a/docs/api/xmlsec-nss-pkikeys.html
+++ b/docs/api/xmlsec-nss-pkikeys.html
@@ -87,16 +87,16 @@
 <h1>
 <a name="XMLSEC-NSS-PKIKEYS"></a>pkikeys</h1>
 <div class="REFNAMEDIV">
-<a name="AEN27746"></a><h2>Name</h2>pkikeys -- PKI keys data implementation.</div>
+<a name="AEN37225"></a><h2>Name</h2>pkikeys -- PKI keys data implementation.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-NSS-PKIKEYS.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    <a href="xmlsec-nss-pkikeys.html#XMLSECNSSPKIADOPTKEY">xmlSecNssPKIAdoptKey</a>                (<font>SECKEYPrivateKey</font> *privkey,
-                                                         <font>SECKEYPublicKey</font> *pubkey);
-<font>SECKEYPublicKey</font>*    <a href="xmlsec-nss-pkikeys.html#XMLSECNSSPKIKEYDATAGETPUBKEY">xmlSecNssPKIKeyDataGetPubKey</a>        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>SECKEYPrivateKey</font>*   <a href="xmlsec-nss-pkikeys.html#XMLSECNSSPKIKEYDATAGETPRIVKEY">xmlSecNssPKIKeyDataGetPrivKey</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>KeyType</font>             <a href="xmlsec-nss-pkikeys.html#XMLSECNSSPKIKEYDATAGETKEYTYPE">xmlSecNssPKIKeyDataGetKeyType</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>                 <a href="xmlsec-nss-pkikeys.html#XMLSECNSSPKIKEYDATADUPLICATE">xmlSecNssPKIKeyDataDuplicate</a>        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> dst,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> src);</pre>
+<pre class="SYNOPSIS"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="RETURNVALUE">xmlSecKeyDataPtr</span></a>    <a href="xmlsec-nss-pkikeys.html#XMLSECNSSPKIADOPTKEY">xmlSecNssPKIAdoptKey</a>                (<code class="PARAMETER"><gtkdoclink href="SECKEYPRIVATEKEY"><span class="TYPE">SECKEYPrivateKey</span></gtkdoclink> *privkey</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="SECKEYPUBLICKEY"><span class="TYPE">SECKEYPublicKey</span></gtkdoclink> *pubkey</code>);
+<gtkdoclink href="SECKEYPUBLICKEY"><span class="RETURNVALUE">SECKEYPublicKey</span></gtkdoclink>*    <a href="xmlsec-nss-pkikeys.html#XMLSECNSSPKIKEYDATAGETPUBKEY">xmlSecNssPKIKeyDataGetPubKey</a>        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="SECKEYPRIVATEKEY"><span class="RETURNVALUE">SECKEYPrivateKey</span></gtkdoclink>*   <a href="xmlsec-nss-pkikeys.html#XMLSECNSSPKIKEYDATAGETPRIVKEY">xmlSecNssPKIKeyDataGetPrivKey</a>       (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="KEYTYPE"><span class="RETURNVALUE">KeyType</span></gtkdoclink><a href="xmlsec-nss-pkikeys.html#XMLSECNSSPKIKEYDATAGETKEYTYPE">xmlSecNssPKIKeyDataGetKeyType</a>       (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-pkikeys.html#XMLSECNSSPKIKEYDATADUPLICATE">xmlSecNssPKIKeyDataDuplicate</a>        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> dst</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> src</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-NSS-PKIKEYS.DESCRIPTION"></a><h2>Description</h2>
@@ -106,23 +106,22 @@
 <a name="XMLSEC-NSS-PKIKEYS.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
 <a name="XMLSECNSSPKIADOPTKEY"></a><h3>xmlSecNssPKIAdoptKey ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    xmlSecNssPKIAdoptKey                (<font>SECKEYPrivateKey</font> *privkey,
-                                                         <font>SECKEYPublicKey</font> *pubkey);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="RETURNVALUE">xmlSecKeyDataPtr</span></a>    xmlSecNssPKIAdoptKey                (<code class="PARAMETER"><gtkdoclink href="SECKEYPRIVATEKEY"><span class="TYPE">SECKEYPrivateKey</span></gtkdoclink> *privkey</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="SECKEYPUBLICKEY"><span class="TYPE">SECKEYPublicKey</span></gtkdoclink> *pubkey</code>);</pre>
 <p>Build a KeyData object from the given Private Key and Public
 Key handles.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27785"><span style="white-space: nowrap"><code class="PARAMETER">privkey</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the NSS Private Key handle</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37287"><span style="white-space: nowrap"><code class="PARAMETER">privkey</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the NSS Private Key handle</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27790"><span style="white-space: nowrap"><code class="PARAMETER">pubkey</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the NSS Public Key handle</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37292"><span style="white-space: nowrap"><code class="PARAMETER">pubkey</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the NSS Public Key handle</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27795"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37297"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to KeyData object or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -130,17 +129,16 @@ Key handles.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSPKIKEYDATAGETPUBKEY"></a><h3>xmlSecNssPKIKeyDataGetPubKey ()</h3>
-<pre class="PROGRAMLISTING"><font>SECKEYPublicKey</font>*    xmlSecNssPKIKeyDataGetPubKey        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="SECKEYPUBLICKEY"><span class="RETURNVALUE">SECKEYPublicKey</span></gtkdoclink>*    xmlSecNssPKIKeyDataGetPubKey        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets the Public Key from the key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27810"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to NSS Key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37314"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to NSS Key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27815"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37319"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SECKEYPublicKey or NULL if an error occurs.
 Caller is responsible for freeing the key when done</p></td>
 </tr>
@@ -149,17 +147,16 @@ Caller is responsible for freeing the key when done</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSPKIKEYDATAGETPRIVKEY"></a><h3>xmlSecNssPKIKeyDataGetPrivKey ()</h3>
-<pre class="PROGRAMLISTING"><font>SECKEYPrivateKey</font>*   xmlSecNssPKIKeyDataGetPrivKey       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="SECKEYPRIVATEKEY"><span class="RETURNVALUE">SECKEYPrivateKey</span></gtkdoclink>*   xmlSecNssPKIKeyDataGetPrivKey       (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets the Private Key from the key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27830"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to NSS Key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37336"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to NSS Key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27835"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37341"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SECKEYPrivateKey or NULL if an error occurs.
 Caller is responsible for freeing the key when done</p></td>
 </tr>
@@ -168,17 +165,16 @@ Caller is responsible for freeing the key when done</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSPKIKEYDATAGETKEYTYPE"></a><h3>xmlSecNssPKIKeyDataGetKeyType ()</h3>
-<pre class="PROGRAMLISTING"><font>KeyType</font>             xmlSecNssPKIKeyDataGetKeyType       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="KEYTYPE"><span class="RETURNVALUE">KeyType</span></gtkdoclink>             xmlSecNssPKIKeyDataGetKeyType       (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets the Key Type from the key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27850"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to NSS Key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37358"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to NSS Key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27855"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37363"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> Key Type</p></td>
 </tr>
 </tbody></table>
@@ -186,22 +182,21 @@ Caller is responsible for freeing the key when done</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSPKIKEYDATADUPLICATE"></a><h3>xmlSecNssPKIKeyDataDuplicate ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssPKIKeyDataDuplicate        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> dst,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> src);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssPKIKeyDataDuplicate        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> dst</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> src</code>);</pre>
 <p>Duplicates the keydata from src to dst</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27871"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to NSS Key data to copy to.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37383"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to NSS Key data to copy to.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27876"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to NSS Key data to copy from.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37388"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to NSS Key data to copy from.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27881"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37393"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> -1 on error, 0 on success</p></td>
 </tr>
 </tbody></table>
diff --git a/docs/api/xmlsec-nss-ref.html b/docs/api/xmlsec-nss-ref.html
index be7f092..81b0c6d 100644
--- a/docs/api/xmlsec-nss-ref.html
+++ b/docs/api/xmlsec-nss-ref.html
@@ -5,7 +5,7 @@
 <meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library API Reference." href="xmlsec-reference.html">
-<link rel="PREVIOUS" title="crypto" href="xmlsec-gnutls-crypto.html">
+<link rel="PREVIOUS" title="crypto" href="xmlsec-gcrypt-crypto.html">
 <link rel="NEXT" title="app" href="xmlsec-nss-app.html">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
@@ -78,7 +78,7 @@
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
 <table width="100%" class="navigation" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="xmlsec-gnutls-crypto.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="xmlsec-gcrypt-crypto.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td><a accesskey="u" href="xmlsec-reference.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">XML Security Library Reference Manual</th>
@@ -107,7 +107,7 @@
     build by extracting comments from the code sources. </p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-gnutls-crypto.html"><b>&lt;&lt;&lt; crypto</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-gcrypt-crypto.html"><b>&lt;&lt;&lt; crypto</b></a></td>
 <td align="right"><a accesskey="n" href="xmlsec-nss-app.html"><b>app &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
diff --git a/docs/api/xmlsec-nss-x509.html b/docs/api/xmlsec-nss-x509.html
index 7dec817..3e0bd88 100644
--- a/docs/api/xmlsec-nss-x509.html
+++ b/docs/api/xmlsec-nss-x509.html
@@ -87,41 +87,41 @@
 <h1>
 <a name="XMLSEC-NSS-X509"></a>x509</h1>
 <div class="REFNAMEDIV">
-<a name="AEN27891"></a><h2>Name</h2>x509 -- X509 certificates support implementation for NSS.</div>
+<a name="AEN37403"></a><h2>Name</h2>x509 -- X509 certificates support implementation for NSS.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-NSS-X509.SYNOPSIS"></a><h2>Synopsis</h2>
 <pre class="SYNOPSIS">#define             <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509ID">xmlSecNssKeyDataX509Id</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETKLASS">xmlSecNssKeyDataX509GetKlass</a>        (void);
-<font>CERTCertificate</font>*    <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETKEYCERT">xmlSecNssKeyDataX509GetKeyCert</a>      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>                 <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509ADOPTKEYCERT">xmlSecNssKeyDataX509AdoptKeyCert</a>    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>CERTCertificate</font> *cert);
-<font>int</font>                 <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509ADOPTCERT">xmlSecNssKeyDataX509AdoptCert</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>CERTCertificate</font> *cert);
-<font>CERTCertificate</font>*    <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETCERT">xmlSecNssKeyDataX509GetCert</a>         (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETCERTSSIZE">xmlSecNssKeyDataX509GetCertsSize</a>    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>                 <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509ADOPTCRL">xmlSecNssKeyDataX509AdoptCrl</a>        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>CERTSignedCrl</font> *crl);
-<font>CERTSignedCrl</font>*      <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETCRL">xmlSecNssKeyDataX509GetCrl</a>          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETCRLSSIZE">xmlSecNssKeyDataX509GetCrlsSize</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    <a href="xmlsec-nss-x509.html#XMLSECNSSX509CERTGETKEY">xmlSecNssX509CertGetKey</a>             (<font>CERTCertificate</font> *cert);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETKLASS">xmlSecNssKeyDataX509GetKlass</a>        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="CERTCERTIFICATE"><span class="RETURNVALUE">CERTCertificate</span></gtkdoclink>*    <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETKEYCERT">xmlSecNssKeyDataX509GetKeyCert</a>      (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509ADOPTKEYCERT">xmlSecNssKeyDataX509AdoptKeyCert</a>    (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="CERTCERTIFICATE"><span class="TYPE">CERTCertificate</span></gtkdoclink> *cert</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509ADOPTCERT">xmlSecNssKeyDataX509AdoptCert</a>       (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="CERTCERTIFICATE"><span class="TYPE">CERTCertificate</span></gtkdoclink> *cert</code>);
+<gtkdoclink href="CERTCERTIFICATE"><span class="RETURNVALUE">CERTCertificate</span></gtkdoclink>*    <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETCERT">xmlSecNssKeyDataX509GetCert</a>         (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETCERTSSIZE">xmlSecNssKeyDataX509GetCertsSize</a>    (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509ADOPTCRL">xmlSecNssKeyDataX509AdoptCrl</a>        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="CERTSIGNEDCRL"><span class="TYPE">CERTSignedCrl</span></gtkdoclink> *crl</code>);
+<gtkdoclink href="CERTSIGNEDCRL"><span class="RETURNVALUE">CERTSignedCrl</span></gtkdoclink>*      <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETCRL">xmlSecNssKeyDataX509GetCrl</a>          (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETCRLSSIZE">xmlSecNssKeyDataX509GetCrlsSize</a>     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="RETURNVALUE">xmlSecKeyDataPtr</span></a>    <a href="xmlsec-nss-x509.html#XMLSECNSSX509CERTGETKEY">xmlSecNssX509CertGetKey</a>             (<code class="PARAMETER"><gtkdoclink href="CERTCERTIFICATE"><span class="TYPE">CERTCertificate</span></gtkdoclink> *cert</code>);
 #define             <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATARAWX509CERTID">xmlSecNssKeyDataRawX509CertId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATARAWX509CERTGETKLASS">xmlSecNssKeyDataRawX509CertGetKlass</a> (void);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATARAWX509CERTGETKLASS">xmlSecNssKeyDataRawX509CertGetKlass</a> (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-nss-x509.html#XMLSECNSSX509STOREID">xmlSecNssX509StoreId</a>
-<font>xmlSecKeyDataStoreId</font>  <a href="xmlsec-nss-x509.html#XMLSECNSSX509STOREGETKLASS">xmlSecNssX509StoreGetKlass</a>        (void);
-<font>CERTCertificate</font>*    <a href="xmlsec-nss-x509.html#XMLSECNSSX509STOREFINDCERT">xmlSecNssX509StoreFindCert</a>          (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>xmlChar</font> *subjectName,
-                                                         <font>xmlChar</font> *issuerName,
-                                                         <font>xmlChar</font> *issuerSerial,
-                                                         <font>xmlChar</font> *ski,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);
-<font>CERTCertificate</font>*    <a href="xmlsec-nss-x509.html#XMLSECNSSX509STOREVERIFY">xmlSecNssX509StoreVerify</a>            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>CERTCertList</font> *certs,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);
-<font>int</font>                 <a href="xmlsec-nss-x509.html#XMLSECNSSX509STOREADOPTCERT">xmlSecNssX509StoreAdoptCert</a>         (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>CERTCertificate</font> *cert,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<gtkdoclink href="XMLSECKEYDATASTOREID"><span class="RETURNVALUE">xmlSecKeyDataStoreId</span></gtkdoclink><a href="xmlsec-nss-x509.html#XMLSECNSSX509STOREGETKLASS">xmlSecNssX509StoreGetKlass</a>        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="CERTCERTIFICATE"><span class="RETURNVALUE">CERTCertificate</span></gtkdoclink>*    <a href="xmlsec-nss-x509.html#XMLSECNSSX509STOREFINDCERT">xmlSecNssX509StoreFindCert</a>          (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *subjectName</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *issuerName</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *issuerSerial</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *ski</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtx</span></a> *keyInfoCtx</code>);
+<gtkdoclink href="CERTCERTIFICATE"><span class="RETURNVALUE">CERTCertificate</span></gtkdoclink>*    <a href="xmlsec-nss-x509.html#XMLSECNSSX509STOREVERIFY">xmlSecNssX509StoreVerify</a>            (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="CERTCERTLIST"><span class="TYPE">CERTCertList</span></gtkdoclink> *certs</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtx</span></a> *keyInfoCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-nss-x509.html#XMLSECNSSX509STOREADOPTCERT">xmlSecNssX509StoreAdoptCert</a>         (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="CERTCERTIFICATE"><span class="TYPE">CERTCertificate</span></gtkdoclink> *cert</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-NSS-X509.DESCRIPTION"></a><h2>Description</h2>
@@ -133,34 +133,31 @@
 <a name="XMLSECNSSKEYDATAX509ID"></a><h3>xmlSecNssKeyDataX509Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssKeyDataX509Id</pre>
 <p>The NSS X509 data klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYDATAX509GETKLASS"></a><h3>xmlSecNssKeyDataX509GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecNssKeyDataX509GetKlass        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecNssKeyDataX509GetKlass        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The NSS X509 key data klass (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-X509DATA"><span class="TYPE">sec-X509Data</span></gtkdoclink>).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27979"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37565"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the X509 data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYDATAX509GETKEYCERT"></a><h3>xmlSecNssKeyDataX509GetKeyCert ()</h3>
-<pre class="PROGRAMLISTING"><font>CERTCertificate</font>*    xmlSecNssKeyDataX509GetKeyCert      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="CERTCERTIFICATE"><span class="RETURNVALUE">CERTCertificate</span></gtkdoclink>*    xmlSecNssKeyDataX509GetKeyCert      (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets the certificate from which the key was extracted.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27994"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37582"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27999"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37587"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the key's certificate or NULL if key data was not used for key
 extraction or an error occurs.</p></td>
 </tr>
@@ -169,22 +166,21 @@ extraction or an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYDATAX509ADOPTKEYCERT"></a><h3>xmlSecNssKeyDataX509AdoptKeyCert ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssKeyDataX509AdoptKeyCert    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>CERTCertificate</font> *cert);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssKeyDataX509AdoptKeyCert    (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="CERTCERTIFICATE"><span class="TYPE">CERTCertificate</span></gtkdoclink> *cert</code>);</pre>
 <p>Sets the key's certificate in <code class="PARAMETER">data</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28016"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37608"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28021"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to NSS X509 certificate.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37613"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to NSS X509 certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28026"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37618"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -192,22 +188,21 @@ extraction or an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYDATAX509ADOPTCERT"></a><h3>xmlSecNssKeyDataX509AdoptCert ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssKeyDataX509AdoptCert       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>CERTCertificate</font> *cert);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssKeyDataX509AdoptCert       (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="CERTCERTIFICATE"><span class="TYPE">CERTCertificate</span></gtkdoclink> *cert</code>);</pre>
 <p>Adds certificate to the X509 key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28042"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37638"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28047"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to NSS X509 certificate.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37643"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to NSS X509 certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28052"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37648"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -215,22 +210,21 @@ extraction or an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYDATAX509GETCERT"></a><h3>xmlSecNssKeyDataX509GetCert ()</h3>
-<pre class="PROGRAMLISTING"><font>CERTCertificate</font>*    xmlSecNssKeyDataX509GetCert         (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="CERTCERTIFICATE"><span class="RETURNVALUE">CERTCertificate</span></gtkdoclink>*    xmlSecNssKeyDataX509GetCert         (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);</pre>
 <p>Gets a certificate from X509 key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28068"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37668"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28073"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the desired certificate position.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37673"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired certificate position.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28078"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37678"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to certificate or NULL if <code class="PARAMETER">pos</code> is larger than the
 number of certificates in <code class="PARAMETER">data</code> or an error occurs.</p></td>
 </tr>
@@ -239,17 +233,16 @@ number of certificates in <code class="PARAMETER">data</code> or an error occurs
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYDATAX509GETCERTSSIZE"></a><h3>xmlSecNssKeyDataX509GetCertsSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecNssKeyDataX509GetCertsSize    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          xmlSecNssKeyDataX509GetCertsSize    (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets the number of certificates in <code class="PARAMETER">data</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28096"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37698"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28101"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37703"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> te number of certificates in <code class="PARAMETER">data</code>.</p></td>
 </tr>
 </tbody></table>
@@ -257,22 +250,21 @@ number of certificates in <code class="PARAMETER">data</code> or an error occurs
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYDATAX509ADOPTCRL"></a><h3>xmlSecNssKeyDataX509AdoptCrl ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssKeyDataX509AdoptCrl        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>CERTSignedCrl</font> *crl);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssKeyDataX509AdoptCrl        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="CERTSIGNEDCRL"><span class="TYPE">CERTSignedCrl</span></gtkdoclink> *crl</code>);</pre>
 <p>Adds CRL to the X509 key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28118"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37724"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28123"><span style="white-space: nowrap"><code class="PARAMETER">crl</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to NSS X509 CRL.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37729"><span style="white-space: nowrap"><code class="PARAMETER">crl</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to NSS X509 CRL.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28128"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37734"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -280,22 +272,21 @@ number of certificates in <code class="PARAMETER">data</code> or an error occurs
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYDATAX509GETCRL"></a><h3>xmlSecNssKeyDataX509GetCrl ()</h3>
-<pre class="PROGRAMLISTING"><font>CERTSignedCrl</font>*      xmlSecNssKeyDataX509GetCrl          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="CERTSIGNEDCRL"><span class="RETURNVALUE">CERTSignedCrl</span></gtkdoclink>*      xmlSecNssKeyDataX509GetCrl          (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);</pre>
 <p>Gets a CRL from X509 key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28144"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37754"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28149"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the desired CRL position.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37759"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired CRL position.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28154"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37764"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to CRL or NULL if <code class="PARAMETER">pos</code> is larger than the
 number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></td>
 </tr>
@@ -304,17 +295,16 @@ number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></t
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYDATAX509GETCRLSSIZE"></a><h3>xmlSecNssKeyDataX509GetCrlsSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecNssKeyDataX509GetCrlsSize     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          xmlSecNssKeyDataX509GetCrlsSize     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets the number of CRLs in <code class="PARAMETER">data</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28172"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37784"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28177"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37789"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> te number of CRLs in <code class="PARAMETER">data</code>.</p></td>
 </tr>
 </tbody></table>
@@ -322,17 +312,16 @@ number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></t
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSX509CERTGETKEY"></a><h3>xmlSecNssX509CertGetKey ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    xmlSecNssX509CertGetKey             (<font>CERTCertificate</font> *cert);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="RETURNVALUE">xmlSecKeyDataPtr</span></a>    xmlSecNssX509CertGetKey             (<code class="PARAMETER"><gtkdoclink href="CERTCERTIFICATE"><span class="TYPE">CERTCertificate</span></gtkdoclink> *cert</code>);</pre>
 <p>Extracts public key from the <code class="PARAMETER">cert</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28194"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the certificate.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37808"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28199"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37813"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> public key value or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -342,17 +331,15 @@ number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></t
 <a name="XMLSECNSSKEYDATARAWX509CERTID"></a><h3>xmlSecNssKeyDataRawX509CertId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssKeyDataRawX509CertId</pre>
 <p>The NSS raw X509 certificate klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSKEYDATARAWX509CERTGETKLASS"></a><h3>xmlSecNssKeyDataRawX509CertGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecNssKeyDataRawX509CertGetKlass (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecNssKeyDataRawX509CertGetKlass (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The raw X509 certificates key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN28220"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37835"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> raw X509 certificates key data klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -361,59 +348,56 @@ number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></t
 <a name="XMLSECNSSX509STOREID"></a><h3>xmlSecNssX509StoreId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecNssX509StoreId</pre>
 <p>The NSS X509 store klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSX509STOREGETKLASS"></a><h3>xmlSecNssX509StoreGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataStoreId</font>  xmlSecNssX509StoreGetKlass        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATASTOREID"><span class="RETURNVALUE">xmlSecKeyDataStoreId</span></gtkdoclink>  xmlSecNssX509StoreGetKlass        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The NSS X509 certificates key data store klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN28241"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37857"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to NSS X509 certificates key data store klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSX509STOREFINDCERT"></a><h3>xmlSecNssX509StoreFindCert ()</h3>
-<pre class="PROGRAMLISTING"><font>CERTCertificate</font>*    xmlSecNssX509StoreFindCert          (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>xmlChar</font> *subjectName,
-                                                         <font>xmlChar</font> *issuerName,
-                                                         <font>xmlChar</font> *issuerSerial,
-                                                         <font>xmlChar</font> *ski,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="CERTCERTIFICATE"><span class="RETURNVALUE">CERTCertificate</span></gtkdoclink>*    xmlSecNssX509StoreFindCert          (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *subjectName</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *issuerName</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *issuerSerial</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *ski</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtx</span></a> *keyInfoCtx</code>);</pre>
 <p>Searches <code class="PARAMETER">store</code> for a certificate that matches given criteria.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28262"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to X509 key data store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37890"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28267"><span style="white-space: nowrap"><code class="PARAMETER">subjectName</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the desired certificate name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37895"><span style="white-space: nowrap"><code class="PARAMETER">subjectName</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired certificate name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28272"><span style="white-space: nowrap"><code class="PARAMETER">issuerName</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the desired certificate issuer name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37900"><span style="white-space: nowrap"><code class="PARAMETER">issuerName</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired certificate issuer name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28277"><span style="white-space: nowrap"><code class="PARAMETER">issuerSerial</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the desired certificate issuer serial number.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37905"><span style="white-space: nowrap"><code class="PARAMETER">issuerSerial</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired certificate issuer serial number.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28282"><span style="white-space: nowrap"><code class="PARAMETER">ski</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the desired certificate SKI.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37910"><span style="white-space: nowrap"><code class="PARAMETER">ski</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired certificate SKI.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28287"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37915"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28293"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37921"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to found certificate or NULL if certificate is not found
 or an error occurs.</p></td>
 </tr>
@@ -422,27 +406,26 @@ or an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSX509STOREVERIFY"></a><h3>xmlSecNssX509StoreVerify ()</h3>
-<pre class="PROGRAMLISTING"><font>CERTCertificate</font>*    xmlSecNssX509StoreVerify            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>CERTCertList</font> *certs,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="CERTCERTIFICATE"><span class="RETURNVALUE">CERTCertificate</span></gtkdoclink>*    xmlSecNssX509StoreVerify            (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="CERTCERTLIST"><span class="TYPE">CERTCertList</span></gtkdoclink> *certs</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtx</span></a> *keyInfoCtx</code>);</pre>
 <p>Verifies <code class="PARAMETER">certs</code> list.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28311"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to X509 key data store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37945"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28316"><span style="white-space: nowrap"><code class="PARAMETER">certs</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the untrusted certificates stack.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37950"><span style="white-space: nowrap"><code class="PARAMETER">certs</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the untrusted certificates stack.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28321"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37955"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28327"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN37961"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the first verified certificate from <code class="PARAMETER">certs</code>.</p></td>
 </tr>
 </tbody></table>
@@ -450,27 +433,26 @@ or an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNSSX509STOREADOPTCERT"></a><h3>xmlSecNssX509StoreAdoptCert ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssX509StoreAdoptCert         (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>CERTCertificate</font> *cert,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNssX509StoreAdoptCert         (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="CERTCERTIFICATE"><span class="TYPE">CERTCertificate</span></gtkdoclink> *cert</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Adds trusted (root) or untrusted certificate to the store.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28345"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to X509 key data store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37985"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28350"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to NSS X509 certificate.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37990"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to NSS X509 certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28355"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the certificate type (trusted/untrusted).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN37995"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate type (trusted/untrusted).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28360"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN38000"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
diff --git a/docs/api/xmlsec-openssl-app.html b/docs/api/xmlsec-openssl-app.html
index 8aa4a61..5a6ec35 100644
--- a/docs/api/xmlsec-openssl-app.html
+++ b/docs/api/xmlsec-openssl-app.html
@@ -87,83 +87,83 @@
 <h1>
 <a name="XMLSEC-OPENSSL-APP"></a>app</h1>
 <div class="REFNAMEDIV">
-<a name="AEN21137"></a><h2>Name</h2>app -- Application functions implementation for OpenSSL.</div>
+<a name="AEN25875"></a><h2>Name</h2>app -- Application functions implementation for OpenSSL.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-OPENSSL-APP.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS"><font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPINIT">xmlSecOpenSSLAppInit</a>                (const <font>char</font> *config);
-<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPSHUTDOWN">xmlSecOpenSSLAppShutdown</a>            (void);
-<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRINIT">xmlSecOpenSSLAppDefaultKeysMngrInit</a> (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecOpenSSLAppDefaultKeysMngrAdoptKey</a>
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRLOAD">xmlSecOpenSSLAppDefaultKeysMngrLoad</a> (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *uri);
-<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRSAVE">xmlSecOpenSSLAppDefaultKeysMngrSave</a> (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRCERTLOAD">xmlSecOpenSSLAppKeysMngrCertLoad</a>    (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRCERTLOADMEMORY">xmlSecOpenSSLAppKeysMngrCertLoadMemory</a>
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRCERTLOADBIO">xmlSecOpenSSLAppKeysMngrCertLoadBIO</a> (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <font>BIO</font> *bio,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRADDCERTSPATH">xmlSecOpenSSLAppKeysMngrAddCertsPath</a>
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *path);
-<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRADDCERTSFILE">xmlSecOpenSSLAppKeysMngrAddCertsFile</a>
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *file);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYLOAD">xmlSecOpenSSLAppKeyLoad</a>             (const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYLOADMEMORY">xmlSecOpenSSLAppKeyLoadMemory</a>       (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYLOADBIO">xmlSecOpenSSLAppKeyLoadBIO</a>          (<font>BIO</font> *bio,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPPKCS12LOAD">xmlSecOpenSSLAppPkcs12Load</a>          (const <font>char</font> *filename,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPPKCS12LOADMEMORY">xmlSecOpenSSLAppPkcs12LoadMemory</a>    (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPPKCS12LOADBIO">xmlSecOpenSSLAppPkcs12LoadBIO</a>       (<font>BIO</font> *bio,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);
-<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYCERTLOAD">xmlSecOpenSSLAppKeyCertLoad</a>         (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYCERTLOADMEMORY">xmlSecOpenSSLAppKeyCertLoadMemory</a>   (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYCERTLOADBIO">xmlSecOpenSSLAppKeyCertLoadBIO</a>      (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>BIO</font> *bio,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYFROMCERTLOADBIO">xmlSecOpenSSLAppKeyFromCertLoadBIO</a>  (<font>BIO</font> *bio,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>void</font>*               <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPGETDEFAULTPWDCALLBACK">xmlSecOpenSSLAppGetDefaultPwdCallback</a>
-                                                        (void);</pre>
+<pre class="SYNOPSIS"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPINIT">xmlSecOpenSSLAppInit</a>                (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *config</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPSHUTDOWN">xmlSecOpenSSLAppShutdown</a>            (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRINIT">xmlSecOpenSSLAppDefaultKeysMngrInit</a> (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecOpenSSLAppDefaultKeysMngrAdoptKey</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRLOAD">xmlSecOpenSSLAppDefaultKeysMngrLoad</a> (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *uri</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRSAVE">xmlSecOpenSSLAppDefaultKeysMngrSave</a> (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRCERTLOAD">xmlSecOpenSSLAppKeysMngrCertLoad</a>    (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRCERTLOADMEMORY">xmlSecOpenSSLAppKeysMngrCertLoadMemory</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRCERTLOADBIO">xmlSecOpenSSLAppKeysMngrCertLoadBIO</a> (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="BIO:CAPS"><span class="TYPE">BIO</span></gtkdoclink> *bio</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRADDCERTSPATH">xmlSecOpenSSLAppKeysMngrAddCertsPath</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *path</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRADDCERTSFILE">xmlSecOpenSSLAppKeysMngrAddCertsFile</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *file</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYLOAD">xmlSecOpenSSLAppKeyLoad</a>             (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYLOADMEMORY">xmlSecOpenSSLAppKeyLoadMemory</a>       (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYLOADBIO">xmlSecOpenSSLAppKeyLoadBIO</a>          (<code class="PARAMETER"><gtkdoclink href="BIO:CAPS"><span class="TYPE">BIO</span></gtkdoclink> *bio</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPPKCS12LOAD">xmlSecOpenSSLAppPkcs12Load</a>          (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPPKCS12LOADMEMORY">xmlSecOpenSSLAppPkcs12LoadMemory</a>    (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPPKCS12LOADBIO">xmlSecOpenSSLAppPkcs12LoadBIO</a>       (<code class="PARAMETER"><gtkdoclink href="BIO:CAPS"><span class="TYPE">BIO</span></gtkdoclink> *bio</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYCERTLOAD">xmlSecOpenSSLAppKeyCertLoad</a>         (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYCERTLOADMEMORY">xmlSecOpenSSLAppKeyCertLoadMemory</a>   (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYCERTLOADBIO">xmlSecOpenSSLAppKeyCertLoadBIO</a>      (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="BIO:CAPS"><span class="TYPE">BIO</span></gtkdoclink> *bio</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);
+<a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYFROMCERTLOADBIO">xmlSecOpenSSLAppKeyFromCertLoadBIO</a>  (<code class="PARAMETER"><gtkdoclink href="BIO:CAPS"><span class="TYPE">BIO</span></gtkdoclink> *bio</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>*               <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPGETDEFAULTPWDCALLBACK">xmlSecOpenSSLAppGetDefaultPwdCallback</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-OPENSSL-APP.DESCRIPTION"></a><h2>Description</h2>
@@ -173,19 +173,18 @@
 <a name="XMLSEC-OPENSSL-APP.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPINIT"></a><h3>xmlSecOpenSSLAppInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppInit                (const <font>char</font> *config);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLAppInit                (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *config</code>);</pre>
 <p>General crypto engine initialization. This function is used
 by XMLSec command line utility and called before
 <code class="PARAMETER">xmlSecInit</code> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21270"><span style="white-space: nowrap"><code class="PARAMETER">config</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the path to certs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26170"><span style="white-space: nowrap"><code class="PARAMETER">config</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the path to certs.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21275"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26175"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -193,32 +192,30 @@ by XMLSec command line utility and called before
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPSHUTDOWN"></a><h3>xmlSecOpenSSLAppShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppShutdown            (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLAppShutdown            (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after
 <code class="PARAMETER">xmlSecShutdown</code> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN21290"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26192"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPDEFAULTKEYSMNGRINIT"></a><h3>xmlSecOpenSSLAppDefaultKeysMngrInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppDefaultKeysMngrInit (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLAppDefaultKeysMngrInit (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);</pre>
 <p>Initializes <code class="PARAMETER">mngr</code> with simple keys store <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREID"><span class="TYPE">xmlSecSimpleKeysStoreId</span></a>
 and a default OpenSSL crypto key data stores.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21308"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26212"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21313"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26217"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -226,24 +223,23 @@ and a default OpenSSL crypto key data stores.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPDEFAULTKEYSMNGRADOPTKEY"></a><h3>xmlSecOpenSSLAppDefaultKeysMngrAdoptKey ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppDefaultKeysMngrAdoptKey
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLAppDefaultKeysMngrAdoptKey
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);</pre>
 <p>Adds <code class="PARAMETER">key</code> to the keys manager <code class="PARAMETER">mngr</code> created with <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecOpenSSLAppDefaultKeysMngrInit</span></a>
 function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21333"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26241"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21338"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26246"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21343"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26251"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -251,23 +247,22 @@ function.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPDEFAULTKEYSMNGRLOAD"></a><h3>xmlSecOpenSSLAppDefaultKeysMngrLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppDefaultKeysMngrLoad (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *uri);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLAppDefaultKeysMngrLoad (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *uri</code>);</pre>
 <p>Loads XML keys file from <code class="PARAMETER">uri</code> to the keys manager <code class="PARAMETER">mngr</code> created
 with <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecOpenSSLAppDefaultKeysMngrInit</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21363"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26275"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21368"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the uri.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26280"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the uri.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21373"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26285"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -275,27 +270,26 @@ with <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRINIT"><span
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPDEFAULTKEYSMNGRSAVE"></a><h3>xmlSecOpenSSLAppDefaultKeysMngrSave ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppDefaultKeysMngrSave (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLAppDefaultKeysMngrSave (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Saves keys from <code class="PARAMETER">mngr</code> to  XML keys file.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21391"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26309"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21396"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the destination filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26314"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the destination filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21401"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the type of keys to save (public/private/symmetric).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26319"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the type of keys to save (public/private/symmetric).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21406"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26324"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -303,34 +297,33 @@ with <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRINIT"><span
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPKEYSMNGRCERTLOAD"></a><h3>xmlSecOpenSSLAppKeysMngrCertLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppKeysMngrCertLoad    (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLAppKeysMngrCertLoad    (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Reads cert from <code class="PARAMETER">filename</code> and adds to the list of trusted or known
 untrusted certs in <code class="PARAMETER">store</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21426"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26352"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21431"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the certificate file.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26357"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21436"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26362"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21441"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the flag that indicates is the certificate in <code class="PARAMETER">filename</code>
+<td align="LEFT" valign="TOP"><a name="AEN26367"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag that indicates is the certificate in <code class="PARAMETER">filename</code>
                      trusted or not.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21447"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26373"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -338,39 +331,38 @@ untrusted certs in <code class="PARAMETER">store</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPKEYSMNGRCERTLOADMEMORY"></a><h3>xmlSecOpenSSLAppKeysMngrCertLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppKeysMngrCertLoadMemory
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLAppKeysMngrCertLoadMemory
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Reads cert from binary buffer <code class="PARAMETER">data</code> and adds to the list of trusted or known
 untrusted certs in <code class="PARAMETER">store</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21468"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26404"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21473"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the certificate binary data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26409"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21478"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the certificate binary data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26414"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21483"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26419"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21488"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the flag that indicates is the certificate trusted or not.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26424"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag that indicates is the certificate trusted or not.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21493"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26429"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -378,33 +370,32 @@ untrusted certs in <code class="PARAMETER">store</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPKEYSMNGRCERTLOADBIO"></a><h3>xmlSecOpenSSLAppKeysMngrCertLoadBIO ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppKeysMngrCertLoadBIO (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         <font>BIO</font> *bio,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLAppKeysMngrCertLoadBIO (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="BIO:CAPS"><span class="TYPE">BIO</span></gtkdoclink> *bio</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Reads cert from an OpenSSL BIO object and adds to the list of trusted or known
 untrusted certs in <code class="PARAMETER">store</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21512"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26456"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21517"><span style="white-space: nowrap"><code class="PARAMETER">bio</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the certificate BIO.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26461"><span style="white-space: nowrap"><code class="PARAMETER">bio</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate BIO.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21522"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26466"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21527"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the flag that indicates is the certificate trusted or not.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26471"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag that indicates is the certificate trusted or not.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21532"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26476"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -412,23 +403,22 @@ untrusted certs in <code class="PARAMETER">store</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPKEYSMNGRADDCERTSPATH"></a><h3>xmlSecOpenSSLAppKeysMngrAddCertsPath ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppKeysMngrAddCertsPath
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *path);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLAppKeysMngrAddCertsPath
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *path</code>);</pre>
 <p>Reads cert from <code class="PARAMETER">path</code> and adds to the list of trusted certificates.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21549"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26497"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21554"><span style="white-space: nowrap"><code class="PARAMETER">path</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the path to trusted certificates.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26502"><span style="white-space: nowrap"><code class="PARAMETER">path</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the path to trusted certificates.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21559"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26507"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -436,24 +426,23 @@ untrusted certs in <code class="PARAMETER">store</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPKEYSMNGRADDCERTSFILE"></a><h3>xmlSecOpenSSLAppKeysMngrAddCertsFile ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppKeysMngrAddCertsFile
-                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                                         const <font>char</font> *file);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLAppKeysMngrAddCertsFile
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *file</code>);</pre>
 <p>Reads certs from <code class="PARAMETER">file</code> and adds to the list of trusted certificates.
 It is possible for <code class="PARAMETER">file</code> to contain multiple certs.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21577"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26529"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21582"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the file containing trusted certificates.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26534"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the file containing trusted certificates.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21587"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26539"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -461,37 +450,36 @@ It is possible for <code class="PARAMETER">file</code> to contain multiple certs
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPKEYLOAD"></a><h3>xmlSecOpenSSLAppKeyLoad ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecOpenSSLAppKeyLoad             (const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecOpenSSLAppKeyLoad             (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key from the a file.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21606"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the key filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26568"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21611"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the key file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26573"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21616"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the key file password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26578"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21621"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the key password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26583"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21626"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26588"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21631"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26593"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -499,42 +487,41 @@ It is possible for <code class="PARAMETER">file</code> to contain multiple certs
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPKEYLOADMEMORY"></a><h3>xmlSecOpenSSLAppKeyLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecOpenSSLAppKeyLoadMemory       (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecOpenSSLAppKeyLoadMemory       (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key from the memory buffer.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21651"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the binary key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26625"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21656"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the size of binary key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26630"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the size of binary key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21661"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the key file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26635"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21666"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the key file password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26640"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21671"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the key password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26645"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21676"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26650"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21681"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26655"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -542,37 +529,36 @@ It is possible for <code class="PARAMETER">file</code> to contain multiple certs
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPKEYLOADBIO"></a><h3>xmlSecOpenSSLAppKeyLoadBIO ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecOpenSSLAppKeyLoadBIO          (<font>BIO</font> *bio,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecOpenSSLAppKeyLoadBIO          (<code class="PARAMETER"><gtkdoclink href="BIO:CAPS"><span class="TYPE">BIO</span></gtkdoclink> *bio</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key from the an OpenSSL BIO object.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21700"><span style="white-space: nowrap"><code class="PARAMETER">bio</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the key BIO.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26684"><span style="white-space: nowrap"><code class="PARAMETER">bio</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key BIO.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21705"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the key file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26689"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21710"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the key file password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26694"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21715"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the key password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26699"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21720"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26704"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21725"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26709"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -580,34 +566,33 @@ It is possible for <code class="PARAMETER">file</code> to contain multiple certs
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPPKCS12LOAD"></a><h3>xmlSecOpenSSLAppPkcs12Load ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecOpenSSLAppPkcs12Load          (const <font>char</font> *filename,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecOpenSSLAppPkcs12Load          (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key and all associated certificates from the PKCS12 file.
 For uniformity, call xmlSecOpenSSLAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21743"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the PKCS12 key filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26735"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21748"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the PKCS12 file password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26740"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21753"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26745"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21758"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26750"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21763"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26755"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -615,39 +600,38 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPPKCS12LOADMEMORY"></a><h3>xmlSecOpenSSLAppPkcs12LoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecOpenSSLAppPkcs12LoadMemory    (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecOpenSSLAppPkcs12LoadMemory    (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key and all associated certificates from the PKCS12 data in memory buffer.
 For uniformity, call xmlSecOpenSSLAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21782"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the PKCS12 binary data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26784"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21787"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the PKCS12 binary data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26789"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21792"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the PKCS12 file password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26794"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21797"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26799"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21802"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26804"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21807"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26809"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -655,34 +639,33 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPPKCS12LOADBIO"></a><h3>xmlSecOpenSSLAppPkcs12LoadBIO ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecOpenSSLAppPkcs12LoadBIO       (<font>BIO</font> *bio,
-                                                         const <font>char</font> *pwd,
-                                                         <font>void</font> *pwdCallback,
-                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecOpenSSLAppPkcs12LoadBIO       (<code class="PARAMETER"><gtkdoclink href="BIO:CAPS"><span class="TYPE">BIO</span></gtkdoclink> *bio</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *pwd</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallback</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *pwdCallbackCtx</code>);</pre>
 <p>Reads key and all associated certificates from the PKCS12 data in an OpenSSL BIO object.
 For uniformity, call xmlSecOpenSSLAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21825"><span style="white-space: nowrap"><code class="PARAMETER">bio</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the PKCS12 key bio.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26835"><span style="white-space: nowrap"><code class="PARAMETER">bio</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 key bio.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21830"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the PKCS12 file password.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26840"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21835"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26845"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21840"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the user context for password callback.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26850"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21845"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26855"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -690,27 +673,26 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPKEYCERTLOAD"></a><h3>xmlSecOpenSSLAppKeyCertLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppKeyCertLoad         (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <font>char</font> *filename,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLAppKeyCertLoad         (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);</pre>
 <p>Reads the certificate from $<code class="PARAMETER">filename</code> and adds it to key.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21863"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26879"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21868"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the certificate filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26884"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21873"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26889"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21878"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26894"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -718,32 +700,31 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPKEYCERTLOADMEMORY"></a><h3>xmlSecOpenSSLAppKeyCertLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppKeyCertLoadMemory   (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLAppKeyCertLoadMemory   (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);</pre>
 <p>Reads the certificate from memory buffer and adds it to key.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21896"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26920"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21901"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the certificate binary data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26925"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21906"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the certificate binary data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26930"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21911"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26935"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21916"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26940"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -751,27 +732,26 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPKEYCERTLOADBIO"></a><h3>xmlSecOpenSSLAppKeyCertLoadBIO ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppKeyCertLoadBIO      (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                                         <font>BIO</font> *bio,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLAppKeyCertLoadBIO      (<code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="BIO:CAPS"><span class="TYPE">BIO</span></gtkdoclink> *bio</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);</pre>
 <p>Reads the certificate from memory buffer and adds it to key.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21933"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26963"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21938"><span style="white-space: nowrap"><code class="PARAMETER">bio</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the certificate bio.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26968"><span style="white-space: nowrap"><code class="PARAMETER">bio</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate bio.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21943"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the certificate file format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26973"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21948"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26978"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -779,22 +759,21 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPKEYFROMCERTLOADBIO"></a><h3>xmlSecOpenSSLAppKeyFromCertLoadBIO ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecOpenSSLAppKeyFromCertLoadBIO  (<font>BIO</font> *bio,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY"><span class="RETURNVALUE">xmlSecKeyPtr</span></a>        xmlSecOpenSSLAppKeyFromCertLoadBIO  (<code class="PARAMETER"><gtkdoclink href="BIO:CAPS"><span class="TYPE">BIO</span></gtkdoclink> *bio</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT"><span class="TYPE">xmlSecKeyDataFormat</span></a> format</code>);</pre>
 <p>Loads public key from cert.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21964"><span style="white-space: nowrap"><code class="PARAMETER">bio</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the BIO.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26998"><span style="white-space: nowrap"><code class="PARAMETER">bio</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the BIO.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21969"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the cert format.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27003"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the cert format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21974"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27008"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -802,13 +781,12 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLAPPGETDEFAULTPWDCALLBACK"></a><h3>xmlSecOpenSSLAppGetDefaultPwdCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>*               xmlSecOpenSSLAppGetDefaultPwdCallback
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>*               xmlSecOpenSSLAppGetDefaultPwdCallback
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Gets default password callback.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN21988"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27024"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> default password callback.</p></td>
 </tr></tbody></table>
 </div>
diff --git a/docs/api/xmlsec-openssl-bn.html b/docs/api/xmlsec-openssl-bn.html
index 4ffd3f6..058d1b1 100644
--- a/docs/api/xmlsec-openssl-bn.html
+++ b/docs/api/xmlsec-openssl-bn.html
@@ -87,14 +87,14 @@
 <h1>
 <a name="XMLSEC-OPENSSL-BN"></a>bn</h1>
 <div class="REFNAMEDIV">
-<a name="AEN21998"></a><h2>Name</h2>bn -- Big numbers helper functions.</div>
+<a name="AEN27034"></a><h2>Name</h2>bn -- Big numbers helper functions.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-OPENSSL-BN.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS"><font>BIGNUM</font>*             <a href="xmlsec-openssl-bn.html#XMLSECOPENSSLNODEGETBNVALUE">xmlSecOpenSSLNodeGetBNValue</a>         (const <font>xmlNodePtr</font> cur,
-                                                         <font>BIGNUM</font> **a);
-<font>int</font>                 <a href="xmlsec-openssl-bn.html#XMLSECOPENSSLNODESETBNVALUE">xmlSecOpenSSLNodeSetBNValue</a>         (<font>xmlNodePtr</font> cur,
-                                                         const <font>BIGNUM</font> *a,
-                                                         <font>int</font> addLineBreaks);</pre>
+<pre class="SYNOPSIS"><gtkdoclink href="BIGNUM:CAPS"><span class="RETURNVALUE">BIGNUM</span></gtkdoclink>*             <a href="xmlsec-openssl-bn.html#XMLSECOPENSSLNODEGETBNVALUE">xmlSecOpenSSLNodeGetBNValue</a>         (<code class="PARAMETER">const <gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="BIGNUM:CAPS"><span class="TYPE">BIGNUM</span></gtkdoclink> **a</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-bn.html#XMLSECOPENSSLNODESETBNVALUE">xmlSecOpenSSLNodeSetBNValue</a>         (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="BIGNUM:CAPS"><span class="TYPE">BIGNUM</span></gtkdoclink> *a</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> addLineBreaks</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-OPENSSL-BN.DESCRIPTION"></a><h2>Description</h2>
@@ -104,25 +104,24 @@
 <a name="XMLSEC-OPENSSL-BN.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLNODEGETBNVALUE"></a><h3>xmlSecOpenSSLNodeGetBNValue ()</h3>
-<pre class="PROGRAMLISTING"><font>BIGNUM</font>*             xmlSecOpenSSLNodeGetBNValue         (const <font>xmlNodePtr</font> cur,
-                                                         <font>BIGNUM</font> **a);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="BIGNUM:CAPS"><span class="RETURNVALUE">BIGNUM</span></gtkdoclink>*             xmlSecOpenSSLNodeGetBNValue         (<code class="PARAMETER">const <gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="BIGNUM:CAPS"><span class="TYPE">BIGNUM</span></gtkdoclink> **a</code>);</pre>
 <p>Converts the node content from CryptoBinary format
 (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-CRYPTOBINARY"><span class="TYPE">sec-CryptoBinary</span></gtkdoclink>)
 to a BIGNUM. If no BIGNUM buffer provided then a new
 BIGNUM is created (caller is responsible for freeing it).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22031"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the poitner to an XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27083"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the poitner to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22036"><span style="white-space: nowrap"><code class="PARAMETER">a</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the BIGNUM buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27088"><span style="white-space: nowrap"><code class="PARAMETER">a</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the BIGNUM buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22041"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27093"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> a pointer to BIGNUM produced from CryptoBinary string
 or NULL if an error occurs.</p></td>
 </tr>
@@ -131,33 +130,32 @@ or NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLNODESETBNVALUE"></a><h3>xmlSecOpenSSLNodeSetBNValue ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLNodeSetBNValue         (<font>xmlNodePtr</font> cur,
-                                                         const <font>BIGNUM</font> *a,
-                                                         <font>int</font> addLineBreaks);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLNodeSetBNValue         (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="BIGNUM:CAPS"><span class="TYPE">BIGNUM</span></gtkdoclink> *a</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> addLineBreaks</code>);</pre>
 <p>Converts BIGNUM to CryptoBinary string
 (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-CRYPTOBINARY"><span class="TYPE">sec-CryptoBinary</span></gtkdoclink>)
 and sets it as the content of the given node. If the
 addLineBreaks is set then line breaks are added
 before and after the CryptoBinary string.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22060"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the pointer to an XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27118"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22065"><span style="white-space: nowrap"><code class="PARAMETER">a</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the BIGNUM.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27123"><span style="white-space: nowrap"><code class="PARAMETER">a</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the BIGNUM.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22070"><span style="white-space: nowrap"><code class="PARAMETER">addLineBreaks</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> if the flag is equal to 1 then
+<td align="LEFT" valign="TOP"><a name="AEN27128"><span style="white-space: nowrap"><code class="PARAMETER">addLineBreaks</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>if the flag is equal to 1 then
              linebreaks will be added before and after
              new buffer content.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22075"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27133"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or -1 otherwise.</p></td>
 </tr>
 </tbody></table>
diff --git a/docs/api/xmlsec-openssl-crypto.html b/docs/api/xmlsec-openssl-crypto.html
index d9acb33..dcd6828 100644
--- a/docs/api/xmlsec-openssl-crypto.html
+++ b/docs/api/xmlsec-openssl-crypto.html
@@ -87,156 +87,156 @@
 <h1>
 <a name="XMLSEC-OPENSSL-CRYPTO"></a>crypto</h1>
 <div class="REFNAMEDIV">
-<a name="AEN22085"></a><h2>Name</h2>crypto -- Crypto transforms implementation for OpenSSL.</div>
+<a name="AEN27143"></a><h2>Name</h2>crypto -- Crypto transforms implementation for OpenSSL.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-OPENSSL-CRYPTO.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS"><font>xmlSecCryptoDLFunctionsPtr</font>  <a href="xmlsec-openssl-crypto.html#XMLSECCRYPTOGETFUNCTIONS-OPENSSL">xmlSecCryptoGetFunctions_openssl</a>
-                                                        (void);
-<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLINIT">xmlSecOpenSSLInit</a>                   (void);
-<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLSHUTDOWN">xmlSecOpenSSLShutdown</a>               (void);
-<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYSMNGRINIT">xmlSecOpenSSLKeysMngrInit</a>           (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGENERATERANDOM">xmlSecOpenSSLGenerateRandom</a>         (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLSETDEFAULTTRUSTEDCERTSFOLDER">xmlSecOpenSSLSetDefaultTrustedCertsFolder</a>
-                                                        (const <font>xmlChar</font> *path);
-const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGETDEFAULTTRUSTEDCERTSFOLDER">xmlSecOpenSSLGetDefaultTrustedCertsFolder</a>
-                                                        (void);
+<pre class="SYNOPSIS"><gtkdoclink href="XMLSECCRYPTODLFUNCTIONS"><span class="RETURNVALUE">xmlSecCryptoDLFunctionsPtr</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECCRYPTOGETFUNCTIONS-OPENSSL">xmlSecCryptoGetFunctions_openssl</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLINIT">xmlSecOpenSSLInit</a>                   (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLSHUTDOWN">xmlSecOpenSSLShutdown</a>               (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYSMNGRINIT">xmlSecOpenSSLKeysMngrInit</a>           (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGENERATERANDOM">xmlSecOpenSSLGenerateRandom</a>         (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buffer</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLSETDEFAULTTRUSTEDCERTSFOLDER">xmlSecOpenSSLSetDefaultTrustedCertsFolder</a>
+                                                        (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *path</code>);
+const <gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGETDEFAULTTRUSTEDCERTSFOLDER">xmlSecOpenSSLGetDefaultTrustedCertsFolder</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAAESID">xmlSecOpenSSLKeyDataAesId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAAESGETKLASS">xmlSecOpenSSLKeyDataAesGetKlass</a>     (void);
-<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAAESSET">xmlSecOpenSSLKeyDataAesSet</a>          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAAESGETKLASS">xmlSecOpenSSLKeyDataAesGetKlass</a>     (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAAESSET">xmlSecOpenSSLKeyDataAesSet</a>          (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES128CBCID">xmlSecOpenSSLTransformAes128CbcId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES128CBCGETKLASS">xmlSecOpenSSLTransformAes128CbcGetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES128CBCGETKLASS">xmlSecOpenSSLTransformAes128CbcGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES192CBCID">xmlSecOpenSSLTransformAes192CbcId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES192CBCGETKLASS">xmlSecOpenSSLTransformAes192CbcGetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES192CBCGETKLASS">xmlSecOpenSSLTransformAes192CbcGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES256CBCID">xmlSecOpenSSLTransformAes256CbcId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES256CBCGETKLASS">xmlSecOpenSSLTransformAes256CbcGetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES256CBCGETKLASS">xmlSecOpenSSLTransformAes256CbcGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES128ID">xmlSecOpenSSLTransformKWAes128Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES128GETKLASS">xmlSecOpenSSLTransformKWAes128GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES128GETKLASS">xmlSecOpenSSLTransformKWAes128GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES192ID">xmlSecOpenSSLTransformKWAes192Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES192GETKLASS">xmlSecOpenSSLTransformKWAes192GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES192GETKLASS">xmlSecOpenSSLTransformKWAes192GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES256ID">xmlSecOpenSSLTransformKWAes256Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES256GETKLASS">xmlSecOpenSSLTransformKWAes256GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES256GETKLASS">xmlSecOpenSSLTransformKWAes256GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADESID">xmlSecOpenSSLKeyDataDesId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADESGETKLASS">xmlSecOpenSSLKeyDataDesGetKlass</a>     (void);
-<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADESSET">xmlSecOpenSSLKeyDataDesSet</a>          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADESGETKLASS">xmlSecOpenSSLKeyDataDesGetKlass</a>     (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADESSET">xmlSecOpenSSLKeyDataDesSet</a>          (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMDES3CBCID">xmlSecOpenSSLTransformDes3CbcId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMDES3CBCGETKLASS">xmlSecOpenSSLTransformDes3CbcGetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMDES3CBCGETKLASS">xmlSecOpenSSLTransformDes3CbcGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWDES3ID">xmlSecOpenSSLTransformKWDes3Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWDES3GETKLASS">xmlSecOpenSSLTransformKWDes3GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWDES3GETKLASS">xmlSecOpenSSLTransformKWDes3GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAID">xmlSecOpenSSLKeyDataDsaId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAGETKLASS">xmlSecOpenSSLKeyDataDsaGetKlass</a>     (void);
-<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAADOPTDSA">xmlSecOpenSSLKeyDataDsaAdoptDsa</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>DSA</font> *dsa);
-<font>DSA</font>*                <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAGETDSA">xmlSecOpenSSLKeyDataDsaGetDsa</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAADOPTEVP">xmlSecOpenSSLKeyDataDsaAdoptEvp</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>EVP_PKEY</font> *pKey);
-<font>EVP_PKEY</font>*           <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAGETEVP">xmlSecOpenSSLKeyDataDsaGetEvp</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAGETKLASS">xmlSecOpenSSLKeyDataDsaGetKlass</a>     (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAADOPTDSA">xmlSecOpenSSLKeyDataDsaAdoptDsa</a>     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="DSA:CAPS"><span class="TYPE">DSA</span></gtkdoclink> *dsa</code>);
+<gtkdoclink href="DSA:CAPS"><span class="RETURNVALUE">DSA</span></gtkdoclink>*                <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAGETDSA">xmlSecOpenSSLKeyDataDsaGetDsa</a>       (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAADOPTEVP">xmlSecOpenSSLKeyDataDsaAdoptEvp</a>     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="EVP-PKEY:CAPS"><span class="TYPE">EVP_PKEY</span></gtkdoclink> *pKey</code>);
+<gtkdoclink href="EVP-PKEY:CAPS"><span class="RETURNVALUE">EVP_PKEY</span></gtkdoclink>*           <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAGETEVP">xmlSecOpenSSLKeyDataDsaGetEvp</a>       (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMDSASHA1ID">xmlSecOpenSSLTransformDsaSha1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMDSASHA1GETKLASS">xmlSecOpenSSLTransformDsaSha1GetKlass</a>
-                                                        (void);
-<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLHMACGETMINOUTPUTLENGTH">xmlSecOpenSSLHmacGetMinOutputLength</a> (void);
-<font>void</font>                <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLHMACSETMINOUTPUTLENGTH">xmlSecOpenSSLHmacSetMinOutputLength</a> (<font>int</font> min_length);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMDSASHA1GETKLASS">xmlSecOpenSSLTransformDsaSha1GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLHMACGETMINOUTPUTLENGTH">xmlSecOpenSSLHmacGetMinOutputLength</a> (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLHMACSETMINOUTPUTLENGTH">xmlSecOpenSSLHmacSetMinOutputLength</a> (<code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> min_length</code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAHMACID">xmlSecOpenSSLKeyDataHmacId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAHMACGETKLASS">xmlSecOpenSSLKeyDataHmacGetKlass</a>    (void);
-<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAHMACSET">xmlSecOpenSSLKeyDataHmacSet</a>         (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAHMACGETKLASS">xmlSecOpenSSLKeyDataHmacGetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAHMACSET">xmlSecOpenSSLKeyDataHmacSet</a>         (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACMD5ID">xmlSecOpenSSLTransformHmacMd5Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACMD5GETKLASS">xmlSecOpenSSLTransformHmacMd5GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACMD5GETKLASS">xmlSecOpenSSLTransformHmacMd5GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACRIPEMD160ID">xmlSecOpenSSLTransformHmacRipemd160Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACRIPEMD160GETKLASS">xmlSecOpenSSLTransformHmacRipemd160GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACRIPEMD160GETKLASS">xmlSecOpenSSLTransformHmacRipemd160GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA1ID">xmlSecOpenSSLTransformHmacSha1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA1GETKLASS">xmlSecOpenSSLTransformHmacSha1GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA1GETKLASS">xmlSecOpenSSLTransformHmacSha1GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA224ID">xmlSecOpenSSLTransformHmacSha224Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA224GETKLASS">xmlSecOpenSSLTransformHmacSha224GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA224GETKLASS">xmlSecOpenSSLTransformHmacSha224GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA256ID">xmlSecOpenSSLTransformHmacSha256Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA256GETKLASS">xmlSecOpenSSLTransformHmacSha256GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA256GETKLASS">xmlSecOpenSSLTransformHmacSha256GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA384ID">xmlSecOpenSSLTransformHmacSha384Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA384GETKLASS">xmlSecOpenSSLTransformHmacSha384GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA384GETKLASS">xmlSecOpenSSLTransformHmacSha384GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA512ID">xmlSecOpenSSLTransformHmacSha512Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA512GETKLASS">xmlSecOpenSSLTransformHmacSha512GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA512GETKLASS">xmlSecOpenSSLTransformHmacSha512GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMMD5ID">xmlSecOpenSSLTransformMd5Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMMD5GETKLASS">xmlSecOpenSSLTransformMd5GetKlass</a>   (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMMD5GETKLASS">xmlSecOpenSSLTransformMd5GetKlass</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRIPEMD160ID">xmlSecOpenSSLTransformRipemd160Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRIPEMD160GETKLASS">xmlSecOpenSSLTransformRipemd160GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRIPEMD160GETKLASS">xmlSecOpenSSLTransformRipemd160GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAID">xmlSecOpenSSLKeyDataRsaId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAGETKLASS">xmlSecOpenSSLKeyDataRsaGetKlass</a>     (void);
-<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAADOPTRSA">xmlSecOpenSSLKeyDataRsaAdoptRsa</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>RSA</font> *rsa);
-<font>RSA</font>*                <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAGETRSA">xmlSecOpenSSLKeyDataRsaGetRsa</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAADOPTEVP">xmlSecOpenSSLKeyDataRsaAdoptEvp</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>EVP_PKEY</font> *pKey);
-<font>EVP_PKEY</font>*           <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAGETEVP">xmlSecOpenSSLKeyDataRsaGetEvp</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAGETKLASS">xmlSecOpenSSLKeyDataRsaGetKlass</a>     (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAADOPTRSA">xmlSecOpenSSLKeyDataRsaAdoptRsa</a>     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="RSA:CAPS"><span class="TYPE">RSA</span></gtkdoclink> *rsa</code>);
+<gtkdoclink href="RSA:CAPS"><span class="RETURNVALUE">RSA</span></gtkdoclink>*                <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAGETRSA">xmlSecOpenSSLKeyDataRsaGetRsa</a>       (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAADOPTEVP">xmlSecOpenSSLKeyDataRsaAdoptEvp</a>     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="EVP-PKEY:CAPS"><span class="TYPE">EVP_PKEY</span></gtkdoclink> *pKey</code>);
+<gtkdoclink href="EVP-PKEY:CAPS"><span class="RETURNVALUE">EVP_PKEY</span></gtkdoclink>*           <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAGETEVP">xmlSecOpenSSLKeyDataRsaGetEvp</a>       (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAMD5ID">xmlSecOpenSSLTransformRsaMd5Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAMD5GETKLASS">xmlSecOpenSSLTransformRsaMd5GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAMD5GETKLASS">xmlSecOpenSSLTransformRsaMd5GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSARIPEMD160ID">xmlSecOpenSSLTransformRsaRipemd160Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSARIPEMD160GETKLASS">xmlSecOpenSSLTransformRsaRipemd160GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSARIPEMD160GETKLASS">xmlSecOpenSSLTransformRsaRipemd160GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA1ID">xmlSecOpenSSLTransformRsaSha1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA1GETKLASS">xmlSecOpenSSLTransformRsaSha1GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA1GETKLASS">xmlSecOpenSSLTransformRsaSha1GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA224ID">xmlSecOpenSSLTransformRsaSha224Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA224GETKLASS">xmlSecOpenSSLTransformRsaSha224GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA224GETKLASS">xmlSecOpenSSLTransformRsaSha224GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA256ID">xmlSecOpenSSLTransformRsaSha256Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA256GETKLASS">xmlSecOpenSSLTransformRsaSha256GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA256GETKLASS">xmlSecOpenSSLTransformRsaSha256GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA384ID">xmlSecOpenSSLTransformRsaSha384Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA384GETKLASS">xmlSecOpenSSLTransformRsaSha384GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA384GETKLASS">xmlSecOpenSSLTransformRsaSha384GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA512ID">xmlSecOpenSSLTransformRsaSha512Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA512GETKLASS">xmlSecOpenSSLTransformRsaSha512GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA512GETKLASS">xmlSecOpenSSLTransformRsaSha512GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAPKCS1ID">xmlSecOpenSSLTransformRsaPkcs1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAPKCS1GETKLASS">xmlSecOpenSSLTransformRsaPkcs1GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAPKCS1GETKLASS">xmlSecOpenSSLTransformRsaPkcs1GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAOAEPID">xmlSecOpenSSLTransformRsaOaepId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAOAEPGETKLASS">xmlSecOpenSSLTransformRsaOaepGetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAOAEPGETKLASS">xmlSecOpenSSLTransformRsaOaepGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA1ID">xmlSecOpenSSLTransformSha1Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA1GETKLASS">xmlSecOpenSSLTransformSha1GetKlass</a>  (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA1GETKLASS">xmlSecOpenSSLTransformSha1GetKlass</a>  (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA224ID">xmlSecOpenSSLTransformSha224Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA224GETKLASS">xmlSecOpenSSLTransformSha224GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA224GETKLASS">xmlSecOpenSSLTransformSha224GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA256ID">xmlSecOpenSSLTransformSha256Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA256GETKLASS">xmlSecOpenSSLTransformSha256GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA256GETKLASS">xmlSecOpenSSLTransformSha256GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA384ID">xmlSecOpenSSLTransformSha384Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA384GETKLASS">xmlSecOpenSSLTransformSha384GetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA384GETKLASS">xmlSecOpenSSLTransformSha384GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA512ID">xmlSecOpenSSLTransformSha512Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA512GETKLASS">xmlSecOpenSSLTransformSha512GetKlass</a>
-                                                        (void);
-#define             <a href="xmlsec-openssl-crypto.html#XMLSEC-OPENSSL-ERRORS-LIB--CAPS">XMLSEC_OPENSSL_ERRORS_LIB</a>
-#define             <a href="xmlsec-openssl-crypto.html#XMLSEC-OPENSSL-ERRORS-FUNCTION--CAPS">XMLSEC_OPENSSL_ERRORS_FUNCTION</a>
-<font>void</font>                <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLERRORSDEFAULTCALLBACK">xmlSecOpenSSLErrorsDefaultCallback</a>  (const <font>char</font> *file,
-                                                         <font>int</font> line,
-                                                         const <font>char</font> *func,
-                                                         const <font>char</font> *errorObject,
-                                                         const <font>char</font> *errorSubject,
-                                                         <font>int</font> reason,
-                                                         const <font>char</font> *msg);</pre>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA512GETKLASS">xmlSecOpenSSLTransformSha512GetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSEC-OPENSSL-ERRORS-LIB:CAPS">XMLSEC_OPENSSL_ERRORS_LIB</a>
+#define             <a href="xmlsec-openssl-crypto.html#XMLSEC-OPENSSL-ERRORS-FUNCTION:CAPS">XMLSEC_OPENSSL_ERRORS_FUNCTION</a>
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLERRORSDEFAULTCALLBACK">xmlSecOpenSSLErrorsDefaultCallback</a>  (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *file</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> line</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *func</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorObject</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorSubject</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> reason</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *msg</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-OPENSSL-CRYPTO.DESCRIPTION"></a><h2>Description</h2>
@@ -246,54 +246,50 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSEC-OPENSSL-CRYPTO.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
 <a name="XMLSECCRYPTOGETFUNCTIONS-OPENSSL"></a><h3>xmlSecCryptoGetFunctions_openssl ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecCryptoDLFunctionsPtr</font>  xmlSecCryptoGetFunctions_openssl
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECCRYPTODLFUNCTIONS"><span class="RETURNVALUE">xmlSecCryptoDLFunctionsPtr</span></gtkdoclink>  xmlSecCryptoGetFunctions_openssl
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Gets the pointer to xmlsec-openssl functions table.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22293"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27561"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the xmlsec-openssl functions table or NULL if an error occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLINIT"></a><h3>xmlSecOpenSSLInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLInit                   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLInit                   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>XMLSec library specific crypto engine initialization.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22307"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27577"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLSHUTDOWN"></a><h3>xmlSecOpenSSLShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLShutdown               (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLShutdown               (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>XMLSec library specific crypto engine shutdown.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22321"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27593"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYSMNGRINIT"></a><h3>xmlSecOpenSSLKeysMngrInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeysMngrInit           (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLKeysMngrInit           (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> mngr</code>);</pre>
 <p>Adds OpenSSL specific key data stores in keys manager.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22336"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27610"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22341"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27615"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -301,22 +297,21 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLGENERATERANDOM"></a><h3>xmlSecOpenSSLGenerateRandom ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLGenerateRandom         (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLGenerateRandom         (<code class="PARAMETER"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> buffer</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);</pre>
 <p>Generates <code class="PARAMETER">size</code> random bytes and puts result in <code class="PARAMETER">buffer</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22359"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the destination buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27637"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the destination buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22364"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the numer of bytes to generate.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27642"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the numer of bytes to generate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22369"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27647"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -324,18 +319,17 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLSETDEFAULTTRUSTEDCERTSFOLDER"></a><h3>xmlSecOpenSSLSetDefaultTrustedCertsFolder ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLSetDefaultTrustedCertsFolder
-                                                        (const <font>xmlChar</font> *path);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLSetDefaultTrustedCertsFolder
+                                                        (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *path</code>);</pre>
 <p>Sets the default trusted certs folder.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22384"><span style="white-space: nowrap"><code class="PARAMETER">path</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the default trusted certs path.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27664"><span style="white-space: nowrap"><code class="PARAMETER">path</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the default trusted certs path.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22389"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27669"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -343,13 +337,12 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLGETDEFAULTTRUSTEDCERTSFOLDER"></a><h3>xmlSecOpenSSLGetDefaultTrustedCertsFolder ()</h3>
-<pre class="PROGRAMLISTING">const <font>xmlChar</font>*      xmlSecOpenSSLGetDefaultTrustedCertsFolder
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING">const <gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*      xmlSecOpenSSLGetDefaultTrustedCertsFolder
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Gets the default trusted certs folder.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22403"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27685"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the default trusted cert folder.</p></td>
 </tr></tbody></table>
 </div>
@@ -358,44 +351,41 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLKEYDATAAESID"></a><h3>xmlSecOpenSSLKeyDataAesId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLKeyDataAesId</pre>
 <p>The AES key klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATAAESGETKLASS"></a><h3>xmlSecOpenSSLKeyDataAesGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecOpenSSLKeyDataAesGetKlass     (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecOpenSSLKeyDataAesGetKlass     (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The AES key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22424"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27707"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> AES key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATAAESSET"></a><h3>xmlSecOpenSSLKeyDataAesSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeyDataAesSet          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLKeyDataAesSet          (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);</pre>
 <p>Sets the value of AES key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22441"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to AES key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27730"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to AES key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22446"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27735"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22451"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the key value size (in bytes).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27740"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22456"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27745"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -405,18 +395,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMAES128CBCID"></a><h3>xmlSecOpenSSLTransformAes128CbcId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformAes128CbcId</pre>
 <p>The AES128 CBC cipher transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMAES128CBCGETKLASS"></a><h3>xmlSecOpenSSLTransformAes128CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformAes128CbcGetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformAes128CbcGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>AES 128 CBC encryption transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22477"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27767"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to AES 128 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
@@ -425,18 +413,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMAES192CBCID"></a><h3>xmlSecOpenSSLTransformAes192CbcId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformAes192CbcId</pre>
 <p>The AES192 CBC cipher transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMAES192CBCGETKLASS"></a><h3>xmlSecOpenSSLTransformAes192CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformAes192CbcGetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformAes192CbcGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>AES 192 CBC encryption transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22498"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27789"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to AES 192 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
@@ -445,18 +431,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMAES256CBCID"></a><h3>xmlSecOpenSSLTransformAes256CbcId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformAes256CbcId</pre>
 <p>The AES256 CBC cipher transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMAES256CBCGETKLASS"></a><h3>xmlSecOpenSSLTransformAes256CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformAes256CbcGetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformAes256CbcGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>AES 256 CBC encryption transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22519"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27811"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to AES 256 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
@@ -465,18 +449,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMKWAES128ID"></a><h3>xmlSecOpenSSLTransformKWAes128Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformKWAes128Id</pre>
 <p>The AES 128 key wrap transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMKWAES128GETKLASS"></a><h3>xmlSecOpenSSLTransformKWAes128GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformKWAes128GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformKWAes128GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The AES-128 kew wrapper transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22540"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27833"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> AES-128 kew wrapper transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -485,18 +467,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMKWAES192ID"></a><h3>xmlSecOpenSSLTransformKWAes192Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformKWAes192Id</pre>
 <p>The AES 192 key wrap transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMKWAES192GETKLASS"></a><h3>xmlSecOpenSSLTransformKWAes192GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformKWAes192GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformKWAes192GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The AES-192 kew wrapper transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22561"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27855"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> AES-192 kew wrapper transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -505,18 +485,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMKWAES256ID"></a><h3>xmlSecOpenSSLTransformKWAes256Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformKWAes256Id</pre>
 <p>The AES 256 key wrap transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMKWAES256GETKLASS"></a><h3>xmlSecOpenSSLTransformKWAes256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformKWAes256GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformKWAes256GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The AES-256 kew wrapper transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22582"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27877"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> AES-256 kew wrapper transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -525,44 +503,41 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLKEYDATADESID"></a><h3>xmlSecOpenSSLKeyDataDesId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLKeyDataDesId</pre>
 <p>The DES key klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATADESGETKLASS"></a><h3>xmlSecOpenSSLKeyDataDesGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecOpenSSLKeyDataDesGetKlass     (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecOpenSSLKeyDataDesGetKlass     (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The DES key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22603"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27899"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> DES key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATADESSET"></a><h3>xmlSecOpenSSLKeyDataDesSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeyDataDesSet          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLKeyDataDesSet          (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);</pre>
 <p>Sets the value of DES key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22620"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to DES key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27922"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to DES key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22625"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27927"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22630"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the key value size (in bytes).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27932"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22635"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27937"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -572,18 +547,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMDES3CBCID"></a><h3>xmlSecOpenSSLTransformDes3CbcId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformDes3CbcId</pre>
 <p>The DES3 CBC cipher transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMDES3CBCGETKLASS"></a><h3>xmlSecOpenSSLTransformDes3CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformDes3CbcGetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformDes3CbcGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Triple DES CBC encryption transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22656"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27959"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to Triple DES encryption transform.</p></td>
 </tr></tbody></table>
 </div>
@@ -591,19 +564,17 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMKWDES3ID"></a><h3>xmlSecOpenSSLTransformKWDes3Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformKWDes3Id</pre>
-<p>The DES3 CBC cipher transform klass.</p>
-<p></p>
+<p>The DES3 KW transform klass.</p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMKWDES3GETKLASS"></a><h3>xmlSecOpenSSLTransformKWDes3GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformKWDes3GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformKWDes3GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The Triple DES key wrapper transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22677"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27981"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> Triple DES key wrapper transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -612,39 +583,36 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLKEYDATADSAID"></a><h3>xmlSecOpenSSLKeyDataDsaId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLKeyDataDsaId</pre>
 <p>The DSA key klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATADSAGETKLASS"></a><h3>xmlSecOpenSSLKeyDataDsaGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecOpenSSLKeyDataDsaGetKlass     (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecOpenSSLKeyDataDsaGetKlass     (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The DSA key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22698"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28003"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to DSA key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATADSAADOPTDSA"></a><h3>xmlSecOpenSSLKeyDataDsaAdoptDsa ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeyDataDsaAdoptDsa     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>DSA</font> *dsa);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLKeyDataDsaAdoptDsa     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="DSA:CAPS"><span class="TYPE">DSA</span></gtkdoclink> *dsa</code>);</pre>
 <p>Sets the value of DSA key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22714"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to DSA key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28023"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to DSA key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22719"><span style="white-space: nowrap"><code class="PARAMETER">dsa</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to OpenSSL DSA key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28028"><span style="white-space: nowrap"><code class="PARAMETER">dsa</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to OpenSSL DSA key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22724"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28033"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -652,17 +620,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATADSAGETDSA"></a><h3>xmlSecOpenSSLKeyDataDsaGetDsa ()</h3>
-<pre class="PROGRAMLISTING"><font>DSA</font>*                xmlSecOpenSSLKeyDataDsaGetDsa       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="DSA:CAPS"><span class="RETURNVALUE">DSA</span></gtkdoclink>*                xmlSecOpenSSLKeyDataDsaGetDsa       (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets the OpenSSL DSA key from DSA key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22739"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to DSA key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28050"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to DSA key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22744"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28055"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to OpenSSL DSA key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -670,22 +637,21 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATADSAADOPTEVP"></a><h3>xmlSecOpenSSLKeyDataDsaAdoptEvp ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeyDataDsaAdoptEvp     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>EVP_PKEY</font> *pKey);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLKeyDataDsaAdoptEvp     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="EVP-PKEY:CAPS"><span class="TYPE">EVP_PKEY</span></gtkdoclink> *pKey</code>);</pre>
 <p>Sets the DSA key data value to OpenSSL EVP key.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22760"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to DSA key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28075"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to DSA key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22765"><span style="white-space: nowrap"><code class="PARAMETER">pKey</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to OpenSSL EVP key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28080"><span style="white-space: nowrap"><code class="PARAMETER">pKey</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to OpenSSL EVP key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22770"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28085"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -693,17 +659,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATADSAGETEVP"></a><h3>xmlSecOpenSSLKeyDataDsaGetEvp ()</h3>
-<pre class="PROGRAMLISTING"><font>EVP_PKEY</font>*           xmlSecOpenSSLKeyDataDsaGetEvp       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="EVP-PKEY:CAPS"><span class="RETURNVALUE">EVP_PKEY</span></gtkdoclink>*           xmlSecOpenSSLKeyDataDsaGetEvp       (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets the OpenSSL EVP key from DSA key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22785"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to DSA key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28102"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to DSA key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22790"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28107"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to OpenSSL EVP key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -713,43 +678,39 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMDSASHA1ID"></a><h3>xmlSecOpenSSLTransformDsaSha1Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformDsaSha1Id</pre>
 <p>The DSA SHA1 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMDSASHA1GETKLASS"></a><h3>xmlSecOpenSSLTransformDsaSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformDsaSha1GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformDsaSha1GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The DSA-SHA1 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22811"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28129"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> DSA-SHA1 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLHMACGETMINOUTPUTLENGTH"></a><h3>xmlSecOpenSSLHmacGetMinOutputLength ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLHmacGetMinOutputLength (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLHmacGetMinOutputLength (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Gets the value of min HMAC length.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22825"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28145"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the min HMAC output length</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLHMACSETMINOUTPUTLENGTH"></a><h3>xmlSecOpenSSLHmacSetMinOutputLength ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecOpenSSLHmacSetMinOutputLength (<font>int</font> min_length);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecOpenSSLHmacSetMinOutputLength (<code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> min_length</code>);</pre>
 <p>Sets the min HMAC output length</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22840"><span style="white-space: nowrap"><code class="PARAMETER">min_length</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the new min length</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28162"><span style="white-space: nowrap"><code class="PARAMETER">min_length</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new min length</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -757,44 +718,41 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLKEYDATAHMACID"></a><h3>xmlSecOpenSSLKeyDataHmacId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLKeyDataHmacId</pre>
 <p>The DHMAC key klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATAHMACGETKLASS"></a><h3>xmlSecOpenSSLKeyDataHmacGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecOpenSSLKeyDataHmacGetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecOpenSSLKeyDataHmacGetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22861"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28184"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> HMAC key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATAHMACSET"></a><h3>xmlSecOpenSSLKeyDataHmacSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeyDataHmacSet         (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLKeyDataHmacSet         (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufSize</code>);</pre>
 <p>Sets the value of HMAC key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22878"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to HMAC key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28207"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to HMAC key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22883"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28212"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22888"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the key value size (in bytes).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28217"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22893"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28222"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -804,18 +762,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMHMACMD5ID"></a><h3>xmlSecOpenSSLTransformHmacMd5Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformHmacMd5Id</pre>
 <p>The HMAC with MD5 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMHMACMD5GETKLASS"></a><h3>xmlSecOpenSSLTransformHmacMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformHmacMd5GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformHmacMd5GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-MD5 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22914"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28244"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-MD5 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -824,18 +780,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMHMACRIPEMD160ID"></a><h3>xmlSecOpenSSLTransformHmacRipemd160Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformHmacRipemd160Id</pre>
 <p>The HMAC with RipeMD160 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMHMACRIPEMD160GETKLASS"></a><h3>xmlSecOpenSSLTransformHmacRipemd160GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformHmacRipemd160GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformHmacRipemd160GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-RIPEMD160 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22935"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28266"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-RIPEMD160 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -844,18 +798,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMHMACSHA1ID"></a><h3>xmlSecOpenSSLTransformHmacSha1Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformHmacSha1Id</pre>
 <p>The HMAC with SHA1 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMHMACSHA1GETKLASS"></a><h3>xmlSecOpenSSLTransformHmacSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformHmacSha1GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformHmacSha1GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA1 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22956"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28288"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA1 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -864,18 +816,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMHMACSHA224ID"></a><h3>xmlSecOpenSSLTransformHmacSha224Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformHmacSha224Id</pre>
 <p>The HMAC with SHA224 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMHMACSHA224GETKLASS"></a><h3>xmlSecOpenSSLTransformHmacSha224GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformHmacSha224GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformHmacSha224GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA224 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22977"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28310"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA224 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -884,18 +834,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMHMACSHA256ID"></a><h3>xmlSecOpenSSLTransformHmacSha256Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformHmacSha256Id</pre>
 <p>The HMAC with SHA256 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMHMACSHA256GETKLASS"></a><h3>xmlSecOpenSSLTransformHmacSha256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformHmacSha256GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformHmacSha256GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA256 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22998"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28332"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA256 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -904,18 +852,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMHMACSHA384ID"></a><h3>xmlSecOpenSSLTransformHmacSha384Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformHmacSha384Id</pre>
 <p>The HMAC with SHA384 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMHMACSHA384GETKLASS"></a><h3>xmlSecOpenSSLTransformHmacSha384GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformHmacSha384GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformHmacSha384GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA384 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23019"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28354"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA384 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -924,18 +870,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMHMACSHA512ID"></a><h3>xmlSecOpenSSLTransformHmacSha512Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformHmacSha512Id</pre>
 <p>The HMAC with SHA512 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMHMACSHA512GETKLASS"></a><h3>xmlSecOpenSSLTransformHmacSha512GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformHmacSha512GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformHmacSha512GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The HMAC-SHA512 transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23040"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28376"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the HMAC-SHA512 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -944,17 +888,15 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMMD5ID"></a><h3>xmlSecOpenSSLTransformMd5Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformMd5Id</pre>
 <p>The MD5 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMMD5GETKLASS"></a><h3>xmlSecOpenSSLTransformMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformMd5GetKlass   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformMd5GetKlass   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>MD5 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23061"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28398"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to MD5 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -963,18 +905,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMRIPEMD160ID"></a><h3>xmlSecOpenSSLTransformRipemd160Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformRipemd160Id</pre>
 <p>The RIPEMD160 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMRIPEMD160GETKLASS"></a><h3>xmlSecOpenSSLTransformRipemd160GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformRipemd160GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformRipemd160GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>RIPEMD-160 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23082"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28420"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to RIPEMD-160 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -983,39 +923,36 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLKEYDATARSAID"></a><h3>xmlSecOpenSSLKeyDataRsaId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLKeyDataRsaId</pre>
 <p>The RSA key klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATARSAGETKLASS"></a><h3>xmlSecOpenSSLKeyDataRsaGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecOpenSSLKeyDataRsaGetKlass     (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecOpenSSLKeyDataRsaGetKlass     (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The OpenSSL RSA key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23103"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28442"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to OpenSSL RSA key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATARSAADOPTRSA"></a><h3>xmlSecOpenSSLKeyDataRsaAdoptRsa ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeyDataRsaAdoptRsa     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>RSA</font> *rsa);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLKeyDataRsaAdoptRsa     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="RSA:CAPS"><span class="TYPE">RSA</span></gtkdoclink> *rsa</code>);</pre>
 <p>Sets the value of RSA key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23119"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to RSA key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28462"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to RSA key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23124"><span style="white-space: nowrap"><code class="PARAMETER">rsa</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to OpenSSL RSA key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28467"><span style="white-space: nowrap"><code class="PARAMETER">rsa</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to OpenSSL RSA key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23129"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28472"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1023,17 +960,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATARSAGETRSA"></a><h3>xmlSecOpenSSLKeyDataRsaGetRsa ()</h3>
-<pre class="PROGRAMLISTING"><font>RSA</font>*                xmlSecOpenSSLKeyDataRsaGetRsa       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="RSA:CAPS"><span class="RETURNVALUE">RSA</span></gtkdoclink>*                xmlSecOpenSSLKeyDataRsaGetRsa       (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets the OpenSSL RSA key from RSA key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23144"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to RSA key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28489"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to RSA key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23149"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28494"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to OpenSSL RSA key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1041,22 +977,21 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATARSAADOPTEVP"></a><h3>xmlSecOpenSSLKeyDataRsaAdoptEvp ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeyDataRsaAdoptEvp     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>EVP_PKEY</font> *pKey);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLKeyDataRsaAdoptEvp     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="EVP-PKEY:CAPS"><span class="TYPE">EVP_PKEY</span></gtkdoclink> *pKey</code>);</pre>
 <p>Sets the RSA key data value to OpenSSL EVP key.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23165"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to RSA key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28514"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to RSA key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23170"><span style="white-space: nowrap"><code class="PARAMETER">pKey</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to OpenSSL EVP key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28519"><span style="white-space: nowrap"><code class="PARAMETER">pKey</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to OpenSSL EVP key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23175"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28524"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1064,17 +999,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATARSAGETEVP"></a><h3>xmlSecOpenSSLKeyDataRsaGetEvp ()</h3>
-<pre class="PROGRAMLISTING"><font>EVP_PKEY</font>*           xmlSecOpenSSLKeyDataRsaGetEvp       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="EVP-PKEY:CAPS"><span class="RETURNVALUE">EVP_PKEY</span></gtkdoclink>*           xmlSecOpenSSLKeyDataRsaGetEvp       (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets the OpenSSL EVP key from RSA key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23190"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to RSA key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28541"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to RSA key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23195"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28546"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to OpenSSL EVP key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1084,18 +1018,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMRSAMD5ID"></a><h3>xmlSecOpenSSLTransformRsaMd5Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformRsaMd5Id</pre>
 <p>The RSA-MD5 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMRSAMD5GETKLASS"></a><h3>xmlSecOpenSSLTransformRsaMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformRsaMd5GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformRsaMd5GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-MD5 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23216"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28568"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-MD5 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1104,18 +1036,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMRSARIPEMD160ID"></a><h3>xmlSecOpenSSLTransformRsaRipemd160Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformRsaRipemd160Id</pre>
 <p>The RSA-RIPEMD160 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMRSARIPEMD160GETKLASS"></a><h3>xmlSecOpenSSLTransformRsaRipemd160GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformRsaRipemd160GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformRsaRipemd160GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-RIPEMD160 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23237"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28590"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-RIPEMD160 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1124,18 +1054,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMRSASHA1ID"></a><h3>xmlSecOpenSSLTransformRsaSha1Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformRsaSha1Id</pre>
 <p>The RSA-SHA1 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMRSASHA1GETKLASS"></a><h3>xmlSecOpenSSLTransformRsaSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformRsaSha1GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformRsaSha1GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-SHA1 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23258"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28612"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-SHA1 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1144,18 +1072,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMRSASHA224ID"></a><h3>xmlSecOpenSSLTransformRsaSha224Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformRsaSha224Id</pre>
 <p>The RSA-SHA224 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMRSASHA224GETKLASS"></a><h3>xmlSecOpenSSLTransformRsaSha224GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformRsaSha224GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformRsaSha224GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-SHA224 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23279"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28634"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-SHA224 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1164,18 +1090,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMRSASHA256ID"></a><h3>xmlSecOpenSSLTransformRsaSha256Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformRsaSha256Id</pre>
 <p>The RSA-SHA256 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMRSASHA256GETKLASS"></a><h3>xmlSecOpenSSLTransformRsaSha256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformRsaSha256GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformRsaSha256GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-SHA256 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23300"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28656"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-SHA256 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1184,18 +1108,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMRSASHA384ID"></a><h3>xmlSecOpenSSLTransformRsaSha384Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformRsaSha384Id</pre>
 <p>The RSA-SHA384 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMRSASHA384GETKLASS"></a><h3>xmlSecOpenSSLTransformRsaSha384GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformRsaSha384GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformRsaSha384GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-SHA384 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23321"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28678"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-SHA384 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1204,18 +1126,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMRSASHA512ID"></a><h3>xmlSecOpenSSLTransformRsaSha512Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformRsaSha512Id</pre>
 <p>The RSA-SHA512 signature transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMRSASHA512GETKLASS"></a><h3>xmlSecOpenSSLTransformRsaSha512GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformRsaSha512GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformRsaSha512GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-SHA512 signature transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23342"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28700"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-SHA512 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1224,18 +1144,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMRSAPKCS1ID"></a><h3>xmlSecOpenSSLTransformRsaPkcs1Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformRsaPkcs1Id</pre>
 <p>The RSA PKCS1 key transport transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMRSAPKCS1GETKLASS"></a><h3>xmlSecOpenSSLTransformRsaPkcs1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformRsaPkcs1GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformRsaPkcs1GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-PKCS1 key transport transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23363"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28722"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-PKCS1 key transport transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1244,18 +1162,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMRSAOAEPID"></a><h3>xmlSecOpenSSLTransformRsaOaepId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformRsaOaepId</pre>
 <p>The RSA PKCS1 key transport transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMRSAOAEPGETKLASS"></a><h3>xmlSecOpenSSLTransformRsaOaepGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformRsaOaepGetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformRsaOaepGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The RSA-OAEP key transport transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23384"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28744"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> RSA-OAEP key transport transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1264,17 +1180,15 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMSHA1ID"></a><h3>xmlSecOpenSSLTransformSha1Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformSha1Id</pre>
 <p>The SHA1 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMSHA1GETKLASS"></a><h3>xmlSecOpenSSLTransformSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformSha1GetKlass  (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformSha1GetKlass  (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA-1 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23405"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28766"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA-1 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1283,18 +1197,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMSHA224ID"></a><h3>xmlSecOpenSSLTransformSha224Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformSha224Id</pre>
 <p>The SHA224 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMSHA224GETKLASS"></a><h3>xmlSecOpenSSLTransformSha224GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformSha224GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformSha224GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA-224 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23426"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28788"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA-224 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1303,18 +1215,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMSHA256ID"></a><h3>xmlSecOpenSSLTransformSha256Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformSha256Id</pre>
 <p>The SHA256 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMSHA256GETKLASS"></a><h3>xmlSecOpenSSLTransformSha256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformSha256GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformSha256GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA-256 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23447"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28810"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA-256 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1323,18 +1233,16 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMSHA384ID"></a><h3>xmlSecOpenSSLTransformSha384Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformSha384Id</pre>
 <p>The SHA384 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMSHA384GETKLASS"></a><h3>xmlSecOpenSSLTransformSha384GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformSha384GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformSha384GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA-384 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23468"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28832"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA-384 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1343,76 +1251,71 @@ const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENS
 <a name="XMLSECOPENSSLTRANSFORMSHA512ID"></a><h3>xmlSecOpenSSLTransformSha512Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformSha512Id</pre>
 <p>The SHA512 digest transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLTRANSFORMSHA512GETKLASS"></a><h3>xmlSecOpenSSLTransformSha512GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformSha512GetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecOpenSSLTransformSha512GetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>SHA-512 digest transform klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23489"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28854"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to SHA-512 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-OPENSSL-ERRORS-LIB--CAPS"></a><h3>XMLSEC_OPENSSL_ERRORS_LIB</h3>
+<a name="XMLSEC-OPENSSL-ERRORS-LIB:CAPS"></a><h3>XMLSEC_OPENSSL_ERRORS_LIB</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_OPENSSL_ERRORS_LIB                       (ERR_LIB_USER + 57)</pre>
 <p>Macro. The XMLSec library klass for OpenSSL errors reporting functions.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-OPENSSL-ERRORS-FUNCTION--CAPS"></a><h3>XMLSEC_OPENSSL_ERRORS_FUNCTION</h3>
+<a name="XMLSEC-OPENSSL-ERRORS-FUNCTION:CAPS"></a><h3>XMLSEC_OPENSSL_ERRORS_FUNCTION</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_OPENSSL_ERRORS_FUNCTION                  0</pre>
 <p>Macro. The XMLSec library functions OpenSSL errors reporting functions.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLERRORSDEFAULTCALLBACK"></a><h3>xmlSecOpenSSLErrorsDefaultCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecOpenSSLErrorsDefaultCallback  (const <font>char</font> *file,
-                                                         <font>int</font> line,
-                                                         const <font>char</font> *func,
-                                                         const <font>char</font> *errorObject,
-                                                         const <font>char</font> *errorSubject,
-                                                         <font>int</font> reason,
-                                                         const <font>char</font> *msg);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecOpenSSLErrorsDefaultCallback  (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *file</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> line</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *func</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorObject</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *errorSubject</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> reason</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *msg</code>);</pre>
 <p>The default OpenSSL errors reporting callback function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23524"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the error location file name (__FILE__ macro).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28901"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error location file name (__FILE__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23529"><span style="white-space: nowrap"><code class="PARAMETER">line</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the error location line number (__LINE__ macro).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28906"><span style="white-space: nowrap"><code class="PARAMETER">line</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error location line number (__LINE__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23534"><span style="white-space: nowrap"><code class="PARAMETER">func</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the error location function name (__FUNCTION__ macro).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28911"><span style="white-space: nowrap"><code class="PARAMETER">func</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error location function name (__FUNCTION__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23539"><span style="white-space: nowrap"><code class="PARAMETER">errorObject</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the error specific error object</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28916"><span style="white-space: nowrap"><code class="PARAMETER">errorObject</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error specific error object</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23544"><span style="white-space: nowrap"><code class="PARAMETER">errorSubject</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the error specific error subject.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28921"><span style="white-space: nowrap"><code class="PARAMETER">errorSubject</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error specific error subject.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23549"><span style="white-space: nowrap"><code class="PARAMETER">reason</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the error code.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28926"><span style="white-space: nowrap"><code class="PARAMETER">reason</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the error code.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23554"><span style="white-space: nowrap"><code class="PARAMETER">msg</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the additional error message.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28931"><span style="white-space: nowrap"><code class="PARAMETER">msg</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the additional error message.</p></td>
 </tr>
 </tbody></table>
 </div>
diff --git a/docs/api/xmlsec-openssl-evp.html b/docs/api/xmlsec-openssl-evp.html
index 5501f8f..b654332 100644
--- a/docs/api/xmlsec-openssl-evp.html
+++ b/docs/api/xmlsec-openssl-evp.html
@@ -87,14 +87,14 @@
 <h1>
 <a name="XMLSEC-OPENSSL-EVP"></a>evp</h1>
 <div class="REFNAMEDIV">
-<a name="AEN23564"></a><h2>Name</h2>evp -- EVP keys data implementation.</div>
+<a name="AEN28941"></a><h2>Name</h2>evp -- EVP keys data implementation.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-OPENSSL-EVP.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS"><font>int</font>                 <a href="xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYDATAADOPTEVP">xmlSecOpenSSLEvpKeyDataAdoptEvp</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>EVP_PKEY</font> *pKey);
-<font>EVP_PKEY</font>*           <a href="xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYDATAGETEVP">xmlSecOpenSSLEvpKeyDataGetEvp</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>EVP_PKEY</font>*           <a href="xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYDUP">xmlSecOpenSSLEvpKeyDup</a>              (<font>EVP_PKEY</font> *pKey);
-<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    <a href="xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYADOPT">xmlSecOpenSSLEvpKeyAdopt</a>            (<font>EVP_PKEY</font> *pKey);</pre>
+<pre class="SYNOPSIS"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYDATAADOPTEVP">xmlSecOpenSSLEvpKeyDataAdoptEvp</a>     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="EVP-PKEY:CAPS"><span class="TYPE">EVP_PKEY</span></gtkdoclink> *pKey</code>);
+<gtkdoclink href="EVP-PKEY:CAPS"><span class="RETURNVALUE">EVP_PKEY</span></gtkdoclink>*           <a href="xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYDATAGETEVP">xmlSecOpenSSLEvpKeyDataGetEvp</a>       (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="EVP-PKEY:CAPS"><span class="RETURNVALUE">EVP_PKEY</span></gtkdoclink>*           <a href="xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYDUP">xmlSecOpenSSLEvpKeyDup</a>              (<code class="PARAMETER"><gtkdoclink href="EVP-PKEY:CAPS"><span class="TYPE">EVP_PKEY</span></gtkdoclink> *pKey</code>);
+<a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="RETURNVALUE">xmlSecKeyDataPtr</span></a>    <a href="xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYADOPT">xmlSecOpenSSLEvpKeyAdopt</a>            (<code class="PARAMETER"><gtkdoclink href="EVP-PKEY:CAPS"><span class="TYPE">EVP_PKEY</span></gtkdoclink> *pKey</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-OPENSSL-EVP.DESCRIPTION"></a><h2>Description</h2>
@@ -104,22 +104,21 @@
 <a name="XMLSEC-OPENSSL-EVP.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLEVPKEYDATAADOPTEVP"></a><h3>xmlSecOpenSSLEvpKeyDataAdoptEvp ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLEvpKeyDataAdoptEvp     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>EVP_PKEY</font> *pKey);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLEvpKeyDataAdoptEvp     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="EVP-PKEY:CAPS"><span class="TYPE">EVP_PKEY</span></gtkdoclink> *pKey</code>);</pre>
 <p>Sets the value of key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23599"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to OpenSSL EVP key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28994"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to OpenSSL EVP key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23604"><span style="white-space: nowrap"><code class="PARAMETER">pKey</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to EVP key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28999"><span style="white-space: nowrap"><code class="PARAMETER">pKey</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to EVP key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23609"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29004"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -127,17 +126,16 @@
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLEVPKEYDATAGETEVP"></a><h3>xmlSecOpenSSLEvpKeyDataGetEvp ()</h3>
-<pre class="PROGRAMLISTING"><font>EVP_PKEY</font>*           xmlSecOpenSSLEvpKeyDataGetEvp       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="EVP-PKEY:CAPS"><span class="RETURNVALUE">EVP_PKEY</span></gtkdoclink>*           xmlSecOpenSSLEvpKeyDataGetEvp       (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets the EVP_PKEY from the key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23624"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to OpenSSL EVP data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29021"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to OpenSSL EVP data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23629"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29026"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to EVP_PKEY or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -145,17 +143,16 @@
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLEVPKEYDUP"></a><h3>xmlSecOpenSSLEvpKeyDup ()</h3>
-<pre class="PROGRAMLISTING"><font>EVP_PKEY</font>*           xmlSecOpenSSLEvpKeyDup              (<font>EVP_PKEY</font> *pKey);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="EVP-PKEY:CAPS"><span class="RETURNVALUE">EVP_PKEY</span></gtkdoclink>*           xmlSecOpenSSLEvpKeyDup              (<code class="PARAMETER"><gtkdoclink href="EVP-PKEY:CAPS"><span class="TYPE">EVP_PKEY</span></gtkdoclink> *pKey</code>);</pre>
 <p>Duplicates <code class="PARAMETER">pKey</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23645"><span style="white-space: nowrap"><code class="PARAMETER">pKey</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to EVP_PKEY.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29044"><span style="white-space: nowrap"><code class="PARAMETER">pKey</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to EVP_PKEY.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23650"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29049"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly created EVP_PKEY object or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -163,17 +160,16 @@
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLEVPKEYADOPT"></a><h3>xmlSecOpenSSLEvpKeyAdopt ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    xmlSecOpenSSLEvpKeyAdopt            (<font>EVP_PKEY</font> *pKey);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="RETURNVALUE">xmlSecKeyDataPtr</span></a>    xmlSecOpenSSLEvpKeyAdopt            (<code class="PARAMETER"><gtkdoclink href="EVP-PKEY:CAPS"><span class="TYPE">EVP_PKEY</span></gtkdoclink> *pKey</code>);</pre>
 <p>Creates xmlsec key object from OpenSSL key object.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23665"><span style="white-space: nowrap"><code class="PARAMETER">pKey</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to EVP_PKEY.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29066"><span style="white-space: nowrap"><code class="PARAMETER">pKey</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to EVP_PKEY.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23670"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29071"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly created xmlsec key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
diff --git a/docs/api/xmlsec-openssl-x509.html b/docs/api/xmlsec-openssl-x509.html
index e738991..c10915c 100644
--- a/docs/api/xmlsec-openssl-x509.html
+++ b/docs/api/xmlsec-openssl-x509.html
@@ -87,53 +87,53 @@
 <h1>
 <a name="XMLSEC-OPENSSL-X509"></a>x509</h1>
 <div class="REFNAMEDIV">
-<a name="AEN23680"></a><h2>Name</h2>x509 -- X509 certificates support implementation for OpenSSL.</div>
+<a name="AEN29081"></a><h2>Name</h2>x509 -- X509 certificates support implementation for OpenSSL.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-OPENSSL-X509.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">#define             <a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509--CAPS">XMLSEC_STACK_OF_X509</a>
-#define             <a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509-CRL--CAPS">XMLSEC_STACK_OF_X509_CRL</a>
+<pre class="SYNOPSIS">#define             <a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509:CAPS">XMLSEC_STACK_OF_X509</a>
+#define             <a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509-CRL:CAPS">XMLSEC_STACK_OF_X509_CRL</a>
 #define             <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509ID">xmlSecOpenSSLKeyDataX509Id</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETKLASS">xmlSecOpenSSLKeyDataX509GetKlass</a>    (void);
-<font>X509</font>*               <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETKEYCERT">xmlSecOpenSSLKeyDataX509GetKeyCert</a>  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>                 <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509ADOPTKEYCERT">xmlSecOpenSSLKeyDataX509AdoptKeyCert</a>
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>X509</font> *cert);
-<font>int</font>                 <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509ADOPTCERT">xmlSecOpenSSLKeyDataX509AdoptCert</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>X509</font> *cert);
-<font>X509</font>*               <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETCERT">xmlSecOpenSSLKeyDataX509GetCert</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETCERTSSIZE">xmlSecOpenSSLKeyDataX509GetCertsSize</a>
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>                 <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509ADOPTCRL">xmlSecOpenSSLKeyDataX509AdoptCrl</a>    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>X509_CRL</font> *crl);
-<font>X509_CRL</font>*           <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETCRL">xmlSecOpenSSLKeyDataX509GetCrl</a>      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETCRLSSIZE">xmlSecOpenSSLKeyDataX509GetCrlsSize</a> (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509CERTGETKEY">xmlSecOpenSSLX509CertGetKey</a>         (<font>X509</font> *cert);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETKLASS">xmlSecOpenSSLKeyDataX509GetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="X509:CAPS"><span class="RETURNVALUE">X509</span></gtkdoclink>*               <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETKEYCERT">xmlSecOpenSSLKeyDataX509GetKeyCert</a>  (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509ADOPTKEYCERT">xmlSecOpenSSLKeyDataX509AdoptKeyCert</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="X509:CAPS"><span class="TYPE">X509</span></gtkdoclink> *cert</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509ADOPTCERT">xmlSecOpenSSLKeyDataX509AdoptCert</a>   (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="X509:CAPS"><span class="TYPE">X509</span></gtkdoclink> *cert</code>);
+<gtkdoclink href="X509:CAPS"><span class="RETURNVALUE">X509</span></gtkdoclink>*               <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETCERT">xmlSecOpenSSLKeyDataX509GetCert</a>     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETCERTSSIZE">xmlSecOpenSSLKeyDataX509GetCertsSize</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509ADOPTCRL">xmlSecOpenSSLKeyDataX509AdoptCrl</a>    (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="X509-CRL:CAPS"><span class="TYPE">X509_CRL</span></gtkdoclink> *crl</code>);
+<gtkdoclink href="X509-CRL:CAPS"><span class="RETURNVALUE">X509_CRL</span></gtkdoclink>*           <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETCRL">xmlSecOpenSSLKeyDataX509GetCrl</a>      (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETCRLSSIZE">xmlSecOpenSSLKeyDataX509GetCrlsSize</a> (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);
+<a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="RETURNVALUE">xmlSecKeyDataPtr</span></a>    <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509CERTGETKEY">xmlSecOpenSSLX509CertGetKey</a>         (<code class="PARAMETER"><gtkdoclink href="X509:CAPS"><span class="TYPE">X509</span></gtkdoclink> *cert</code>);
 #define             <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATARAWX509CERTID">xmlSecOpenSSLKeyDataRawX509CertId</a>
-<font>xmlSecKeyDataId</font>     <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATARAWX509CERTGETKLASS">xmlSecOpenSSLKeyDataRawX509CertGetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink><a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATARAWX509CERTGETKLASS">xmlSecOpenSSLKeyDataRawX509CertGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREID">xmlSecOpenSSLX509StoreId</a>
-<font>xmlSecKeyDataStoreId</font>  <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREGETKLASS">xmlSecOpenSSLX509StoreGetKlass</a>    (void);
-<font>X509</font>*               <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREFINDCERT">xmlSecOpenSSLX509StoreFindCert</a>      (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>xmlChar</font> *subjectName,
-                                                         <font>xmlChar</font> *issuerName,
-                                                         <font>xmlChar</font> *issuerSerial,
-                                                         <font>xmlChar</font> *ski,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);
-<font>X509</font>*               <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREVERIFY">xmlSecOpenSSLX509StoreVerify</a>        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509--CAPS">XMLSEC_STACK_OF_X509</a> *certs,
-                                                         <a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509-CRL--CAPS">XMLSEC_STACK_OF_X509_CRL</a> *crls,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);
-<font>int</font>                 <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREADOPTCERT">xmlSecOpenSSLX509StoreAdoptCert</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>X509</font> *cert,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>                 <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREADOPTCRL">xmlSecOpenSSLX509StoreAdoptCrl</a>      (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>X509_CRL</font> *crl);
-<font>int</font>                 <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREADDCERTSPATH">xmlSecOpenSSLX509StoreAddCertsPath</a>  (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         const <font>char</font> *path);
-<font>int</font>                 <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREADDCERTSFILE">xmlSecOpenSSLX509StoreAddCertsFile</a>  (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         const <font>char</font> *file);</pre>
+<gtkdoclink href="XMLSECKEYDATASTOREID"><span class="RETURNVALUE">xmlSecKeyDataStoreId</span></gtkdoclink><a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREGETKLASS">xmlSecOpenSSLX509StoreGetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="X509:CAPS"><span class="RETURNVALUE">X509</span></gtkdoclink>*               <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREFINDCERT">xmlSecOpenSSLX509StoreFindCert</a>      (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *subjectName</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *issuerName</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *issuerSerial</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *ski</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtx</span></a> *keyInfoCtx</code>);
+<gtkdoclink href="X509:CAPS"><span class="RETURNVALUE">X509</span></gtkdoclink>*               <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREVERIFY">xmlSecOpenSSLX509StoreVerify</a>        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509:CAPS"><span class="TYPE">XMLSEC_STACK_OF_X509</span></a> *certs</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509-CRL:CAPS"><span class="TYPE">XMLSEC_STACK_OF_X509_CRL</span></a> *crls</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtx</span></a> *keyInfoCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREADOPTCERT">xmlSecOpenSSLX509StoreAdoptCert</a>     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="X509:CAPS"><span class="TYPE">X509</span></gtkdoclink> *cert</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREADOPTCRL">xmlSecOpenSSLX509StoreAdoptCrl</a>      (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="X509-CRL:CAPS"><span class="TYPE">X509_CRL</span></gtkdoclink> *crl</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREADDCERTSPATH">xmlSecOpenSSLX509StoreAddCertsPath</a>  (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *path</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREADDCERTSFILE">xmlSecOpenSSLX509StoreAddCertsFile</a>  (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *file</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-OPENSSL-X509.DESCRIPTION"></a><h2>Description</h2>
@@ -142,51 +142,46 @@
 <div class="REFSECT1">
 <a name="XMLSEC-OPENSSL-X509.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="XMLSEC-STACK-OF-X509--CAPS"></a><h3>XMLSEC_STACK_OF_X509</h3>
+<a name="XMLSEC-STACK-OF-X509:CAPS"></a><h3>XMLSEC_STACK_OF_X509</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_STACK_OF_X509            STACK_OF(X509)</pre>
 <p>Macro. To make docbook happy.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-STACK-OF-X509-CRL--CAPS"></a><h3>XMLSEC_STACK_OF_X509_CRL</h3>
+<a name="XMLSEC-STACK-OF-X509-CRL:CAPS"></a><h3>XMLSEC_STACK_OF_X509_CRL</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_STACK_OF_X509_CRL        STACK_OF(X509_CRL)</pre>
 <p>Macro. To make docbook happy.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATAX509ID"></a><h3>xmlSecOpenSSLKeyDataX509Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLKeyDataX509Id</pre>
 <p>The OpenSSL X509 data klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATAX509GETKLASS"></a><h3>xmlSecOpenSSLKeyDataX509GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecOpenSSLKeyDataX509GetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecOpenSSLKeyDataX509GetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The OpenSSL X509 key data klass (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-X509DATA"><span class="TYPE">sec-X509Data</span></gtkdoclink>).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23797"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29287"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the X509 data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATAX509GETKEYCERT"></a><h3>xmlSecOpenSSLKeyDataX509GetKeyCert ()</h3>
-<pre class="PROGRAMLISTING"><font>X509</font>*               xmlSecOpenSSLKeyDataX509GetKeyCert  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="X509:CAPS"><span class="RETURNVALUE">X509</span></gtkdoclink>*               xmlSecOpenSSLKeyDataX509GetKeyCert  (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets the certificate from which the key was extracted.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23812"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29304"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23817"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29309"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the key's certificate or NULL if key data was not used for key
 extraction or an error occurs.</p></td>
 </tr>
@@ -195,23 +190,22 @@ extraction or an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATAX509ADOPTKEYCERT"></a><h3>xmlSecOpenSSLKeyDataX509AdoptKeyCert ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeyDataX509AdoptKeyCert
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>X509</font> *cert);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLKeyDataX509AdoptKeyCert
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="X509:CAPS"><span class="TYPE">X509</span></gtkdoclink> *cert</code>);</pre>
 <p>Sets the key's certificate in <code class="PARAMETER">data</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23834"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29330"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23839"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to OpenSSL X509 certificate.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29335"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to OpenSSL X509 certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23844"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29340"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -219,22 +213,21 @@ extraction or an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATAX509ADOPTCERT"></a><h3>xmlSecOpenSSLKeyDataX509AdoptCert ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeyDataX509AdoptCert   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>X509</font> *cert);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLKeyDataX509AdoptCert   (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="X509:CAPS"><span class="TYPE">X509</span></gtkdoclink> *cert</code>);</pre>
 <p>Adds certificate to the X509 key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23860"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29360"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23865"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to OpenSSL X509 certificate.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29365"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to OpenSSL X509 certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23870"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29370"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -242,22 +235,21 @@ extraction or an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATAX509GETCERT"></a><h3>xmlSecOpenSSLKeyDataX509GetCert ()</h3>
-<pre class="PROGRAMLISTING"><font>X509</font>*               xmlSecOpenSSLKeyDataX509GetCert     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="X509:CAPS"><span class="RETURNVALUE">X509</span></gtkdoclink>*               xmlSecOpenSSLKeyDataX509GetCert     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);</pre>
 <p>Gets a certificate from X509 key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23886"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29390"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23891"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the desired certificate position.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29395"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired certificate position.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23896"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29400"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to certificate or NULL if <code class="PARAMETER">pos</code> is larger than the
 number of certificates in <code class="PARAMETER">data</code> or an error occurs.</p></td>
 </tr>
@@ -266,18 +258,17 @@ number of certificates in <code class="PARAMETER">data</code> or an error occurs
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATAX509GETCERTSSIZE"></a><h3>xmlSecOpenSSLKeyDataX509GetCertsSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecOpenSSLKeyDataX509GetCertsSize
-                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          xmlSecOpenSSLKeyDataX509GetCertsSize
+                                                        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets the number of certificates in <code class="PARAMETER">data</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23914"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29420"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23919"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29425"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> te number of certificates in <code class="PARAMETER">data</code>.</p></td>
 </tr>
 </tbody></table>
@@ -285,22 +276,21 @@ number of certificates in <code class="PARAMETER">data</code> or an error occurs
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATAX509ADOPTCRL"></a><h3>xmlSecOpenSSLKeyDataX509AdoptCrl ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeyDataX509AdoptCrl    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <font>X509_CRL</font> *crl);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLKeyDataX509AdoptCrl    (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="X509-CRL:CAPS"><span class="TYPE">X509_CRL</span></gtkdoclink> *crl</code>);</pre>
 <p>Adds CRL to the X509 key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23936"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29446"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23941"><span style="white-space: nowrap"><code class="PARAMETER">crl</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to OpenSSL X509 CRL.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29451"><span style="white-space: nowrap"><code class="PARAMETER">crl</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to OpenSSL X509 CRL.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23946"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29456"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -308,22 +298,21 @@ number of certificates in <code class="PARAMETER">data</code> or an error occurs
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATAX509GETCRL"></a><h3>xmlSecOpenSSLKeyDataX509GetCrl ()</h3>
-<pre class="PROGRAMLISTING"><font>X509_CRL</font>*           xmlSecOpenSSLKeyDataX509GetCrl      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="X509-CRL:CAPS"><span class="RETURNVALUE">X509_CRL</span></gtkdoclink>*           xmlSecOpenSSLKeyDataX509GetCrl      (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> pos</code>);</pre>
 <p>Gets a CRL from X509 key data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23962"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29476"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23967"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the desired CRL position.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29481"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired CRL position.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23972"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29486"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to CRL or NULL if <code class="PARAMETER">pos</code> is larger than the
 number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></td>
 </tr>
@@ -332,17 +321,16 @@ number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></t
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATAX509GETCRLSSIZE"></a><h3>xmlSecOpenSSLKeyDataX509GetCrlsSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecOpenSSLKeyDataX509GetCrlsSize (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="RETURNVALUE">xmlSecSize</span></a>          xmlSecOpenSSLKeyDataX509GetCrlsSize (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="TYPE">xmlSecKeyDataPtr</span></a> data</code>);</pre>
 <p>Gets the number of CRLs in <code class="PARAMETER">data</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23990"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29506"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23995"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29511"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> te number of CRLs in <code class="PARAMETER">data</code>.</p></td>
 </tr>
 </tbody></table>
@@ -350,17 +338,16 @@ number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></t
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLX509CERTGETKEY"></a><h3>xmlSecOpenSSLX509CertGetKey ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    xmlSecOpenSSLX509CertGetKey         (<font>X509</font> *cert);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA"><span class="RETURNVALUE">xmlSecKeyDataPtr</span></a>    xmlSecOpenSSLX509CertGetKey         (<code class="PARAMETER"><gtkdoclink href="X509:CAPS"><span class="TYPE">X509</span></gtkdoclink> *cert</code>);</pre>
 <p>Extracts public key from the <code class="PARAMETER">cert</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24012"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the certificate.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29530"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24017"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29535"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> public key value or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -370,18 +357,16 @@ number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></t
 <a name="XMLSECOPENSSLKEYDATARAWX509CERTID"></a><h3>xmlSecOpenSSLKeyDataRawX509CertId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLKeyDataRawX509CertId</pre>
 <p>The OpenSSL raw X509 certificate klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLKEYDATARAWX509CERTGETKLASS"></a><h3>xmlSecOpenSSLKeyDataRawX509CertGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecOpenSSLKeyDataRawX509CertGetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATAID"><span class="RETURNVALUE">xmlSecKeyDataId</span></gtkdoclink>     xmlSecOpenSSLKeyDataRawX509CertGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The raw X509 certificates key data klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24038"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29557"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> raw X509 certificates key data klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -390,59 +375,56 @@ number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></t
 <a name="XMLSECOPENSSLX509STOREID"></a><h3>xmlSecOpenSSLX509StoreId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecOpenSSLX509StoreId</pre>
 <p>The OpenSSL X509 store klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLX509STOREGETKLASS"></a><h3>xmlSecOpenSSLX509StoreGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataStoreId</font>  xmlSecOpenSSLX509StoreGetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECKEYDATASTOREID"><span class="RETURNVALUE">xmlSecKeyDataStoreId</span></gtkdoclink>  xmlSecOpenSSLX509StoreGetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The OpenSSL X509 certificates key data store klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24059"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29579"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to OpenSSL X509 certificates key data store klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLX509STOREFINDCERT"></a><h3>xmlSecOpenSSLX509StoreFindCert ()</h3>
-<pre class="PROGRAMLISTING"><font>X509</font>*               xmlSecOpenSSLX509StoreFindCert      (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>xmlChar</font> *subjectName,
-                                                         <font>xmlChar</font> *issuerName,
-                                                         <font>xmlChar</font> *issuerSerial,
-                                                         <font>xmlChar</font> *ski,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="X509:CAPS"><span class="RETURNVALUE">X509</span></gtkdoclink>*               xmlSecOpenSSLX509StoreFindCert      (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *subjectName</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *issuerName</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *issuerSerial</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *ski</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtx</span></a> *keyInfoCtx</code>);</pre>
 <p>Searches <code class="PARAMETER">store</code> for a certificate that matches given criteria.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24080"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to X509 key data store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29612"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24085"><span style="white-space: nowrap"><code class="PARAMETER">subjectName</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the desired certificate name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29617"><span style="white-space: nowrap"><code class="PARAMETER">subjectName</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired certificate name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24090"><span style="white-space: nowrap"><code class="PARAMETER">issuerName</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the desired certificate issuer name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29622"><span style="white-space: nowrap"><code class="PARAMETER">issuerName</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired certificate issuer name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24095"><span style="white-space: nowrap"><code class="PARAMETER">issuerSerial</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the desired certificate issuer serial number.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29627"><span style="white-space: nowrap"><code class="PARAMETER">issuerSerial</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired certificate issuer serial number.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24100"><span style="white-space: nowrap"><code class="PARAMETER">ski</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the desired certificate SKI.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29632"><span style="white-space: nowrap"><code class="PARAMETER">ski</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired certificate SKI.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24105"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29637"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24111"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29643"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to found certificate or NULL if certificate is not found
 or an error occurs.</p></td>
 </tr>
@@ -451,32 +433,31 @@ or an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLX509STOREVERIFY"></a><h3>xmlSecOpenSSLX509StoreVerify ()</h3>
-<pre class="PROGRAMLISTING"><font>X509</font>*               xmlSecOpenSSLX509StoreVerify        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509--CAPS">XMLSEC_STACK_OF_X509</a> *certs,
-                                                         <a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509-CRL--CAPS">XMLSEC_STACK_OF_X509_CRL</a> *crls,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="X509:CAPS"><span class="RETURNVALUE">X509</span></gtkdoclink>*               xmlSecOpenSSLX509StoreVerify        (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509:CAPS"><span class="TYPE">XMLSEC_STACK_OF_X509</span></a> *certs</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509-CRL:CAPS"><span class="TYPE">XMLSEC_STACK_OF_X509_CRL</span></a> *crls</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtx</span></a> *keyInfoCtx</code>);</pre>
 <p>Verifies <code class="PARAMETER">certs</code> list.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24130"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to X509 key data store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29670"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24135"><span style="white-space: nowrap"><code class="PARAMETER">certs</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the untrusted certificates stack.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29675"><span style="white-space: nowrap"><code class="PARAMETER">certs</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the untrusted certificates stack.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24140"><span style="white-space: nowrap"><code class="PARAMETER">crls</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the crls stack.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29680"><span style="white-space: nowrap"><code class="PARAMETER">crls</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the crls stack.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24145"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29685"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24151"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29691"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the first verified certificate from <code class="PARAMETER">certs</code>.</p></td>
 </tr>
 </tbody></table>
@@ -484,27 +465,26 @@ or an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLX509STOREADOPTCERT"></a><h3>xmlSecOpenSSLX509StoreAdoptCert ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLX509StoreAdoptCert     (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>X509</font> *cert,
-                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLX509StoreAdoptCert     (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="X509:CAPS"><span class="TYPE">X509</span></gtkdoclink> *cert</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE"><span class="TYPE">xmlSecKeyDataType</span></a> type</code>);</pre>
 <p>Adds trusted (root) or untrusted certificate to the store.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24169"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to X509 key data store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29715"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24174"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to OpenSSL X509 certificate.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29720"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to OpenSSL X509 certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24179"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the certificate type (trusted/untrusted).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29725"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certificate type (trusted/untrusted).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24184"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29730"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -512,22 +492,21 @@ or an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLX509STOREADOPTCRL"></a><h3>xmlSecOpenSSLX509StoreAdoptCrl ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLX509StoreAdoptCrl      (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         <font>X509_CRL</font> *crl);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLX509StoreAdoptCrl      (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="X509-CRL:CAPS"><span class="TYPE">X509_CRL</span></gtkdoclink> *crl</code>);</pre>
 <p>Adds X509 CRL to the store.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24200"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to X509 key data store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29750"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24205"><span style="white-space: nowrap"><code class="PARAMETER">crl</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to OpenSSL X509_CRL.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29755"><span style="white-space: nowrap"><code class="PARAMETER">crl</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to OpenSSL X509_CRL.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24210"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29760"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -535,23 +514,22 @@ or an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLX509STOREADDCERTSPATH"></a><h3>xmlSecOpenSSLX509StoreAddCertsPath ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLX509StoreAddCertsPath  (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         const <font>char</font> *path);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLX509StoreAddCertsPath  (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *path</code>);</pre>
 <p>Adds all certs in the <code class="PARAMETER">path</code> to the list of trusted certs
 in <code class="PARAMETER">store</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24228"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the pointer to OpenSSL x509 store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29782"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to OpenSSL x509 store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24233"><span style="white-space: nowrap"><code class="PARAMETER">path</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the path to the certs dir.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29787"><span style="white-space: nowrap"><code class="PARAMETER">path</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the path to the certs dir.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24238"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29792"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -559,23 +537,22 @@ in <code class="PARAMETER">store</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECOPENSSLX509STOREADDCERTSFILE"></a><h3>xmlSecOpenSSLX509StoreAddCertsFile ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLX509StoreAddCertsFile  (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                                         const <font>char</font> *file);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecOpenSSLX509StoreAddCertsFile  (<code class="PARAMETER"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE"><span class="TYPE">xmlSecKeyDataStorePtr</span></a> store</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *file</code>);</pre>
 <p>Adds all certs in <code class="PARAMETER">file</code> to the list of trusted certs
 in <code class="PARAMETER">store</code>. It is possible for <code class="PARAMETER">file</code> to contain multiple certs.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24257"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the pointer to OpenSSL x509 store.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29815"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to OpenSSL x509 store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24262"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the certs file.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29820"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the certs file.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24267"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29825"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
diff --git a/docs/api/xmlsec-parser.html b/docs/api/xmlsec-parser.html
index 459ca95..aacd319 100644
--- a/docs/api/xmlsec-parser.html
+++ b/docs/api/xmlsec-parser.html
@@ -87,21 +87,21 @@
 <h1>
 <a name="XMLSEC-PARSER"></a>parser</h1>
 <div class="REFNAMEDIV">
-<a name="AEN12089"></a><h2>Name</h2>parser -- Parser transform implementation.</div>
+<a name="AEN14535"></a><h2>Name</h2>parser -- Parser transform implementation.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-PARSER.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS"><font>xmlDocPtr</font>           <a href="xmlsec-parser.html#XMLSECPARSEFILE">xmlSecParseFile</a>                     (const <font>char</font> *filename);
-<font>xmlDocPtr</font>           <a href="xmlsec-parser.html#XMLSECPARSEMEMORY">xmlSecParseMemory</a>                   (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size,
-                                                         <font>int</font> recovery);
-<font>xmlDocPtr</font>           <a href="xmlsec-parser.html#XMLSECPARSEMEMORYEXT">xmlSecParseMemoryExt</a>                (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *prefix,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> prefixSize,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufferSize,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *postfix,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> postfixSize);
+<pre class="SYNOPSIS"><gtkdoclink href="XMLDOC"><span class="RETURNVALUE">xmlDocPtr</span></gtkdoclink><a href="xmlsec-parser.html#XMLSECPARSEFILE">xmlSecParseFile</a>                     (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>);
+<gtkdoclink href="XMLDOC"><span class="RETURNVALUE">xmlDocPtr</span></gtkdoclink><a href="xmlsec-parser.html#XMLSECPARSEMEMORY">xmlSecParseMemory</a>                   (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buffer</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> recovery</code>);
+<gtkdoclink href="XMLDOC"><span class="RETURNVALUE">xmlDocPtr</span></gtkdoclink><a href="xmlsec-parser.html#XMLSECPARSEMEMORYEXT">xmlSecParseMemoryExt</a>                (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *prefix</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> prefixSize</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buffer</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufferSize</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *postfix</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> postfixSize</code>);
 #define             <a href="xmlsec-parser.html#XMLSECTRANSFORMXMLPARSERID">xmlSecTransformXmlParserId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-parser.html#XMLSECTRANSFORMXMLPARSERGETKLASS">xmlSecTransformXmlParserGetKlass</a>    (void);</pre>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-parser.html#XMLSECTRANSFORMXMLPARSERGETKLASS">xmlSecTransformXmlParserGetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-PARSER.DESCRIPTION"></a><h2>Description</h2>
@@ -111,18 +111,17 @@
 <a name="XMLSEC-PARSER.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
 <a name="XMLSECPARSEFILE"></a><h3>xmlSecParseFile ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlDocPtr</font>           xmlSecParseFile                     (const <font>char</font> *filename);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLDOC"><span class="RETURNVALUE">xmlDocPtr</span></gtkdoclink>           xmlSecParseFile                     (<code class="PARAMETER">const <gtkdoclink href="CHAR"><span class="TYPE">char</span></gtkdoclink> *filename</code>);</pre>
 <p>Loads XML Doc from file <code class="PARAMETER">filename</code>. We need a special version because of
 c14n issue. The code is copied from <gtkdoclink href="XMLSAXPARSEFILEWITHDATA"><code class="FUNCTION">xmlSAXParseFileWithData()</code></gtkdoclink> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12132"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the filename.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14606"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12137"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14611"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the loaded XML document or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -130,28 +129,27 @@ c14n issue. The code is copied from <gtkdoclink href="XMLSAXPARSEFILEWITHDATA"><
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPARSEMEMORY"></a><h3>xmlSecParseMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlDocPtr</font>           xmlSecParseMemory                   (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size,
-                                                         <font>int</font> recovery);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLDOC"><span class="RETURNVALUE">xmlDocPtr</span></gtkdoclink>           xmlSecParseMemory                   (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buffer</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> recovery</code>);</pre>
 <p>Loads XML Doc from memory. We need a special version because of
 c14n issue. The code is copied from <gtkdoclink href="XMLSAXPARSEMEMORY"><code class="FUNCTION">xmlSAXParseMemory()</code></gtkdoclink> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12156"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the input buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14636"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12161"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the input buffer size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14641"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12166"><span style="white-space: nowrap"><code class="PARAMETER">recovery</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the flag.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14646"><span style="white-space: nowrap"><code class="PARAMETER">recovery</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12171"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14651"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the loaded XML document or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -159,42 +157,41 @@ c14n issue. The code is copied from <gtkdoclink href="XMLSAXPARSEMEMORY"><code c
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPARSEMEMORYEXT"></a><h3>xmlSecParseMemoryExt ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlDocPtr</font>           xmlSecParseMemoryExt                (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *prefix,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> prefixSize,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufferSize,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *postfix,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> postfixSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLDOC"><span class="RETURNVALUE">xmlDocPtr</span></gtkdoclink>           xmlSecParseMemoryExt                (<code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *prefix</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> prefixSize</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buffer</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bufferSize</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *postfix</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> postfixSize</code>);</pre>
 <p>Loads XML Doc from 3 chunks of memory: <code class="PARAMETER">prefix</code>, <code class="PARAMETER">buffer</code> and <code class="PARAMETER">postfix</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12194"><span style="white-space: nowrap"><code class="PARAMETER">prefix</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the first part of the input.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14686"><span style="white-space: nowrap"><code class="PARAMETER">prefix</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the first part of the input.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12199"><span style="white-space: nowrap"><code class="PARAMETER">prefixSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the size of the first part of the input.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14691"><span style="white-space: nowrap"><code class="PARAMETER">prefixSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the size of the first part of the input.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12204"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the second part of the input.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14696"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the second part of the input.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12209"><span style="white-space: nowrap"><code class="PARAMETER">bufferSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the size of the second part of the input.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14701"><span style="white-space: nowrap"><code class="PARAMETER">bufferSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the size of the second part of the input.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12214"><span style="white-space: nowrap"><code class="PARAMETER">postfix</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the third part of the input.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14706"><span style="white-space: nowrap"><code class="PARAMETER">postfix</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the third part of the input.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12219"><span style="white-space: nowrap"><code class="PARAMETER">postfixSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the size of the third part of the input.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14711"><span style="white-space: nowrap"><code class="PARAMETER">postfixSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the size of the third part of the input.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12224"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14716"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the loaded XML document or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -204,17 +201,15 @@ c14n issue. The code is copied from <gtkdoclink href="XMLSAXPARSEMEMORY"><code c
 <a name="XMLSECTRANSFORMXMLPARSERID"></a><h3>xmlSecTransformXmlParserId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecTransformXmlParserId</pre>
 <p>The XML Parser transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMXMLPARSERGETKLASS"></a><h3>xmlSecTransformXmlParserGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformXmlParserGetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformXmlParserGetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The XML parser transform.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN12245"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14738"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> XML parser transform klass.</p></td>
 </tr></tbody></table>
 </div>
diff --git a/docs/api/xmlsec-reference.html b/docs/api/xmlsec-reference.html
index bafcc15..0efbc52 100644
--- a/docs/api/xmlsec-reference.html
+++ b/docs/api/xmlsec-reference.html
@@ -90,6 +90,7 @@
 <dt><a href="xmlsec-ref.html">XML Security Core Library API Reference.</a></dt>
 <dt><a href="xmlsec-openssl-ref.html">XML Security Library for OpenSLL API Reference.</a></dt>
 <dt><a href="xmlsec-gnutls-ref.html">XML Security Library for GnuTLS API Reference.</a></dt>
+<dt><a href="xmlsec-gcrypt-ref.html">XML Security Library for GCrypt API Reference.</a></dt>
 <dt><a href="xmlsec-nss-ref.html">XML Security Library for NSS API Reference.</a></dt>
 <dt><a href="xmlsec-mscrypto-ref.html">XML Security Library for MSCrypto API Reference.</a></dt>
 <dt><a href="xmlsec-index.html">XML Security Library Reference Index</a></dt>
diff --git a/docs/api/xmlsec-templates.html b/docs/api/xmlsec-templates.html
index 328ab2c..28bfebe 100644
--- a/docs/api/xmlsec-templates.html
+++ b/docs/api/xmlsec-templates.html
@@ -87,121 +87,121 @@
 <h1>
 <a name="XMLSEC-TEMPLATES"></a>templates</h1>
 <div class="REFNAMEDIV">
-<a name="AEN12255"></a><h2>Name</h2>templates -- Dynamic templates creation functions.</div>
+<a name="AEN14748"></a><h2>Name</h2>templates -- Dynamic templates creation functions.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-TEMPLATES.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS"><font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLSIGNATURECREATE">xmlSecTmplSignatureCreate</a>           (<font>xmlDocPtr</font> doc,
-                                                         <font>xmlSecTransformId</font> c14nMethodId,
-                                                         <font>xmlSecTransformId</font> signMethodId,
-                                                         const <font>xmlChar</font> *id);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLSIGNATURECREATENSPREF">xmlSecTmplSignatureCreateNsPref</a>     (<font>xmlDocPtr</font> doc,
-                                                         <font>xmlSecTransformId</font> c14nMethodId,
-                                                         <font>xmlSecTransformId</font> signMethodId,
-                                                         const <font>xmlChar</font> *id,
-                                                         const <font>xmlChar</font> *nsPrefix);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLSIGNATUREENSUREKEYINFO">xmlSecTmplSignatureEnsureKeyInfo</a>    (<font>xmlNodePtr</font> signNode,
-                                                         const <font>xmlChar</font> *id);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLSIGNATUREADDREFERENCE">xmlSecTmplSignatureAddReference</a>     (<font>xmlNodePtr</font> signNode,
-                                                         <font>xmlSecTransformId</font> digestMethodId,
-                                                         const <font>xmlChar</font> *id,
-                                                         const <font>xmlChar</font> *uri,
-                                                         const <font>xmlChar</font> *type);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLSIGNATUREADDOBJECT">xmlSecTmplSignatureAddObject</a>        (<font>xmlNodePtr</font> signNode,
-                                                         const <font>xmlChar</font> *id,
-                                                         const <font>xmlChar</font> *mimeType,
-                                                         const <font>xmlChar</font> *encoding);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLSIGNATUREGETSIGNMETHODNODE">xmlSecTmplSignatureGetSignMethodNode</a>
-                                                        (<font>xmlNodePtr</font> signNode);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLSIGNATUREGETC14NMETHODNODE">xmlSecTmplSignatureGetC14NMethodNode</a>
-                                                        (<font>xmlNodePtr</font> signNode);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLREFERENCEADDTRANSFORM">xmlSecTmplReferenceAddTransform</a>     (<font>xmlNodePtr</font> referenceNode,
-                                                         <font>xmlSecTransformId</font> transformId);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLOBJECTADDSIGNPROPERTIES">xmlSecTmplObjectAddSignProperties</a>   (<font>xmlNodePtr</font> objectNode,
-                                                         const <font>xmlChar</font> *id,
-                                                         const <font>xmlChar</font> *target);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLOBJECTADDMANIFEST">xmlSecTmplObjectAddManifest</a>         (<font>xmlNodePtr</font> objectNode,
-                                                         const <font>xmlChar</font> *id);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLMANIFESTADDREFERENCE">xmlSecTmplManifestAddReference</a>      (<font>xmlNodePtr</font> manifestNode,
-                                                         <font>xmlSecTransformId</font> digestMethodId,
-                                                         const <font>xmlChar</font> *id,
-                                                         const <font>xmlChar</font> *uri,
-                                                         const <font>xmlChar</font> *type);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLENCDATACREATE">xmlSecTmplEncDataCreate</a>             (<font>xmlDocPtr</font> doc,
-                                                         <font>xmlSecTransformId</font> encMethodId,
-                                                         const <font>xmlChar</font> *id,
-                                                         const <font>xmlChar</font> *type,
-                                                         const <font>xmlChar</font> *mimeType,
-                                                         const <font>xmlChar</font> *encoding);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLENCDATAENSUREKEYINFO">xmlSecTmplEncDataEnsureKeyInfo</a>      (<font>xmlNodePtr</font> encNode,
-                                                         const <font>xmlChar</font> *id);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLENCDATAENSUREENCPROPERTIES">xmlSecTmplEncDataEnsureEncProperties</a>
-                                                        (<font>xmlNodePtr</font> encNode,
-                                                         const <font>xmlChar</font> *id);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLENCDATAADDENCPROPERTY">xmlSecTmplEncDataAddEncProperty</a>     (<font>xmlNodePtr</font> encNode,
-                                                         const <font>xmlChar</font> *id,
-                                                         const <font>xmlChar</font> *target);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLENCDATAENSURECIPHERVALUE">xmlSecTmplEncDataEnsureCipherValue</a>  (<font>xmlNodePtr</font> encNode);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLENCDATAENSURECIPHERREFERENCE">xmlSecTmplEncDataEnsureCipherReference</a>
-                                                        (<font>xmlNodePtr</font> encNode,
-                                                         const <font>xmlChar</font> *uri);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLENCDATAGETENCMETHODNODE">xmlSecTmplEncDataGetEncMethodNode</a>   (<font>xmlNodePtr</font> encNode);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLCIPHERREFERENCEADDTRANSFORM">xmlSecTmplCipherReferenceAddTransform</a>
-                                                        (<font>xmlNodePtr</font> cipherReferenceNode,
-                                                         <font>xmlSecTransformId</font> transformId);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLREFERENCELISTADDDATAREFERENCE">xmlSecTmplReferenceListAddDataReference</a>
-                                                        (<font>xmlNodePtr</font> encNode,
-                                                         const <font>xmlChar</font> *uri);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLREFERENCELISTADDKEYREFERENCE">xmlSecTmplReferenceListAddKeyReference</a>
-                                                        (<font>xmlNodePtr</font> encNode,
-                                                         const <font>xmlChar</font> *uri);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLKEYINFOADDKEYNAME">xmlSecTmplKeyInfoAddKeyName</a>         (<font>xmlNodePtr</font> keyInfoNode,
-                                                         const <font>xmlChar</font> *name);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLKEYINFOADDKEYVALUE">xmlSecTmplKeyInfoAddKeyValue</a>        (<font>xmlNodePtr</font> keyInfoNode);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLKEYINFOADDX509DATA">xmlSecTmplKeyInfoAddX509Data</a>        (<font>xmlNodePtr</font> keyInfoNode);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLKEYINFOADDRETRIEVALMETHOD">xmlSecTmplKeyInfoAddRetrievalMethod</a> (<font>xmlNodePtr</font> keyInfoNode,
-                                                         const <font>xmlChar</font> *uri,
-                                                         const <font>xmlChar</font> *type);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLRETRIEVALMETHODADDTRANSFORM">xmlSecTmplRetrievalMethodAddTransform</a>
-                                                        (<font>xmlNodePtr</font> retrMethodNode,
-                                                         <font>xmlSecTransformId</font> transformId);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLKEYINFOADDENCRYPTEDKEY">xmlSecTmplKeyInfoAddEncryptedKey</a>    (<font>xmlNodePtr</font> keyInfoNode,
-                                                         <font>xmlSecTransformId</font> encMethodId,
-                                                         const <font>xmlChar</font> *id,
-                                                         const <font>xmlChar</font> *type,
-                                                         const <font>xmlChar</font> *recipient);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLX509DATAADDISSUERSERIAL">xmlSecTmplX509DataAddIssuerSerial</a>   (<font>xmlNodePtr</font> x509DataNode);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLX509ISSUERSERIALADDISSUERNAME">xmlSecTmplX509IssuerSerialAddIssuerName</a>
-                                                        (<font>xmlNodePtr</font> x509IssuerSerialNode,
-                                                         const <font>xmlChar</font> *issuerName);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLX509ISSUERSERIALADDSERIALNUMBER">xmlSecTmplX509IssuerSerialAddSerialNumber</a>
-                                                        (<font>xmlNodePtr</font> x509IssuerSerialNode,
-                                                         const <font>xmlChar</font> *serial);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLX509DATAADDSUBJECTNAME">xmlSecTmplX509DataAddSubjectName</a>    (<font>xmlNodePtr</font> x509DataNode);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLX509DATAADDSKI">xmlSecTmplX509DataAddSKI</a>            (<font>xmlNodePtr</font> x509DataNode);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLX509DATAADDCERTIFICATE">xmlSecTmplX509DataAddCertificate</a>    (<font>xmlNodePtr</font> x509DataNode);
-<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLX509DATAADDCRL">xmlSecTmplX509DataAddCRL</a>            (<font>xmlNodePtr</font> x509DataNode);
-<font>int</font>                 <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDHMACOUTPUTLENGTH">xmlSecTmplTransformAddHmacOutputLength</a>
-                                                        (<font>xmlNodePtr</font> transformNode,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bitsLen);
-<font>int</font>                 <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDRSAOAEPPARAM">xmlSecTmplTransformAddRsaOaepParam</a>  (<font>xmlNodePtr</font> transformNode,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>int</font>                 <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDXSLTSTYLESHEET">xmlSecTmplTransformAddXsltStylesheet</a>
-                                                        (<font>xmlNodePtr</font> transformNode,
-                                                         const <font>xmlChar</font> *xslt);
-<font>int</font>                 <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDC14NINCLNAMESPACES">xmlSecTmplTransformAddC14NInclNamespaces</a>
-                                                        (<font>xmlNodePtr</font> transformNode,
-                                                         const <font>xmlChar</font> *prefixList);
-<font>int</font>                 <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDXPATH">xmlSecTmplTransformAddXPath</a>         (<font>xmlNodePtr</font> transformNode,
-                                                         const <font>xmlChar</font> *expression,
-                                                         const <font>xmlChar</font> **nsList);
-<font>int</font>                 <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDXPATH2">xmlSecTmplTransformAddXPath2</a>        (<font>xmlNodePtr</font> transformNode,
-                                                         const <font>xmlChar</font> *type,
-                                                         const <font>xmlChar</font> *expression,
-                                                         const <font>xmlChar</font> **nsList);
-<font>int</font>                 <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDXPOINTER">xmlSecTmplTransformAddXPointer</a>      (<font>xmlNodePtr</font> transformNode,
-                                                         const <font>xmlChar</font> *expression,
-                                                         const <font>xmlChar</font> **nsList);</pre>
+<pre class="SYNOPSIS"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLSIGNATURECREATE">xmlSecTmplSignatureCreate</a>           (<code class="PARAMETER"><gtkdoclink href="XMLDOC"><span class="TYPE">xmlDocPtr</span></gtkdoclink> doc</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> c14nMethodId</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> signMethodId</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLSIGNATURECREATENSPREF">xmlSecTmplSignatureCreateNsPref</a>     (<code class="PARAMETER"><gtkdoclink href="XMLDOC"><span class="TYPE">xmlDocPtr</span></gtkdoclink> doc</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> c14nMethodId</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> signMethodId</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *nsPrefix</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLSIGNATUREENSUREKEYINFO">xmlSecTmplSignatureEnsureKeyInfo</a>    (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> signNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLSIGNATUREADDREFERENCE">xmlSecTmplSignatureAddReference</a>     (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> signNode</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> digestMethodId</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *type</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLSIGNATUREADDOBJECT">xmlSecTmplSignatureAddObject</a>        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> signNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *mimeType</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *encoding</code>);
+<gtkdoclink href="XMLNODE"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLSIGNATUREGETSIGNMETHODNODE">xmlSecTmplSignatureGetSignMethodNode</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> signNode</code>);
+<gtkdoclink href="XMLNODE"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLSIGNATUREGETC14NMETHODNODE">xmlSecTmplSignatureGetC14NMethodNode</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> signNode</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLREFERENCEADDTRANSFORM">xmlSecTmplReferenceAddTransform</a>     (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> referenceNode</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> transformId</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLOBJECTADDSIGNPROPERTIES">xmlSecTmplObjectAddSignProperties</a>   (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> objectNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *target</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLOBJECTADDMANIFEST">xmlSecTmplObjectAddManifest</a>         (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> objectNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLMANIFESTADDREFERENCE">xmlSecTmplManifestAddReference</a>      (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> manifestNode</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> digestMethodId</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *type</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLENCDATACREATE">xmlSecTmplEncDataCreate</a>             (<code class="PARAMETER"><gtkdoclink href="XMLDOC"><span class="TYPE">xmlDocPtr</span></gtkdoclink> doc</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> encMethodId</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *type</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *mimeType</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *encoding</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLENCDATAENSUREKEYINFO">xmlSecTmplEncDataEnsureKeyInfo</a>      (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> encNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>);
+<gtkdoclink href="XMLNODE"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLENCDATAENSUREENCPROPERTIES">xmlSecTmplEncDataEnsureEncProperties</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> encNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLENCDATAADDENCPROPERTY">xmlSecTmplEncDataAddEncProperty</a>     (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> encNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *target</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLENCDATAENSURECIPHERVALUE">xmlSecTmplEncDataEnsureCipherValue</a>  (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> encNode</code>);
+<gtkdoclink href="XMLNODE"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLENCDATAENSURECIPHERREFERENCE">xmlSecTmplEncDataEnsureCipherReference</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> encNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLENCDATAGETENCMETHODNODE">xmlSecTmplEncDataGetEncMethodNode</a>   (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> encNode</code>);
+<gtkdoclink href="XMLNODE"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLCIPHERREFERENCEADDTRANSFORM">xmlSecTmplCipherReferenceAddTransform</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cipherReferenceNode</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> transformId</code>);
+<gtkdoclink href="XMLNODE"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLREFERENCELISTADDDATAREFERENCE">xmlSecTmplReferenceListAddDataReference</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> encNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>);
+<gtkdoclink href="XMLNODE"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLREFERENCELISTADDKEYREFERENCE">xmlSecTmplReferenceListAddKeyReference</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> encNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLKEYINFOADDKEYNAME">xmlSecTmplKeyInfoAddKeyName</a>         (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> keyInfoNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLKEYINFOADDKEYVALUE">xmlSecTmplKeyInfoAddKeyValue</a>        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> keyInfoNode</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLKEYINFOADDX509DATA">xmlSecTmplKeyInfoAddX509Data</a>        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> keyInfoNode</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLKEYINFOADDRETRIEVALMETHOD">xmlSecTmplKeyInfoAddRetrievalMethod</a> (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> keyInfoNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *type</code>);
+<gtkdoclink href="XMLNODE"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLRETRIEVALMETHODADDTRANSFORM">xmlSecTmplRetrievalMethodAddTransform</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> retrMethodNode</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> transformId</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLKEYINFOADDENCRYPTEDKEY">xmlSecTmplKeyInfoAddEncryptedKey</a>    (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> keyInfoNode</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> encMethodId</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *type</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *recipient</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLX509DATAADDISSUERSERIAL">xmlSecTmplX509DataAddIssuerSerial</a>   (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> x509DataNode</code>);
+<gtkdoclink href="XMLNODE"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLX509ISSUERSERIALADDISSUERNAME">xmlSecTmplX509IssuerSerialAddIssuerName</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> x509IssuerSerialNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *issuerName</code>);
+<gtkdoclink href="XMLNODE"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLX509ISSUERSERIALADDSERIALNUMBER">xmlSecTmplX509IssuerSerialAddSerialNumber</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> x509IssuerSerialNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *serial</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLX509DATAADDSUBJECTNAME">xmlSecTmplX509DataAddSubjectName</a>    (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> x509DataNode</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLX509DATAADDSKI">xmlSecTmplX509DataAddSKI</a>            (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> x509DataNode</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLX509DATAADDCERTIFICATE">xmlSecTmplX509DataAddCertificate</a>    (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> x509DataNode</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLX509DATAADDCRL">xmlSecTmplX509DataAddCRL</a>            (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> x509DataNode</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDHMACOUTPUTLENGTH">xmlSecTmplTransformAddHmacOutputLength</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> transformNode</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bitsLen</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDRSAOAEPPARAM">xmlSecTmplTransformAddRsaOaepParam</a>  (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> transformNode</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDXSLTSTYLESHEET">xmlSecTmplTransformAddXsltStylesheet</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> transformNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *xslt</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDC14NINCLNAMESPACES">xmlSecTmplTransformAddC14NInclNamespaces</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> transformNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *prefixList</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDXPATH">xmlSecTmplTransformAddXPath</a>         (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> transformNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *expression</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> **nsList</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDXPATH2">xmlSecTmplTransformAddXPath2</a>        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> transformNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *type</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *expression</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> **nsList</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDXPOINTER">xmlSecTmplTransformAddXPointer</a>      (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> transformNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *expression</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> **nsList</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-TEMPLATES.DESCRIPTION"></a><h2>Description</h2>
@@ -211,39 +211,38 @@
 <a name="XMLSEC-TEMPLATES.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
 <a name="XMLSECTMPLSIGNATURECREATE"></a><h3>xmlSecTmplSignatureCreate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplSignatureCreate           (<font>xmlDocPtr</font> doc,
-                                                         <font>xmlSecTransformId</font> c14nMethodId,
-                                                         <font>xmlSecTransformId</font> signMethodId,
-                                                         const <font>xmlChar</font> *id);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplSignatureCreate           (<code class="PARAMETER"><gtkdoclink href="XMLDOC"><span class="TYPE">xmlDocPtr</span></gtkdoclink> doc</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> c14nMethodId</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> signMethodId</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>);</pre>
 <p>Creates new <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node with the mandatory <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a>,
 <a href="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod"; target="_top">&lt;dsig:CanonicalizationMethod/&gt;</a>, <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod"; target="_top">&lt;dsig:SignatureMethod/&gt;</a> and
 <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureValue"; target="_top">&lt;dsig:SignatureValue/&gt;</a> children and sub-children.
 The application is responsible for inserting the returned node
 in the XML document.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12465"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to signature document or NULL; in the
+<td align="LEFT" valign="TOP"><a name="AEN15205"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to signature document or NULL; in the
                      second case, application must later call <code class="PARAMETER">xmlSetTreeDoc</code>
                      to ensure that all the children nodes have correct
                      pointer to XML document.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12471"><span style="white-space: nowrap"><code class="PARAMETER">c14nMethodId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the signature canonicalization method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15211"><span style="white-space: nowrap"><code class="PARAMETER">c14nMethodId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the signature canonicalization method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12476"><span style="white-space: nowrap"><code class="PARAMETER">signMethodId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the signature  method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15216"><span style="white-space: nowrap"><code class="PARAMETER">signMethodId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the signature  method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12481"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the node id (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15221"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the node id (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12486"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15226"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node or NULL if an
 error occurs.</p></td>
 </tr>
@@ -252,11 +251,11 @@ error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLSIGNATURECREATENSPREF"></a><h3>xmlSecTmplSignatureCreateNsPref ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplSignatureCreateNsPref     (<font>xmlDocPtr</font> doc,
-                                                         <font>xmlSecTransformId</font> c14nMethodId,
-                                                         <font>xmlSecTransformId</font> signMethodId,
-                                                         const <font>xmlChar</font> *id,
-                                                         const <font>xmlChar</font> *nsPrefix);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplSignatureCreateNsPref     (<code class="PARAMETER"><gtkdoclink href="XMLDOC"><span class="TYPE">xmlDocPtr</span></gtkdoclink> doc</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> c14nMethodId</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> signMethodId</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *nsPrefix</code>);</pre>
 <p>Creates new <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node with the mandatory
 <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a>, <a href="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod"; target="_top">&lt;dsig:CanonicalizationMethod/&gt;</a>,
 <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod"; target="_top">&lt;dsig:SignatureMethod/&gt;</a> and <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureValue"; target="_top">&lt;dsig:SignatureValue/&gt;</a> children and
@@ -266,33 +265,32 @@ 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.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12511"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to signature document or NULL; in the
+<td align="LEFT" valign="TOP"><a name="AEN15261"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to signature document or NULL; in the
                      second case, application must later call <code class="PARAMETER">xmlSetTreeDoc</code>
                      to ensure that all the children nodes have correct
                      pointer to XML document.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12517"><span style="white-space: nowrap"><code class="PARAMETER">c14nMethodId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the signature canonicalization method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15267"><span style="white-space: nowrap"><code class="PARAMETER">c14nMethodId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the signature canonicalization method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12522"><span style="white-space: nowrap"><code class="PARAMETER">signMethodId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the signature  method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15272"><span style="white-space: nowrap"><code class="PARAMETER">signMethodId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the signature  method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12527"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the node id (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15277"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the node id (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12532"><span style="white-space: nowrap"><code class="PARAMETER">nsPrefix</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>   the namespace prefix for the signature element (e.g. "dsig"), or NULL</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15282"><span style="white-space: nowrap"><code class="PARAMETER">nsPrefix</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the namespace prefix for the signature element (e.g. "dsig"), or NULL</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12537"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15287"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node or NULL if an
 error occurs.</p></td>
 </tr>
@@ -301,23 +299,22 @@ error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLSIGNATUREENSUREKEYINFO"></a><h3>xmlSecTmplSignatureEnsureKeyInfo ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplSignatureEnsureKeyInfo    (<font>xmlNodePtr</font> signNode,
-                                                         const <font>xmlChar</font> *id);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplSignatureEnsureKeyInfo    (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> signNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>);</pre>
 <p>Adds (if necessary) <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a>
 node <code class="PARAMETER">signNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12557"><span style="white-space: nowrap"><code class="PARAMETER">signNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the  pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15311"><span style="white-space: nowrap"><code class="PARAMETER">signNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the  pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12563"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the node id (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15317"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the node id (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12568"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15322"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node or NULL if an
 error occurs.</p></td>
 </tr>
@@ -326,39 +323,38 @@ error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLSIGNATUREADDREFERENCE"></a><h3>xmlSecTmplSignatureAddReference ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplSignatureAddReference     (<font>xmlNodePtr</font> signNode,
-                                                         <font>xmlSecTransformId</font> digestMethodId,
-                                                         const <font>xmlChar</font> *id,
-                                                         const <font>xmlChar</font> *uri,
-                                                         const <font>xmlChar</font> *type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplSignatureAddReference     (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> signNode</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> digestMethodId</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *type</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node with given URI (<code class="PARAMETER">uri</code>), Id (<code class="PARAMETER">id</code>) and
 Type (<code class="PARAMETER">type</code>) attributes and the required children <a href="http://www.w3.org/TR/xmldsig-core/#sec-DigestMethod"; target="_top">&lt;dsig:DigestMethod/&gt;</a> and
 <a href="http://www.w3.org/TR/xmldsig-core/#sec-DigestValue"; target="_top">&lt;dsig:DigestValue/&gt;</a> to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> child of <code class="PARAMETER">signNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12596"><span style="white-space: nowrap"><code class="PARAMETER">signNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15360"><span style="white-space: nowrap"><code class="PARAMETER">signNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12602"><span style="white-space: nowrap"><code class="PARAMETER">digestMethodId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the reference digest method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15366"><span style="white-space: nowrap"><code class="PARAMETER">digestMethodId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the reference digest method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12607"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the node id (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15371"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the node id (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12612"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the reference node uri (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15376"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the reference node uri (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12617"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the reference node type (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15381"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the reference node type (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12622"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15386"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node or NULL
 if an error occurs.</p></td>
 </tr>
@@ -367,32 +363,31 @@ if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLSIGNATUREADDOBJECT"></a><h3>xmlSecTmplSignatureAddObject ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplSignatureAddObject        (<font>xmlNodePtr</font> signNode,
-                                                         const <font>xmlChar</font> *id,
-                                                         const <font>xmlChar</font> *mimeType,
-                                                         const <font>xmlChar</font> *encoding);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplSignatureAddObject        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> signNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *mimeType</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *encoding</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-Object"; target="_top">&lt;dsig:Object/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node <code class="PARAMETER">signNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12644"><span style="white-space: nowrap"><code class="PARAMETER">signNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15416"><span style="white-space: nowrap"><code class="PARAMETER">signNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12650"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the node id (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15422"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the node id (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12655"><span style="white-space: nowrap"><code class="PARAMETER">mimeType</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the object mime type (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15427"><span style="white-space: nowrap"><code class="PARAMETER">mimeType</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the object mime type (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12660"><span style="white-space: nowrap"><code class="PARAMETER">encoding</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the object encoding (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15432"><span style="white-space: nowrap"><code class="PARAMETER">encoding</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the object encoding (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12665"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15437"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Object"; target="_top">&lt;dsig:Object/&gt;</a> node or NULL
 if an error occurs.</p></td>
 </tr>
@@ -401,18 +396,17 @@ if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLSIGNATUREGETSIGNMETHODNODE"></a><h3>xmlSecTmplSignatureGetSignMethodNode ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplSignatureGetSignMethodNode
-                                                        (<font>xmlNodePtr</font> signNode);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODE"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplSignatureGetSignMethodNode
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> signNode</code>);</pre>
 <p>Gets pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod"; target="_top">&lt;dsig:SignatureMethod/&gt;</a> child of <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12683"><span style="white-space: nowrap"><code class="PARAMETER">signNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature%20"; target="_top">&lt;dsig:Signature /&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15457"><span style="white-space: nowrap"><code class="PARAMETER">signNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature%20"; target="_top">&lt;dsig:Signature /&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12689"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15463"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod%20"; target="_top">&lt;dsig:SignatureMethod /&gt;</a> node or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -420,18 +414,17 @@ if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLSIGNATUREGETC14NMETHODNODE"></a><h3>xmlSecTmplSignatureGetC14NMethodNode ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplSignatureGetC14NMethodNode
-                                                        (<font>xmlNodePtr</font> signNode);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODE"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplSignatureGetC14NMethodNode
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> signNode</code>);</pre>
 <p>Gets pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod"; target="_top">&lt;dsig:CanonicalizationMethod/&gt;</a> child of <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12707"><span style="white-space: nowrap"><code class="PARAMETER">signNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature%20"; target="_top">&lt;dsig:Signature /&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15483"><span style="white-space: nowrap"><code class="PARAMETER">signNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature%20"; target="_top">&lt;dsig:Signature /&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12713"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15489"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod%20"; target="_top">&lt;dsig:CanonicalizationMethod /&gt;</a> node or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -439,22 +432,21 @@ if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLREFERENCEADDTRANSFORM"></a><h3>xmlSecTmplReferenceAddTransform ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplReferenceAddTransform     (<font>xmlNodePtr</font> referenceNode,
-                                                         <font>xmlSecTransformId</font> transformId);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplReferenceAddTransform     (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> referenceNode</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> transformId</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node <code class="PARAMETER">referenceNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12733"><span style="white-space: nowrap"><code class="PARAMETER">referenceNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15513"><span style="white-space: nowrap"><code class="PARAMETER">referenceNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12739"><span style="white-space: nowrap"><code class="PARAMETER">transformId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the transform method id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15519"><span style="white-space: nowrap"><code class="PARAMETER">transformId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform method id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12744"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15524"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node or NULL if an
 error occurs.</p></td>
 </tr>
@@ -463,27 +455,26 @@ error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLOBJECTADDSIGNPROPERTIES"></a><h3>xmlSecTmplObjectAddSignProperties ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplObjectAddSignProperties   (<font>xmlNodePtr</font> objectNode,
-                                                         const <font>xmlChar</font> *id,
-                                                         const <font>xmlChar</font> *target);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplObjectAddSignProperties   (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> objectNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *target</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureProperties"; target="_top">&lt;dsig:SignatureProperties/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Object"; target="_top">&lt;dsig:Object/&gt;</a> node <code class="PARAMETER">objectNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12765"><span style="white-space: nowrap"><code class="PARAMETER">objectNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the  pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Object"; target="_top">&lt;dsig:Object/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15551"><span style="white-space: nowrap"><code class="PARAMETER">objectNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the  pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Object"; target="_top">&lt;dsig:Object/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12771"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the node id (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15557"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the node id (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12776"><span style="white-space: nowrap"><code class="PARAMETER">target</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the Target  (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15562"><span style="white-space: nowrap"><code class="PARAMETER">target</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the Target  (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12781"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15567"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureProperties"; target="_top">&lt;dsig:SignatureProperties/&gt;</a> node or NULL
 if an error occurs.</p></td>
 </tr>
@@ -492,22 +483,21 @@ if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLOBJECTADDMANIFEST"></a><h3>xmlSecTmplObjectAddManifest ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplObjectAddManifest         (<font>xmlNodePtr</font> objectNode,
-                                                         const <font>xmlChar</font> *id);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplObjectAddManifest         (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> objectNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Object"; target="_top">&lt;dsig:Object/&gt;</a> node <code class="PARAMETER">objectNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12801"><span style="white-space: nowrap"><code class="PARAMETER">objectNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the  pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Object"; target="_top">&lt;dsig:Object/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15591"><span style="white-space: nowrap"><code class="PARAMETER">objectNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the  pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Object"; target="_top">&lt;dsig:Object/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12807"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the node id (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15597"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the node id (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12812"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15602"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> node or NULL
 if an error occurs.</p></td>
 </tr>
@@ -516,39 +506,38 @@ if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLMANIFESTADDREFERENCE"></a><h3>xmlSecTmplManifestAddReference ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplManifestAddReference      (<font>xmlNodePtr</font> manifestNode,
-                                                         <font>xmlSecTransformId</font> digestMethodId,
-                                                         const <font>xmlChar</font> *id,
-                                                         const <font>xmlChar</font> *uri,
-                                                         const <font>xmlChar</font> *type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplManifestAddReference      (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> manifestNode</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> digestMethodId</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *type</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node with specified URI (<code class="PARAMETER">uri</code>), Id (<code class="PARAMETER">id</code>) and
 Type (<code class="PARAMETER">type</code>) attributes and the required children <a href="http://www.w3.org/TR/xmldsig-core/#sec-DigestMethod"; target="_top">&lt;dsig:DigestMethod/&gt;</a> and
 <a href="http://www.w3.org/TR/xmldsig-core/#sec-DigestValue"; target="_top">&lt;dsig:DigestValue/&gt;</a> to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> node <code class="PARAMETER">manifestNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12840"><span style="white-space: nowrap"><code class="PARAMETER">manifestNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15640"><span style="white-space: nowrap"><code class="PARAMETER">manifestNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12846"><span style="white-space: nowrap"><code class="PARAMETER">digestMethodId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the reference digest method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15646"><span style="white-space: nowrap"><code class="PARAMETER">digestMethodId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the reference digest method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12851"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the node id (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15651"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the node id (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12856"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the reference node uri (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15656"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the reference node uri (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12861"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the reference node type (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15661"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the reference node type (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12866"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15666"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node or NULL
 if an error occurs.</p></td>
 </tr>
@@ -557,44 +546,43 @@ if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLENCDATACREATE"></a><h3>xmlSecTmplEncDataCreate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplEncDataCreate             (<font>xmlDocPtr</font> doc,
-                                                         <font>xmlSecTransformId</font> encMethodId,
-                                                         const <font>xmlChar</font> *id,
-                                                         const <font>xmlChar</font> *type,
-                                                         const <font>xmlChar</font> *mimeType,
-                                                         const <font>xmlChar</font> *encoding);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplEncDataCreate             (<code class="PARAMETER"><gtkdoclink href="XMLDOC"><span class="TYPE">xmlDocPtr</span></gtkdoclink> doc</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> encMethodId</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *type</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *mimeType</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *encoding</code>);</pre>
 <p>Creates new <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData%20"; target="_top">&lt;enc:EncryptedData /&gt;</a> node for encryption template.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12888"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to signature document or NULL; in the later
+<td align="LEFT" valign="TOP"><a name="AEN15700"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to signature document or NULL; in the later
                      case, application must later call <code class="PARAMETER">xmlSetTreeDoc</code> to ensure
                      that all the children nodes have correct pointer to XML document.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12894"><span style="white-space: nowrap"><code class="PARAMETER">encMethodId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the encryption method (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15706"><span style="white-space: nowrap"><code class="PARAMETER">encMethodId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the encryption method (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12899"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the Id attribute (optional).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15711"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the Id attribute (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12904"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the Type attribute (optional)</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15716"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the Type attribute (optional)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12909"><span style="white-space: nowrap"><code class="PARAMETER">mimeType</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the MimeType attribute (optional)</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15721"><span style="white-space: nowrap"><code class="PARAMETER">mimeType</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the MimeType attribute (optional)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12914"><span style="white-space: nowrap"><code class="PARAMETER">encoding</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the Encoding attribute (optional)</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15726"><span style="white-space: nowrap"><code class="PARAMETER">encoding</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the Encoding attribute (optional)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12919"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15731"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer newly created  <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node or NULL
 if an error occurs.</p></td>
 </tr>
@@ -603,22 +591,21 @@ if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLENCDATAENSUREKEYINFO"></a><h3>xmlSecTmplEncDataEnsureKeyInfo ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplEncDataEnsureKeyInfo      (<font>xmlNodePtr</font> encNode,
-                                                         const <font>xmlChar</font> *id);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplEncDataEnsureKeyInfo      (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> encNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> to the  <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node <code class="PARAMETER">encNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12939"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15755"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12945"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the Id attrbibute (optional).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15761"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the Id attrbibute (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12950"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15766"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -627,24 +614,23 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLENCDATAENSUREENCPROPERTIES"></a><h3>xmlSecTmplEncDataEnsureEncProperties ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplEncDataEnsureEncProperties
-                                                        (<font>xmlNodePtr</font> encNode,
-                                                         const <font>xmlChar</font> *id);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODE"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplEncDataEnsureEncProperties
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> encNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties"; target="_top">&lt;enc:EncryptionProperties/&gt;</a> node to the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a>
 node <code class="PARAMETER">encNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12970"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15790"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12976"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the Id attribute (optional).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15796"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the Id attribute (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12981"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15801"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties"; target="_top">&lt;enc:EncryptionProperties/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -653,29 +639,28 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLENCDATAADDENCPROPERTY"></a><h3>xmlSecTmplEncDataAddEncProperty ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplEncDataAddEncProperty     (<font>xmlNodePtr</font> encNode,
-                                                         const <font>xmlChar</font> *id,
-                                                         const <font>xmlChar</font> *target);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplEncDataAddEncProperty     (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> encNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *target</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperty"; target="_top">&lt;enc:EncryptionProperty/&gt;</a> node (and the parent
 <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties"; target="_top">&lt;enc:EncryptionProperties/&gt;</a> node if required) to the
 <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node <code class="PARAMETER">encNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13003"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15829"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13009"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the Id attribute (optional).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15835"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the Id attribute (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13014"><span style="white-space: nowrap"><code class="PARAMETER">target</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the Target attribute (optional).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15840"><span style="white-space: nowrap"><code class="PARAMETER">target</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the Target attribute (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13019"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15845"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperty"; target="_top">&lt;enc:EncryptionProperty/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -684,17 +669,16 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLENCDATAENSURECIPHERVALUE"></a><h3>xmlSecTmplEncDataEnsureCipherValue ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplEncDataEnsureCipherValue  (<font>xmlNodePtr</font> encNode);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplEncDataEnsureCipherValue  (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> encNode</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue"; target="_top">&lt;enc:CipherValue/&gt;</a> to the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node <code class="PARAMETER">encNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13038"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15866"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13044"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15872"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue"; target="_top">&lt;enc:CipherValue/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -703,24 +687,23 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLENCDATAENSURECIPHERREFERENCE"></a><h3>xmlSecTmplEncDataEnsureCipherReference ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplEncDataEnsureCipherReference
-                                                        (<font>xmlNodePtr</font> encNode,
-                                                         const <font>xmlChar</font> *uri);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODE"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplEncDataEnsureCipherReference
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> encNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference"; target="_top">&lt;enc:CipherReference/&gt;</a> node with specified URI attribute <code class="PARAMETER">uri</code>
 to the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node <code class="PARAMETER">encNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13065"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15897"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13071"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the URI attribute (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15903"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the URI attribute (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13076"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15908"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference"; target="_top">&lt;enc:CipherReference/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -729,17 +712,16 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLENCDATAGETENCMETHODNODE"></a><h3>xmlSecTmplEncDataGetEncMethodNode ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplEncDataGetEncMethodNode   (<font>xmlNodePtr</font> encNode);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplEncDataGetEncMethodNode   (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> encNode</code>);</pre>
 <p>Gets pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncrytpionMethod"; target="_top">&lt;enc:EncrytpionMethod/&gt;</a> node.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13093"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EcnryptedData%20"; target="_top">&lt;enc:EcnryptedData /&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15927"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EcnryptedData%20"; target="_top">&lt;enc:EcnryptedData /&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13099"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15933"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod%20"; target="_top">&lt;enc:EncryptionMethod /&gt;</a> node or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -747,25 +729,24 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLCIPHERREFERENCEADDTRANSFORM"></a><h3>xmlSecTmplCipherReferenceAddTransform ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplCipherReferenceAddTransform
-                                                        (<font>xmlNodePtr</font> cipherReferenceNode,
-                                                         <font>xmlSecTransformId</font> transformId);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODE"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplCipherReferenceAddTransform
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cipherReferenceNode</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> transformId</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node (and the parent <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transforms"; target="_top">&lt;dsig:Transforms/&gt;</a> node)
 with specified transform methods <code class="PARAMETER">transform</code> to the <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference"; target="_top">&lt;enc:CipherReference/&gt;</a>
 child node of the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node <code class="PARAMETER">encNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13122"><span style="white-space: nowrap"><code class="PARAMETER">cipherReferenceNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference"; target="_top">&lt;enc:CipherReference/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15960"><span style="white-space: nowrap"><code class="PARAMETER">cipherReferenceNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference"; target="_top">&lt;enc:CipherReference/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13128"><span style="white-space: nowrap"><code class="PARAMETER">transformId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the transform id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15966"><span style="white-space: nowrap"><code class="PARAMETER">transformId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13133"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15971"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -774,23 +755,22 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLREFERENCELISTADDDATAREFERENCE"></a><h3>xmlSecTmplReferenceListAddDataReference ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplReferenceListAddDataReference
-                                                        (<font>xmlNodePtr</font> encNode,
-                                                         const <font>xmlChar</font> *uri);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODE"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplReferenceListAddDataReference
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> encNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmlenc-core/#sec-DataReference"; target="_top">&lt;enc:DataReference/&gt;</a> and the parent <a href="http://www.w3.org/TR/xmlenc-core/#sec-ReferenceList"; target="_top">&lt;enc:ReferenceList/&gt;</a> node (if needed).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13152"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                    the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15994"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13158"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                        uri to reference (optional)</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16000"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>uri to reference (optional)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13163"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16005"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-DataReference"; target="_top">&lt;enc:DataReference/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -799,23 +779,22 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLREFERENCELISTADDKEYREFERENCE"></a><h3>xmlSecTmplReferenceListAddKeyReference ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplReferenceListAddKeyReference
-                                                        (<font>xmlNodePtr</font> encNode,
-                                                         const <font>xmlChar</font> *uri);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODE"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplReferenceListAddKeyReference
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> encNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmlenc-core/#sec-KeyReference"; target="_top">&lt;enc:KeyReference/&gt;</a> and the parent <a href="http://www.w3.org/TR/xmlenc-core/#sec-ReferenceList"; target="_top">&lt;enc:ReferenceList/&gt;</a> node (if needed).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13182"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                    the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16028"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13188"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                        uri to reference (optional)</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16034"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>uri to reference (optional)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13193"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16039"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-KeyReference"; target="_top">&lt;enc:KeyReference/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -824,22 +803,21 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLKEYINFOADDKEYNAME"></a><h3>xmlSecTmplKeyInfoAddKeyName ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplKeyInfoAddKeyName         (<font>xmlNodePtr</font> keyInfoNode,
-                                                         const <font>xmlChar</font> *name);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplKeyInfoAddKeyName         (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> keyInfoNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyName"; target="_top">&lt;dsig:KeyName/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <code class="PARAMETER">keyInfoNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13213"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16063"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13219"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the key name (optional).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16069"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the key name (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13224"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16074"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyName"; target="_top">&lt;dsig:KeyName/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -848,17 +826,16 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLKEYINFOADDKEYVALUE"></a><h3>xmlSecTmplKeyInfoAddKeyValue ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplKeyInfoAddKeyValue        (<font>xmlNodePtr</font> keyInfoNode);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplKeyInfoAddKeyValue        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> keyInfoNode</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue"; target="_top">&lt;dsig:KeyValue/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <code class="PARAMETER">keyInfoNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13243"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16095"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13249"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16101"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue"; target="_top">&lt;dsig:KeyValue/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -867,17 +844,16 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLKEYINFOADDX509DATA"></a><h3>xmlSecTmplKeyInfoAddX509Data ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplKeyInfoAddX509Data        (<font>xmlNodePtr</font> keyInfoNode);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplKeyInfoAddX509Data        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> keyInfoNode</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <code class="PARAMETER">keyInfoNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13268"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16122"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13274"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16128"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -886,27 +862,26 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLKEYINFOADDRETRIEVALMETHOD"></a><h3>xmlSecTmplKeyInfoAddRetrievalMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplKeyInfoAddRetrievalMethod (<font>xmlNodePtr</font> keyInfoNode,
-                                                         const <font>xmlChar</font> *uri,
-                                                         const <font>xmlChar</font> *type);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplKeyInfoAddRetrievalMethod (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> keyInfoNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *type</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod"; target="_top">&lt;dsig:RetrievalMethod/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <code class="PARAMETER">keyInfoNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13295"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16155"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13301"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the URI attribute (optional).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16161"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the URI attribute (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13306"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the Type attribute(optional).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16166"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the Type attribute(optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13311"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16171"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod"; target="_top">&lt;dsig:RetrievalMethod/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -915,24 +890,23 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLRETRIEVALMETHODADDTRANSFORM"></a><h3>xmlSecTmplRetrievalMethodAddTransform ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplRetrievalMethodAddTransform
-                                                        (<font>xmlNodePtr</font> retrMethodNode,
-                                                         <font>xmlSecTransformId</font> transformId);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODE"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplRetrievalMethodAddTransform
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> retrMethodNode</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> transformId</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node (and the parent <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transforms"; target="_top">&lt;dsig:Transforms/&gt;</a> node
 if required) to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod"; target="_top">&lt;dsig:RetrievalMethod/&gt;</a> node <code class="PARAMETER">retrMethod</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13332"><span style="white-space: nowrap"><code class="PARAMETER">retrMethodNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod"; target="_top">&lt;dsig:RetrievalMethod/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16196"><span style="white-space: nowrap"><code class="PARAMETER">retrMethodNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod"; target="_top">&lt;dsig:RetrievalMethod/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13338"><span style="white-space: nowrap"><code class="PARAMETER">transformId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the transform id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16202"><span style="white-space: nowrap"><code class="PARAMETER">transformId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13343"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16207"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transforms"; target="_top">&lt;dsig:Transforms/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -941,38 +915,37 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLKEYINFOADDENCRYPTEDKEY"></a><h3>xmlSecTmplKeyInfoAddEncryptedKey ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplKeyInfoAddEncryptedKey    (<font>xmlNodePtr</font> keyInfoNode,
-                                                         <font>xmlSecTransformId</font> encMethodId,
-                                                         const <font>xmlChar</font> *id,
-                                                         const <font>xmlChar</font> *type,
-                                                         const <font>xmlChar</font> *recipient);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplKeyInfoAddEncryptedKey    (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> keyInfoNode</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> encMethodId</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *type</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *recipient</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node with given attributes to
 the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <code class="PARAMETER">keyInfoNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13366"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16240"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13372"><span style="white-space: nowrap"><code class="PARAMETER">encMethodId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the encryption method (optional).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16246"><span style="white-space: nowrap"><code class="PARAMETER">encMethodId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the encryption method (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13377"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the Id attribute (optional).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16251"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the Id attribute (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13382"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the Type attribute (optional).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16256"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the Type attribute (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13387"><span style="white-space: nowrap"><code class="PARAMETER">recipient</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the Recipient attribute (optional).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16261"><span style="white-space: nowrap"><code class="PARAMETER">recipient</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the Recipient attribute (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13392"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16266"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -981,17 +954,16 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLX509DATAADDISSUERSERIAL"></a><h3>xmlSecTmplX509DataAddIssuerSerial ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplX509DataAddIssuerSerial   (<font>xmlNodePtr</font> x509DataNode);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplX509DataAddIssuerSerial   (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> x509DataNode</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial"; target="_top">&lt;dsig:X509IssuerSerial/&gt;</a> node to the given <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13410"><span style="white-space: nowrap"><code class="PARAMETER">x509DataNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16286"><span style="white-space: nowrap"><code class="PARAMETER">x509DataNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13416"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16292"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial"; target="_top">&lt;dsig:X509IssuerSerial/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -1000,23 +972,22 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLX509ISSUERSERIALADDISSUERNAME"></a><h3>xmlSecTmplX509IssuerSerialAddIssuerName ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplX509IssuerSerialAddIssuerName
-                                                        (<font>xmlNodePtr</font> x509IssuerSerialNode,
-                                                         const <font>xmlChar</font> *issuerName);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODE"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplX509IssuerSerialAddIssuerName
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> x509IssuerSerialNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *issuerName</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerName"; target="_top">&lt;dsig:X509IssuerName/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial"; target="_top">&lt;dsig:X509IssuerSerial/&gt;</a> node <code class="PARAMETER">x509IssuerSerialNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13436"><span style="white-space: nowrap"><code class="PARAMETER">x509IssuerSerialNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial"; target="_top">&lt;dsig:X509IssuerSerial/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16316"><span style="white-space: nowrap"><code class="PARAMETER">x509IssuerSerialNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial"; target="_top">&lt;dsig:X509IssuerSerial/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13442"><span style="white-space: nowrap"><code class="PARAMETER">issuerName</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the issuer name (optional).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16322"><span style="white-space: nowrap"><code class="PARAMETER">issuerName</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the issuer name (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13447"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16327"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerName"; target="_top">&lt;dsig:X509IssuerName/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -1025,23 +996,22 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLX509ISSUERSERIALADDSERIALNUMBER"></a><h3>xmlSecTmplX509IssuerSerialAddSerialNumber ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplX509IssuerSerialAddSerialNumber
-                                                        (<font>xmlNodePtr</font> x509IssuerSerialNode,
-                                                         const <font>xmlChar</font> *serial);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODE"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplX509IssuerSerialAddSerialNumber
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> x509IssuerSerialNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *serial</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SerialNumber"; target="_top">&lt;dsig:X509SerialNumber/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial"; target="_top">&lt;dsig:X509IssuerSerial/&gt;</a> node <code class="PARAMETER">x509IssuerSerialNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13467"><span style="white-space: nowrap"><code class="PARAMETER">x509IssuerSerialNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial"; target="_top">&lt;dsig:X509IssuerSerial/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16351"><span style="white-space: nowrap"><code class="PARAMETER">x509IssuerSerialNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial"; target="_top">&lt;dsig:X509IssuerSerial/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13473"><span style="white-space: nowrap"><code class="PARAMETER">serial</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the serial number (optional).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16357"><span style="white-space: nowrap"><code class="PARAMETER">serial</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the serial number (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13478"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16362"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SerialNumber"; target="_top">&lt;dsig:X509SerialNumber/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -1050,17 +1020,16 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLX509DATAADDSUBJECTNAME"></a><h3>xmlSecTmplX509DataAddSubjectName ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplX509DataAddSubjectName    (<font>xmlNodePtr</font> x509DataNode);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplX509DataAddSubjectName    (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> x509DataNode</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName"; target="_top">&lt;dsig:X509SubjectName/&gt;</a> node to the given <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13496"><span style="white-space: nowrap"><code class="PARAMETER">x509DataNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16382"><span style="white-space: nowrap"><code class="PARAMETER">x509DataNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13502"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16388"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName"; target="_top">&lt;dsig:X509SubjectName/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -1069,17 +1038,16 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLX509DATAADDSKI"></a><h3>xmlSecTmplX509DataAddSKI ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplX509DataAddSKI            (<font>xmlNodePtr</font> x509DataNode);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplX509DataAddSKI            (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> x509DataNode</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SKI"; target="_top">&lt;dsig:X509SKI/&gt;</a> node to the given <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13520"><span style="white-space: nowrap"><code class="PARAMETER">x509DataNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16408"><span style="white-space: nowrap"><code class="PARAMETER">x509DataNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13526"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16414"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SKI"; target="_top">&lt;dsig:X509SKI/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -1088,17 +1056,16 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLX509DATAADDCERTIFICATE"></a><h3>xmlSecTmplX509DataAddCertificate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplX509DataAddCertificate    (<font>xmlNodePtr</font> x509DataNode);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplX509DataAddCertificate    (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> x509DataNode</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate"; target="_top">&lt;dsig:X509Certificate/&gt;</a> node to the given <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13544"><span style="white-space: nowrap"><code class="PARAMETER">x509DataNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16434"><span style="white-space: nowrap"><code class="PARAMETER">x509DataNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13550"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16440"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate"; target="_top">&lt;dsig:X509Certificate/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -1107,17 +1074,16 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLX509DATAADDCRL"></a><h3>xmlSecTmplX509DataAddCRL ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplX509DataAddCRL            (<font>xmlNodePtr</font> x509DataNode);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecTmplX509DataAddCRL            (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> x509DataNode</code>);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509CRL"; target="_top">&lt;dsig:X509CRL/&gt;</a> node to the given <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13568"><span style="white-space: nowrap"><code class="PARAMETER">x509DataNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16460"><span style="white-space: nowrap"><code class="PARAMETER">x509DataNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13574"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16466"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509CRL"; target="_top">&lt;dsig:X509CRL/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
@@ -1126,24 +1092,23 @@ NULL if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLTRANSFORMADDHMACOUTPUTLENGTH"></a><h3>xmlSecTmplTransformAddHmacOutputLength ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTmplTransformAddHmacOutputLength
-                                                        (<font>xmlNodePtr</font> transformNode,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bitsLen);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTmplTransformAddHmacOutputLength
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> transformNode</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> bitsLen</code>);</pre>
 <p>Creates <a href="http://www.w3.org/TR/xmldsig-core/#sec-HMACOutputLength"; target="_top">&lt;dsig:HMACOutputLength/&gt;</a> child for the HMAC transform
 node <code class="PARAMETER">node</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13593"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>      the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16489"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13599"><span style="white-space: nowrap"><code class="PARAMETER">bitsLen</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the required length in bits</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16495"><span style="white-space: nowrap"><code class="PARAMETER">bitsLen</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the required length in bits</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13604"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16500"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success and a negatie value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1151,27 +1116,26 @@ node <code class="PARAMETER">node</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLTRANSFORMADDRSAOAEPPARAM"></a><h3>xmlSecTmplTransformAddRsaOaepParam ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTmplTransformAddRsaOaepParam  (<font>xmlNodePtr</font> transformNode,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTmplTransformAddRsaOaepParam  (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> transformNode</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buf</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);</pre>
 <p>Creates <a href="http://www.w3.org/TR/xmlenc-core/#sec-OAEPParam"; target="_top">&lt;enc:OAEPParam/&gt;</a> child node in the <code class="PARAMETER">node</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13623"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>      the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16525"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13629"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the OAEP param buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16531"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the OAEP param buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13634"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the OAEP param buffer size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16536"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the OAEP param buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13639"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16541"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1179,23 +1143,22 @@ node <code class="PARAMETER">node</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLTRANSFORMADDXSLTSTYLESHEET"></a><h3>xmlSecTmplTransformAddXsltStylesheet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTmplTransformAddXsltStylesheet
-                                                        (<font>xmlNodePtr</font> transformNode,
-                                                         const <font>xmlChar</font> *xslt);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTmplTransformAddXsltStylesheet
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> transformNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *xslt</code>);</pre>
 <p>Writes the XSLT transform expression to the <code class="PARAMETER">node</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13656"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>      the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16562"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13662"><span style="white-space: nowrap"><code class="PARAMETER">xslt</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the XSLT transform exspression.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16568"><span style="white-space: nowrap"><code class="PARAMETER">xslt</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the XSLT transform exspression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13667"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16573"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1203,25 +1166,24 @@ node <code class="PARAMETER">node</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLTRANSFORMADDC14NINCLNAMESPACES"></a><h3>xmlSecTmplTransformAddC14NInclNamespaces ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTmplTransformAddC14NInclNamespaces
-                                                        (<font>xmlNodePtr</font> transformNode,
-                                                         const <font>xmlChar</font> *prefixList);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTmplTransformAddC14NInclNamespaces
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> transformNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *prefixList</code>);</pre>
 <p>Adds "inclusive" namespaces to the ExcC14N transform node <code class="PARAMETER">node</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13684"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>      the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16594"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13690"><span style="white-space: nowrap"><code class="PARAMETER">prefixList</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the white space delimited  list of namespace prefixes,
+<td align="LEFT" valign="TOP"><a name="AEN16600"><span style="white-space: nowrap"><code class="PARAMETER">prefixList</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the white space delimited  list of namespace prefixes,
                      where "<gtkdoclink href="DEFAULT"><span class="TYPE">default</span></gtkdoclink>" indicates the default namespace
                      (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13697"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16607"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 if success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1229,29 +1191,28 @@ node <code class="PARAMETER">node</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLTRANSFORMADDXPATH"></a><h3>xmlSecTmplTransformAddXPath ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTmplTransformAddXPath         (<font>xmlNodePtr</font> transformNode,
-                                                         const <font>xmlChar</font> *expression,
-                                                         const <font>xmlChar</font> **nsList);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTmplTransformAddXPath         (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> transformNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *expression</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> **nsList</code>);</pre>
 <p>Writes XPath transform infromation to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node
 <code class="PARAMETER">node</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13716"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>      the pointer to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16632"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13722"><span style="white-space: nowrap"><code class="PARAMETER">expression</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the XPath expression.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16638"><span style="white-space: nowrap"><code class="PARAMETER">expression</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the XPath expression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13727"><span style="white-space: nowrap"><code class="PARAMETER">nsList</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the NULL terminated list of namespace prefix/href pairs
+<td align="LEFT" valign="TOP"><a name="AEN16643"><span style="white-space: nowrap"><code class="PARAMETER">nsList</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the NULL terminated list of namespace prefix/href pairs
                      (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13732"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16648"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 for success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1259,34 +1220,33 @@ node <code class="PARAMETER">node</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLTRANSFORMADDXPATH2"></a><h3>xmlSecTmplTransformAddXPath2 ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTmplTransformAddXPath2        (<font>xmlNodePtr</font> transformNode,
-                                                         const <font>xmlChar</font> *type,
-                                                         const <font>xmlChar</font> *expression,
-                                                         const <font>xmlChar</font> **nsList);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTmplTransformAddXPath2        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> transformNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *type</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *expression</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> **nsList</code>);</pre>
 <p>Writes XPath2 transform infromation to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node
 <code class="PARAMETER">node</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13752"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>      the pointer to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16676"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13758"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the XPath2 transform type ("union", "intersect" or "subtract").</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16682"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the XPath2 transform type ("union", "intersect" or "subtract").</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13763"><span style="white-space: nowrap"><code class="PARAMETER">expression</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the XPath expression.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16687"><span style="white-space: nowrap"><code class="PARAMETER">expression</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the XPath expression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13768"><span style="white-space: nowrap"><code class="PARAMETER">nsList</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the NULL terminated list of namespace prefix/href pairs.
+<td align="LEFT" valign="TOP"><a name="AEN16692"><span style="white-space: nowrap"><code class="PARAMETER">nsList</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the NULL terminated list of namespace prefix/href pairs.
                      (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13773"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16697"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 for success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1294,29 +1254,28 @@ node <code class="PARAMETER">node</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTMPLTRANSFORMADDXPOINTER"></a><h3>xmlSecTmplTransformAddXPointer ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTmplTransformAddXPointer      (<font>xmlNodePtr</font> transformNode,
-                                                         const <font>xmlChar</font> *expression,
-                                                         const <font>xmlChar</font> **nsList);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTmplTransformAddXPointer      (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> transformNode</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *expression</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> **nsList</code>);</pre>
 <p>Writes XPoniter transform infromation to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node
 <code class="PARAMETER">node</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13792"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>      the pointer to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16722"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13798"><span style="white-space: nowrap"><code class="PARAMETER">expression</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the XPath expression.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16728"><span style="white-space: nowrap"><code class="PARAMETER">expression</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the XPath expression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13803"><span style="white-space: nowrap"><code class="PARAMETER">nsList</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the NULL terminated list of namespace prefix/href pairs.
+<td align="LEFT" valign="TOP"><a name="AEN16733"><span style="white-space: nowrap"><code class="PARAMETER">nsList</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the NULL terminated list of namespace prefix/href pairs.
                      (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13808"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16738"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 for success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
diff --git a/docs/api/xmlsec-transforms.html b/docs/api/xmlsec-transforms.html
index 59ee533..a42c219 100644
--- a/docs/api/xmlsec-transforms.html
+++ b/docs/api/xmlsec-transforms.html
@@ -87,15 +87,15 @@
 <h1>
 <a name="XMLSEC-TRANSFORMS"></a>transforms</h1>
 <div class="REFNAMEDIV">
-<a name="AEN13818"></a><h2>Name</h2>transforms -- Transform object definition.</div>
+<a name="AEN16748"></a><h2>Name</h2>transforms -- Transform object definition.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-TRANSFORMS.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">#define             <a href="xmlsec-transforms.html#XMLSEC-TRANSFORM-BINARY-CHUNK--CAPS">XMLSEC_TRANSFORM_BINARY_CHUNK</a>
-<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a>    <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDSGET">xmlSecTransformIdsGet</a>               (void);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDSINIT">xmlSecTransformIdsInit</a>              (void);
-<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDSSHUTDOWN">xmlSecTransformIdsShutdown</a>          (void);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDSREGISTERDEFAULT">xmlSecTransformIdsRegisterDefault</a>   (void);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDSREGISTER">xmlSecTransformIdsRegister</a>          (<font>xmlSecTransformId</font> id);
+<pre class="SYNOPSIS">#define             <a href="xmlsec-transforms.html#XMLSEC-TRANSFORM-BINARY-CHUNK:CAPS">XMLSEC_TRANSFORM_BINARY_CHUNK</a>
+<a href="xmlsec-list.html#XMLSECPTRLIST"><span class="RETURNVALUE">xmlSecPtrListPtr</span></a>    <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDSGET">xmlSecTransformIdsGet</a>               (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMIDSINIT">xmlSecTransformIdsInit</a>              (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMIDSSHUTDOWN">xmlSecTransformIdsShutdown</a>          (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMIDSREGISTERDEFAULT">xmlSecTransformIdsRegisterDefault</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMIDSREGISTER">xmlSecTransformIdsRegister</a>          (<code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> id</code>);
 enum                <a href="xmlsec-transforms.html#XMLSECTRANSFORMSTATUS">xmlSecTransformStatus</a>;
 enum                <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a>;
 enum                <a href="xmlsec-transforms.html#XMLSECTRANSFORMOPERATION">xmlSecTransformOperation</a>;
@@ -106,8 +106,8 @@ typedef             <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPE">xmlS
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPELOCAL">xmlSecTransformUriTypeLocal</a>
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPEREMOTE">xmlSecTransformUriTypeRemote</a>
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPEANY">xmlSecTransformUriTypeAny</a>
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPECHECK">xmlSecTransformUriTypeCheck</a>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPE">xmlSecTransformUriType</a> type,
-                                                         const <font>xmlChar</font> *uri);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPECHECK">xmlSecTransformUriTypeCheck</a>         (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPE"><span class="TYPE">xmlSecTransformUriType</span></a> type</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>);
 typedef             <a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a>;
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPEUNKNOWN">xmlSecTransformDataTypeUnknown</a>
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPEBIN">xmlSecTransformDataTypeBin</a>
@@ -120,226 +120,229 @@ typedef             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSec
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGESIGNATUREMETHOD">xmlSecTransformUsageSignatureMethod</a>
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGEENCRYPTIONMETHOD">xmlSecTransformUsageEncryptionMethod</a>
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGEANY">xmlSecTransformUsageAny</a>
-<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXPREEXECUTECALLBACK">*xmlSecTransformCtxPreExecuteCallback</a>)
-                                                        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-#define             <a href="xmlsec-transforms.html#XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK--CAPS">XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK</a>
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXPREEXECUTECALLBACK">*xmlSecTransformCtxPreExecuteCallback</a>)
+                                                        (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+#define             <a href="xmlsec-transforms.html#XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK:CAPS">XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK</a>
 struct              <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtx</a>;
-<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXCREATE">xmlSecTransformCtxCreate</a>         (void);
-<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXDESTROY">xmlSecTransformCtxDestroy</a>           (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXINITIALIZE">xmlSecTransformCtxInitialize</a>        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);
-<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXFINALIZE">xmlSecTransformCtxFinalize</a>          (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);
-<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXRESET">xmlSecTransformCtxReset</a>             (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXCOPYUSERPREF">xmlSecTransformCtxCopyUserPref</a>      (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> dst,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> src);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXSETURI">xmlSecTransformCtxSetUri</a>            (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         const <font>xmlChar</font> *uri,
-                                                         <font>xmlNodePtr</font> hereNode);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXAPPEND">xmlSecTransformCtxAppend</a>            (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXPREPEND">xmlSecTransformCtxPrepend</a>           (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);
-<font>xmlSecTransformPtr</font>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXCREATEANDAPPEND">xmlSecTransformCtxCreateAndAppend</a>   (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <font>xmlSecTransformId</font> id);
-<font>xmlSecTransformPtr</font>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXCREATEANDPREPEND">xmlSecTransformCtxCreateAndPrepend</a>  (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <font>xmlSecTransformId</font> id);
-<font>xmlSecTransformPtr</font>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXNODEREAD">xmlSecTransformCtxNodeRead</a>          (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXNODESLISTREAD">xmlSecTransformCtxNodesListRead</a>     (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXPREPARE">xmlSecTransformCtxPrepare</a>           (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a> inputDataType);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXBINARYEXECUTE">xmlSecTransformCtxBinaryExecute</a>     (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXURIEXECUTE">xmlSecTransformCtxUriExecute</a>        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         const <font>xmlChar</font> *uri);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXXMLEXECUTE">xmlSecTransformCtxXmlExecute</a>        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXEXECUTE">xmlSecTransformCtxExecute</a>           (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <font>xmlDocPtr</font> doc);
-<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXDEBUGDUMP">xmlSecTransformCtxDebugDump</a>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <font>FILE</font> *output);
-<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXDEBUGXMLDUMP">xmlSecTransformCtxDebugXmlDump</a>      (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <font>FILE</font> *output);
+<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="RETURNVALUE">xmlSecTransformCtxPtr</span></a>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXCREATE">xmlSecTransformCtxCreate</a>         (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXDESTROY">xmlSecTransformCtxDestroy</a>           (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXINITIALIZE">xmlSecTransformCtxInitialize</a>        (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXFINALIZE">xmlSecTransformCtxFinalize</a>          (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXRESET">xmlSecTransformCtxReset</a>             (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXCOPYUSERPREF">xmlSecTransformCtxCopyUserPref</a>      (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> dst</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> src</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXSETURI">xmlSecTransformCtxSetUri</a>            (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> hereNode</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXAPPEND">xmlSecTransformCtxAppend</a>            (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXPREPEND">xmlSecTransformCtxPrepend</a>           (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>);
+<gtkdoclink href="XMLSECTRANSFORMPTR"><span class="RETURNVALUE">xmlSecTransformPtr</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXCREATEANDAPPEND">xmlSecTransformCtxCreateAndAppend</a>   (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> id</code>);
+<gtkdoclink href="XMLSECTRANSFORMPTR"><span class="RETURNVALUE">xmlSecTransformPtr</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXCREATEANDPREPEND">xmlSecTransformCtxCreateAndPrepend</a>  (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> id</code>);
+<gtkdoclink href="XMLSECTRANSFORMPTR"><span class="RETURNVALUE">xmlSecTransformPtr</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXNODEREAD">xmlSecTransformCtxNodeRead</a>          (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE"><span class="TYPE">xmlSecTransformUsage</span></a> usage</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXNODESLISTREAD">xmlSecTransformCtxNodesListRead</a>     (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE"><span class="TYPE">xmlSecTransformUsage</span></a> usage</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXPREPARE">xmlSecTransformCtxPrepare</a>           (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE"><span class="TYPE">xmlSecTransformDataType</span></a> inputDataType</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXBINARYEXECUTE">xmlSecTransformCtxBinaryExecute</a>     (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXURIEXECUTE">xmlSecTransformCtxUriExecute</a>        (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXXMLEXECUTE">xmlSecTransformCtxXmlExecute</a>        (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nodes</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXEXECUTE">xmlSecTransformCtxExecute</a>           (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLDOC"><span class="TYPE">xmlDocPtr</span></gtkdoclink> doc</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXDEBUGDUMP">xmlSecTransformCtxDebugDump</a>         (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXDEBUGXMLDUMP">xmlSecTransformCtxDebugXmlDump</a>      (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
 struct              <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransform</a>;
-<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMCREATE">xmlSecTransformCreate</a>               (<font>xmlSecTransformId</font> id);
-<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMDESTROY">xmlSecTransformDestroy</a>              (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);
-<font>xmlSecTransformPtr</font>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMNODEREAD">xmlSecTransformNodeRead</a>             (<font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMPUMP">xmlSecTransformPump</a>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> left,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> right,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEY">xmlSecTransformSetKey</a>               (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEYREQ">xmlSecTransformSetKeyReq</a>            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFY">xmlSecTransformVerify</a>               (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFYNODECONTENT">xmlSecTransformVerifyNodeContent</a>    (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMGETDATATYPE">xmlSecTransformGetDataType</a>     (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a> mode,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHBIN">xmlSecTransformPushBin</a>              (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <font>int</font> final,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPBIN">xmlSecTransformPopBin</a>               (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> maxDataSize,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *dataSize,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHXML">xmlSecTransformPushXml</a>              (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPXML">xmlSecTransformPopXml</a>               (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> *nodes,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMEXECUTE">xmlSecTransformExecute</a>              (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <font>int</font> last,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEBUGDUMP">xmlSecTransformDebugDump</a>            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <font>FILE</font> *output);
-<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEBUGXMLDUMP">xmlSecTransformDebugXmlDump</a>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <font>FILE</font> *output);
+<a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="RETURNVALUE">xmlSecTransformPtr</span></a>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMCREATE">xmlSecTransformCreate</a>               (<code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> id</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMDESTROY">xmlSecTransformDestroy</a>              (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>);
+<gtkdoclink href="XMLSECTRANSFORMPTR"><span class="RETURNVALUE">xmlSecTransformPtr</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMNODEREAD">xmlSecTransformNodeRead</a>             (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE"><span class="TYPE">xmlSecTransformUsage</span></a> usage</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMPUMP">xmlSecTransformPump</a>                 (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> left</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> right</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEY">xmlSecTransformSetKey</a>               (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEYREQ">xmlSecTransformSetKeyReq</a>            (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> keyReq</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFY">xmlSecTransformVerify</a>               (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFYNODECONTENT">xmlSecTransformVerifyNodeContent</a>    (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE"><span class="RETURNVALUE">xmlSecTransformDataType</span></a>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMGETDATATYPE">xmlSecTransformGetDataType</a>     (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE"><span class="TYPE">xmlSecTransformMode</span></a> mode</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHBIN">xmlSecTransformPushBin</a>              (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> final</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPBIN">xmlSecTransformPopBin</a>               (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> maxDataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> *dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHXML">xmlSecTransformPushXml</a>              (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nodes</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPXML">xmlSecTransformPopXml</a>               (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> *nodes</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMEXECUTE">xmlSecTransformExecute</a>              (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> last</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMDEBUGDUMP">xmlSecTransformDebugDump</a>            (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMDEBUGXMLDUMP">xmlSecTransformDebugXmlDump</a>         (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMGETNAME">xmlSecTransformGetName</a>              (transform)
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMISVALID">xmlSecTransformIsValid</a>              (transform)
-#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCHECKTYPE">xmlSecTransformCheckType</a>            (transform, t)
-#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCHECKID">xmlSecTransformCheckId</a>              (transform, i)
-#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCHECKSIZE">xmlSecTransformCheckSize</a>            (transform, size)
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCONNECT">xmlSecTransformConnect</a>              (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> left,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> right,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMREMOVE">xmlSecTransformRemove</a>               (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);
-<a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTGETDATATYPE">xmlSecTransformDefaultGetDataType</a>
-                                                        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a> mode,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTPUSHBIN">xmlSecTransformDefaultPushBin</a>       (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <font>int</font> final,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTPOPBIN">xmlSecTransformDefaultPopBin</a>        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> maxDataSize,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *dataSize,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTPUSHXML">xmlSecTransformDefaultPushXml</a>       (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTPOPXML">xmlSecTransformDefaultPopXml</a>        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> *nodes,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>xmlOutputBufferPtr</font>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMCREATEOUTPUTBUFFER">xmlSecTransformCreateOutputBuffer</a>   (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>xmlParserInputBufferPtr</font>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMCREATEINPUTBUFFER">xmlSecTransformCreateInputBuffer</a>
-                                                        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMINITIALIZEMETHOD">*xmlSecTransformInitializeMethod</a>)  (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);
-<font>void</font>                (<a href="xmlsec-transforms.html#XMLSECTRANSFORMFINALIZEMETHOD">*xmlSecTransformFinalizeMethod</a>)    (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);
-<a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a>  (<a href="xmlsec-transforms.html#XMLSECTRANSFORMGETDATATYPEMETHOD">*xmlSecTransformGetDataTypeMethod</a>)
-                                                        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a> mode,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMNODEREADMETHOD">*xmlSecTransformNodeReadMethod</a>)    (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMNODEWRITEMETHOD">*xmlSecTransformNodeWriteMethod</a>)   (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEYREQUIREMENTSMETHOD">*xmlSecTransformSetKeyRequirementsMethod</a>)
-                                                        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);
-<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEYMETHOD">*xmlSecTransformSetKeyMethod</a>)      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFYMETHOD">*xmlSecTransformVerifyMethod</a>)      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHBINMETHOD">*xmlSecTransformPushBinMethod</a>)     (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <font>int</font> final,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPBINMETHOD">*xmlSecTransformPopBinMethod</a>)      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> maxDataSize,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *dataSize,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHXMLMETHOD">*xmlSecTransformPushXmlMethod</a>)     (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPXMLMETHOD">*xmlSecTransformPopXmlMethod</a>)      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> *nodes,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMEXECUTEMETHOD">*xmlSecTransformExecuteMethod</a>)     (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <font>int</font> last,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCHECKTYPE">xmlSecTransformCheckType</a>            (transform,
+                                                         t)
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCHECKID">xmlSecTransformCheckId</a>              (transform,
+                                                         i)
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCHECKSIZE">xmlSecTransformCheckSize</a>            (transform,
+                                                         size)
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCONNECT">xmlSecTransformConnect</a>              (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> left</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> right</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMREMOVE">xmlSecTransformRemove</a>               (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>);
+<a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE"><span class="RETURNVALUE">xmlSecTransformDataType</span></a>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTGETDATATYPE">xmlSecTransformDefaultGetDataType</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE"><span class="TYPE">xmlSecTransformMode</span></a> mode</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTPUSHBIN">xmlSecTransformDefaultPushBin</a>       (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> final</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTPOPBIN">xmlSecTransformDefaultPopBin</a>        (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> maxDataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> *dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTPUSHXML">xmlSecTransformDefaultPushXml</a>       (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nodes</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTPOPXML">xmlSecTransformDefaultPopXml</a>        (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> *nodes</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="XMLOUTPUTBUFFERPTR"><span class="RETURNVALUE">xmlOutputBufferPtr</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCREATEOUTPUTBUFFER">xmlSecTransformCreateOutputBuffer</a>   (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="XMLPARSERINPUTBUFFER"><span class="RETURNVALUE">xmlParserInputBufferPtr</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMCREATEINPUTBUFFER">xmlSecTransformCreateInputBuffer</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMINITIALIZEMETHOD">*xmlSecTransformInitializeMethod</a>)  (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                (<a href="xmlsec-transforms.html#XMLSECTRANSFORMFINALIZEMETHOD">*xmlSecTransformFinalizeMethod</a>)    (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>);
+<a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE"><span class="RETURNVALUE">xmlSecTransformDataType</span></a>  (<a href="xmlsec-transforms.html#XMLSECTRANSFORMGETDATATYPEMETHOD">*xmlSecTransformGetDataTypeMethod</a>)
+                                                        (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE"><span class="TYPE">xmlSecTransformMode</span></a> mode</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMNODEREADMETHOD">*xmlSecTransformNodeReadMethod</a>)    (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMNODEWRITEMETHOD">*xmlSecTransformNodeWriteMethod</a>)   (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEYREQUIREMENTSMETHOD">*xmlSecTransformSetKeyRequirementsMethod</a>)
+                                                        (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> keyReq</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEYMETHOD">*xmlSecTransformSetKeyMethod</a>)      (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFYMETHOD">*xmlSecTransformVerifyMethod</a>)      (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHBINMETHOD">*xmlSecTransformPushBinMethod</a>)     (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> final</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPBINMETHOD">*xmlSecTransformPopBinMethod</a>)      (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> maxDataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> *dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHXMLMETHOD">*xmlSecTransformPushXmlMethod</a>)     (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nodes</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPXMLMETHOD">*xmlSecTransformPopXmlMethod</a>)      (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> *nodes</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMEXECUTEMETHOD">*xmlSecTransformExecuteMethod</a>)     (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> last</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);
 struct              <a href="xmlsec-transforms.html#XMLSECTRANSFORMKLASS">xmlSecTransformKlass</a>;
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMKLASSGETNAME">xmlSecTransformKlassGetName</a>         (klass)
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTID">xmlSecTransformIdListId</a>
-<font>xmlSecPtrListId</font>     <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTGETKLASS">xmlSecTransformIdListGetKlass</a>       (void);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTFIND">xmlSecTransformIdListFind</a>           (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>xmlSecTransformId</font> transformId);
-<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTFINDBYHREF">xmlSecTransformIdListFindByHref</a>     (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         const <font>xmlChar</font> *href,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);
-<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTFINDBYNAME">xmlSecTransformIdListFindByName</a>     (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         const <font>xmlChar</font> *name,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);
-<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTDEBUGDUMP">xmlSecTransformIdListDebugDump</a>      (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>FILE</font> *output);
-<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTDEBUGXMLDUMP">xmlSecTransformIdListDebugXmlDump</a>   (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>FILE</font> *output);
+<gtkdoclink href="XMLSECPTRLISTID"><span class="RETURNVALUE">xmlSecPtrListId</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTGETKLASS">xmlSecTransformIdListGetKlass</a>       (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTFIND">xmlSecTransformIdListFind</a>           (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> transformId</code>);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTFINDBYHREF">xmlSecTransformIdListFindByHref</a>     (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *href</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE"><span class="TYPE">xmlSecTransformUsage</span></a> usage</code>);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTFINDBYNAME">xmlSecTransformIdListFindByName</a>     (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE"><span class="TYPE">xmlSecTransformUsage</span></a> usage</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTDEBUGDUMP">xmlSecTransformIdListDebugDump</a>      (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTDEBUGXMLDUMP">xmlSecTransformIdListDebugXmlDump</a>   (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDUNKNOWN">xmlSecTransformIdUnknown</a>
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMBASE64ID">xmlSecTransformBase64Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMBASE64GETKLASS">xmlSecTransformBase64GetKlass</a>       (void);
-<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMBASE64SETLINESIZE">xmlSecTransformBase64SetLineSize</a>    (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> lineSize);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMBASE64GETKLASS">xmlSecTransformBase64GetKlass</a>       (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMBASE64SETLINESIZE">xmlSecTransformBase64SetLineSize</a>    (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> lineSize</code>);
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14NID">xmlSecTransformInclC14NId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14NGETKLASS">xmlSecTransformInclC14NGetKlass</a>     (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14NGETKLASS">xmlSecTransformInclC14NGetKlass</a>     (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14NWITHCOMMENTSID">xmlSecTransformInclC14NWithCommentsId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14NWITHCOMMENTSGETKLASS">xmlSecTransformInclC14NWithCommentsGetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14NWITHCOMMENTSGETKLASS">xmlSecTransformInclC14NWithCommentsGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14N11ID">xmlSecTransformInclC14N11Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14N11GETKLASS">xmlSecTransformInclC14N11GetKlass</a>   (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14N11GETKLASS">xmlSecTransformInclC14N11GetKlass</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14N11WITHCOMMENTSID">xmlSecTransformInclC14N11WithCommentsId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14N11WITHCOMMENTSGETKLASS">xmlSecTransformInclC14N11WithCommentsGetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14N11WITHCOMMENTSGETKLASS">xmlSecTransformInclC14N11WithCommentsGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMEXCLC14NID">xmlSecTransformExclC14NId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMEXCLC14NGETKLASS">xmlSecTransformExclC14NGetKlass</a>     (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMEXCLC14NGETKLASS">xmlSecTransformExclC14NGetKlass</a>     (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMEXCLC14NWITHCOMMENTSID">xmlSecTransformExclC14NWithCommentsId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMEXCLC14NWITHCOMMENTSGETKLASS">xmlSecTransformExclC14NWithCommentsGetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMEXCLC14NWITHCOMMENTSGETKLASS">xmlSecTransformExclC14NWithCommentsGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMENVELOPEDID">xmlSecTransformEnvelopedId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMENVELOPEDGETKLASS">xmlSecTransformEnvelopedGetKlass</a>    (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMENVELOPEDGETKLASS">xmlSecTransformEnvelopedGetKlass</a>    (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPATHID">xmlSecTransformXPathId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPATHGETKLASS">xmlSecTransformXPathGetKlass</a>        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMXPATHGETKLASS">xmlSecTransformXPathGetKlass</a>        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPATH2ID">xmlSecTransformXPath2Id</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPATH2GETKLASS">xmlSecTransformXPath2GetKlass</a>       (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMXPATH2GETKLASS">xmlSecTransformXPath2GetKlass</a>       (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPOINTERID">xmlSecTransformXPointerId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPOINTERGETKLASS">xmlSecTransformXPointerGetKlass</a>     (void);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPOINTERSETEXPR">xmlSecTransformXPointerSetExpr</a>      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         const <font>xmlChar</font> *expr,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESETTYPE">xmlSecNodeSetType</a> nodeSetType,
-                                                         <font>xmlNodePtr</font> hereNode);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMXPOINTERGETKLASS">xmlSecTransformXPointerGetKlass</a>     (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMXPOINTERSETEXPR">xmlSecTransformXPointerSetExpr</a>      (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *expr</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESETTYPE"><span class="TYPE">xmlSecNodeSetType</span></a> nodeSetType</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> hereNode</code>);
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMXSLTID">xmlSecTransformXsltId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMXSLTGETKLASS">xmlSecTransformXsltGetKlass</a>         (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMXSLTGETKLASS">xmlSecTransformXsltGetKlass</a>         (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMREMOVEXMLTAGSC14NID">xmlSecTransformRemoveXmlTagsC14NId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMREMOVEXMLTAGSC14NGETKLASS">xmlSecTransformRemoveXmlTagsC14NGetKlass</a>
-                                                        (void);
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMREMOVEXMLTAGSC14NGETKLASS">xmlSecTransformRemoveXmlTagsC14NGetKlass</a>
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);
 #define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMVISA3DHACKID">xmlSecTransformVisa3DHackId</a>
-<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMVISA3DHACKGETKLASS">xmlSecTransformVisa3DHackGetKlass</a>   (void);
-<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMVISA3DHACKSETID">xmlSecTransformVisa3DHackSetID</a>      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         const <font>xmlChar</font> *id);</pre>
+<gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMVISA3DHACKGETKLASS">xmlSecTransformVisa3DHackGetKlass</a>   (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-transforms.html#XMLSECTRANSFORMVISA3DHACKSETID">xmlSecTransformVisa3DHackSetID</a>      (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-TRANSFORMS.DESCRIPTION"></a><h2>Description</h2>
@@ -348,72 +351,66 @@ struct              <a href="xmlsec-transforms.html#XMLSECTRANSFORMKLASS">xmlSec
 <div class="REFSECT1">
 <a name="XMLSEC-TRANSFORMS.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="XMLSEC-TRANSFORM-BINARY-CHUNK--CAPS"></a><h3>XMLSEC_TRANSFORM_BINARY_CHUNK</h3>
+<a name="XMLSEC-TRANSFORM-BINARY-CHUNK:CAPS"></a><h3>XMLSEC_TRANSFORM_BINARY_CHUNK</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_TRANSFORM_BINARY_CHUNK                   64</pre>
 <p>The binary data chunks size. XMLSec processes binary data one chunk
 at a time. Changing this impacts xmlsec memory usage and performance.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMIDSGET"></a><h3>xmlSecTransformIdsGet ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a>    xmlSecTransformIdsGet               (void);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="RETURNVALUE">xmlSecPtrListPtr</span></a>    xmlSecTransformIdsGet               (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Gets global registered transform klasses list.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN14242"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17645"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to list of all registered transform klasses.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMIDSINIT"></a><h3>xmlSecTransformIdsInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformIdsInit              (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformIdsInit              (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Initializes the transform klasses. This function is called from the
 <a href="xmlsec-xmlsec.html#XMLSECINIT"><span class="TYPE">xmlSecInit</span></a> function and the application should not call it directly.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN14258"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17663"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMIDSSHUTDOWN"></a><h3>xmlSecTransformIdsShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformIdsShutdown          (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecTransformIdsShutdown          (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Shuts down the keys data klasses. This function is called from the
 <a href="xmlsec-xmlsec.html#XMLSECSHUTDOWN"><span class="TYPE">xmlSecShutdown</span></a> function and the application should not call it directly.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMIDSREGISTERDEFAULT"></a><h3>xmlSecTransformIdsRegisterDefault ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformIdsRegisterDefault   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformIdsRegisterDefault   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Registers default (implemented by XML Security Library)
 transform klasses: XPath transform, Base64 transform, ...</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN14282"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17691"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMIDSREGISTER"></a><h3>xmlSecTransformIdsRegister ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformIdsRegister          (<font>xmlSecTransformId</font> id);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformIdsRegister          (<code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> id</code>);</pre>
 <p>Registers <code class="PARAMETER">id</code> in the global list of transform klasses.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14298"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17709"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14303"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17714"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -430,27 +427,26 @@ transform klasses: XPath transform, Base64 transform, ...</p>
 } xmlSecTransformStatus;</pre>
 <p>The transform execution status.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMSTATUSNONE"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformStatusNone</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>          the status unknown.</p></td>
+<td align="LEFT" valign="TOP"><p>the status unknown.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMSTATUSWORKING"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformStatusWorking</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>       the transform is executed.</p></td>
+<td align="LEFT" valign="TOP"><p>the transform is executed.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMSTATUSFINISHED"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformStatusFinished</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>      the transform finished</p></td>
+<td align="LEFT" valign="TOP"><p>the transform finished</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMSTATUSOK"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformStatusOk</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>            the transform succeeded.</p></td>
+<td align="LEFT" valign="TOP"><p>the transform succeeded.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMSTATUSFAIL"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformStatusFail</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>          the transform failed (an error occur).</p></td>
+<td align="LEFT" valign="TOP"><p>the transform failed (an error occur).</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -464,19 +460,18 @@ transform klasses: XPath transform, Base64 transform, ...</p>
 } xmlSecTransformMode;</pre>
 <p>The transform operation mode</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMMODENONE"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformModeNone</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>            the mode is unknown.</p></td>
+<td align="LEFT" valign="TOP"><p>the mode is unknown.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMMODEPUSH"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformModePush</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>            pushing data thru transform.</p></td>
+<td align="LEFT" valign="TOP"><p>pushing data thru transform.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMMODEPOP"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformModePop</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>             popping data from transform.</p></td>
+<td align="LEFT" valign="TOP"><p>popping data from transform.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -494,35 +489,34 @@ transform klasses: XPath transform, Base64 transform, ...</p>
 } xmlSecTransformOperation;</pre>
 <p>The transform operation.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMOPERATIONNONE"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformOperationNone</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>       the operation is unknown.</p></td>
+<td align="LEFT" valign="TOP"><p>the operation is unknown.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMOPERATIONENCODE"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformOperationEncode</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>     the encode operation (for base64 transform).</p></td>
+<td align="LEFT" valign="TOP"><p>the encode operation (for base64 transform).</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMOPERATIONDECODE"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformOperationDecode</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>     the decode operation (for base64 transform).</p></td>
+<td align="LEFT" valign="TOP"><p>the decode operation (for base64 transform).</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMOPERATIONSIGN"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformOperationSign</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>       the sign or digest operation.</p></td>
+<td align="LEFT" valign="TOP"><p>the sign or digest operation.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMOPERATIONVERIFY"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformOperationVerify</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>     the verification of signature or digest operation.</p></td>
+<td align="LEFT" valign="TOP"><p>the verification of signature or digest operation.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMOPERATIONENCRYPT"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformOperationEncrypt</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>    the encryption operation.</p></td>
+<td align="LEFT" valign="TOP"><p>the encryption operation.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMOPERATIONDECRYPT"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformOperationDecrypt</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>    the decryption operation.</p></td>
+<td align="LEFT" valign="TOP"><p>the decryption operation.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -531,69 +525,61 @@ transform klasses: XPath transform, Base64 transform, ...</p>
 <a name="XMLSECTRANSFORMURITYPE"></a><h3>xmlSecTransformUriType</h3>
 <pre class="PROGRAMLISTING">typedef unsigned int                            xmlSecTransformUriType;</pre>
 <p>URI transform type bit mask.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMURITYPENONE"></a><h3>xmlSecTransformUriTypeNone</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUriTypeNone              0x0000</pre>
 <p>The URI type is unknown or not set.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMURITYPEEMPTY"></a><h3>xmlSecTransformUriTypeEmpty</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUriTypeEmpty             0x0001</pre>
 <p>The empty URI ("") type.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMURITYPESAMEDOCUMENT"></a><h3>xmlSecTransformUriTypeSameDocument</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUriTypeSameDocument      0x0002</pre>
 <p>The smae document ("#...") but not empty ("") URI type.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMURITYPELOCAL"></a><h3>xmlSecTransformUriTypeLocal</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUriTypeLocal             0x0004</pre>
 <p>The local URI ("file:///....") type.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMURITYPEREMOTE"></a><h3>xmlSecTransformUriTypeRemote</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUriTypeRemote            0x0008</pre>
 <p>The remote URI type.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMURITYPEANY"></a><h3>xmlSecTransformUriTypeAny</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUriTypeAny               0xFFFF</pre>
 <p>Any URI type.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMURITYPECHECK"></a><h3>xmlSecTransformUriTypeCheck ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformUriTypeCheck         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPE">xmlSecTransformUriType</a> type,
-                                                         const <font>xmlChar</font> *uri);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformUriTypeCheck         (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPE"><span class="TYPE">xmlSecTransformUriType</span></a> type</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>);</pre>
 <p>Checks if <code class="PARAMETER">uri</code> matches expected type <code class="PARAMETER">type</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14469"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the expected URI type.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17874"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the expected URI type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14474"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the uri for checking.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17879"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the uri for checking.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14479"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17884"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 1 if <code class="PARAMETER">uri</code> matches <code class="PARAMETER">type</code>, 0 if not or a negative value
 if an error occurs.</p></td>
 </tr>
@@ -604,103 +590,90 @@ if an error occurs.</p></td>
 <a name="XMLSECTRANSFORMDATATYPE"></a><h3>xmlSecTransformDataType</h3>
 <pre class="PROGRAMLISTING">typedef xmlSecByte                              xmlSecTransformDataType;</pre>
 <p>Transform data type bit mask.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMDATATYPEUNKNOWN"></a><h3>xmlSecTransformDataTypeUnknown</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformDataTypeUnknown          0x0000</pre>
 <p>The transform data type is unknown or nor data expected.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMDATATYPEBIN"></a><h3>xmlSecTransformDataTypeBin</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformDataTypeBin              0x0001</pre>
 <p>The binary transform data.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMDATATYPEXML"></a><h3>xmlSecTransformDataTypeXml</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformDataTypeXml              0x0002</pre>
 <p>The xml transform data.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMUSAGE"></a><h3>xmlSecTransformUsage</h3>
 <pre class="PROGRAMLISTING">typedef unsigned int                            xmlSecTransformUsage;</pre>
 <p>The transform usage bit mask.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMUSAGEUNKNOWN"></a><h3>xmlSecTransformUsageUnknown</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUsageUnknown             0x0000</pre>
 <p>Transforms usage is unknown or undefined.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMUSAGEDSIGTRANSFORM"></a><h3>xmlSecTransformUsageDSigTransform</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUsageDSigTransform       0x0001</pre>
 <p>Transform could be used in &lt;dsig:Transform&gt;.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMUSAGEC14NMETHOD"></a><h3>xmlSecTransformUsageC14NMethod</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUsageC14NMethod          0x0002</pre>
 <p>Transform could be used in &lt;dsig:CanonicalizationMethod&gt;.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMUSAGEDIGESTMETHOD"></a><h3>xmlSecTransformUsageDigestMethod</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUsageDigestMethod        0x0004</pre>
 <p>Transform could be used in &lt;dsig:DigestMethod&gt;.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMUSAGESIGNATUREMETHOD"></a><h3>xmlSecTransformUsageSignatureMethod</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUsageSignatureMethod     0x0008</pre>
 <p>Transform could be used in &lt;dsig:SignatureMethod&gt;.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMUSAGEENCRYPTIONMETHOD"></a><h3>xmlSecTransformUsageEncryptionMethod</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUsageEncryptionMethod    0x0010</pre>
 <p>Transform could be used in &lt;enc:EncryptionMethod&gt;.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMUSAGEANY"></a><h3>xmlSecTransformUsageAny</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUsageAny                 0xFFFF</pre>
 <p>Transform could be used for operation.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXPREEXECUTECALLBACK"></a><h3>xmlSecTransformCtxPreExecuteCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformCtxPreExecuteCallback)
-                                                        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecTransformCtxPreExecuteCallback)
+                                                        (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>The callback called after creating transforms chain but before
 starting data processing. Application can use this callback to
 do additional transforms chain verification or modification and
 aborting transforms execution (if necessary).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14580"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to transform's context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17975"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform's context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14585"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17980"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success and a negative value otherwise (in this case,
 transforms chain will not be executed and xmlsec processing stops).</p></td>
 </tr>
@@ -708,12 +681,11 @@ transforms chain will not be executed and xmlsec processing stops).</p></td>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK--CAPS"></a><h3>XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK</h3>
+<a name="XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK:CAPS"></a><h3>XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK               0x00000001</pre>
 <p>If this flag is set then URI ID references are resolved directly
 without using XPointers. This allows one to sign/verify Visa3D
 documents that don't follow XML, XPointer and XML DSig specifications.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
@@ -741,35 +713,34 @@ documents that don't follow XML, XPointer and XML DSig specifications.</p>
 };</pre>
 <p>The transform execution context.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14605"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">userData</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to user data (xmlsec and xmlsec-crypto never
+<td align="LEFT" valign="TOP"><a name="AEN17998"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">userData</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to user data (xmlsec and xmlsec-crypto never
                      touch this).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14611"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the bit mask flags to control transforms execution
+<td align="LEFT" valign="TOP"><a name="AEN18005"><span style="white-space: nowrap">unsigned <gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> <code class="STRUCTFIELD">flags</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the bit mask flags to control transforms execution
                      (reserved for the future).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14617"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags2</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the bit mask flags to control transforms execution
+<td align="LEFT" valign="TOP"><a name="AEN18012"><span style="white-space: nowrap">unsigned <gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> <code class="STRUCTFIELD">flags2</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the bit mask flags to control transforms execution
                      (reserved for the future).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14623"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPE">xmlSecTransformUriType</a> <code class="STRUCTFIELD">enabledUris</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the allowed transform data source uri types.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18019"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPE"><span class="TYPE">xmlSecTransformUriType</span></a> <code class="STRUCTFIELD">enabledUris</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the allowed transform data source uri types.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14629"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a> <code class="STRUCTFIELD">enabledTransforms</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>  the list of enabled transforms; if list is empty (default)
+<td align="LEFT" valign="TOP"><a name="AEN18026"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrList</span></a> <code class="STRUCTFIELD">enabledTransforms</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the list of enabled transforms; if list is empty (default)
                      then all registered transforms are enabled.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14635"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXPREEXECUTECALLBACK">xmlSecTransformCtxPreExecuteCallback</a> <code class="STRUCTFIELD">preExecCallback</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>    the callback called after preparing transform chain
+<td align="LEFT" valign="TOP"><a name="AEN18033"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXPREEXECUTECALLBACK"><span class="TYPE">xmlSecTransformCtxPreExecuteCallback</span></a> <code class="STRUCTFIELD">preExecCallback</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the callback called after preparing transform chain
                      and right before actual data processing; application
                      can use this callback to change transforms parameters,
                      insert additional transforms in the chain or do
@@ -777,50 +748,49 @@ documents that don't follow XML, XPointer and XML DSig specifications.</p>
                      if needed).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14641"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> <code class="STRUCTFIELD">result</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to transforms result buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18040"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> <code class="STRUCTFIELD">result</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transforms result buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14647"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMSTATUS">xmlSecTransformStatus</a> <code class="STRUCTFIELD">status</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the transforms chain processng status.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18047"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMSTATUS"><span class="TYPE">xmlSecTransformStatus</span></a> <code class="STRUCTFIELD">status</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transforms chain processng status.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14653"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">uri</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the data source URI without xpointer expression.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18054"><span style="white-space: nowrap"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">uri</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data source URI without xpointer expression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14659"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">xptrExpr</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the xpointer expression from data source URI (if any).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18061"><span style="white-space: nowrap"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">xptrExpr</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the xpointer expression from data source URI (if any).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14665"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">first</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the first transform in the chain.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18068"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> <code class="STRUCTFIELD">first</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the first transform in the chain.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14671"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">last</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the last transform in the chain.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18075"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> <code class="STRUCTFIELD">last</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the last transform in the chain.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14677"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18082"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14683"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18089"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXCREATE"></a><h3>xmlSecTransformCtxCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a>  xmlSecTransformCtxCreate         (void);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="RETURNVALUE">xmlSecTransformCtxPtr</span></a>  xmlSecTransformCtxCreate         (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Creates transforms chain processing context.
 The caller is responsible for destroying returend object by calling
 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXDESTROY"><span class="TYPE">xmlSecTransformCtxDestroy</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN14700"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18109"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly allocated context object or NULL if an error
 occurs.</p></td>
 </tr></tbody></table>
@@ -828,31 +798,29 @@ occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXDESTROY"></a><h3>xmlSecTransformCtxDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformCtxDestroy           (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecTransformCtxDestroy           (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>);</pre>
 <p>Destroy context object created with <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXCREATE"><span class="TYPE">xmlSecTransformCtxCreate</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN14717"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to transforms chain processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18128"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transforms chain processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXINITIALIZE"></a><h3>xmlSecTransformCtxInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxInitialize        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformCtxInitialize        (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>);</pre>
 <p>Initializes transforms chain processing context.
 The caller is responsible for cleaing up returend object by calling
 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXFINALIZE"><span class="TYPE">xmlSecTransformCtxFinalize</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14734"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to transforms chain processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18147"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14739"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18152"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -860,46 +828,43 @@ The caller is responsible for cleaing up returend object by calling
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXFINALIZE"></a><h3>xmlSecTransformCtxFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformCtxFinalize          (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecTransformCtxFinalize          (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>);</pre>
 <p>Cleans up <code class="PARAMETER">ctx</code> object initialized with <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXINITIALIZE"><span class="TYPE">xmlSecTransformCtxInitialize</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN14757"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to transforms chain processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18172"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transforms chain processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXRESET"></a><h3>xmlSecTransformCtxReset ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformCtxReset             (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecTransformCtxReset             (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>);</pre>
 <p>Resets transfroms context for new processing.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN14772"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to transforms chain processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18189"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transforms chain processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXCOPYUSERPREF"></a><h3>xmlSecTransformCtxCopyUserPref ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxCopyUserPref      (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> dst,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> src);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformCtxCopyUserPref      (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> dst</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> src</code>);</pre>
 <p>Copies user settings from <code class="PARAMETER">src</code> context to <code class="PARAMETER">dst</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14790"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to destination transforms chain processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18211"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to destination transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14795"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to source transforms chain processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18216"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to source transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14800"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18221"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -907,9 +872,9 @@ The caller is responsible for cleaing up returend object by calling
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXSETURI"></a><h3>xmlSecTransformCtxSetUri ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxSetUri            (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         const <font>xmlChar</font> *uri,
-                                                         <font>xmlNodePtr</font> hereNode);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformCtxSetUri            (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> hereNode</code>);</pre>
 <p>Parses uri and adds xpointer transforms if required.</p>
 <p>The following examples demonstrate what the URI attribute identifies and
 how it is dereferenced
@@ -934,23 +899,22 @@ identifies a node-set containing the element with ID attribute value
 (and its applications) modify this node-set to include the element plus
 all descendents including namespaces and attributes -- but not comments.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14828"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to transforms chain processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18255"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14833"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the URI.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18260"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the URI.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14838"><span style="white-space: nowrap"><code class="PARAMETER">hereNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to "here" node required by some
+<td align="LEFT" valign="TOP"><a name="AEN18265"><span style="white-space: nowrap"><code class="PARAMETER">hereNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to "here" node required by some
                      XML transforms (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14843"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18270"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -958,23 +922,22 @@ all descendents including namespaces and attributes -- but not comments.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXAPPEND"></a><h3>xmlSecTransformCtxAppend ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxAppend            (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformCtxAppend            (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>);</pre>
 <p>Connects the <code class="PARAMETER">transform</code> to the end of the chain of transforms in the <code class="PARAMETER">ctx</code>
 (see <a href="xmlsec-transforms.html#XMLSECTRANSFORMCONNECT"><span class="TYPE">xmlSecTransformConnect</span></a> function for details).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14863"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to transforms chain processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18294"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14868"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to new transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18299"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to new transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14873"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18304"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -982,23 +945,22 @@ all descendents including namespaces and attributes -- but not comments.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXPREPEND"></a><h3>xmlSecTransformCtxPrepend ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxPrepend           (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformCtxPrepend           (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>);</pre>
 <p>Connects the <code class="PARAMETER">transform</code> to the beggining of the chain of transforms in the <code class="PARAMETER">ctx</code>
 (see <a href="xmlsec-transforms.html#XMLSECTRANSFORMCONNECT"><span class="TYPE">xmlSecTransformConnect</span></a> function for details).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14893"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to transforms chain processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18328"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14898"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to new transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18333"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to new transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14903"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18338"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1006,23 +968,22 @@ all descendents including namespaces and attributes -- but not comments.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXCREATEANDAPPEND"></a><h3>xmlSecTransformCtxCreateAndAppend ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformPtr</font>  xmlSecTransformCtxCreateAndAppend   (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <font>xmlSecTransformId</font> id);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMPTR"><span class="RETURNVALUE">xmlSecTransformPtr</span></gtkdoclink>  xmlSecTransformCtxCreateAndAppend   (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> id</code>);</pre>
 <p>Creaeates new transform and connects it to the end of the chain of
 transforms in the <code class="PARAMETER">ctx</code> (see <a href="xmlsec-transforms.html#XMLSECTRANSFORMCONNECT"><span class="TYPE">xmlSecTransformConnect</span></a> function for details).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14922"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to transforms chain processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18361"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14927"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the new transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18366"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new transform klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14932"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18371"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly created transform or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1030,23 +991,22 @@ transforms in the <code class="PARAMETER">ctx</code> (see <a href="xmlsec-transf
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXCREATEANDPREPEND"></a><h3>xmlSecTransformCtxCreateAndPrepend ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformPtr</font>  xmlSecTransformCtxCreateAndPrepend  (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <font>xmlSecTransformId</font> id);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMPTR"><span class="RETURNVALUE">xmlSecTransformPtr</span></gtkdoclink>  xmlSecTransformCtxCreateAndPrepend  (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> id</code>);</pre>
 <p>Creaeates new transform and connects it to the end of the chain of
 transforms in the <code class="PARAMETER">ctx</code> (see <a href="xmlsec-transforms.html#XMLSECTRANSFORMCONNECT"><span class="TYPE">xmlSecTransformConnect</span></a> function for details).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14951"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to transforms chain processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18394"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14956"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the new transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18399"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new transform klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14961"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18404"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly created transform or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1054,28 +1014,27 @@ transforms in the <code class="PARAMETER">ctx</code> (see <a href="xmlsec-transf
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXNODEREAD"></a><h3>xmlSecTransformCtxNodeRead ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformPtr</font>  xmlSecTransformCtxNodeRead          (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMPTR"><span class="RETURNVALUE">xmlSecTransformPtr</span></gtkdoclink>  xmlSecTransformCtxNodeRead          (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE"><span class="TYPE">xmlSecTransformUsage</span></a> usage</code>);</pre>
 <p>Reads the transform from the <code class="PARAMETER">node</code> and appends it to the current chain
 of transforms in <code class="PARAMETER">ctx</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14980"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to transforms chain processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18429"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14985"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to transform's node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18434"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform's node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14990"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the transform's usage (signature, encryption, etc.).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18439"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform's usage (signature, encryption, etc.).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14995"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18444"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly created transform or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1083,28 +1042,27 @@ of transforms in <code class="PARAMETER">ctx</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXNODESLISTREAD"></a><h3>xmlSecTransformCtxNodesListRead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxNodesListRead     (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformCtxNodesListRead     (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE"><span class="TYPE">xmlSecTransformUsage</span></a> usage</code>);</pre>
 <p>Reads transforms from the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> children of the <code class="PARAMETER">node</code> and
 appends them to the current transforms chain in <code class="PARAMETER">ctx</code> object.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15015"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to transforms chain processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18470"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15020"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> nodes parent node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18475"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> nodes parent node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15026"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the transform's usage (signature, encryption, etc.).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18481"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform's usage (signature, encryption, etc.).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15031"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18486"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1112,22 +1070,21 @@ appends them to the current transforms chain in <code class="PARAMETER">ctx</cod
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXPREPARE"></a><h3>xmlSecTransformCtxPrepare ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxPrepare           (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a> inputDataType);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformCtxPrepare           (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE"><span class="TYPE">xmlSecTransformDataType</span></a> inputDataType</code>);</pre>
 <p>Prepares the transform context for processing data of <code class="PARAMETER">inputDataType</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15048"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to transforms chain processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18507"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15053"><span style="white-space: nowrap"><code class="PARAMETER">inputDataType</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>      the expected input type.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18512"><span style="white-space: nowrap"><code class="PARAMETER">inputDataType</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the expected input type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15058"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18517"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1135,27 +1092,26 @@ appends them to the current transforms chain in <code class="PARAMETER">ctx</cod
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXBINARYEXECUTE"></a><h3>xmlSecTransformCtxBinaryExecute ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxBinaryExecute     (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformCtxBinaryExecute     (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>);</pre>
 <p>Processes binary data using transforms chain in the <code class="PARAMETER">ctx</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15076"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to transforms chain processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18541"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15081"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the input binary data buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18546"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input binary data buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15086"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the input data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18551"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15091"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18556"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1163,22 +1119,21 @@ appends them to the current transforms chain in <code class="PARAMETER">ctx</cod
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXURIEXECUTE"></a><h3>xmlSecTransformCtxUriExecute ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxUriExecute        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         const <font>xmlChar</font> *uri);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformCtxUriExecute        (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>);</pre>
 <p>Process binary data from the URI using transforms chain in <code class="PARAMETER">ctx</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15108"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to transforms chain processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18577"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15113"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the URI.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18582"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the URI.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15118"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18587"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1186,22 +1141,21 @@ appends them to the current transforms chain in <code class="PARAMETER">ctx</cod
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXXMLEXECUTE"></a><h3>xmlSecTransformCtxXmlExecute ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxXmlExecute        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformCtxXmlExecute        (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nodes</code>);</pre>
 <p>Process <code class="PARAMETER">nodes</code> using transforms in the transforms chain in <code class="PARAMETER">ctx</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15136"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to transforms chain processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18609"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15141"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the input node set.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18614"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input node set.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15146"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18619"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1209,22 +1163,21 @@ appends them to the current transforms chain in <code class="PARAMETER">ctx</cod
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXEXECUTE"></a><h3>xmlSecTransformCtxExecute ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxExecute           (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <font>xmlDocPtr</font> doc);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformCtxExecute           (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLDOC"><span class="TYPE">xmlDocPtr</span></gtkdoclink> doc</code>);</pre>
 <p>Executes transforms chain in <code class="PARAMETER">ctx</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15163"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to transforms chain processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18640"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15168"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to input document.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18645"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to input document.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15173"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18650"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1232,38 +1185,36 @@ appends them to the current transforms chain in <code class="PARAMETER">ctx</cod
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXDEBUGDUMP"></a><h3>xmlSecTransformCtxDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformCtxDebugDump         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecTransformCtxDebugDump         (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints transforms context debug information to <code class="PARAMETER">output</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15190"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to transforms chain processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18671"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15195"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18676"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCTXDEBUGXMLDUMP"></a><h3>xmlSecTransformCtxDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformCtxDebugXmlDump      (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecTransformCtxDebugXmlDump      (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> ctx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints transforms context debug information to <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15212"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to transforms chain processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18697"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15217"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18702"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -1294,73 +1245,71 @@ appends them to the current transforms chain in <code class="PARAMETER">ctx</cod
 };</pre>
 <p>The transform structure.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15230"><span style="white-space: nowrap"><font>xmlSecTransformId</font> <code class="STRUCTFIELD">id</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the transform id (pointer to <gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink>).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18714"><span style="white-space: nowrap"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> <code class="STRUCTFIELD">id</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform id (pointer to <gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink>).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15238"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMOPERATION">xmlSecTransformOperation</a> <code class="STRUCTFIELD">operation</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the transform's opertaion.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18723"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMOPERATION"><span class="TYPE">xmlSecTransformOperation</span></a> <code class="STRUCTFIELD">operation</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform's opertaion.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15244"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMSTATUS">xmlSecTransformStatus</a> <code class="STRUCTFIELD">status</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the current status.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18730"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMSTATUS"><span class="TYPE">xmlSecTransformStatus</span></a> <code class="STRUCTFIELD">status</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the current status.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15250"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">hereNode</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to transform's <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform%20"; target="_top">&lt;dsig:Transform /&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18737"><span style="white-space: nowrap"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> <code class="STRUCTFIELD">hereNode</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform's <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform%20"; target="_top">&lt;dsig:Transform /&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15257"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">next</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to next transform in the chain.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18745"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> <code class="STRUCTFIELD">next</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to next transform in the chain.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15263"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">prev</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to previous transform in the chain.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18752"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> <code class="STRUCTFIELD">prev</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to previous transform in the chain.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15269"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a> <code class="STRUCTFIELD">inBuf</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the input binary data buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18759"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBuffer</span></a> <code class="STRUCTFIELD">inBuf</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input binary data buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15275"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a> <code class="STRUCTFIELD">outBuf</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the output binary data buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18766"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBuffer</span></a> <code class="STRUCTFIELD">outBuf</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the output binary data buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15281"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> <code class="STRUCTFIELD">inNodes</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the input XML nodes.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18773"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> <code class="STRUCTFIELD">inNodes</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input XML nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15287"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> <code class="STRUCTFIELD">outNodes</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the output XML nodes.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18780"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> <code class="STRUCTFIELD">outNodes</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the output XML nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15293"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18787"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15299"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18794"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCREATE"></a><h3>xmlSecTransformCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a>  xmlSecTransformCreate               (<font>xmlSecTransformId</font> id);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="RETURNVALUE">xmlSecTransformPtr</span></a>  xmlSecTransformCreate               (<code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> id</code>);</pre>
 <p>Creates new transform of the <code class="PARAMETER">id</code> klass. The caller is responsible for
 destroying returned tansform using <a href="xmlsec-transforms.html#XMLSECTRANSFORMDESTROY"><span class="TYPE">xmlSecTransformDestroy</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15318"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the transform id to create.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18816"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform id to create.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15323"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18821"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly created transform or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1368,43 +1317,41 @@ destroying returned tansform using <a href="xmlsec-transforms.html#XMLSECTRANSFO
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMDESTROY"></a><h3>xmlSecTransformDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformDestroy              (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecTransformDestroy              (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>);</pre>
 <p>Destroys transform created with <a href="xmlsec-transforms.html#XMLSECTRANSFORMCREATE"><span class="TYPE">xmlSecTransformCreate</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN15340"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18840"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMNODEREAD"></a><h3>xmlSecTransformNodeRead ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformPtr</font>  xmlSecTransformNodeRead             (<font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMPTR"><span class="RETURNVALUE">xmlSecTransformPtr</span></gtkdoclink>  xmlSecTransformNodeRead             (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE"><span class="TYPE">xmlSecTransformUsage</span></a> usage</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>Reads transform from the <code class="PARAMETER">node</code> as follows:</p>
 <p>   1) reads "Algorithm" attribute;</p>
 <p>   2) checks the lists of known and allowed transforms;</p>
 <p>   3) calls transform's create method;</p>
 <p>   4) calls transform's read transform node method.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15362"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to the transform's node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18868"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to the transform's node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15367"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the transform usage (signature, encryption, ...).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18873"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform usage (signature, encryption, ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15372"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the transform's chaing processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18878"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform's chaing processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15377"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18883"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly created transform or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1412,28 +1359,27 @@ destroying returned tansform using <a href="xmlsec-transforms.html#XMLSECTRANSFO
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMPUMP"></a><h3>xmlSecTransformPump ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformPump                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> left,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> right,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformPump                 (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> left</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> right</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>Pops data from <code class="PARAMETER">left</code> transform and pushes to <code class="PARAMETER">right</code> transform until
 no more data is available.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15396"><span style="white-space: nowrap"><code class="PARAMETER">left</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the source pumping transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18908"><span style="white-space: nowrap"><code class="PARAMETER">left</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the source pumping transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15401"><span style="white-space: nowrap"><code class="PARAMETER">right</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the destination pumping transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18913"><span style="white-space: nowrap"><code class="PARAMETER">right</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the destination pumping transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15406"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the transform's chaing processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18918"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform's chaing processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15411"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18923"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1441,22 +1387,21 @@ no more data is available.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMSETKEY"></a><h3>xmlSecTransformSetKey ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformSetKey               (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformSetKey               (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);</pre>
 <p>Sets the transform's key.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15427"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18943"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15432"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18948"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15437"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18953"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1464,22 +1409,21 @@ no more data is available.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMSETKEYREQ"></a><h3>xmlSecTransformSetKeyReq ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformSetKeyReq            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformSetKeyReq            (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> keyReq</code>);</pre>
 <p>Sets the key requirements for <code class="PARAMETER">transform</code> in the <code class="PARAMETER">keyReq</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15455"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18975"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15460"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to keys requirements object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18980"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys requirements object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15465"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18985"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -1487,34 +1431,33 @@ no more data is available.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMVERIFY"></a><h3>xmlSecTransformVerify ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformVerify               (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformVerify               (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>Verifies the data with transform's processing results
 (for digest, HMAC and signature transforms). The verification
 result is stored in the <gtkdoclink href="STATUS"><span class="TYPE">status</span></gtkdoclink> member of <a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransform</span></a> object.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15487"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19015"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15492"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the binary data for verification.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19020"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the binary data for verification.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15497"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19025"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15502"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the transform's chaing processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19030"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform's chaing processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15507"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19035"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1522,28 +1465,27 @@ result is stored in the <gtkdoclink href="STATUS"><span class="TYPE">status</spa
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMVERIFYNODECONTENT"></a><h3>xmlSecTransformVerifyNodeContent ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformVerifyNodeContent    (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformVerifyNodeContent    (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>Gets the <code class="PARAMETER">node</code> content, base64 decodes it and calls <a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFY"><span class="TYPE">xmlSecTransformVerify</span></a>
 function to verify binary results.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15527"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19061"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15532"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19066"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15537"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the transform's chaing processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19071"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform's chaing processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15542"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19076"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1551,28 +1493,27 @@ function to verify binary results.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMGETDATATYPE"></a><h3>xmlSecTransformGetDataType ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a>  xmlSecTransformGetDataType     (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a> mode,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE"><span class="RETURNVALUE">xmlSecTransformDataType</span></a>  xmlSecTransformGetDataType     (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE"><span class="TYPE">xmlSecTransformMode</span></a> mode</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>Gets transform input (<code class="PARAMETER">mode</code> is "push") or output (<code class="PARAMETER">mode</code> is "pop") data
 type (binary or XML).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15561"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19101"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15566"><span style="white-space: nowrap"><code class="PARAMETER">mode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the data mode (push or pop).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19106"><span style="white-space: nowrap"><code class="PARAMETER">mode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data mode (push or pop).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15571"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the transform's chaing processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19111"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform's chaing processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15576"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19116"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the transform's data type for the <code class="PARAMETER">mode</code> operation.</p></td>
 </tr>
 </tbody></table>
@@ -1580,38 +1521,37 @@ type (binary or XML).</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMPUSHBIN"></a><h3>xmlSecTransformPushBin ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformPushBin              (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <font>int</font> final,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformPushBin              (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> final</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>Process binary <code class="PARAMETER">data</code> and pushes results to next transform.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15597"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19147"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15602"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the input binary data,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19152"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input binary data,</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15607"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the input data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19157"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15612"><span style="white-space: nowrap"><code class="PARAMETER">final</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the flag: if set to 1 then it's the last
+<td align="LEFT" valign="TOP"><a name="AEN19162"><span style="white-space: nowrap"><code class="PARAMETER">final</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag: if set to 1 then it's the last
                      data chunk.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15617"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to transform context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19167"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15622"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19172"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1619,39 +1559,38 @@ type (binary or XML).</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMPOPBIN"></a><h3>xmlSecTransformPopBin ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformPopBin               (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> maxDataSize,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *dataSize,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformPopBin               (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> maxDataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> *dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>Pops data from previous transform in the chain, processes data and
 returns result in the <code class="PARAMETER">data</code> buffer. The size of returned data is
 placed in the <code class="PARAMETER">dataSize</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15643"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19203"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15648"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the buffer to store result data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19208"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the buffer to store result data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15653"><span style="white-space: nowrap"><code class="PARAMETER">maxDataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the size of the buffer <gtkdoclink href="DATA"><span class="TYPE">data</span></gtkdoclink>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19213"><span style="white-space: nowrap"><code class="PARAMETER">maxDataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the size of the buffer <gtkdoclink href="DATA"><span class="TYPE">data</span></gtkdoclink>.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15660"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to returned data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19220"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to returned data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15665"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to transform context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19225"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15670"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19230"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1659,27 +1598,26 @@ placed in the <code class="PARAMETER">dataSize</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMPUSHXML"></a><h3>xmlSecTransformPushXml ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformPushXml              (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformPushXml              (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nodes</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>Processes <code class="PARAMETER">nodes</code> and pushes result to the next transform in the chain.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15688"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19254"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15693"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the input nodes.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19259"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15698"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to transform context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19264"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15703"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19269"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1687,28 +1625,27 @@ placed in the <code class="PARAMETER">dataSize</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMPOPXML"></a><h3>xmlSecTransformPopXml ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformPopXml               (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> *nodes,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformPopXml               (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> *nodes</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>Pops data from previous transform in the chain, processes the data and
 returns result in <code class="PARAMETER">nodes</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15721"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19293"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15726"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to store popinter to result nodes.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19298"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to store popinter to result nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15731"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to transform context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19303"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15736"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19308"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1716,27 +1653,26 @@ returns result in <code class="PARAMETER">nodes</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMEXECUTE"></a><h3>xmlSecTransformExecute ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformExecute              (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <font>int</font> last,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformExecute              (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> last</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>Executes transform (used by default popBin/pushBin/popXml/pushXml methods).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15753"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19331"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15758"><span style="white-space: nowrap"><code class="PARAMETER">last</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the flag: if set to 1 then it's the last data chunk.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19336"><span style="white-space: nowrap"><code class="PARAMETER">last</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag: if set to 1 then it's the last data chunk.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15763"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the transform's chaing processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19341"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform's chaing processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15768"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19346"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1744,38 +1680,36 @@ returns result in <code class="PARAMETER">nodes</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMDEBUGDUMP"></a><h3>xmlSecTransformDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformDebugDump            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecTransformDebugDump            (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints transform's debug information to <code class="PARAMETER">output</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15785"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19367"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15790"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19372"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMDEBUGXMLDUMP"></a><h3>xmlSecTransformDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformDebugXmlDump         (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecTransformDebugXmlDump         (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints transform's debug information to <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15807"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19393"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15812"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19398"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -1785,10 +1719,9 @@ returns result in <code class="PARAMETER">nodes</code>.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecTransformGetName(transform)</pre>
 <p>Macro. Returns transform name.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN15825"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19410"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -1797,10 +1730,9 @@ returns result in <code class="PARAMETER">nodes</code>.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecTransformIsValid(transform)</pre>
 <p>Macro. Returns 1 if the <code class="PARAMETER">transform</code> is valid or 0 otherwise.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN15839"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19423"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -1810,15 +1742,14 @@ returns result in <code class="PARAMETER">nodes</code>.</p>
 <p>Macro. Returns 1 if the <code class="PARAMETER">transform</code> is valid and has specified type <code class="PARAMETER">t</code>
 or 0 otherwise.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15854"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19437"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15859"><span style="white-space: nowrap"><code class="PARAMETER">t</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the transform type.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19442"><span style="white-space: nowrap"><code class="PARAMETER">t</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform type.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -1829,15 +1760,14 @@ or 0 otherwise.</p>
 <p>Macro. Returns 1 if the <code class="PARAMETER">transform</code> is valid and has specified id <code class="PARAMETER">i</code>
 or 0 otherwise.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15874"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19456"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15879"><span style="white-space: nowrap"><code class="PARAMETER">i</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the transform id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19461"><span style="white-space: nowrap"><code class="PARAMETER">i</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform id.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -1848,24 +1778,23 @@ or 0 otherwise.</p>
 <p>Macro. Returns 1 if the <code class="PARAMETER">transform</code> is valid and has at least <code class="PARAMETER">size</code>
 bytes or 0 otherwise.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15894"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19475"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15899"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the transform object size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19480"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform object size.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCONNECT"></a><h3>xmlSecTransformConnect ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformConnect              (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> left,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> right,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformConnect              (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> left</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> right</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>If the data object is a node-set and the next transform requires octets,
 the signature application MUST attempt to convert the node-set to an octet
 stream using Canonical XML [XML-C14N].</p>
@@ -1882,22 +1811,21 @@ automatically strips away the start and end tags of the identified element
 and any of its descendant elements as well as any descendant comments and
 processing instructions. The output of this transform is an octet stream.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15922"><span style="white-space: nowrap"><code class="PARAMETER">left</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to left (prev) transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19509"><span style="white-space: nowrap"><code class="PARAMETER">left</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to left (prev) transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15927"><span style="white-space: nowrap"><code class="PARAMETER">right</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to right (next) transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19514"><span style="white-space: nowrap"><code class="PARAMETER">right</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to right (next) transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15932"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the transform's chaing processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19519"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform's chaing processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15937"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19524"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1905,42 +1833,40 @@ processing instructions. The output of this transform is an octet stream.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMREMOVE"></a><h3>xmlSecTransformRemove ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformRemove               (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecTransformRemove               (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>);</pre>
 <p>Removes <code class="PARAMETER">transform</code> from the chain.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN15953"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p> the pointer to <a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransform</span></a> structure.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19542"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransform</span></a> structure.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMDEFAULTGETDATATYPE"></a><h3>xmlSecTransformDefaultGetDataType ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a>  xmlSecTransformDefaultGetDataType
-                                                        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a> mode,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE"><span class="RETURNVALUE">xmlSecTransformDataType</span></a>  xmlSecTransformDefaultGetDataType
+                                                        (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE"><span class="TYPE">xmlSecTransformMode</span></a> mode</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>Gets transform input (<code class="PARAMETER">mode</code> is "push") or output (<code class="PARAMETER">mode</code> is "pop") data
 type (binary or XML) by analyzing available pushBin/popBin/pushXml/popXml
 methods.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15974"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19569"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15979"><span style="white-space: nowrap"><code class="PARAMETER">mode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the data mode (push or pop).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19574"><span style="white-space: nowrap"><code class="PARAMETER">mode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the data mode (push or pop).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15984"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the transform's chaing processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19579"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform's chaing processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15989"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19584"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the transform's data type for the <code class="PARAMETER">mode</code> operation.</p></td>
 </tr>
 </tbody></table>
@@ -1948,39 +1874,38 @@ methods.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMDEFAULTPUSHBIN"></a><h3>xmlSecTransformDefaultPushBin ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformDefaultPushBin       (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <font>int</font> final,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformDefaultPushBin       (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> final</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>Process binary <code class="PARAMETER">data</code> by calling transform's execute method and pushes
 results to next transform.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16010"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19615"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16015"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the input binary data,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19620"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input binary data,</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16020"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the input data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19625"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16025"><span style="white-space: nowrap"><code class="PARAMETER">final</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the flag: if set to 1 then it's the last
+<td align="LEFT" valign="TOP"><a name="AEN19630"><span style="white-space: nowrap"><code class="PARAMETER">final</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag: if set to 1 then it's the last
                      data chunk.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16030"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to transform context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19635"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16035"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19640"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -1988,39 +1913,38 @@ results to next transform.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMDEFAULTPOPBIN"></a><h3>xmlSecTransformDefaultPopBin ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformDefaultPopBin        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> maxDataSize,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *dataSize,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformDefaultPopBin        (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> maxDataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> *dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>Pops data from previous transform in the chain, processes data by calling
 transform's execute method and returns result in the <code class="PARAMETER">data</code> buffer. The
 size of returned data is placed in the <code class="PARAMETER">dataSize</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16056"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19671"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16061"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the buffer to store result data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19676"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the buffer to store result data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16066"><span style="white-space: nowrap"><code class="PARAMETER">maxDataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the size of the buffer <gtkdoclink href="DATA"><span class="TYPE">data</span></gtkdoclink>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19681"><span style="white-space: nowrap"><code class="PARAMETER">maxDataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the size of the buffer <gtkdoclink href="DATA"><span class="TYPE">data</span></gtkdoclink>.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16073"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to returned data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19688"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to returned data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16078"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to transform context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19693"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16083"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19698"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -2028,28 +1952,27 @@ size of returned data is placed in the <code class="PARAMETER">dataSize</code>.<
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMDEFAULTPUSHXML"></a><h3>xmlSecTransformDefaultPushXml ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformDefaultPushXml       (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformDefaultPushXml       (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nodes</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>Processes <code class="PARAMETER">nodes</code> by calling transform's execute method and pushes
 result to the next transform in the chain.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16101"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19722"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16106"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the input nodes.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19727"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16111"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to transform context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19732"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16116"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19737"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -2057,28 +1980,27 @@ result to the next transform in the chain.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMDEFAULTPOPXML"></a><h3>xmlSecTransformDefaultPopXml ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformDefaultPopXml        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> *nodes,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformDefaultPopXml        (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> *nodes</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>Pops data from previous transform in the chain, processes the data
 by calling transform's execute method and returns result in <code class="PARAMETER">nodes</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16134"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19761"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16139"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to store popinter to result nodes.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19766"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to store popinter to result nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16144"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to transform context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19771"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16149"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19776"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -2086,22 +2008,21 @@ by calling transform's execute method and returns result in <code class="PARAMET
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCREATEOUTPUTBUFFER"></a><h3>xmlSecTransformCreateOutputBuffer ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlOutputBufferPtr</font>  xmlSecTransformCreateOutputBuffer   (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLOUTPUTBUFFERPTR"><span class="RETURNVALUE">xmlOutputBufferPtr</span></gtkdoclink>  xmlSecTransformCreateOutputBuffer   (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>Creates output buffer to write data to <code class="PARAMETER">transform</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16166"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19797"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16171"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to transform context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19802"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16176"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19807"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to new output buffer or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -2109,23 +2030,22 @@ by calling transform's execute method and returns result in <code class="PARAMET
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMCREATEINPUTBUFFER"></a><h3>xmlSecTransformCreateInputBuffer ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlParserInputBufferPtr</font>  xmlSecTransformCreateInputBuffer
-                                                        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLPARSERINPUTBUFFER"><span class="RETURNVALUE">xmlParserInputBufferPtr</span></gtkdoclink>  xmlSecTransformCreateInputBuffer
+                                                        (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>Creates input buffer to read data from <code class="PARAMETER">transform</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16193"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19828"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16198"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the pointer to transform context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19833"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16203"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19838"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to new input buffer or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -2133,17 +2053,16 @@ by calling transform's execute method and returns result in <code class="PARAMET
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMINITIALIZEMETHOD"></a><h3>xmlSecTransformInitializeMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformInitializeMethod)  (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecTransformInitializeMethod)  (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>);</pre>
 <p>The transform specific initialization method.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16218"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19855"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16223"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19860"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -2151,41 +2070,39 @@ by calling transform's execute method and returns result in <code class="PARAMET
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMFINALIZEMETHOD"></a><h3>xmlSecTransformFinalizeMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                (*xmlSecTransformFinalizeMethod)    (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                (*xmlSecTransformFinalizeMethod)    (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>);</pre>
 <p>The transform specific destroy method.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN16238"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19877"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMGETDATATYPEMETHOD"></a><h3>xmlSecTransformGetDataTypeMethod ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a>  (*xmlSecTransformGetDataTypeMethod)
-                                                        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a> mode,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE"><span class="RETURNVALUE">xmlSecTransformDataType</span></a>  (*xmlSecTransformGetDataTypeMethod)
+                                                        (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE"><span class="TYPE">xmlSecTransformMode</span></a> mode</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>The transform specific method to query information about transform
 data type in specified mode <code class="PARAMETER">mode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16256"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19901"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16261"><span style="white-space: nowrap"><code class="PARAMETER">mode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the mode.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19906"><span style="white-space: nowrap"><code class="PARAMETER">mode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the mode.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16266"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to transform context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19911"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16271"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19916"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> transform data type.</p></td>
 </tr>
 </tbody></table>
@@ -2193,28 +2110,27 @@ data type in specified mode <code class="PARAMETER">mode</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMNODEREADMETHOD"></a><h3>xmlSecTransformNodeReadMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformNodeReadMethod)    (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecTransformNodeReadMethod)    (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>The transform specific method to read the transform data from
 the <code class="PARAMETER">node</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16289"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19940"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16294"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19945"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16300"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to transform context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19951"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16305"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19956"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -2222,27 +2138,26 @@ the <code class="PARAMETER">node</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMNODEWRITEMETHOD"></a><h3>xmlSecTransformNodeWriteMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformNodeWriteMethod)   (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecTransformNodeWriteMethod)   (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>The transform specific method to write transform information to an XML node <code class="PARAMETER">node</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16323"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19980"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16328"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19985"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16334"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to transform context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19991"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16339"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19996"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -2250,23 +2165,22 @@ the <code class="PARAMETER">node</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMSETKEYREQUIREMENTSMETHOD"></a><h3>xmlSecTransformSetKeyRequirementsMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformSetKeyRequirementsMethod)
-                                                        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecTransformSetKeyRequirementsMethod)
+                                                        (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEYREQ"><span class="TYPE">xmlSecKeyReqPtr</span></a> keyReq</code>);</pre>
 <p>Transform specific method to set transform's key requirements.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16355"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20016"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16360"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                     the pointer to key requirements structure.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20021"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key requirements structure.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16365"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20026"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -2274,22 +2188,21 @@ the <code class="PARAMETER">node</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMSETKEYMETHOD"></a><h3>xmlSecTransformSetKeyMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformSetKeyMethod)      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecTransformSetKeyMethod)      (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> key</code>);</pre>
 <p>The transform specific method to set the key for use.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16381"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20046"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16386"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                        the pointer to key.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20051"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16391"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20056"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -2297,35 +2210,34 @@ the <code class="PARAMETER">node</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMVERIFYMETHOD"></a><h3>xmlSecTransformVerifyMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformVerifyMethod)      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecTransformVerifyMethod)      (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>The transform specific method to verify transform processing results
 (used by digest and signature transforms). This method sets <code class="PARAMETER">status</code>
 member of the <a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransform</span></a> structure to either <a href="xmlsec-transforms.html#XMLSECTRANSFORMSTATUSOK"><span class="TYPE">xmlSecTransformStatusOk</span></a>
 if verification succeeded or <a href="xmlsec-transforms.html#XMLSECTRANSFORMSTATUSFAIL"><span class="TYPE">xmlSecTransformStatusFail</span></a> otherwise.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16416"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20089"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16421"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the input buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20094"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16426"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                   the size of input buffer <code class="PARAMETER">data</code>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20099"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the size of input buffer <code class="PARAMETER">data</code>.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16432"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to transform context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20105"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16437"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20110"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -2333,39 +2245,38 @@ if verification succeeded or <a href="xmlsec-transforms.html#XMLSECTRANSFORMSTAT
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMPUSHBINMETHOD"></a><h3>xmlSecTransformPushBinMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformPushBinMethod)     (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                                         <font>int</font> final,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecTransformPushBinMethod)     (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> final</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>The transform specific method to process data from <code class="PARAMETER">data</code> and push
 result to the next transform in the chain.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16457"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20140"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16462"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the input binary data,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20145"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input binary data,</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16467"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                   the input data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20150"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16472"><span style="white-space: nowrap"><code class="PARAMETER">final</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                      the flag: if set to 1 then it's the last
+<td align="LEFT" valign="TOP"><a name="AEN20155"><span style="white-space: nowrap"><code class="PARAMETER">final</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag: if set to 1 then it's the last
                              data chunk.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16477"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to transform context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20160"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16482"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20165"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -2373,39 +2284,38 @@ result to the next transform in the chain.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMPOPBINMETHOD"></a><h3>xmlSecTransformPopBinMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformPopBinMethod)      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> maxDataSize,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *dataSize,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecTransformPopBinMethod)      (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> maxDataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> *dataSize</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>The transform specific method to pop data from previous transform
 in the chain and return result in the <code class="PARAMETER">data</code> buffer. The size of returned
 data is placed in the <code class="PARAMETER">dataSize</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16503"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20196"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16508"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the buffer to store result data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20201"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the buffer to store result data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16513"><span style="white-space: nowrap"><code class="PARAMETER">maxDataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the size of the buffer <code class="PARAMETER">data</code>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20206"><span style="white-space: nowrap"><code class="PARAMETER">maxDataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the size of the buffer <code class="PARAMETER">data</code>.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16519"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                   the pointer to returned data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20212"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to returned data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16524"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to transform context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20217"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16529"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20222"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -2413,28 +2323,27 @@ data is placed in the <code class="PARAMETER">dataSize</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMPUSHXMLMETHOD"></a><h3>xmlSecTransformPushXmlMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformPushXmlMethod)     (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecTransformPushXmlMethod)     (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> nodes</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>The transform specific method to process <code class="PARAMETER">nodes</code> and push result to the next
 transform in the chain.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16547"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20246"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16552"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                      the input nodes.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20251"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16557"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to transform context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20256"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16562"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20261"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -2442,28 +2351,27 @@ transform in the chain.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMPOPXMLMETHOD"></a><h3>xmlSecTransformPopXmlMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformPopXmlMethod)      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> *nodes,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecTransformPopXmlMethod)      (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSetPtr</span></a> *nodes</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>The transform specific method to pop data from previous transform in the chain,
 process the data and return result in <code class="PARAMETER">nodes</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16580"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20285"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16585"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                      the pointer to store popinter to result nodes.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20290"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to store popinter to result nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16590"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to transform context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20295"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16595"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20300"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -2471,27 +2379,26 @@ process the data and return result in <code class="PARAMETER">nodes</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMEXECUTEMETHOD"></a><h3>xmlSecTransformExecuteMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformExecuteMethod)     (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <font>int</font> last,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 (*xmlSecTransformExecuteMethod)     (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> last</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtxPtr</span></a> transformCtx</code>);</pre>
 <p>Transform specific method to process a chunk of data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16612"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the pointer to transform object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20323"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16617"><span style="white-space: nowrap"><code class="PARAMETER">last</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the flag: if set to 1 then it's the last data chunk.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20328"><span style="white-space: nowrap"><code class="PARAMETER">last</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag: if set to 1 then it's the last data chunk.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16622"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to transform context object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20333"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16627"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20338"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -2533,88 +2440,87 @@ process the data and return result in <code class="PARAMETER">nodes</code>.</p>
 };</pre>
 <p>The transform klass desccription structure.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16640"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">klassSize</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the transform klass structure size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20350"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> <code class="STRUCTFIELD">klassSize</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform klass structure size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16646"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">objSize</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                    the transform object size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20357"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> <code class="STRUCTFIELD">objSize</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform object size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16652"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">name</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the transform's name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20364"><span style="white-space: nowrap">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">name</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform's name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16658"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">href</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the transform's identification string (href).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20371"><span style="white-space: nowrap">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">href</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform's identification string (href).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16664"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> <code class="STRUCTFIELD">usage</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                      the allowed transforms usages.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20378"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE"><span class="TYPE">xmlSecTransformUsage</span></a> <code class="STRUCTFIELD">usage</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the allowed transforms usages.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16670"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMINITIALIZEMETHOD">xmlSecTransformInitializeMethod</a> <code class="STRUCTFIELD">initialize</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the initialization method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20385"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMINITIALIZEMETHOD"><span class="TYPE">xmlSecTransformInitializeMethod</span></a> <code class="STRUCTFIELD">initialize</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the initialization method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16676"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMFINALIZEMETHOD">xmlSecTransformFinalizeMethod</a> <code class="STRUCTFIELD">finalize</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                   the finmalization (destroy) function.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20392"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMFINALIZEMETHOD"><span class="TYPE">xmlSecTransformFinalizeMethod</span></a> <code class="STRUCTFIELD">finalize</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the finmalization (destroy) function.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16682"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMNODEREADMETHOD">xmlSecTransformNodeReadMethod</a> <code class="STRUCTFIELD">readNode</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                   the XML node read method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20399"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMNODEREADMETHOD"><span class="TYPE">xmlSecTransformNodeReadMethod</span></a> <code class="STRUCTFIELD">readNode</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the XML node read method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16688"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMNODEWRITEMETHOD">xmlSecTransformNodeWriteMethod</a> <code class="STRUCTFIELD">writeNode</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the XML node write method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20406"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMNODEWRITEMETHOD"><span class="TYPE">xmlSecTransformNodeWriteMethod</span></a> <code class="STRUCTFIELD">writeNode</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the XML node write method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16694"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEYREQUIREMENTSMETHOD">xmlSecTransformSetKeyRequirementsMethod</a> <code class="STRUCTFIELD">setKeyReq</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the set key requirements method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20413"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEYREQUIREMENTSMETHOD"><span class="TYPE">xmlSecTransformSetKeyRequirementsMethod</span></a> <code class="STRUCTFIELD">setKeyReq</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the set key requirements method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16700"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEYMETHOD">xmlSecTransformSetKeyMethod</a> <code class="STRUCTFIELD">setKey</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                     the set key method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20420"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEYMETHOD"><span class="TYPE">xmlSecTransformSetKeyMethod</span></a> <code class="STRUCTFIELD">setKey</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the set key method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16706"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFYMETHOD">xmlSecTransformVerifyMethod</a> <code class="STRUCTFIELD">verify</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                     the verify method (for digest and signature transforms).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20427"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFYMETHOD"><span class="TYPE">xmlSecTransformVerifyMethod</span></a> <code class="STRUCTFIELD">verify</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the verify method (for digest and signature transforms).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16712"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMGETDATATYPEMETHOD">xmlSecTransformGetDataTypeMethod</a> <code class="STRUCTFIELD">getDataType</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the input/output data type query method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20434"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMGETDATATYPEMETHOD"><span class="TYPE">xmlSecTransformGetDataTypeMethod</span></a> <code class="STRUCTFIELD">getDataType</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the input/output data type query method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16718"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHBINMETHOD">xmlSecTransformPushBinMethod</a> <code class="STRUCTFIELD">pushBin</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                    the binary data "push thru chain" processing method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20441"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHBINMETHOD"><span class="TYPE">xmlSecTransformPushBinMethod</span></a> <code class="STRUCTFIELD">pushBin</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the binary data "push thru chain" processing method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16724"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPBINMETHOD">xmlSecTransformPopBinMethod</a> <code class="STRUCTFIELD">popBin</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                     the binary data "pop from chain" procesing method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20448"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPBINMETHOD"><span class="TYPE">xmlSecTransformPopBinMethod</span></a> <code class="STRUCTFIELD">popBin</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the binary data "pop from chain" procesing method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16730"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHXMLMETHOD">xmlSecTransformPushXmlMethod</a> <code class="STRUCTFIELD">pushXml</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                    the XML data "push thru chain" processing method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20455"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHXMLMETHOD"><span class="TYPE">xmlSecTransformPushXmlMethod</span></a> <code class="STRUCTFIELD">pushXml</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the XML data "push thru chain" processing method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16736"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPXMLMETHOD">xmlSecTransformPopXmlMethod</a> <code class="STRUCTFIELD">popXml</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                     the XML data "pop from chain" procesing method.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20462"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPXMLMETHOD"><span class="TYPE">xmlSecTransformPopXmlMethod</span></a> <code class="STRUCTFIELD">popXml</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the XML data "pop from chain" procesing method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16742"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMEXECUTEMETHOD">xmlSecTransformExecuteMethod</a> <code class="STRUCTFIELD">execute</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                    the low level data processing method used  by default
+<td align="LEFT" valign="TOP"><a name="AEN20469"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMEXECUTEMETHOD"><span class="TYPE">xmlSecTransformExecuteMethod</span></a> <code class="STRUCTFIELD">execute</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the low level data processing method used  by default
                              implementations of <code class="PARAMETER">pushBin</code>, <code class="PARAMETER">popBin</code>, <code class="PARAMETER">pushXml</code> and <code class="PARAMETER">popXml</code>.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16752"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20480"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16758"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20487"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -2624,10 +2530,9 @@ process the data and return result in <code class="PARAMETER">nodes</code>.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecTransformKlassGetName(klass)</pre>
 <p>Macro. Returns transform klass name.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN16772"><span style="white-space: nowrap"><code class="PARAMETER">klass</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the transofrm's klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20501"><span style="white-space: nowrap"><code class="PARAMETER">klass</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transofrm's klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -2635,39 +2540,36 @@ process the data and return result in <code class="PARAMETER">nodes</code>.</p>
 <a name="XMLSECTRANSFORMIDLISTID"></a><h3>xmlSecTransformIdListId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformIdListId xmlSecTransformIdListGetKlass()</pre>
 <p>Transform klasses list klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMIDLISTGETKLASS"></a><h3>xmlSecTransformIdListGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font>     xmlSecTransformIdListGetKlass       (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECPTRLISTID"><span class="RETURNVALUE">xmlSecPtrListId</span></gtkdoclink>     xmlSecTransformIdListGetKlass       (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The transform id list klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN16793"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20523"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the transform id list klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMIDLISTFIND"></a><h3>xmlSecTransformIdListFind ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformIdListFind           (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>xmlSecTransformId</font> transformId);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformIdListFind           (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> transformId</code>);</pre>
 <p>Lookups <code class="PARAMETER">dataId</code> in <code class="PARAMETER">list</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16811"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to transform ids list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20545"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16816"><span style="white-space: nowrap"><code class="PARAMETER">transformId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20550"><span style="white-space: nowrap"><code class="PARAMETER">transformId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16821"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20555"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 1 if <code class="PARAMETER">dataId</code> is found in the <code class="PARAMETER">list</code>, 0 if not and a negative
 value if an error occurs.</p></td>
 </tr>
@@ -2676,27 +2578,26 @@ value if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMIDLISTFINDBYHREF"></a><h3>xmlSecTransformIdListFindByHref ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformIdListFindByHref     (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         const <font>xmlChar</font> *href,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformIdListFindByHref     (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *href</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE"><span class="TYPE">xmlSecTransformUsage</span></a> usage</code>);</pre>
 <p>Lookups data klass in the list with given <code class="PARAMETER">href</code> and <code class="PARAMETER">usage</code> in <code class="PARAMETER">list</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16843"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to transform ids list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20583"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16848"><span style="white-space: nowrap"><code class="PARAMETER">href</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the desired transform klass href.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20588"><span style="white-space: nowrap"><code class="PARAMETER">href</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired transform klass href.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16853"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the desired transform usage.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20593"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired transform usage.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16858"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20598"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> transform klass is found and NULL otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -2704,27 +2605,26 @@ value if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMIDLISTFINDBYNAME"></a><h3>xmlSecTransformIdListFindByName ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformIdListFindByName     (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         const <font>xmlChar</font> *name,
-                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformIdListFindByName     (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE"><span class="TYPE">xmlSecTransformUsage</span></a> usage</code>);</pre>
 <p>Lookups data klass in the list with given <code class="PARAMETER">name</code> and <code class="PARAMETER">usage</code> in <code class="PARAMETER">list</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16878"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to transform ids list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20624"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16883"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the desired transform klass name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20629"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired transform klass name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16888"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the desired transform usage.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20634"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the desired transform usage.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16893"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20639"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> transform klass is found and NULL otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -2732,38 +2632,36 @@ value if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMIDLISTDEBUGDUMP"></a><h3>xmlSecTransformIdListDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformIdListDebugDump      (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecTransformIdListDebugDump      (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints binary transform debug information to <code class="PARAMETER">output</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16910"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to transform ids list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20660"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16915"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20665"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMIDLISTDEBUGXMLDUMP"></a><h3>xmlSecTransformIdListDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformIdListDebugXmlDump   (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecTransformIdListDebugXmlDump   (<code class="PARAMETER"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> list</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints binary transform debug information to <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16932"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to transform ids list.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20686"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to transform ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16937"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20691"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -2772,19 +2670,17 @@ value if an error occurs.</p></td>
 <a name="XMLSECTRANSFORMIDUNKNOWN"></a><h3>xmlSecTransformIdUnknown</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformIdUnknown                        ((xmlSecTransformId)NULL)</pre>
 <p>The "unknown" transform id (NULL).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMBASE64ID"></a><h3>xmlSecTransformBase64Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecTransformBase64Id</pre>
 <p>The base64 encode transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMBASE64GETKLASS"></a><h3>xmlSecTransformBase64GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformBase64GetKlass       (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformBase64GetKlass       (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The Base64 transform klass (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-BASE-64"><span class="TYPE">sec-Base-64</span></gtkdoclink>).
 The normative specification for base64 decoding transforms is RFC 2045
 (http://www.ietf.org/rfc/rfc2045.txt). The base64 Transform element has
@@ -2792,28 +2688,26 @@ no content. The input is decoded by the algorithms. This transform is
 useful if an application needs to sign the raw data associated with
 the encoded content of an element.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN16967"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20721"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> base64 transform id.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMBASE64SETLINESIZE"></a><h3>xmlSecTransformBase64SetLineSize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformBase64SetLineSize    (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> lineSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecTransformBase64SetLineSize    (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> lineSize</code>);</pre>
 <p>Sets the max line size to <code class="PARAMETER">lineSize</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16984"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to BASE64 encode transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20742"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to BASE64 encode transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16989"><span style="white-space: nowrap"><code class="PARAMETER">lineSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the new max line size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20747"><span style="white-space: nowrap"><code class="PARAMETER">lineSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new max line size.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -2822,19 +2716,17 @@ the encoded content of an element.</p>
 <a name="XMLSECTRANSFORMINCLC14NID"></a><h3>xmlSecTransformInclC14NId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecTransformInclC14NId</pre>
 <p>The regular (inclusive) C14N without comments transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMINCLC14NGETKLASS"></a><h3>xmlSecTransformInclC14NGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformInclC14NGetKlass     (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformInclC14NGetKlass     (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Inclusive (regular) canonicalization that omits comments transform klass
 (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-C14NALG"><span class="TYPE">sec-c14nAlg</span></gtkdoclink> and
 http://www.w3.org/TR/2001/REC-xml-c14n-20010315).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17012"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20771"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> c14n transform id.</p></td>
 </tr></tbody></table>
 </div>
@@ -2843,20 +2735,18 @@ http://www.w3.org/TR/2001/REC-xml-c14n-20010315).</p>
 <a name="XMLSECTRANSFORMINCLC14NWITHCOMMENTSID"></a><h3>xmlSecTransformInclC14NWithCommentsId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecTransformInclC14NWithCommentsId</pre>
 <p>The regular (inclusive) C14N with comments transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMINCLC14NWITHCOMMENTSGETKLASS"></a><h3>xmlSecTransformInclC14NWithCommentsGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformInclC14NWithCommentsGetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformInclC14NWithCommentsGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Inclusive (regular) canonicalization that includes comments transform klass
 (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-C14NALG"><span class="TYPE">sec-c14nAlg</span></gtkdoclink> and
 http://www.w3.org/TR/2001/REC-xml-c14n-20010315).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17035"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20795"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> c14n with comments transform id.</p></td>
 </tr></tbody></table>
 </div>
@@ -2865,17 +2755,15 @@ http://www.w3.org/TR/2001/REC-xml-c14n-20010315).</p>
 <a name="XMLSECTRANSFORMINCLC14N11ID"></a><h3>xmlSecTransformInclC14N11Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecTransformInclC14N11Id</pre>
 <p>The regular (inclusive) C14N 1.1 without comments transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMINCLC14N11GETKLASS"></a><h3>xmlSecTransformInclC14N11GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformInclC14N11GetKlass   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformInclC14N11GetKlass   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>C14N version 1.1 (http://www.w3.org/TR/xml-c14n11)</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17056"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20817"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> c14n v1.1 transform id.</p></td>
 </tr></tbody></table>
 </div>
@@ -2884,18 +2772,16 @@ http://www.w3.org/TR/2001/REC-xml-c14n-20010315).</p>
 <a name="XMLSECTRANSFORMINCLC14N11WITHCOMMENTSID"></a><h3>xmlSecTransformInclC14N11WithCommentsId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecTransformInclC14N11WithCommentsId</pre>
 <p>The regular (inclusive) C14N 1.1 with comments transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMINCLC14N11WITHCOMMENTSGETKLASS"></a><h3>xmlSecTransformInclC14N11WithCommentsGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformInclC14N11WithCommentsGetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformInclC14N11WithCommentsGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>C14N version 1.1 (http://www.w3.org/TR/xml-c14n11) with comments</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17077"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20839"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> c14n v1.1 with comments transform id.</p></td>
 </tr></tbody></table>
 </div>
@@ -2904,18 +2790,16 @@ http://www.w3.org/TR/2001/REC-xml-c14n-20010315).</p>
 <a name="XMLSECTRANSFORMEXCLC14NID"></a><h3>xmlSecTransformExclC14NId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecTransformExclC14NId</pre>
 <p>The exclusive C14N without comments transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMEXCLC14NGETKLASS"></a><h3>xmlSecTransformExclC14NGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformExclC14NGetKlass     (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformExclC14NGetKlass     (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Exclusive canoncicalization that ommits comments transform klass
 (http://www.w3.org/TR/xml-exc-c14n/).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17098"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20861"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> exclusive c14n transform id.</p></td>
 </tr></tbody></table>
 </div>
@@ -2924,19 +2808,17 @@ http://www.w3.org/TR/2001/REC-xml-c14n-20010315).</p>
 <a name="XMLSECTRANSFORMEXCLC14NWITHCOMMENTSID"></a><h3>xmlSecTransformExclC14NWithCommentsId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecTransformExclC14NWithCommentsId</pre>
 <p>The exclusive C14N with comments transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMEXCLC14NWITHCOMMENTSGETKLASS"></a><h3>xmlSecTransformExclC14NWithCommentsGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformExclC14NWithCommentsGetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformExclC14NWithCommentsGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Exclusive canoncicalization that includes comments transform klass
 (http://www.w3.org/TR/xml-exc-c14n/).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17119"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20883"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> exclusive c14n with comments transform id.</p></td>
 </tr></tbody></table>
 </div>
@@ -2945,12 +2827,11 @@ http://www.w3.org/TR/2001/REC-xml-c14n-20010315).</p>
 <a name="XMLSECTRANSFORMENVELOPEDID"></a><h3>xmlSecTransformEnvelopedId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecTransformEnvelopedId</pre>
 <p>The "enveloped" transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMENVELOPEDGETKLASS"></a><h3>xmlSecTransformEnvelopedGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformEnvelopedGetKlass    (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformEnvelopedGetKlass    (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The enveloped transform klass (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-ENVELOPEDSIGNATURE"><span class="TYPE">sec-EnvelopedSignature</span></gtkdoclink>):</p>
 <p>An enveloped signature transform T removes the whole Signature element
 containing T from the digest calculation of the Reference element
@@ -2970,9 +2851,8 @@ expression evaluator to create this transform. However, this transform
 MUST produce output in exactly the same manner as the XPath transform
 parameterized by the XPath expression above.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17147"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20912"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> enveloped transform id.</p></td>
 </tr></tbody></table>
 </div>
@@ -2981,19 +2861,17 @@ parameterized by the XPath expression above.</p>
 <a name="XMLSECTRANSFORMXPATHID"></a><h3>xmlSecTransformXPathId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecTransformXPathId</pre>
 <p>The XPath transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMXPATHGETKLASS"></a><h3>xmlSecTransformXPathGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformXPathGetKlass        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformXPathGetKlass        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The XPath transform evaluates given XPath expression and
 intersects the result with the previous nodes set. See
 http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-XPATH"><span class="TYPE">sec-XPath</span></gtkdoclink> for more details.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17170"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20936"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> XPath transform id.</p></td>
 </tr></tbody></table>
 </div>
@@ -3002,17 +2880,15 @@ http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-XPATH"><span class="TYPE
 <a name="XMLSECTRANSFORMXPATH2ID"></a><h3>xmlSecTransformXPath2Id</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecTransformXPath2Id</pre>
 <p>The XPath2 transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMXPATH2GETKLASS"></a><h3>xmlSecTransformXPath2GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformXPath2GetKlass       (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformXPath2GetKlass       (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The XPath2 transform (http://www.w3.org/TR/xmldsig-filter2/).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17191"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20958"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> XPath2 transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -3021,50 +2897,47 @@ http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-XPATH"><span class="TYPE
 <a name="XMLSECTRANSFORMXPOINTERID"></a><h3>xmlSecTransformXPointerId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecTransformXPointerId</pre>
 <p>The XPointer transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMXPOINTERGETKLASS"></a><h3>xmlSecTransformXPointerGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformXPointerGetKlass     (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformXPointerGetKlass     (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The XPointer transform klass
 (http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17212"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20980"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> XPointer transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMXPOINTERSETEXPR"></a><h3>xmlSecTransformXPointerSetExpr ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformXPointerSetExpr      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         const <font>xmlChar</font> *expr,
-                                                         <a href="xmlsec-nodeset.html#XMLSECNODESETTYPE">xmlSecNodeSetType</a> nodeSetType,
-                                                         <font>xmlNodePtr</font> hereNode);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformXPointerSetExpr      (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *expr</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-nodeset.html#XMLSECNODESETTYPE"><span class="TYPE">xmlSecNodeSetType</span></a> nodeSetType</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> hereNode</code>);</pre>
 <p>Sets the XPointer expression for an XPointer <code class="PARAMETER">transform</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17231"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to XPointer transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21007"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to XPointer transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17236"><span style="white-space: nowrap"><code class="PARAMETER">expr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the XPointer expression.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21012"><span style="white-space: nowrap"><code class="PARAMETER">expr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the XPointer expression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17241"><span style="white-space: nowrap"><code class="PARAMETER">nodeSetType</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the type of evaluated XPointer expression.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21017"><span style="white-space: nowrap"><code class="PARAMETER">nodeSetType</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the type of evaluated XPointer expression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17246"><span style="white-space: nowrap"><code class="PARAMETER">hereNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to "here" node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21022"><span style="white-space: nowrap"><code class="PARAMETER">hereNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to "here" node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17251"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21027"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -3074,12 +2947,11 @@ http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-XPATH"><span class="TYPE
 <a name="XMLSECTRANSFORMXSLTID"></a><h3>xmlSecTransformXsltId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecTransformXsltId</pre>
 <p>The XSLT transform klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMXSLTGETKLASS"></a><h3>xmlSecTransformXsltGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformXsltGetKlass         (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformXsltGetKlass         (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>XSLT transform klass (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-XSLT"><span class="TYPE">sec-XSLT</span></gtkdoclink>):</p>
 <p>The normative specification for XSL Transformations is [XSLT].
 Specification of a namespace-qualified stylesheet element, which MUST be
@@ -3104,9 +2976,8 @@ to ensure interoperability of the resulting signatures among applications
 that support the XSLT transform. Note that if the output is actually HTML,
 then the result of these steps is logically equivalent [XHTML].</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17277"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21054"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to XSLT transform klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -3115,13 +2986,12 @@ then the result of these steps is logically equivalent [XHTML].</p>
 <a name="XMLSECTRANSFORMREMOVEXMLTAGSC14NID"></a><h3>xmlSecTransformRemoveXmlTagsC14NId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecTransformRemoveXmlTagsC14NId</pre>
 <p>The "remove all xml tags" transform klass (used before base64 transforms).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMREMOVEXMLTAGSC14NGETKLASS"></a><h3>xmlSecTransformRemoveXmlTagsC14NGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRemoveXmlTagsC14NGetKlass
-                                                        (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformRemoveXmlTagsC14NGetKlass
+                                                        (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The "remove xml tags" transform klass (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-BASE-64"><span class="TYPE">sec-Base-64</span></gtkdoclink>):
 Base64 transform requires an octet stream for input. If an XPath node-set
 (or sufficiently functional alternative) is given as input, then it is
@@ -3134,9 +3004,8 @@ automatically strips away the start and end tags of the identified element
 and any of its descendant elements as well as any descendant comments and
 processing instructions. The output of this transform is an octet stream.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17302"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21080"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> "remove xml tags" transform id.</p></td>
 </tr></tbody></table>
 </div>
@@ -3148,42 +3017,39 @@ processing instructions. The output of this transform is an octet stream.</p>
 is Visa3D protocol. It doesn't follow XML/XPointer/XMLDSig specs and allows
 invalid XPointer expressions in the URI attribute. Since we couldn't evaluate
 such expressions thru XPath/XPointer engine, we need to have this hack here.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMVISA3DHACKGETKLASS"></a><h3>xmlSecTransformVisa3DHackGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformVisa3DHackGetKlass   (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECTRANSFORMID"><span class="RETURNVALUE">xmlSecTransformId</span></gtkdoclink>   xmlSecTransformVisa3DHackGetKlass   (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The Visa3DHack transform klass. The only reason why we need this
 is Visa3D protocol. It doesn't follow XML/XPointer/XMLDSig specs and allows
 invalid XPointer expressions in the URI attribute. Since we couldn't evaluate
 such expressions thru XPath/XPointer engine, we need to have this hack here.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17323"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21102"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> Visa3DHack transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECTRANSFORMVISA3DHACKSETID"></a><h3>xmlSecTransformVisa3DHackSetID ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformVisa3DHackSetID      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                                         const <font>xmlChar</font> *id);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecTransformVisa3DHackSetID      (<code class="PARAMETER"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> transform</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *id</code>);</pre>
 <p>Sets the ID value for an Visa3DHack <code class="PARAMETER">transform</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17340"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the pointer to Visa3DHack transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21123"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to Visa3DHack transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17345"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the ID value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21128"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the ID value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17350"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21133"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
diff --git a/docs/api/xmlsec-version.html b/docs/api/xmlsec-version.html
index 51308cc..a55c3c3 100644
--- a/docs/api/xmlsec-version.html
+++ b/docs/api/xmlsec-version.html
@@ -87,14 +87,14 @@
 <h1>
 <a name="XMLSEC-VERSION"></a>version</h1>
 <div class="REFNAMEDIV">
-<a name="AEN17360"></a><h2>Name</h2>version -- Version macros.</div>
+<a name="AEN21143"></a><h2>Name</h2>version -- Version macros.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-VERSION.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">#define             <a href="xmlsec-version.html#XMLSEC-VERSION--CAPS">XMLSEC_VERSION</a>
-#define             <a href="xmlsec-version.html#XMLSEC-VERSION-MAJOR--CAPS">XMLSEC_VERSION_MAJOR</a>
-#define             <a href="xmlsec-version.html#XMLSEC-VERSION-MINOR--CAPS">XMLSEC_VERSION_MINOR</a>
-#define             <a href="xmlsec-version.html#XMLSEC-VERSION-SUBMINOR--CAPS">XMLSEC_VERSION_SUBMINOR</a>
-#define             <a href="xmlsec-version.html#XMLSEC-VERSION-INFO--CAPS">XMLSEC_VERSION_INFO</a></pre>
+<pre class="SYNOPSIS">#define             <a href="xmlsec-version.html#XMLSEC-VERSION:CAPS">XMLSEC_VERSION</a>
+#define             <a href="xmlsec-version.html#XMLSEC-VERSION-MAJOR:CAPS">XMLSEC_VERSION_MAJOR</a>
+#define             <a href="xmlsec-version.html#XMLSEC-VERSION-MINOR:CAPS">XMLSEC_VERSION_MINOR</a>
+#define             <a href="xmlsec-version.html#XMLSEC-VERSION-SUBMINOR:CAPS">XMLSEC_VERSION_SUBMINOR</a>
+#define             <a href="xmlsec-version.html#XMLSEC-VERSION-INFO:CAPS">XMLSEC_VERSION_INFO</a></pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-VERSION.DESCRIPTION"></a><h2>Description</h2>
@@ -103,40 +103,35 @@
 <div class="REFSECT1">
 <a name="XMLSEC-VERSION.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="XMLSEC-VERSION--CAPS"></a><h3>XMLSEC_VERSION</h3>
+<a name="XMLSEC-VERSION:CAPS"></a><h3>XMLSEC_VERSION</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_VERSION			"1.2.15"</pre>
 <p>The library version string in the format
 "&lt;major-number&gt;.&lt;minor-number&gt;.&lt;sub-minor-number&gt;".</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-VERSION-MAJOR--CAPS"></a><h3>XMLSEC_VERSION_MAJOR</h3>
+<a name="XMLSEC-VERSION-MAJOR:CAPS"></a><h3>XMLSEC_VERSION_MAJOR</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_VERSION_MAJOR		1</pre>
 <p>The library major version number.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-VERSION-MINOR--CAPS"></a><h3>XMLSEC_VERSION_MINOR</h3>
+<a name="XMLSEC-VERSION-MINOR:CAPS"></a><h3>XMLSEC_VERSION_MINOR</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_VERSION_MINOR		2</pre>
 <p>The library minor version number.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-VERSION-SUBMINOR--CAPS"></a><h3>XMLSEC_VERSION_SUBMINOR</h3>
+<a name="XMLSEC-VERSION-SUBMINOR:CAPS"></a><h3>XMLSEC_VERSION_SUBMINOR</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_VERSION_SUBMINOR		15</pre>
 <p>The library sub-minor version number.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-VERSION-INFO--CAPS"></a><h3>XMLSEC_VERSION_INFO</h3>
+<a name="XMLSEC-VERSION-INFO:CAPS"></a><h3>XMLSEC_VERSION_INFO</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_VERSION_INFO		"3:15:2"</pre>
 <p>The library version info string in the format
 "&lt;major-number&gt;+&lt;minor-number&gt;:&lt;sub-minor-number&gt;:&lt;minor-number&gt;".</p>
-<p></p>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
diff --git a/docs/api/xmlsec-x509.html b/docs/api/xmlsec-x509.html
index 3f497ea..4acda88 100644
--- a/docs/api/xmlsec-x509.html
+++ b/docs/api/xmlsec-x509.html
@@ -87,18 +87,18 @@
 <h1>
 <a name="XMLSEC-X509"></a>x509</h1>
 <div class="REFNAMEDIV">
-<a name="AEN21022"></a><h2>Name</h2>x509 -- <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate"; target="_top">&lt;dsig:X509Certificate/&gt;</a> node parser.</div>
+<a name="AEN25753"></a><h2>Name</h2>x509 -- <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate"; target="_top">&lt;dsig:X509Certificate/&gt;</a> node parser.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-X509.SYNOPSIS"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">#define             <a href="xmlsec-x509.html#XMLSEC-X509DATA-CERTIFICATE-NODE--CAPS">XMLSEC_X509DATA_CERTIFICATE_NODE</a>
-#define             <a href="xmlsec-x509.html#XMLSEC-X509DATA-SUBJECTNAME-NODE--CAPS">XMLSEC_X509DATA_SUBJECTNAME_NODE</a>
-#define             <a href="xmlsec-x509.html#XMLSEC-X509DATA-ISSUERSERIAL-NODE--CAPS">XMLSEC_X509DATA_ISSUERSERIAL_NODE</a>
-#define             <a href="xmlsec-x509.html#XMLSEC-X509DATA-SKI-NODE--CAPS">XMLSEC_X509DATA_SKI_NODE</a>
-#define             <a href="xmlsec-x509.html#XMLSEC-X509DATA-CRL-NODE--CAPS">XMLSEC_X509DATA_CRL_NODE</a>
-#define             <a href="xmlsec-x509.html#XMLSEC-X509DATA-DEFAULT--CAPS">XMLSEC_X509DATA_DEFAULT</a>
-<font>int</font>                 <a href="xmlsec-x509.html#XMLSECX509DATAGETNODECONTENT">xmlSecX509DataGetNodeContent</a>        (<font>xmlNodePtr</font> node,
-                                                         <font>int</font> deleteChildren,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="SYNOPSIS">#define             <a href="xmlsec-x509.html#XMLSEC-X509DATA-CERTIFICATE-NODE:CAPS">XMLSEC_X509DATA_CERTIFICATE_NODE</a>
+#define             <a href="xmlsec-x509.html#XMLSEC-X509DATA-SUBJECTNAME-NODE:CAPS">XMLSEC_X509DATA_SUBJECTNAME_NODE</a>
+#define             <a href="xmlsec-x509.html#XMLSEC-X509DATA-ISSUERSERIAL-NODE:CAPS">XMLSEC_X509DATA_ISSUERSERIAL_NODE</a>
+#define             <a href="xmlsec-x509.html#XMLSEC-X509DATA-SKI-NODE:CAPS">XMLSEC_X509DATA_SKI_NODE</a>
+#define             <a href="xmlsec-x509.html#XMLSEC-X509DATA-CRL-NODE:CAPS">XMLSEC_X509DATA_CRL_NODE</a>
+#define             <a href="xmlsec-x509.html#XMLSEC-X509DATA-DEFAULT:CAPS">XMLSEC_X509DATA_DEFAULT</a>
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-x509.html#XMLSECX509DATAGETNODECONTENT">xmlSecX509DataGetNodeContent</a>        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> deleteChildren</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-X509.DESCRIPTION"></a><h2>Description</h2>
@@ -107,72 +107,65 @@
 <div class="REFSECT1">
 <a name="XMLSEC-X509.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="XMLSEC-X509DATA-CERTIFICATE-NODE--CAPS"></a><h3>XMLSEC_X509DATA_CERTIFICATE_NODE</h3>
+<a name="XMLSEC-X509DATA-CERTIFICATE-NODE:CAPS"></a><h3>XMLSEC_X509DATA_CERTIFICATE_NODE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_X509DATA_CERTIFICATE_NODE                        0x00000001</pre>
 <p><a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate"; target="_top">&lt;dsig:X509Certificate/&gt;</a> node found or would be written back.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-X509DATA-SUBJECTNAME-NODE--CAPS"></a><h3>XMLSEC_X509DATA_SUBJECTNAME_NODE</h3>
+<a name="XMLSEC-X509DATA-SUBJECTNAME-NODE:CAPS"></a><h3>XMLSEC_X509DATA_SUBJECTNAME_NODE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_X509DATA_SUBJECTNAME_NODE                        0x00000002</pre>
 <p><a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName"; target="_top">&lt;dsig:X509SubjectName/&gt;</a> node found or would be written back.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-X509DATA-ISSUERSERIAL-NODE--CAPS"></a><h3>XMLSEC_X509DATA_ISSUERSERIAL_NODE</h3>
+<a name="XMLSEC-X509DATA-ISSUERSERIAL-NODE:CAPS"></a><h3>XMLSEC_X509DATA_ISSUERSERIAL_NODE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_X509DATA_ISSUERSERIAL_NODE                       0x00000004</pre>
 <p><a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial"; target="_top">&lt;dsig:X509IssuerSerial/&gt;</a> node found or would be written back.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-X509DATA-SKI-NODE--CAPS"></a><h3>XMLSEC_X509DATA_SKI_NODE</h3>
+<a name="XMLSEC-X509DATA-SKI-NODE:CAPS"></a><h3>XMLSEC_X509DATA_SKI_NODE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_X509DATA_SKI_NODE                                0x00000008</pre>
 <p>&lt;dsig:/X509SKI&gt; node found or would be written back.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-X509DATA-CRL-NODE--CAPS"></a><h3>XMLSEC_X509DATA_CRL_NODE</h3>
+<a name="XMLSEC-X509DATA-CRL-NODE:CAPS"></a><h3>XMLSEC_X509DATA_CRL_NODE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_X509DATA_CRL_NODE                                0x00000010</pre>
 <p><a href="http://www.w3.org/TR/xmldsig-core/#sec-X509CRL"; target="_top">&lt;dsig:X509CRL/&gt;</a> node found or would be written back.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-X509DATA-DEFAULT--CAPS"></a><h3>XMLSEC_X509DATA_DEFAULT</h3>
+<a name="XMLSEC-X509DATA-DEFAULT:CAPS"></a><h3>XMLSEC_X509DATA_DEFAULT</h3>
 <pre class="PROGRAMLISTING">#define             XMLSEC_X509DATA_DEFAULT</pre>
 <p>Default set of nodes to write in case of empty
 <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node template.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECX509DATAGETNODECONTENT"></a><h3>xmlSecX509DataGetNodeContent ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecX509DataGetNodeContent        (<font>xmlNodePtr</font> node,
-                                                         <font>int</font> deleteChildren,
-                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecX509DataGetNodeContent        (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> deleteChildren</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtxPtr</span></a> keyInfoCtx</code>);</pre>
 <p>Reads the contents of <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node and returns it as
 a bits mask.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21106"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25844"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21112"><span style="white-space: nowrap"><code class="PARAMETER">deleteChildren</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the flag that indicates whether to remove node children after reading.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25850"><span style="white-space: nowrap"><code class="PARAMETER">deleteChildren</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag that indicates whether to remove node children after reading.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21117"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25855"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21123"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25861"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the bit mask representing the <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node content
 or a negative value if an error occurs.</p></td>
 </tr>
diff --git a/docs/api/xmlsec-xmldsig.html b/docs/api/xmlsec-xmldsig.html
index f846843..2f0b436 100644
--- a/docs/api/xmlsec-xmldsig.html
+++ b/docs/api/xmlsec-xmldsig.html
@@ -87,55 +87,55 @@
 <h1>
 <a name="XMLSEC-XMLDSIG"></a>xmldsig</h1>
 <div class="REFNAMEDIV">
-<a name="AEN17416"></a><h2>Name</h2>xmldsig -- XML Digital Signature support.</div>
+<a name="AEN21194"></a><h2>Name</h2>xmldsig -- XML Digital Signature support.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-XMLDSIG.SYNOPSIS"></a><h2>Synopsis</h2>
 <pre class="SYNOPSIS">enum                <a href="xmlsec-xmldsig.html#XMLSECDSIGSTATUS">xmlSecDSigStatus</a>;
-#define             <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS--CAPS">XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS</a>
-#define             <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES--CAPS">XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</a>
-#define             <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES--CAPS">XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</a>
-#define             <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNATURE--CAPS">XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</a>
-#define             <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK--CAPS">XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</a>
+#define             <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS:CAPS">XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS</a>
+#define             <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES:CAPS">XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</a>
+#define             <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES:CAPS">XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</a>
+#define             <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNATURE:CAPS">XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</a>
+#define             <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK:CAPS">XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</a>
 struct              <a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtx</a>;
-<font>xmlSecDSigCtxPtr</font>    <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXCREATE">xmlSecDSigCtxCreate</a>                 (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
-<font>void</font>                <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXDESTROY">xmlSecDSigCtxDestroy</a>                (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx);
-<font>int</font>                 <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXINITIALIZE">xmlSecDSigCtxInitialize</a>             (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
-<font>void</font>                <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXFINALIZE">xmlSecDSigCtxFinalize</a>               (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx);
-<font>int</font>                 <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXSIGN">xmlSecDSigCtxSign</a>                   (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                                         <font>xmlNodePtr</font> tmpl);
-<font>int</font>                 <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXVERIFY">xmlSecDSigCtxVerify</a>                 (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                                         <font>xmlNodePtr</font> node);
-<font>int</font>                 <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXENABLEREFERENCETRANSFORM">xmlSecDSigCtxEnableReferenceTransform</a>
-                                                        (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                                         <font>xmlSecTransformId</font> transformId);
-<font>int</font>                 <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXENABLESIGNATURETRANSFORM">xmlSecDSigCtxEnableSignatureTransform</a>
-                                                        (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                                         <font>xmlSecTransformId</font> transformId);
-<font>xmlSecBufferPtr</font>     <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXGETPRESIGNBUFFER">xmlSecDSigCtxGetPreSignBuffer</a>       (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx);
-<font>void</font>                <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXDEBUGDUMP">xmlSecDSigCtxDebugDump</a>              (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                                         <font>FILE</font> *output);
-<font>void</font>                <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXDEBUGXMLDUMP">xmlSecDSigCtxDebugXmlDump</a>           (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                                         <font>FILE</font> *output);
+<gtkdoclink href="XMLSECDSIGCTXPTR"><span class="RETURNVALUE">xmlSecDSigCtxPtr</span></gtkdoclink><a href="xmlsec-xmldsig.html#XMLSECDSIGCTXCREATE">xmlSecDSigCtxCreate</a>                 (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> keysMngr</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-xmldsig.html#XMLSECDSIGCTXDESTROY">xmlSecDSigCtxDestroy</a>                (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmldsig.html#XMLSECDSIGCTXINITIALIZE">xmlSecDSigCtxInitialize</a>             (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> keysMngr</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-xmldsig.html#XMLSECDSIGCTXFINALIZE">xmlSecDSigCtxFinalize</a>               (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmldsig.html#XMLSECDSIGCTXSIGN">xmlSecDSigCtxSign</a>                   (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> tmpl</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmldsig.html#XMLSECDSIGCTXVERIFY">xmlSecDSigCtxVerify</a>                 (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmldsig.html#XMLSECDSIGCTXENABLEREFERENCETRANSFORM">xmlSecDSigCtxEnableReferenceTransform</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> transformId</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmldsig.html#XMLSECDSIGCTXENABLESIGNATURETRANSFORM">xmlSecDSigCtxEnableSignatureTransform</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> transformId</code>);
+<gtkdoclink href="XMLSECBUFFERPTR"><span class="RETURNVALUE">xmlSecBufferPtr</span></gtkdoclink><a href="xmlsec-xmldsig.html#XMLSECDSIGCTXGETPRESIGNBUFFER">xmlSecDSigCtxGetPreSignBuffer</a>       (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-xmldsig.html#XMLSECDSIGCTXDEBUGDUMP">xmlSecDSigCtxDebugDump</a>              (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-xmldsig.html#XMLSECDSIGCTXDEBUGXMLDUMP">xmlSecDSigCtxDebugXmlDump</a>           (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
 enum                <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN">xmlSecDSigReferenceOrigin</a>;
 struct              <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtx</a>;
-<font>xmlSecDSigReferenceCtxPtr</font>  <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXCREATE">xmlSecDSigReferenceCtxCreate</a> (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                                         <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN">xmlSecDSigReferenceOrigin</a> origin);
-<font>void</font>                <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXDESTROY">xmlSecDSigReferenceCtxDestroy</a>       (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx);
-<font>int</font>                 <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXINITIALIZE">xmlSecDSigReferenceCtxInitialize</a>    (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
-                                                         <a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                                         <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN">xmlSecDSigReferenceOrigin</a> origin);
-<font>void</font>                <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXFINALIZE">xmlSecDSigReferenceCtxFinalize</a>      (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx);
-<font>int</font>                 <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXPROCESSNODE">xmlSecDSigReferenceCtxProcessNode</a>   (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
-                                                         <font>xmlNodePtr</font> node);
-<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a>     <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXGETPREDIGESTBUFFER">xmlSecDSigReferenceCtxGetPreDigestBuffer</a>
-                                                        (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx);
-<font>void</font>                <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXDEBUGDUMP">xmlSecDSigReferenceCtxDebugDump</a>     (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
-                                                         <font>FILE</font> *output);
-<font>void</font>                <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXDEBUGXMLDUMP">xmlSecDSigReferenceCtxDebugXmlDump</a>  (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
-                                                         <font>FILE</font> *output);
+<gtkdoclink href="XMLSECDSIGREFERENCECTXPTR"><span class="RETURNVALUE">xmlSecDSigReferenceCtxPtr</span></gtkdoclink><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXCREATE">xmlSecDSigReferenceCtxCreate</a> (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN"><span class="TYPE">xmlSecDSigReferenceOrigin</span></a> origin</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXDESTROY">xmlSecDSigReferenceCtxDestroy</a>       (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX"><span class="TYPE">xmlSecDSigReferenceCtxPtr</span></a> dsigRefCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXINITIALIZE">xmlSecDSigReferenceCtxInitialize</a>    (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX"><span class="TYPE">xmlSecDSigReferenceCtxPtr</span></a> dsigRefCtx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN"><span class="TYPE">xmlSecDSigReferenceOrigin</span></a> origin</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXFINALIZE">xmlSecDSigReferenceCtxFinalize</a>      (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX"><span class="TYPE">xmlSecDSigReferenceCtxPtr</span></a> dsigRefCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXPROCESSNODE">xmlSecDSigReferenceCtxProcessNode</a>   (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX"><span class="TYPE">xmlSecDSigReferenceCtxPtr</span></a> dsigRefCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>);
+<a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="RETURNVALUE">xmlSecBufferPtr</span></a>     <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXGETPREDIGESTBUFFER">xmlSecDSigReferenceCtxGetPreDigestBuffer</a>
+                                                        (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX"><span class="TYPE">xmlSecDSigReferenceCtxPtr</span></a> dsigRefCtx</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXDEBUGDUMP">xmlSecDSigReferenceCtxDebugDump</a>     (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX"><span class="TYPE">xmlSecDSigReferenceCtxPtr</span></a> dsigRefCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXDEBUGXMLDUMP">xmlSecDSigReferenceCtxDebugXmlDump</a>  (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX"><span class="TYPE">xmlSecDSigReferenceCtxPtr</span></a> dsigRefCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
 #define             <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXLISTID">xmlSecDSigReferenceCtxListId</a>
-<font>xmlSecPtrListId</font>     <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXLISTGETKLASS">xmlSecDSigReferenceCtxListGetKlass</a>  (void);</pre>
+<gtkdoclink href="XMLSECPTRLISTID"><span class="RETURNVALUE">xmlSecPtrListId</span></gtkdoclink><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXLISTGETKLASS">xmlSecDSigReferenceCtxListGetKlass</a>  (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-XMLDSIG.DESCRIPTION"></a><h2>Description</h2>
@@ -152,61 +152,55 @@ struct              <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecD
 } xmlSecDSigStatus;</pre>
 <p>XML Digital signature processing status.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECDSIGSTATUSUNKNOWN"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecDSigStatusUnknown</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>    the status is unknow.</p></td>
+<td align="LEFT" valign="TOP"><p>the status is unknow.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECDSIGSTATUSSUCCEEDED"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecDSigStatusSucceeded</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>  the processing succeeded.</p></td>
+<td align="LEFT" valign="TOP"><p>the processing succeeded.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECDSIGSTATUSINVALID"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecDSigStatusInvalid</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>    the processing failed.</p></td>
+<td align="LEFT" valign="TOP"><p>the processing failed.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS--CAPS"></a><h3>XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS</h3>
+<a name="XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS:CAPS"></a><h3>XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS                      0x00000001</pre>
 <p>If this flag is set then <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifests"; target="_top">&lt;dsig:Manifests/&gt;</a> nodes will not be processed.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES--CAPS"></a><h3>XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</h3>
+<a name="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES:CAPS"></a><h3>XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES           0x00000002</pre>
 <p>If this flag is set then pre-digest buffer for <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> child
 of <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element will be stored in <a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtx</span></a>.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES--CAPS"></a><h3>XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</h3>
+<a name="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES:CAPS"></a><h3>XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES             0x00000004</pre>
 <p>If this flag is set then pre-digest buffer for <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> child
 of <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> element will be stored in <a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtx</span></a>.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE--CAPS"></a><h3>XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</h3>
+<a name="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE:CAPS"></a><h3>XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_DSIG_FLAGS_STORE_SIGNATURE                       0x00000008</pre>
 <p>If this flag is set then pre-signature buffer for <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a>
 element processing will be stored in <a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtx</span></a>.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK--CAPS"></a><h3>XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</h3>
+<a name="XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK:CAPS"></a><h3>XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK                       0x00000010</pre>
 <p>If this flag is set then URI ID references are resolved directly
 without using XPointers. This allows one to sign/verify Visa3D
 documents that don't follow XML, XPointer and XML DSig specifications.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
@@ -245,130 +239,128 @@ documents that don't follow XML, XPointer and XML DSig specifications.</p>
 };</pre>
 <p>XML DSig processing context.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17587"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">userData</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                   the pointer to user data (xmlsec and xmlsec-crypto libraries
+<td align="LEFT" valign="TOP"><a name="AEN21444"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">userData</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to user data (xmlsec and xmlsec-crypto libraries
                              never touches this).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17593"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                      the XML Digital Signature processing flags.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21451"><span style="white-space: nowrap">unsigned <gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> <code class="STRUCTFIELD">flags</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the XML Digital Signature processing flags.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17599"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags2</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                     the XML Digital Signature processing flags.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21458"><span style="white-space: nowrap">unsigned <gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> <code class="STRUCTFIELD">flags2</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the XML Digital Signature processing flags.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17605"><span style="white-space: nowrap"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> <code class="STRUCTFIELD">keyInfoReadCtx</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the reading key context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21465"><span style="white-space: nowrap"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtx</span></a> <code class="STRUCTFIELD">keyInfoReadCtx</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the reading key context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17611"><span style="white-space: nowrap"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> <code class="STRUCTFIELD">keyInfoWriteCtx</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the writing key context (not used for signature verification).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21472"><span style="white-space: nowrap"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtx</span></a> <code class="STRUCTFIELD">keyInfoWriteCtx</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the writing key context (not used for signature verification).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17617"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtx</a> <code class="STRUCTFIELD">transformCtx</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> node processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21479"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtx</span></a> <code class="STRUCTFIELD">transformCtx</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17624"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPE">xmlSecTransformUriType</a> <code class="STRUCTFIELD">enabledReferenceUris</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the URI types allowed for <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21487"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPE"><span class="TYPE">xmlSecTransformUriType</span></a> <code class="STRUCTFIELD">enabledReferenceUris</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the URI types allowed for <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17631"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> <code class="STRUCTFIELD">enabledReferenceTransforms</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p> the list of transforms allowed in <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21495"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrListPtr</span></a> <code class="STRUCTFIELD">enabledReferenceTransforms</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the list of transforms allowed in <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17638"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXPREEXECUTECALLBACK">xmlSecTransformCtxPreExecuteCallback</a> <code class="STRUCTFIELD">referencePreExecuteCallback</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21503"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXPREEXECUTECALLBACK"><span class="TYPE">xmlSecTransformCtxPreExecuteCallback</span></a> <code class="STRUCTFIELD">referencePreExecuteCallback</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>the callback for <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node processing.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17645"><span style="white-space: nowrap"><font>xmlSecTransformId</font> <code class="STRUCTFIELD">defSignMethodId</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the default signing method klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21511"><span style="white-space: nowrap"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> <code class="STRUCTFIELD">defSignMethodId</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the default signing method klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17651"><span style="white-space: nowrap"><font>xmlSecTransformId</font> <code class="STRUCTFIELD">defC14NMethodId</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the default c14n method klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21518"><span style="white-space: nowrap"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> <code class="STRUCTFIELD">defC14NMethodId</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the default c14n method klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17657"><span style="white-space: nowrap"><font>xmlSecTransformId</font> <code class="STRUCTFIELD">defDigestMethodId</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the default digest method klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21525"><span style="white-space: nowrap"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> <code class="STRUCTFIELD">defDigestMethodId</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the default digest method klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17663"><span style="white-space: nowrap"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <code class="STRUCTFIELD">signKey</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                    the signature key; application may set <gtkdoclink href="SIGNKEY"><span class="TYPE">signKey</span></gtkdoclink>
+<td align="LEFT" valign="TOP"><a name="AEN21532"><span style="white-space: nowrap"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> <code class="STRUCTFIELD">signKey</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the signature key; application may set <gtkdoclink href="SIGNKEY"><span class="TYPE">signKey</span></gtkdoclink>
                              before calling <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXSIGN"><span class="TYPE">xmlSecDSigCtxSign</span></a> or <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXVERIFY"><span class="TYPE">xmlSecDSigCtxVerify</span></a>
                              functions.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17675"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMOPERATION">xmlSecTransformOperation</a> <code class="STRUCTFIELD">operation</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the operation: sign or verify.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21545"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMOPERATION"><span class="TYPE">xmlSecTransformOperation</span></a> <code class="STRUCTFIELD">operation</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the operation: sign or verify.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17681"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> <code class="STRUCTFIELD">result</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                     the pointer to signature (not valid for signature verificaction).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21552"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> <code class="STRUCTFIELD">result</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to signature (not valid for signature verificaction).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17687"><span style="white-space: nowrap"><a href="xmlsec-xmldsig.html#XMLSECDSIGSTATUS">xmlSecDSigStatus</a> <code class="STRUCTFIELD">status</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                     the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signatuire"; target="_top">&lt;dsig:Signatuire/&gt;</a> procesisng status.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21559"><span style="white-space: nowrap"><a href="xmlsec-xmldsig.html#XMLSECDSIGSTATUS"><span class="TYPE">xmlSecDSigStatus</span></a> <code class="STRUCTFIELD">status</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signatuire"; target="_top">&lt;dsig:Signatuire/&gt;</a> procesisng status.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17694"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">signMethod</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the pointer to signature transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21567"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> <code class="STRUCTFIELD">signMethod</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to signature transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17700"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">c14nMethod</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the pointer to c14n transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21574"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> <code class="STRUCTFIELD">c14nMethod</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to c14n transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17706"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">preSignMemBufMethod</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the pointer to binary buffer right before signature
-                             (valid only if <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNATURE--CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</span></a> flag is set).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21581"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> <code class="STRUCTFIELD">preSignMemBufMethod</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to binary buffer right before signature
+                             (valid only if <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNATURE:CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</span></a> flag is set).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17714"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">signValueNode</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureValue"; target="_top">&lt;dsig:SignatureValue/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21590"><span style="white-space: nowrap"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> <code class="STRUCTFIELD">signValueNode</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureValue"; target="_top">&lt;dsig:SignatureValue/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17721"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">id</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                         the pointer to Id attribute of <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21598"><span style="white-space: nowrap"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">id</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to Id attribute of <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17728"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a> <code class="STRUCTFIELD">signedInfoReferences</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the list of references in <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21606"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrList</span></a> <code class="STRUCTFIELD">signedInfoReferences</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the list of references in <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17735"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a> <code class="STRUCTFIELD">manifestReferences</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the list of references in <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> nodes.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21614"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST"><span class="TYPE">xmlSecPtrList</span></a> <code class="STRUCTFIELD">manifestReferences</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the list of references in <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17742"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21622"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17748"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21629"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECDSIGCTXCREATE"></a><h3>xmlSecDSigCtxCreate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecDSigCtxPtr</font>    xmlSecDSigCtxCreate                 (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECDSIGCTXPTR"><span class="RETURNVALUE">xmlSecDSigCtxPtr</span></gtkdoclink>    xmlSecDSigCtxCreate                 (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> keysMngr</code>);</pre>
 <p>Creates <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> element processing context.
 The caller is responsible for destroying returend object by calling
 <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXDESTROY"><span class="TYPE">xmlSecDSigCtxDestroy</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17767"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21651"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17772"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21656"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly allocated context object or NULL if an error
 occurs.</p></td>
 </tr>
@@ -377,36 +369,34 @@ occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECDSIGCTXDESTROY"></a><h3>xmlSecDSigCtxDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecDSigCtxDestroy                (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecDSigCtxDestroy                (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>);</pre>
 <p>Destroy context object created with <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXCREATE"><span class="TYPE">xmlSecDSigCtxCreate</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17789"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21675"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECDSIGCTXINITIALIZE"></a><h3>xmlSecDSigCtxInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecDSigCtxInitialize             (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecDSigCtxInitialize             (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> keysMngr</code>);</pre>
 <p>Initializes <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> element processing context.
 The caller is responsible for cleaing up returend object by calling
 <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXFINALIZE"><span class="TYPE">xmlSecDSigCtxFinalize</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17809"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21699"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17815"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21705"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17820"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21710"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -414,34 +404,32 @@ The caller is responsible for cleaing up returend object by calling
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECDSIGCTXFINALIZE"></a><h3>xmlSecDSigCtxFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecDSigCtxFinalize               (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecDSigCtxFinalize               (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>);</pre>
 <p>Cleans up <code class="PARAMETER">dsigCtx</code> object initialized with <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXINITIALIZE"><span class="TYPE">xmlSecDSigCtxInitialize</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17838"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21730"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECDSIGCTXSIGN"></a><h3>xmlSecDSigCtxSign ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecDSigCtxSign                   (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                                         <font>xmlNodePtr</font> tmpl);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecDSigCtxSign                   (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> tmpl</code>);</pre>
 <p>Signs the data as described in <code class="PARAMETER">tmpl</code> node.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17856"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21752"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17862"><span style="white-space: nowrap"><code class="PARAMETER">tmpl</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node with signature template.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21758"><span style="white-space: nowrap"><code class="PARAMETER">tmpl</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node with signature template.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17868"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21764"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -449,23 +437,22 @@ The caller is responsible for cleaing up returend object by calling
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECDSIGCTXVERIFY"></a><h3>xmlSecDSigCtxVerify ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecDSigCtxVerify                 (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                                         <font>xmlNodePtr</font> node);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecDSigCtxVerify                 (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>);</pre>
 <p>Vaidates signature in the <code class="PARAMETER">node</code>. The verification result is returned
 in <gtkdoclink href="STATUS"><span class="TYPE">status</span></gtkdoclink> member of the <code class="PARAMETER">dsigCtx</code> object.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17888"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21788"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17894"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer with <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21794"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer with <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17900"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21800"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success (check <gtkdoclink href="STATUS"><span class="TYPE">status</span></gtkdoclink> member of <code class="PARAMETER">dsigCtx</code> to get
 signature verification result) or a negative value if an error occurs.</p></td>
 </tr>
@@ -474,23 +461,22 @@ signature verification result) or a negative value if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECDSIGCTXENABLEREFERENCETRANSFORM"></a><h3>xmlSecDSigCtxEnableReferenceTransform ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecDSigCtxEnableReferenceTransform
-                                                        (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                                         <font>xmlSecTransformId</font> transformId);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecDSigCtxEnableReferenceTransform
+                                                        (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> transformId</code>);</pre>
 <p>Enables <code class="PARAMETER">transformId</code> for <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> elements processing.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17921"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21825"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17927"><span style="white-space: nowrap"><code class="PARAMETER">transformId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21831"><span style="white-space: nowrap"><code class="PARAMETER">transformId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17932"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21836"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -498,23 +484,22 @@ signature verification result) or a negative value if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECDSIGCTXENABLESIGNATURETRANSFORM"></a><h3>xmlSecDSigCtxEnableSignatureTransform ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecDSigCtxEnableSignatureTransform
-                                                        (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                                         <font>xmlSecTransformId</font> transformId);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecDSigCtxEnableSignatureTransform
+                                                        (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> transformId</code>);</pre>
 <p>Enables <code class="PARAMETER">transformId</code> for <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> element processing.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17950"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21858"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17956"><span style="white-space: nowrap"><code class="PARAMETER">transformId</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21864"><span style="white-space: nowrap"><code class="PARAMETER">transformId</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transform klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17961"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21869"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -522,19 +507,18 @@ signature verification result) or a negative value if an error occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECDSIGCTXGETPRESIGNBUFFER"></a><h3>xmlSecDSigCtxGetPreSignBuffer ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecBufferPtr</font>     xmlSecDSigCtxGetPreSignBuffer       (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECBUFFERPTR"><span class="RETURNVALUE">xmlSecBufferPtr</span></gtkdoclink>     xmlSecDSigCtxGetPreSignBuffer       (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>);</pre>
 <p>Gets pointer to the buffer with serialized <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> element
 just before signature claculation (valid if and only if
-<a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNATURE--CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</span></a> context flag is set.</p>
-<p></p>
+<a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNATURE:CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</span></a> context flag is set.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17979"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21889"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17985"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21895"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -542,38 +526,36 @@ just before signature claculation (valid if and only if
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECDSIGCTXDEBUGDUMP"></a><h3>xmlSecDSigCtxDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecDSigCtxDebugDump              (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecDSigCtxDebugDump              (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints the debug information about <code class="PARAMETER">dsigCtx</code> to <code class="PARAMETER">output</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18003"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21917"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18009"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21923"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECDSIGCTXDEBUGXMLDUMP"></a><h3>xmlSecDSigCtxDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecDSigCtxDebugXmlDump           (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecDSigCtxDebugXmlDump           (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints the debug information about <code class="PARAMETER">dsigCtx</code> to <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18027"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21945"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18033"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21951"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -587,7 +569,6 @@ just before signature claculation (valid if and only if
 <p>The possible <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node locations: in the <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a>
 node or in the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> node.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECDSIGREFERENCEORIGINSIGNEDINFO"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecDSigReferenceOriginSignedInfo</tt></span></a></td>
@@ -595,7 +576,7 @@ node or in the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target=
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECDSIGREFERENCEORIGINMANIFEST"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecDSigReferenceOriginManifest</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>  reference &lt;dsig:Manifest&gt; node.</p></td>
+<td align="LEFT" valign="TOP"><p>reference &lt;dsig:Manifest&gt; node.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -622,87 +603,85 @@ node or in the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target=
 };</pre>
 <p>The <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> processing context.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18068"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">userData</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                   the pointer to user data (xmlsec and xmlsec-crypto libraries
+<td align="LEFT" valign="TOP"><a name="AEN21984"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">userData</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to user data (xmlsec and xmlsec-crypto libraries
                              never touches this).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18074"><span style="white-space: nowrap"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> <code class="STRUCTFIELD">dsigCtx</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                    the pointer to "parent" <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21991"><span style="white-space: nowrap"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> <code class="STRUCTFIELD">dsigCtx</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to "parent" <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18081"><span style="white-space: nowrap"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN">xmlSecDSigReferenceOrigin</a> <code class="STRUCTFIELD">origin</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                     the signature origin (<a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> or <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a>).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21999"><span style="white-space: nowrap"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN"><span class="TYPE">xmlSecDSigReferenceOrigin</span></a> <code class="STRUCTFIELD">origin</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the signature origin (<a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> or <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a>).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18089"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtx</a> <code class="STRUCTFIELD">transformCtx</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the reference processing transforms context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22008"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtx</span></a> <code class="STRUCTFIELD">transformCtx</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the reference processing transforms context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18095"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">digestMethod</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to digest transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22015"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> <code class="STRUCTFIELD">digestMethod</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to digest transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18101"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> <code class="STRUCTFIELD">result</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                     the pointer to digest result.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22022"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> <code class="STRUCTFIELD">result</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to digest result.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18107"><span style="white-space: nowrap"><a href="xmlsec-xmldsig.html#XMLSECDSIGSTATUS">xmlSecDSigStatus</a> <code class="STRUCTFIELD">status</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                     the reference processing status.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22029"><span style="white-space: nowrap"><a href="xmlsec-xmldsig.html#XMLSECDSIGSTATUS"><span class="TYPE">xmlSecDSigStatus</span></a> <code class="STRUCTFIELD">status</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the reference processing status.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18113"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">preDigestMemBufMethod</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>      the pointer to binary buffer right before digest
+<td align="LEFT" valign="TOP"><a name="AEN22036"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> <code class="STRUCTFIELD">preDigestMemBufMethod</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to binary buffer right before digest
                              (valid only if either
-                             <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES--CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</span></a> or
-                             <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES--CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</span></a> flags are set).</p></td>
+                             <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES:CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</span></a> or
+                             <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES:CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</span></a> flags are set).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18123"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">id</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                         the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node ID attribute.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22047"><span style="white-space: nowrap"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">id</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node ID attribute.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18130"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">uri</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                        the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node URI attribute.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22055"><span style="white-space: nowrap"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">uri</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node URI attribute.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18137"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">type</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node Type attribute.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22063"><span style="white-space: nowrap"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">type</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node Type attribute.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18144"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22071"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18150"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22078"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECDSIGREFERENCECTXCREATE"></a><h3>xmlSecDSigReferenceCtxCreate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecDSigReferenceCtxPtr</font>  xmlSecDSigReferenceCtxCreate (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                                         <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN">xmlSecDSigReferenceOrigin</a> origin);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECDSIGREFERENCECTXPTR"><span class="RETURNVALUE">xmlSecDSigReferenceCtxPtr</span></gtkdoclink>  xmlSecDSigReferenceCtxCreate (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN"><span class="TYPE">xmlSecDSigReferenceOrigin</span></a> origin</code>);</pre>
 <p>Creates new <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context. Caller is responsible
 for destroying the returned context by calling <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXDESTROY"><span class="TYPE">xmlSecDSigReferenceCtxDestroy</span></a>
 function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18170"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to parent <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22103"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to parent <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18176"><span style="white-space: nowrap"><code class="PARAMETER">origin</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the reference origin (<a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> or <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> node).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22109"><span style="white-space: nowrap"><code class="PARAMETER">origin</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the reference origin (<a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> or <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> node).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18183"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22116"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly created context or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -710,41 +689,39 @@ function.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECDSIGREFERENCECTXDESTROY"></a><h3>xmlSecDSigReferenceCtxDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecDSigReferenceCtxDestroy       (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecDSigReferenceCtxDestroy       (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX"><span class="TYPE">xmlSecDSigReferenceCtxPtr</span></a> dsigRefCtx</code>);</pre>
 <p>Destroy context object created with <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXCREATE"><span class="TYPE">xmlSecDSigReferenceCtxCreate</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN18200"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22135"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECDSIGREFERENCECTXINITIALIZE"></a><h3>xmlSecDSigReferenceCtxInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecDSigReferenceCtxInitialize    (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
-                                                         <a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                                         <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN">xmlSecDSigReferenceOrigin</a> origin);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecDSigReferenceCtxInitialize    (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX"><span class="TYPE">xmlSecDSigReferenceCtxPtr</span></a> dsigRefCtx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtxPtr</span></a> dsigCtx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN"><span class="TYPE">xmlSecDSigReferenceOrigin</span></a> origin</code>);</pre>
 <p>Initializes new <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context. Caller is responsible
 for cleaning up the returned context by calling <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXFINALIZE"><span class="TYPE">xmlSecDSigReferenceCtxFinalize</span></a>
 function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18221"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22162"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18227"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to parent <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22168"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to parent <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18233"><span style="white-space: nowrap"><code class="PARAMETER">origin</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the reference origin (<a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> or <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> node).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22174"><span style="white-space: nowrap"><code class="PARAMETER">origin</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the reference origin (<a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> or <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> node).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18240"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22181"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on succes or aa negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -752,20 +729,19 @@ function.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECDSIGREFERENCECTXFINALIZE"></a><h3>xmlSecDSigReferenceCtxFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecDSigReferenceCtxFinalize      (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecDSigReferenceCtxFinalize      (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX"><span class="TYPE">xmlSecDSigReferenceCtxPtr</span></a> dsigRefCtx</code>);</pre>
 <p>Cleans up context object created with <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXINITIALIZE"><span class="TYPE">xmlSecDSigReferenceCtxInitialize</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN18257"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22200"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECDSIGREFERENCECTXPROCESSNODE"></a><h3>xmlSecDSigReferenceCtxProcessNode ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecDSigReferenceCtxProcessNode   (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
-                                                         <font>xmlNodePtr</font> node);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecDSigReferenceCtxProcessNode   (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX"><span class="TYPE">xmlSecDSigReferenceCtxPtr</span></a> dsigRefCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>);</pre>
 <p>The Reference Element (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-REFERENCE"><span class="TYPE">sec-Reference</span></gtkdoclink>)</p>
 <p>Reference is an element that may occur one or more times. It specifies
 a digest algorithm and digest value, and optionally an identifier of the
@@ -778,18 +754,17 @@ external data, an application may wish to signal that the referent is a
 Manifest. An optional ID attribute permits a Reference to be referenced
 from elsewhere.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18277"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22224"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18283"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22230"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18289"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22236"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on succes or aa negative value otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -797,21 +772,20 @@ from elsewhere.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECDSIGREFERENCECTXGETPREDIGESTBUFFER"></a><h3>xmlSecDSigReferenceCtxGetPreDigestBuffer ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a>     xmlSecDSigReferenceCtxGetPreDigestBuffer
-                                                        (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx);</pre>
+<pre class="PROGRAMLISTING"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="RETURNVALUE">xmlSecBufferPtr</span></a>     xmlSecDSigReferenceCtxGetPreDigestBuffer
+                                                        (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX"><span class="TYPE">xmlSecDSigReferenceCtxPtr</span></a> dsigRefCtx</code>);</pre>
 <p>Gets the results of <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node processing just before digesting
-(valid only if <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES--CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</span></a> or
-<a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES--CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</span></a> flas of signature context
+(valid only if <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES:CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</span></a> or
+<a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES:CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</span></a> flas of signature context
 is set).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18309"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22258"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18315"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22264"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the buffer or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -819,38 +793,36 @@ is set).</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECDSIGREFERENCECTXDEBUGDUMP"></a><h3>xmlSecDSigReferenceCtxDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecDSigReferenceCtxDebugDump     (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecDSigReferenceCtxDebugDump     (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX"><span class="TYPE">xmlSecDSigReferenceCtxPtr</span></a> dsigRefCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints debug information about <code class="PARAMETER">dsigRefCtx</code> to <code class="PARAMETER">output</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18333"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22286"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18339"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22292"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECDSIGREFERENCECTXDEBUGXMLDUMP"></a><h3>xmlSecDSigReferenceCtxDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecDSigReferenceCtxDebugXmlDump  (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecDSigReferenceCtxDebugXmlDump  (<code class="PARAMETER"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX"><span class="TYPE">xmlSecDSigReferenceCtxPtr</span></a> dsigRefCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints debug information about <code class="PARAMETER">dsigRefCtx</code> to <code class="PARAMETER">output</code> in output format.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18357"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22314"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18363"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22320"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -859,17 +831,15 @@ is set).</p>
 <a name="XMLSECDSIGREFERENCECTXLISTID"></a><h3>xmlSecDSigReferenceCtxListId</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecDSigReferenceCtxListId</pre>
 <p>The references list klass.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECDSIGREFERENCECTXLISTGETKLASS"></a><h3>xmlSecDSigReferenceCtxListGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font>     xmlSecDSigReferenceCtxListGetKlass  (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECPTRLISTID"><span class="RETURNVALUE">xmlSecPtrListId</span></gtkdoclink>     xmlSecDSigReferenceCtxListGetKlass  (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>The <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing contexts list klass.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN18385"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22343"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context list klass.</p></td>
 </tr></tbody></table>
 </div>
diff --git a/docs/api/xmlsec-xmlenc.html b/docs/api/xmlsec-xmlenc.html
index b4a2ca8..1c8c344 100644
--- a/docs/api/xmlsec-xmlenc.html
+++ b/docs/api/xmlsec-xmlenc.html
@@ -87,38 +87,38 @@
 <h1>
 <a name="XMLSEC-XMLENC"></a>xmlenc</h1>
 <div class="REFNAMEDIV">
-<a name="AEN18396"></a><h2>Name</h2>xmlenc -- XML Encryption support.</div>
+<a name="AEN22354"></a><h2>Name</h2>xmlenc -- XML Encryption support.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-XMLENC.SYNOPSIS"></a><h2>Synopsis</h2>
 <pre class="SYNOPSIS">enum                <a href="xmlsec-xmlenc.html#XMLENCCTXMODE">xmlEncCtxMode</a>;
-#define             <a href="xmlsec-xmlenc.html#XMLSEC-ENC-RETURN-REPLACED-NODE--CAPS">XMLSEC_ENC_RETURN_REPLACED_NODE</a>
+#define             <a href="xmlsec-xmlenc.html#XMLSEC-ENC-RETURN-REPLACED-NODE:CAPS">XMLSEC_ENC_RETURN_REPLACED_NODE</a>
 struct              <a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtx</a>;
-<font>xmlSecEncCtxPtr</font>     <a href="xmlsec-xmlenc.html#XMLSECENCCTXCREATE">xmlSecEncCtxCreate</a>                  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
-<font>void</font>                <a href="xmlsec-xmlenc.html#XMLSECENCCTXDESTROY">xmlSecEncCtxDestroy</a>                 (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx);
-<font>int</font>                 <a href="xmlsec-xmlenc.html#XMLSECENCCTXINITIALIZE">xmlSecEncCtxInitialize</a>              (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
-<font>void</font>                <a href="xmlsec-xmlenc.html#XMLSECENCCTXFINALIZE">xmlSecEncCtxFinalize</a>                (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx);
-<font>int</font>                 <a href="xmlsec-xmlenc.html#XMLSECENCCTXCOPYUSERPREF">xmlSecEncCtxCopyUserPref</a>            (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> dst,
-                                                         <a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> src);
-<font>void</font>                <a href="xmlsec-xmlenc.html#XMLSECENCCTXRESET">xmlSecEncCtxReset</a>                   (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx);
-<font>int</font>                 <a href="xmlsec-xmlenc.html#XMLSECENCCTXBINARYENCRYPT">xmlSecEncCtxBinaryEncrypt</a>           (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                                         <font>xmlNodePtr</font> tmpl,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);
-<font>int</font>                 <a href="xmlsec-xmlenc.html#XMLSECENCCTXXMLENCRYPT">xmlSecEncCtxXmlEncrypt</a>              (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                                         <font>xmlNodePtr</font> tmpl,
-                                                         <font>xmlNodePtr</font> node);
-<font>int</font>                 <a href="xmlsec-xmlenc.html#XMLSECENCCTXURIENCRYPT">xmlSecEncCtxUriEncrypt</a>              (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                                         <font>xmlNodePtr</font> tmpl,
-                                                         const <font>xmlChar</font> *uri);
-<font>int</font>                 <a href="xmlsec-xmlenc.html#XMLSECENCCTXDECRYPT">xmlSecEncCtxDecrypt</a>                 (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                                         <font>xmlNodePtr</font> node);
-<font>xmlSecBufferPtr</font>     <a href="xmlsec-xmlenc.html#XMLSECENCCTXDECRYPTTOBUFFER">xmlSecEncCtxDecryptToBuffer</a>         (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                                         <font>xmlNodePtr</font> node);
-<font>void</font>                <a href="xmlsec-xmlenc.html#XMLSECENCCTXDEBUGDUMP">xmlSecEncCtxDebugDump</a>               (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                                         <font>FILE</font> *output);
-<font>void</font>                <a href="xmlsec-xmlenc.html#XMLSECENCCTXDEBUGXMLDUMP">xmlSecEncCtxDebugXmlDump</a>            (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                                         <font>FILE</font> *output);</pre>
+<gtkdoclink href="XMLSECENCCTXPTR"><span class="RETURNVALUE">xmlSecEncCtxPtr</span></gtkdoclink><a href="xmlsec-xmlenc.html#XMLSECENCCTXCREATE">xmlSecEncCtxCreate</a>                  (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> keysMngr</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-xmlenc.html#XMLSECENCCTXDESTROY">xmlSecEncCtxDestroy</a>                 (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmlenc.html#XMLSECENCCTXINITIALIZE">xmlSecEncCtxInitialize</a>              (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> keysMngr</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-xmlenc.html#XMLSECENCCTXFINALIZE">xmlSecEncCtxFinalize</a>                (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmlenc.html#XMLSECENCCTXCOPYUSERPREF">xmlSecEncCtxCopyUserPref</a>            (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> dst</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> src</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-xmlenc.html#XMLSECENCCTXRESET">xmlSecEncCtxReset</a>                   (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmlenc.html#XMLSECENCCTXBINARYENCRYPT">xmlSecEncCtxBinaryEncrypt</a>           (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> tmpl</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmlenc.html#XMLSECENCCTXXMLENCRYPT">xmlSecEncCtxXmlEncrypt</a>              (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> tmpl</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmlenc.html#XMLSECENCCTXURIENCRYPT">xmlSecEncCtxUriEncrypt</a>              (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> tmpl</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmlenc.html#XMLSECENCCTXDECRYPT">xmlSecEncCtxDecrypt</a>                 (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>);
+<gtkdoclink href="XMLSECBUFFERPTR"><span class="RETURNVALUE">xmlSecBufferPtr</span></gtkdoclink><a href="xmlsec-xmlenc.html#XMLSECENCCTXDECRYPTTOBUFFER">xmlSecEncCtxDecryptToBuffer</a>         (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-xmlenc.html#XMLSECENCCTXDEBUGDUMP">xmlSecEncCtxDebugDump</a>               (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-xmlenc.html#XMLSECENCCTXDEBUGXMLDUMP">xmlSecEncCtxDebugXmlDump</a>            (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-XMLENC.DESCRIPTION"></a><h2>Description</h2>
@@ -134,24 +134,22 @@ struct              <a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtx</a>;
 } xmlEncCtxMode;</pre>
 <p>The <a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtx</span></a> mode.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLENCCTXMODEENCRYPTEDDATA"><span style="white-space: nowrap"><tt class="LITERAL">xmlEncCtxModeEncryptedData</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p> the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> element procesing.</p></td>
+<td align="LEFT" valign="TOP"><p>the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> element procesing.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLENCCTXMODEENCRYPTEDKEY"><span style="white-space: nowrap"><tt class="LITERAL">xmlEncCtxModeEncryptedKey</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>  the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> element processing.</p></td>
+<td align="LEFT" valign="TOP"><p>the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> element processing.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-ENC-RETURN-REPLACED-NODE--CAPS"></a><h3>XMLSEC_ENC_RETURN_REPLACED_NODE</h3>
+<a name="XMLSEC-ENC-RETURN-REPLACED-NODE:CAPS"></a><h3>XMLSEC_ENC_RETURN_REPLACED_NODE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ENC_RETURN_REPLACED_NODE                 0x00000001</pre>
 <p>If this flag is set, then the replaced node will be returned in the replacedNodeList</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
@@ -194,139 +192,137 @@ struct              <a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtx</a>;
 };</pre>
 <p>XML Encrypiton context.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18499"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">userData</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                   the pointer to user data (xmlsec and xmlsec-crypto libraries
+<td align="LEFT" valign="TOP"><a name="AEN22519"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">userData</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to user data (xmlsec and xmlsec-crypto libraries
                              never touches this).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18505"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                      the XML Encryption processing flags.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22526"><span style="white-space: nowrap">unsigned <gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> <code class="STRUCTFIELD">flags</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the XML Encryption processing flags.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18511"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags2</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                     the XML Encryption processing flags.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22533"><span style="white-space: nowrap">unsigned <gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> <code class="STRUCTFIELD">flags2</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the XML Encryption processing flags.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18517"><span style="white-space: nowrap"><a href="xmlsec-xmlenc.html#XMLENCCTXMODE">xmlEncCtxMode</a> <code class="STRUCTFIELD">mode</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the mode.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22540"><span style="white-space: nowrap"><a href="xmlsec-xmlenc.html#XMLENCCTXMODE"><span class="TYPE">xmlEncCtxMode</span></a> <code class="STRUCTFIELD">mode</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the mode.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18523"><span style="white-space: nowrap"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> <code class="STRUCTFIELD">keyInfoReadCtx</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the reading key context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22547"><span style="white-space: nowrap"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtx</span></a> <code class="STRUCTFIELD">keyInfoReadCtx</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the reading key context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18529"><span style="white-space: nowrap"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> <code class="STRUCTFIELD">keyInfoWriteCtx</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the writing key context (not used for signature verification).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22554"><span style="white-space: nowrap"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX"><span class="TYPE">xmlSecKeyInfoCtx</span></a> <code class="STRUCTFIELD">keyInfoWriteCtx</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the writing key context (not used for signature verification).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18535"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtx</a> <code class="STRUCTFIELD">transformCtx</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the transforms processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22561"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX"><span class="TYPE">xmlSecTransformCtx</span></a> <code class="STRUCTFIELD">transformCtx</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the transforms processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18541"><span style="white-space: nowrap"><font>xmlSecTransformId</font> <code class="STRUCTFIELD">defEncMethodId</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the default encryption method (used if
+<td align="LEFT" valign="TOP"><a name="AEN22568"><span style="white-space: nowrap"><gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink> <code class="STRUCTFIELD">defEncMethodId</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the default encryption method (used if
                              <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod"; target="_top">&lt;enc:EncryptionMethod/&gt;</a> node is not present).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18548"><span style="white-space: nowrap"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <code class="STRUCTFIELD">encKey</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                     the signature key; application may set <gtkdoclink href="ENCKEY"><span class="TYPE">encKey</span></gtkdoclink>
+<td align="LEFT" valign="TOP"><a name="AEN22576"><span style="white-space: nowrap"><a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKeyPtr</span></a> <code class="STRUCTFIELD">encKey</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the signature key; application may set <gtkdoclink href="ENCKEY"><span class="TYPE">encKey</span></gtkdoclink>
                              before calling encryption/decryption functions.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18556"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMOPERATION">xmlSecTransformOperation</a> <code class="STRUCTFIELD">operation</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the operation: encrypt or decrypt.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22585"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMOPERATION"><span class="TYPE">xmlSecTransformOperation</span></a> <code class="STRUCTFIELD">operation</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the operation: encrypt or decrypt.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18562"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> <code class="STRUCTFIELD">result</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                     the pointer to signature (not valid for signature verificaction).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22592"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBufferPtr</span></a> <code class="STRUCTFIELD">result</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to signature (not valid for signature verificaction).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18568"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">resultBase64Encoded</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the flag: if set then result in <gtkdoclink href="RESULT"><span class="TYPE">result</span></gtkdoclink> is base64 encoded.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22599"><span style="white-space: nowrap"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> <code class="STRUCTFIELD">resultBase64Encoded</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag: if set then result in <gtkdoclink href="RESULT"><span class="TYPE">result</span></gtkdoclink> is base64 encoded.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18576"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">resultReplaced</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the flag: if set then resulted <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a>
+<td align="LEFT" valign="TOP"><a name="AEN22608"><span style="white-space: nowrap"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> <code class="STRUCTFIELD">resultReplaced</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the flag: if set then resulted <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a>
                              or <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node is added to the document.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18584"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">encMethod</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the pointer to encryption transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22617"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransformPtr</span></a> <code class="STRUCTFIELD">encMethod</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to encryption transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18590"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">id</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                         the ID attribute of <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a>
+<td align="LEFT" valign="TOP"><a name="AEN22624"><span style="white-space: nowrap"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">id</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the ID attribute of <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a>
                              or <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18598"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">type</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the Type attribute of <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a>
+<td align="LEFT" valign="TOP"><a name="AEN22633"><span style="white-space: nowrap"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">type</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the Type attribute of <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a>
                              or <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18606"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">mimeType</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                   the MimeType attribute of <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a>
+<td align="LEFT" valign="TOP"><a name="AEN22642"><span style="white-space: nowrap"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">mimeType</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the MimeType attribute of <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a>
                              or <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18614"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">encoding</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                   the Encoding attributeof <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a>
+<td align="LEFT" valign="TOP"><a name="AEN22651"><span style="white-space: nowrap"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">encoding</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the Encoding attributeof <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a>
                              or <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18622"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">recipient</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the Recipient attribute of <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node..</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22660"><span style="white-space: nowrap"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">recipient</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the Recipient attribute of <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node..</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18629"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">carriedKeyName</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the CarriedKeyName attribute of <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22668"><span style="white-space: nowrap"><gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">carriedKeyName</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the CarriedKeyName attribute of <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18636"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">encDataNode</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a>
+<td align="LEFT" valign="TOP"><a name="AEN22676"><span style="white-space: nowrap"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> <code class="STRUCTFIELD">encDataNode</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a>
                              or <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18644"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">encMethodNode</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod"; target="_top">&lt;enc:EncryptionMethod/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22685"><span style="white-space: nowrap"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> <code class="STRUCTFIELD">encMethodNode</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod"; target="_top">&lt;enc:EncryptionMethod/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18651"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">keyInfoNode</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-KeyInfo"; target="_top">&lt;enc:KeyInfo/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22693"><span style="white-space: nowrap"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> <code class="STRUCTFIELD">keyInfoNode</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-KeyInfo"; target="_top">&lt;enc:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18658"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">cipherValueNode</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue"; target="_top">&lt;enc:CipherValue/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22701"><span style="white-space: nowrap"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> <code class="STRUCTFIELD">cipherValueNode</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue"; target="_top">&lt;enc:CipherValue/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18665"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">replacedNodeList</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p> the first node of the list of replaced nodes depending on the nodeReplacementMode</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22709"><span style="white-space: nowrap"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> <code class="STRUCTFIELD">replacedNodeList</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the first node of the list of replaced nodes depending on the nodeReplacementMode</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18671"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  reserved for the future.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22716"><span style="white-space: nowrap"><gtkdoclink href="VOID"><span class="TYPE">void</span></gtkdoclink> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECENCCTXCREATE"></a><h3>xmlSecEncCtxCreate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecEncCtxPtr</font>     xmlSecEncCtxCreate                  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECENCCTXPTR"><span class="RETURNVALUE">xmlSecEncCtxPtr</span></gtkdoclink>     xmlSecEncCtxCreate                  (<code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> keysMngr</code>);</pre>
 <p>Creates <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> element processing context.
 The caller is responsible for destroying returend object by calling
 <a href="xmlsec-xmlenc.html#XMLSECENCCTXDESTROY"><span class="TYPE">xmlSecEncCtxDestroy</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18690"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22738"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18695"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22743"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly allocated context object or NULL if an error
 occurs.</p></td>
 </tr>
@@ -335,36 +331,34 @@ occurs.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECENCCTXDESTROY"></a><h3>xmlSecEncCtxDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecEncCtxDestroy                 (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecEncCtxDestroy                 (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>);</pre>
 <p>Destroy context object created with <a href="xmlsec-xmlenc.html#XMLSECENCCTXCREATE"><span class="TYPE">xmlSecEncCtxCreate</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN18712"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22762"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECENCCTXINITIALIZE"></a><h3>xmlSecEncCtxInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecEncCtxInitialize              (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecEncCtxInitialize              (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR"><span class="TYPE">xmlSecKeysMngrPtr</span></a> keysMngr</code>);</pre>
 <p>Initializes <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> element processing context.
 The caller is responsible for cleaing up returend object by calling
 <a href="xmlsec-xmlenc.html#XMLSECENCCTXFINALIZE"><span class="TYPE">xmlSecEncCtxFinalize</span></a> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18732"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22786"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18738"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to keys manager.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22792"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18743"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22797"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -372,34 +366,32 @@ The caller is responsible for cleaing up returend object by calling
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECENCCTXFINALIZE"></a><h3>xmlSecEncCtxFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecEncCtxFinalize                (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecEncCtxFinalize                (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>);</pre>
 <p>Cleans up <code class="PARAMETER">encCtx</code> object.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN18759"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22815"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECENCCTXCOPYUSERPREF"></a><h3>xmlSecEncCtxCopyUserPref ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecEncCtxCopyUserPref            (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> dst,
-                                                         <a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> src);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecEncCtxCopyUserPref            (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> dst</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> src</code>);</pre>
 <p>Copies user preference from <code class="PARAMETER">src</code> context to <code class="PARAMETER">dst</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18778"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to destination context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22838"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to destination context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18783"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to source context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22843"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to source context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18788"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22848"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -407,44 +399,42 @@ The caller is responsible for cleaing up returend object by calling
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECENCCTXRESET"></a><h3>xmlSecEncCtxReset ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecEncCtxReset                   (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecEncCtxReset                   (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>);</pre>
 <p>Resets <code class="PARAMETER">encCtx</code> object, user settings are not touched.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN18804"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22866"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECENCCTXBINARYENCRYPT"></a><h3>xmlSecEncCtxBinaryEncrypt ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecEncCtxBinaryEncrypt           (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                                         <font>xmlNodePtr</font> tmpl,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecEncCtxBinaryEncrypt           (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> tmpl</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *data</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> dataSize</code>);</pre>
 <p>Encrypts <code class="PARAMETER">data</code> according to template <code class="PARAMETER">tmpl</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18825"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22895"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18831"><span style="white-space: nowrap"><code class="PARAMETER">tmpl</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> template node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22901"><span style="white-space: nowrap"><code class="PARAMETER">tmpl</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> template node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18837"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer for binary buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22907"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer for binary buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18842"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the <code class="PARAMETER">data</code> buffer size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22912"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the <code class="PARAMETER">data</code> buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18848"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22918"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -452,28 +442,27 @@ The caller is responsible for cleaing up returend object by calling
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECENCCTXXMLENCRYPT"></a><h3>xmlSecEncCtxXmlEncrypt ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecEncCtxXmlEncrypt              (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                                         <font>xmlNodePtr</font> tmpl,
-                                                         <font>xmlNodePtr</font> node);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecEncCtxXmlEncrypt              (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> tmpl</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>);</pre>
 <p>Encrypts <code class="PARAMETER">node</code> according to template <code class="PARAMETER">tmpl</code>. If requested, <code class="PARAMETER">node</code> is replaced
 with result <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18869"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22945"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18875"><span style="white-space: nowrap"><code class="PARAMETER">tmpl</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> template node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22951"><span style="white-space: nowrap"><code class="PARAMETER">tmpl</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> template node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18881"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to node for encryption.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22957"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to node for encryption.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18886"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22962"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -481,27 +470,26 @@ with result <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECENCCTXURIENCRYPT"></a><h3>xmlSecEncCtxUriEncrypt ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecEncCtxUriEncrypt              (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                                         <font>xmlNodePtr</font> tmpl,
-                                                         const <font>xmlChar</font> *uri);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecEncCtxUriEncrypt              (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> tmpl</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *uri</code>);</pre>
 <p>Encrypts data from <code class="PARAMETER">uri</code> according to template <code class="PARAMETER">tmpl</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18905"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22987"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18911"><span style="white-space: nowrap"><code class="PARAMETER">tmpl</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> template node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22993"><span style="white-space: nowrap"><code class="PARAMETER">tmpl</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> template node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18917"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the URI.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22999"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the URI.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18922"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23004"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -509,22 +497,21 @@ with result <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECENCCTXDECRYPT"></a><h3>xmlSecEncCtxDecrypt ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecEncCtxDecrypt                 (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                                         <font>xmlNodePtr</font> node);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecEncCtxDecrypt                 (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>);</pre>
 <p>Decrypts <code class="PARAMETER">node</code> and if necessary replaces <code class="PARAMETER">node</code> with decrypted data.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18940"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23026"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18946"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23032"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18952"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23038"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -532,22 +519,21 @@ with result <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECENCCTXDECRYPTTOBUFFER"></a><h3>xmlSecEncCtxDecryptToBuffer ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecBufferPtr</font>     xmlSecEncCtxDecryptToBuffer         (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                                         <font>xmlNodePtr</font> node);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECBUFFERPTR"><span class="RETURNVALUE">xmlSecBufferPtr</span></gtkdoclink>     xmlSecEncCtxDecryptToBuffer         (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>);</pre>
 <p>Decrypts <code class="PARAMETER">node</code> data to the <code class="PARAMETER">encCtx</code> buffer.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18970"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23060"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18976"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23066"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18982"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23072"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -555,38 +541,36 @@ with result <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECENCCTXDEBUGDUMP"></a><h3>xmlSecEncCtxDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecEncCtxDebugDump               (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecEncCtxDebugDump               (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints the debug information about <code class="PARAMETER">encCtx</code> to <code class="PARAMETER">output</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19000"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23094"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19006"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23100"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECENCCTXDEBUGXMLDUMP"></a><h3>xmlSecEncCtxDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecEncCtxDebugXmlDump            (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecEncCtxDebugXmlDump            (<code class="PARAMETER"><a href="xmlsec-xmlenc.html#XMLSECENCCTX"><span class="TYPE">xmlSecEncCtxPtr</span></a> encCtx</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints the debug information about <code class="PARAMETER">encCtx</code> to <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19024"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23122"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19030"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23128"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
diff --git a/docs/api/xmlsec-xmlsec.html b/docs/api/xmlsec-xmlsec.html
index ddaf5b6..96763bc 100644
--- a/docs/api/xmlsec-xmlsec.html
+++ b/docs/api/xmlsec-xmlsec.html
@@ -87,23 +87,28 @@
 <h1>
 <a name="XMLSEC-XMLSEC"></a>xmlsec</h1>
 <div class="REFNAMEDIV">
-<a name="AEN19040"></a><h2>Name</h2>xmlsec -- Utility functions.</div>
+<a name="AEN23138"></a><h2>Name</h2>xmlsec -- Utility functions.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-XMLSEC.SYNOPSIS"></a><h2>Synopsis</h2>
 <pre class="SYNOPSIS">typedef             <font>xmlSecPtr</font>;
 #define             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>
-#define             <a href="xmlsec-xmlsec.html#XMLSEC-SIZE-BAD-CAST--CAPS">XMLSEC_SIZE_BAD_CAST</a>                (val)
+#define             <a href="xmlsec-xmlsec.html#XMLSEC-SIZE-BAD-CAST:CAPS">XMLSEC_SIZE_BAD_CAST</a>                (val)
 #define             <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a>
-<font>int</font>                 <a href="xmlsec-xmlsec.html#XMLSECINIT">xmlSecInit</a>                          (void);
-<font>int</font>                 <a href="xmlsec-xmlsec.html#XMLSECSHUTDOWN">xmlSecShutdown</a>                      (void);
-#define             <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONEXACT">xmlSecCheckVersionExact</a>             ()
-#define             <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSION">xmlSecCheckVersion</a>                  ()
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmlsec.html#XMLSECINIT">xmlSecInit</a>                          (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmlsec.html#XMLSECSHUTDOWN">xmlSecShutdown</a>                      (<code class="PARAMETER"><span class="TYPE">void</span></code>);
+#define             <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONEXACT">xmlSecCheckVersionExact</a>
+#define             <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSION">xmlSecCheckVersion</a>
 enum                <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONMODE">xmlSecCheckVersionMode</a>;
-<font>int</font>                 <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONEXT">xmlSecCheckVersionExt</a>               (<font>int</font> major,
-                                                         <font>int</font> minor,
-                                                         <font>int</font> subminor,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONMODE">xmlSecCheckVersionMode</a> mode);
-#define             <a href="xmlsec-xmlsec.html#ATTRIBUTE-UNUSED--CAPS">ATTRIBUTE_UNUSED</a></pre>
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONEXT">xmlSecCheckVersionExt</a>               (<code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> major</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> minor</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> subminor</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONMODE"><span class="TYPE">xmlSecCheckVersionMode</span></a> mode</code>);
+#define             <a href="xmlsec-xmlsec.html#ATTRIBUTE-UNUSED:CAPS">ATTRIBUTE_UNUSED</a>
+#define             <a href="xmlsec-xmlsec.html#XMLSEC-PTR-TO-FUNC-IMPL:CAPS">XMLSEC_PTR_TO_FUNC_IMPL</a>             (func_type)
+#define             <a href="xmlsec-xmlsec.html#XMLSEC-PTR-TO-FUNC:CAPS">XMLSEC_PTR_TO_FUNC</a>                  (func_type,
+                                                         ptr)
+#define             <a href="xmlsec-xmlsec.html#XMLSEC-FUNC-TO-PTR:CAPS">XMLSEC_FUNC_TO_PTR</a>                  (func_type,
+                                                         func)</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-XMLSEC.DESCRIPTION"></a><h2>Description</h2>
@@ -115,7 +120,6 @@ enum                <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONMODE">xmlSecCh
 <a name="XMLSECPTR"></a><h3>xmlSecPtr</h3>
 <pre class="PROGRAMLISTING">typedef void*                                   xmlSecPtr;</pre>
 <p>Void pointer.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
@@ -123,18 +127,16 @@ enum                <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONMODE">xmlSecCh
 <pre class="PROGRAMLISTING">#define             xmlSecSize</pre>
 <p>Size of something. Should be typedef instead of define
 but it will break ABI (todo).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSEC-SIZE-BAD-CAST--CAPS"></a><h3>XMLSEC_SIZE_BAD_CAST()</h3>
+<a name="XMLSEC-SIZE-BAD-CAST:CAPS"></a><h3>XMLSEC_SIZE_BAD_CAST()</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_SIZE_BAD_CAST(val)               ((xmlSecSize)(val))</pre>
 <p>Bad cast to xmlSecSize</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN19091"><span style="white-space: nowrap"><code class="PARAMETER">val</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>        the value to cast</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23204"><span style="white-space: nowrap"><code class="PARAMETER">val</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the value to cast</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -143,50 +145,45 @@ but it will break ABI (todo).</p>
 <pre class="PROGRAMLISTING">#define xmlSecByte                              unsigned char</pre>
 <p>One byte. Should be typedef instead of define
 but it will break ABI (todo).</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECINIT"></a><h3>xmlSecInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecInit                          (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecInit                          (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Initializes XML Security Library. The depended libraries
 (LibXML and LibXSLT) must be initialized before.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN19112"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23226"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECSHUTDOWN"></a><h3>xmlSecShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecShutdown                      (void);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecShutdown                      (<code class="PARAMETER"><span class="TYPE">void</span></code>);</pre>
 <p>Clean ups the XML Security Library.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN19126"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23242"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSECCHECKVERSIONEXACT"></a><h3>xmlSecCheckVersionExact()</h3>
+<a name="XMLSECCHECKVERSIONEXACT"></a><h3>xmlSecCheckVersionExact</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecCheckVersionExact()</pre>
 <p>Macro. Returns 1 if the loaded xmlsec library version exactly matches
 the one used to compile the caller, 0 if it does not or a negative
 value if an error occurs.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="XMLSECCHECKVERSION"></a><h3>xmlSecCheckVersion()</h3>
+<a name="XMLSECCHECKVERSION"></a><h3>xmlSecCheckVersion</h3>
 <pre class="PROGRAMLISTING">#define             xmlSecCheckVersion()</pre>
 <p>Macro. Returns 1 if the loaded xmlsec library version ABI compatible with
 the one used to compile the caller, 0 if it does not or a negative
 value if an error occurs.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
@@ -197,47 +194,45 @@ value if an error occurs.</p>
 } xmlSecCheckVersionMode;</pre>
 <p>The xmlsec library version mode.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECCHECKVERSIONEXACTMATCH"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecCheckVersionExactMatch</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>       the version should match exactly.</p></td>
+<td align="LEFT" valign="TOP"><p>the version should match exactly.</p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="XMLSECCHECKVERSIONABICOMPATIBLE"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecCheckVersionABICompatible</tt></span></a></td>
-<td align="LEFT" valign="TOP"><p>    the version should be ABI compatible.</p></td>
+<td align="LEFT" valign="TOP"><p>the version should be ABI compatible.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCHECKVERSIONEXT"></a><h3>xmlSecCheckVersionExt ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCheckVersionExt               (<font>int</font> major,
-                                                         <font>int</font> minor,
-                                                         <font>int</font> subminor,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONMODE">xmlSecCheckVersionMode</a> mode);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCheckVersionExt               (<code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> major</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> minor</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> subminor</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONMODE"><span class="TYPE">xmlSecCheckVersionMode</span></a> mode</code>);</pre>
 <p>Checks if the loaded version of xmlsec library could be used.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19176"><span style="white-space: nowrap"><code class="PARAMETER">major</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the major version number.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23297"><span style="white-space: nowrap"><code class="PARAMETER">major</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the major version number.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19181"><span style="white-space: nowrap"><code class="PARAMETER">minor</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the minor version number.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23302"><span style="white-space: nowrap"><code class="PARAMETER">minor</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the minor version number.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19186"><span style="white-space: nowrap"><code class="PARAMETER">subminor</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the subminor version number.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23307"><span style="white-space: nowrap"><code class="PARAMETER">subminor</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the subminor version number.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19191"><span style="white-space: nowrap"><code class="PARAMETER">mode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the version check mode.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23312"><span style="white-space: nowrap"><code class="PARAMETER">mode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the version check mode.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19196"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23317"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 1 if the loaded xmlsec library version is OK to use
 0 if it is not or a negative value if an error occurs.</p></td>
 </tr>
@@ -245,10 +240,55 @@ value if an error occurs.</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="ATTRIBUTE-UNUSED--CAPS"></a><h3>ATTRIBUTE_UNUSED</h3>
+<a name="ATTRIBUTE-UNUSED:CAPS"></a><h3>ATTRIBUTE_UNUSED</h3>
 <pre class="PROGRAMLISTING">#define             ATTRIBUTE_UNUSED</pre>
 <p>Macro used to signal to GCC unused function parameters</p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSEC-PTR-TO-FUNC-IMPL:CAPS"></a><h3>XMLSEC_PTR_TO_FUNC_IMPL()</h3>
+<pre class="PROGRAMLISTING">#define             XMLSEC_PTR_TO_FUNC_IMPL(func_type)</pre>
+<p>Macro declares helper functions to convert between "void *" pointer and
+function pointer.</p>
 <p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN23335"><span style="white-space: nowrap"><code class="PARAMETER">func_type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the function type.</p></td>
+</tr></tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSEC-PTR-TO-FUNC:CAPS"></a><h3>XMLSEC_PTR_TO_FUNC()</h3>
+<pre class="PROGRAMLISTING">#define             XMLSEC_PTR_TO_FUNC(func_type, ptr)</pre>
+<p>Macro converts from "void*" pointer to "func_type" function pointer.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN23347"><span style="white-space: nowrap"><code class="PARAMETER">func_type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the function type.</p></td>
+</tr>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN23352"><span style="white-space: nowrap"><code class="PARAMETER">ptr</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the "void*" pointer to be converted.</p></td>
+</tr>
+</tbody></table>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSEC-FUNC-TO-PTR:CAPS"></a><h3>XMLSEC_FUNC_TO_PTR()</h3>
+<pre class="PROGRAMLISTING">#define             XMLSEC_FUNC_TO_PTR(func_type, func)</pre>
+<p>Macro converts from "func_type" function pointer to "void*" pointer.</p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN23364"><span style="white-space: nowrap"><code class="PARAMETER">func_type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the function type.</p></td>
+</tr>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN23369"><span style="white-space: nowrap"><code class="PARAMETER">func</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the "func_type" function pointer to be converted.</p></td>
+</tr>
+</tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
diff --git a/docs/api/xmlsec-xmltree.html b/docs/api/xmlsec-xmltree.html
index d2b7771..03d5024 100644
--- a/docs/api/xmlsec-xmltree.html
+++ b/docs/api/xmlsec-xmltree.html
@@ -87,154 +87,154 @@
 <h1>
 <a name="XMLSEC-XMLTREE"></a>xmltree</h1>
 <div class="REFNAMEDIV">
-<a name="AEN19213"></a><h2>Name</h2>xmltree -- XML tree operations.</div>
+<a name="AEN23379"></a><h2>Name</h2>xmltree -- XML tree operations.</div>
 <div class="REFSYNOPSISDIV">
 <a name="XMLSEC-XMLTREE.SYNOPSIS"></a><h2>Synopsis</h2>
 <pre class="SYNOPSIS">#define             <a href="xmlsec-xmltree.html#XMLSECNODEGETNAME">xmlSecNodeGetName</a>                   (node)
-const <font>xmlChar</font>*      <a href="xmlsec-xmltree.html#XMLSECGETNODENSHREF">xmlSecGetNodeNsHref</a>                 (const <font>xmlNodePtr</font> cur);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECCHECKNODENAME">xmlSecCheckNodeName</a>                 (const <font>xmlNodePtr</font> cur,
-                                                         const <font>xmlChar</font> *name,
-                                                         const <font>xmlChar</font> *ns);
-<font>xmlNodePtr</font>          <a href="xmlsec-xmltree.html#XMLSECGETNEXTELEMENTNODE">xmlSecGetNextElementNode</a>            (<font>xmlNodePtr</font> cur);
-<font>xmlNodePtr</font>          <a href="xmlsec-xmltree.html#XMLSECFINDCHILD">xmlSecFindChild</a>                     (const <font>xmlNodePtr</font> parent,
-                                                         const <font>xmlChar</font> *name,
-                                                         const <font>xmlChar</font> *ns);
-<font>xmlNodePtr</font>          <a href="xmlsec-xmltree.html#XMLSECFINDPARENT">xmlSecFindParent</a>                    (const <font>xmlNodePtr</font> cur,
-                                                         const <font>xmlChar</font> *name,
-                                                         const <font>xmlChar</font> *ns);
-<font>xmlNodePtr</font>          <a href="xmlsec-xmltree.html#XMLSECFINDNODE">xmlSecFindNode</a>                      (const <font>xmlNodePtr</font> parent,
-                                                         const <font>xmlChar</font> *name,
-                                                         const <font>xmlChar</font> *ns);
-<font>xmlNodePtr</font>          <a href="xmlsec-xmltree.html#XMLSECADDCHILD">xmlSecAddChild</a>                      (<font>xmlNodePtr</font> parent,
-                                                         const <font>xmlChar</font> *name,
-                                                         const <font>xmlChar</font> *ns);
-<font>xmlNodePtr</font>          <a href="xmlsec-xmltree.html#XMLSECADDCHILDNODE">xmlSecAddChildNode</a>                  (<font>xmlNodePtr</font> parent,
-                                                         <font>xmlNodePtr</font> child);
-<font>xmlNodePtr</font>          <a href="xmlsec-xmltree.html#XMLSECADDNEXTSIBLING">xmlSecAddNextSibling</a>                (<font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *name,
-                                                         const <font>xmlChar</font> *ns);
-<font>xmlNodePtr</font>          <a href="xmlsec-xmltree.html#XMLSECADDPREVSIBLING">xmlSecAddPrevSibling</a>                (<font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *name,
-                                                         const <font>xmlChar</font> *ns);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECREPLACENODE">xmlSecReplaceNode</a>                   (<font>xmlNodePtr</font> node,
-                                                         <font>xmlNodePtr</font> newNode);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECREPLACENODEANDRETURN">xmlSecReplaceNodeAndReturn</a>          (<font>xmlNodePtr</font> node,
-                                                         <font>xmlNodePtr</font> newNode,
-                                                         <font>xmlNodePtr</font> *replaced);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECREPLACECONTENT">xmlSecReplaceContent</a>                (<font>xmlNodePtr</font> node,
-                                                         <font>xmlNodePtr</font> newNode);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECREPLACECONTENTANDRETURN">xmlSecReplaceContentAndReturn</a>       (<font>xmlNodePtr</font> node,
-                                                         <font>xmlNodePtr</font> newNode,
-                                                         <font>xmlNodePtr</font> *replaced);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECREPLACENODEBUFFER">xmlSecReplaceNodeBuffer</a>             (<font>xmlNodePtr</font> node,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECREPLACENODEBUFFERANDRETURN">xmlSecReplaceNodeBufferAndReturn</a>    (<font>xmlNodePtr</font> node,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size,
-                                                         <font>xmlNodePtr</font> *replaced);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECNODEENCODEANDSETCONTENT">xmlSecNodeEncodeAndSetContent</a>       (<font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *buffer);
-<font>void</font>                <a href="xmlsec-xmltree.html#XMLSECADDIDS">xmlSecAddIDs</a>                        (<font>xmlDocPtr</font> doc,
-                                                         <font>xmlNodePtr</font> cur,
-                                                         const <font>xmlChar</font> **ids);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECGENERATEANDADDID">xmlSecGenerateAndAddID</a>              (<font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *attrName,
-                                                         const <font>xmlChar</font> *prefix,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len);
-<font>xmlChar</font>*            <a href="xmlsec-xmltree.html#XMLSECGENERATEID">xmlSecGenerateID</a>                    (const <font>xmlChar</font> *prefix,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len);
-<font>xmlDocPtr</font>           <a href="xmlsec-xmltree.html#XMLSECCREATETREE">xmlSecCreateTree</a>                    (const <font>xmlChar</font> *rootNodeName,
-                                                         const <font>xmlChar</font> *rootNodeNs);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECISEMPTYNODE">xmlSecIsEmptyNode</a>                   (<font>xmlNodePtr</font> node);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECISEMPTYSTRING">xmlSecIsEmptyString</a>                 (const <font>xmlChar</font> *str);
-<font>xmlChar</font>*            <a href="xmlsec-xmltree.html#XMLSECGETQNAME">xmlSecGetQName</a>                      (<font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *href,
-                                                         const <font>xmlChar</font> *local);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECPRINTXMLSTRING">xmlSecPrintXmlString</a>                (<font>FILE</font> *fd,
-                                                         const <font>xmlChar</font> *str);
+const <gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*      <a href="xmlsec-xmltree.html#XMLSECGETNODENSHREF">xmlSecGetNodeNsHref</a>                 (<code class="PARAMETER">const <gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECCHECKNODENAME">xmlSecCheckNodeName</a>                 (<code class="PARAMETER">const <gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *ns</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECGETNEXTELEMENTNODE">xmlSecGetNextElementNode</a>            (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECFINDCHILD">xmlSecFindChild</a>                     (<code class="PARAMETER">const <gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> parent</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *ns</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECFINDPARENT">xmlSecFindParent</a>                    (<code class="PARAMETER">const <gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *ns</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECFINDNODE">xmlSecFindNode</a>                      (<code class="PARAMETER">const <gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> parent</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *ns</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECADDCHILD">xmlSecAddChild</a>                      (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> parent</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *ns</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECADDCHILDNODE">xmlSecAddChildNode</a>                  (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> parent</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> child</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECADDNEXTSIBLING">xmlSecAddNextSibling</a>                (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *ns</code>);
+<gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECADDPREVSIBLING">xmlSecAddPrevSibling</a>                (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *ns</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECREPLACENODE">xmlSecReplaceNode</a>                   (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> newNode</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECREPLACENODEANDRETURN">xmlSecReplaceNodeAndReturn</a>          (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> newNode</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> *replaced</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECREPLACECONTENT">xmlSecReplaceContent</a>                (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> newNode</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECREPLACECONTENTANDRETURN">xmlSecReplaceContentAndReturn</a>       (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> newNode</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> *replaced</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECREPLACENODEBUFFER">xmlSecReplaceNodeBuffer</a>             (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buffer</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECREPLACENODEBUFFERANDRETURN">xmlSecReplaceNodeBufferAndReturn</a>    (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buffer</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> *replaced</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECNODEENCODEANDSETCONTENT">xmlSecNodeEncodeAndSetContent</a>       (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *buffer</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECADDIDS">xmlSecAddIDs</a>                        (<code class="PARAMETER"><gtkdoclink href="XMLDOC"><span class="TYPE">xmlDocPtr</span></gtkdoclink> doc</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> **ids</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECGENERATEANDADDID">xmlSecGenerateAndAddID</a>              (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *attrName</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *prefix</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> len</code>);
+<gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*            <a href="xmlsec-xmltree.html#XMLSECGENERATEID">xmlSecGenerateID</a>                    (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *prefix</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> len</code>);
+<gtkdoclink href="XMLDOC"><span class="RETURNVALUE">xmlDocPtr</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECCREATETREE">xmlSecCreateTree</a>                    (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *rootNodeName</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *rootNodeNs</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECISEMPTYNODE">xmlSecIsEmptyNode</a>                   (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECISEMPTYSTRING">xmlSecIsEmptyString</a>                 (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *str</code>);
+<gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*            <a href="xmlsec-xmltree.html#XMLSECGETQNAME">xmlSecGetQName</a>                      (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *href</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *local</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECPRINTXMLSTRING">xmlSecPrintXmlString</a>                (<code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *fd</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *str</code>);
 #define             <a href="xmlsec-xmltree.html#XMLSECISHEX">xmlSecIsHex</a>                         (c)
 #define             <a href="xmlsec-xmltree.html#XMLSECGETHEX">xmlSecGetHex</a>                        (c)
 struct              <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERINFO">xmlSecQName2IntegerInfo</a>;
 typedef             <font>xmlSecQName2IntegerInfoConstPtr</font>;
-<font>xmlSecQName2IntegerInfoConstPtr</font>  <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERGETINFO">xmlSecQName2IntegerGetInfo</a>
-                                                        (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                                         <font>int</font> intValue);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERGETINTEGER">xmlSecQName2IntegerGetInteger</a>       (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                                         const <font>xmlChar</font> *qnameHref,
-                                                         const <font>xmlChar</font> *qnameLocalPart,
-                                                         <font>int</font> *intValue);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERGETINTEGERFROMSTRING">xmlSecQName2IntegerGetIntegerFromString</a>
-                                                        (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                                         <font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *qname,
-                                                         <font>int</font> *intValue);
-<font>xmlChar</font> *           <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERGETSTRINGFROMINTEGER">xmlSecQName2IntegerGetStringFromInteger</a>
-                                                        (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <font>int</font> intValue);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERNODEREAD">xmlSecQName2IntegerNodeRead</a>         (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <font>int</font> *intValue);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERNODEWRITE">xmlSecQName2IntegerNodeWrite</a>        (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                                         <font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *nodeName,
-                                                         const <font>xmlChar</font> *nodeNs,
-                                                         <font>int</font> intValue);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERATTRIBUTEREAD">xmlSecQName2IntegerAttributeRead</a>    (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                                         <font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *attrName,
-                                                         <font>int</font> *intValue);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERATTRIBUTEWRITE">xmlSecQName2IntegerAttributeWrite</a>   (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                                         <font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *attrName,
-                                                         <font>int</font> intValue);
-<font>void</font>                <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERDEBUGDUMP">xmlSecQName2IntegerDebugDump</a>        (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                                         <font>int</font> intValue,
-                                                         const <font>xmlChar</font> *name,
-                                                         <font>FILE</font> *output);
-<font>void</font>                <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERDEBUGXMLDUMP">xmlSecQName2IntegerDebugXmlDump</a>     (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                                         <font>int</font> intValue,
-                                                         const <font>xmlChar</font> *name,
-                                                         <font>FILE</font> *output);
+<gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="RETURNVALUE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERGETINFO">xmlSecQName2IntegerGetInfo</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="TYPE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> intValue</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERGETINTEGER">xmlSecQName2IntegerGetInteger</a>       (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="TYPE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *qnameHref</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *qnameLocalPart</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> *intValue</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERGETINTEGERFROMSTRING">xmlSecQName2IntegerGetIntegerFromString</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="TYPE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *qname</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> *intValue</code>);
+<gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink> *           <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERGETSTRINGFROMINTEGER">xmlSecQName2IntegerGetStringFromInteger</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="TYPE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> intValue</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERNODEREAD">xmlSecQName2IntegerNodeRead</a>         (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="TYPE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> *intValue</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERNODEWRITE">xmlSecQName2IntegerNodeWrite</a>        (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="TYPE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *nodeName</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *nodeNs</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> intValue</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERATTRIBUTEREAD">xmlSecQName2IntegerAttributeRead</a>    (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="TYPE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *attrName</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> *intValue</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERATTRIBUTEWRITE">xmlSecQName2IntegerAttributeWrite</a>   (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="TYPE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *attrName</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> intValue</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERDEBUGDUMP">xmlSecQName2IntegerDebugDump</a>        (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="TYPE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> intValue</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERDEBUGXMLDUMP">xmlSecQName2IntegerDebugXmlDump</a>     (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="TYPE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> intValue</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
 typedef             <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a>;
 struct              <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKINFO">xmlSecQName2BitMaskInfo</a>;
 typedef             <font>xmlSecQName2BitMaskInfoConstPtr</font>;
-<font>xmlSecQName2BitMaskInfoConstPtr</font>  <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETINFO">xmlSecQName2BitMaskGetInfo</a>
-                                                        (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETBITMASK">xmlSecQName2BitMaskGetBitMask</a>       (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                                         const <font>xmlChar</font> *qnameLocalPart,
-                                                         const <font>xmlChar</font> *qnameHref,
-                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> *mask);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKNODESREAD">xmlSecQName2BitMaskNodesRead</a>        (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                                         <font>xmlNodePtr</font> *node,
-                                                         const <font>xmlChar</font> *nodeName,
-                                                         const <font>xmlChar</font> *nodeNs,
-                                                         <font>int</font> stopOnUnknown,
-                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> *mask);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETBITMASKFROMSTRING">xmlSecQName2BitMaskGetBitMaskFromString</a>
-                                                        (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                                         <font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *qname,
-                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> *mask);
-<font>xmlChar</font> *           <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETSTRINGFROMBITMASK">xmlSecQName2BitMaskGetStringFromBitMask</a>
-                                                        (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask);
-<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKNODESWRITE">xmlSecQName2BitMaskNodesWrite</a>       (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                                         <font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *nodeName,
-                                                         const <font>xmlChar</font> *nodeNs,
-                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask);
-<font>void</font>                <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKDEBUGDUMP">xmlSecQName2BitMaskDebugDump</a>        (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask,
-                                                         const <font>xmlChar</font> *name,
-                                                         <font>FILE</font> *output);
-<font>void</font>                <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKDEBUGXMLDUMP">xmlSecQName2BitMaskDebugXmlDump</a>     (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask,
-                                                         const <font>xmlChar</font> *name,
-                                                         <font>FILE</font> *output);</pre>
+<gtkdoclink href="XMLSECQNAME2BITMASKINFOCONST"><span class="RETURNVALUE">xmlSecQName2BitMaskInfoConstPtr</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETINFO">xmlSecQName2BitMaskGetInfo</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2BITMASKINFOCONST"><span class="TYPE">xmlSecQName2BitMaskInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmltree.html#XMLSECBITMASK"><span class="TYPE">xmlSecBitMask</span></a> mask</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETBITMASK">xmlSecQName2BitMaskGetBitMask</a>       (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2BITMASKINFOCONST"><span class="TYPE">xmlSecQName2BitMaskInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *qnameLocalPart</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *qnameHref</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmltree.html#XMLSECBITMASK"><span class="TYPE">xmlSecBitMask</span></a> *mask</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKNODESREAD">xmlSecQName2BitMaskNodesRead</a>        (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2BITMASKINFOCONST"><span class="TYPE">xmlSecQName2BitMaskInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> *node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *nodeName</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *nodeNs</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> stopOnUnknown</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmltree.html#XMLSECBITMASK"><span class="TYPE">xmlSecBitMask</span></a> *mask</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETBITMASKFROMSTRING">xmlSecQName2BitMaskGetBitMaskFromString</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2BITMASKINFOCONST"><span class="TYPE">xmlSecQName2BitMaskInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *qname</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmltree.html#XMLSECBITMASK"><span class="TYPE">xmlSecBitMask</span></a> *mask</code>);
+<gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink> *           <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETSTRINGFROMBITMASK">xmlSecQName2BitMaskGetStringFromBitMask</a>
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2BITMASKINFOCONST"><span class="TYPE">xmlSecQName2BitMaskInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmltree.html#XMLSECBITMASK"><span class="TYPE">xmlSecBitMask</span></a> mask</code>);
+<gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKNODESWRITE">xmlSecQName2BitMaskNodesWrite</a>       (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2BITMASKINFOCONST"><span class="TYPE">xmlSecQName2BitMaskInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *nodeName</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *nodeNs</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmltree.html#XMLSECBITMASK"><span class="TYPE">xmlSecBitMask</span></a> mask</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKDEBUGDUMP">xmlSecQName2BitMaskDebugDump</a>        (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2BITMASKINFOCONST"><span class="TYPE">xmlSecQName2BitMaskInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmltree.html#XMLSECBITMASK"><span class="TYPE">xmlSecBitMask</span></a> mask</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);
+<gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink><a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKDEBUGXMLDUMP">xmlSecQName2BitMaskDebugXmlDump</a>     (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2BITMASKINFOCONST"><span class="TYPE">xmlSecQName2BitMaskInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmltree.html#XMLSECBITMASK"><span class="TYPE">xmlSecBitMask</span></a> mask</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 </div>
 <div class="REFSECT1">
 <a name="XMLSEC-XMLTREE.DESCRIPTION"></a><h2>Description</h2>
@@ -247,26 +247,24 @@ typedef             <font>xmlSecQName2BitMaskInfoConstPtr</font>;
 <pre class="PROGRAMLISTING">#define             xmlSecNodeGetName(node)</pre>
 <p>Macro. Returns node's name.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN19457"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23927"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to node.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGETNODENSHREF"></a><h3>xmlSecGetNodeNsHref ()</h3>
-<pre class="PROGRAMLISTING">const <font>xmlChar</font>*      xmlSecGetNodeNsHref                 (const <font>xmlNodePtr</font> cur);</pre>
+<pre class="PROGRAMLISTING">const <gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*      xmlSecGetNodeNsHref                 (<code class="PARAMETER">const <gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>);</pre>
 <p>Get's node's namespace href.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19472"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23944"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19477"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23949"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> node's namespace href.</p></td>
 </tr>
 </tbody></table>
@@ -274,27 +272,26 @@ typedef             <font>xmlSecQName2BitMaskInfoConstPtr</font>;
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCHECKNODENAME"></a><h3>xmlSecCheckNodeName ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCheckNodeName                 (const <font>xmlNodePtr</font> cur,
-                                                         const <font>xmlChar</font> *name,
-                                                         const <font>xmlChar</font> *ns);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecCheckNodeName                 (<code class="PARAMETER">const <gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *ns</code>);</pre>
 <p>Checks that the node has a given name and a given namespace href.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19494"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to an XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23972"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19499"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the name,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23977"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the name,</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19504"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the namespace href.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23982"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the namespace href.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19509"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23987"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 1 if the node matches or 0 otherwise.</p></td>
 </tr>
 </tbody></table>
@@ -302,17 +299,16 @@ typedef             <font>xmlSecQName2BitMaskInfoConstPtr</font>;
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGETNEXTELEMENTNODE"></a><h3>xmlSecGetNextElementNode ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecGetNextElementNode            (<font>xmlNodePtr</font> cur);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecGetNextElementNode            (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>);</pre>
 <p>Seraches for the next element node.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19524"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to an XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24004"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19529"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24009"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to next element node or NULL if it is not found.</p></td>
 </tr>
 </tbody></table>
@@ -320,28 +316,27 @@ typedef             <font>xmlSecQName2BitMaskInfoConstPtr</font>;
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECFINDCHILD"></a><h3>xmlSecFindChild ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecFindChild                     (const <font>xmlNodePtr</font> parent,
-                                                         const <font>xmlChar</font> *name,
-                                                         const <font>xmlChar</font> *ns);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecFindChild                     (<code class="PARAMETER">const <gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> parent</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *ns</code>);</pre>
 <p>Searches a direct child of the <code class="PARAMETER">parent</code> node having given name and
 namespace href.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19547"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24033"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19552"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24038"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19557"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the namespace href (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24043"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the namespace href (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19562"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24048"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to the found node or NULL if an error occurs or
 node is not found.</p></td>
 </tr>
@@ -350,28 +345,27 @@ node is not found.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECFINDPARENT"></a><h3>xmlSecFindParent ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecFindParent                    (const <font>xmlNodePtr</font> cur,
-                                                         const <font>xmlChar</font> *name,
-                                                         const <font>xmlChar</font> *ns);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecFindParent                    (<code class="PARAMETER">const <gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *ns</code>);</pre>
 <p>Searches the ancestors axis of the <code class="PARAMETER">cur</code> node for a node having given name
 and namespace href.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19580"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to an XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24072"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19585"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24077"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19590"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the namespace href (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24082"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the namespace href (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19595"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24087"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to the found node or NULL if an error occurs or
 node is not found.</p></td>
 </tr>
@@ -380,28 +374,27 @@ node is not found.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECFINDNODE"></a><h3>xmlSecFindNode ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecFindNode                      (const <font>xmlNodePtr</font> parent,
-                                                         const <font>xmlChar</font> *name,
-                                                         const <font>xmlChar</font> *ns);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecFindNode                      (<code class="PARAMETER">const <gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> parent</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *ns</code>);</pre>
 <p>Searches all children of the <code class="PARAMETER">parent</code> node having given name and
 namespace href.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19613"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24111"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19618"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24116"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19623"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the namespace href (may be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24121"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the namespace href (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19628"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24126"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to the found node or NULL if an error occurs or
 node is not found.</p></td>
 </tr>
@@ -410,27 +403,26 @@ node is not found.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECADDCHILD"></a><h3>xmlSecAddChild ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecAddChild                      (<font>xmlNodePtr</font> parent,
-                                                         const <font>xmlChar</font> *name,
-                                                         const <font>xmlChar</font> *ns);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecAddChild                      (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> parent</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *ns</code>);</pre>
 <p>Adds a child to the node <code class="PARAMETER">parent</code> with given <code class="PARAMETER">name</code> and namespace <code class="PARAMETER">ns</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19648"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to an XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24152"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19653"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the new node name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24157"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new node name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19658"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the new node namespace.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24162"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new node namespace.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19663"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24167"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the new node or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -438,22 +430,21 @@ node is not found.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECADDCHILDNODE"></a><h3>xmlSecAddChildNode ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecAddChildNode                  (<font>xmlNodePtr</font> parent,
-                                                         <font>xmlNodePtr</font> child);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecAddChildNode                  (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> parent</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> child</code>);</pre>
 <p>Adds <code class="PARAMETER">child</code> node to the <code class="PARAMETER">parent</code> node.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19681"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to an XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24189"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19686"><span style="white-space: nowrap"><code class="PARAMETER">child</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the new node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24194"><span style="white-space: nowrap"><code class="PARAMETER">child</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19691"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24199"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the new node or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -461,27 +452,26 @@ node is not found.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECADDNEXTSIBLING"></a><h3>xmlSecAddNextSibling ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecAddNextSibling                (<font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *name,
-                                                         const <font>xmlChar</font> *ns);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecAddNextSibling                (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *ns</code>);</pre>
 <p>Adds next sibling to the node <code class="PARAMETER">node</code> with given <code class="PARAMETER">name</code> and namespace <code class="PARAMETER">ns</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19711"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to an XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24225"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19716"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the new node name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24230"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new node name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19721"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the new node namespace.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24235"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new node namespace.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19726"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24240"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the new node or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -489,27 +479,26 @@ node is not found.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECADDPREVSIBLING"></a><h3>xmlSecAddPrevSibling ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecAddPrevSibling                (<font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *name,
-                                                         const <font>xmlChar</font> *ns);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLNODEPTR"><span class="RETURNVALUE">xmlNodePtr</span></gtkdoclink>          xmlSecAddPrevSibling                (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *ns</code>);</pre>
 <p>Adds prev sibling to the node <code class="PARAMETER">node</code> with given <code class="PARAMETER">name</code> and namespace <code class="PARAMETER">ns</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19746"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to an XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24266"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19751"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the new node name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24271"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new node name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19756"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                 the new node namespace.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24276"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new node namespace.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19761"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24281"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the new node or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -517,22 +506,21 @@ node is not found.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECREPLACENODE"></a><h3>xmlSecReplaceNode ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecReplaceNode                   (<font>xmlNodePtr</font> node,
-                                                         <font>xmlNodePtr</font> newNode);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecReplaceNode                   (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> newNode</code>);</pre>
 <p>Swaps the <code class="PARAMETER">node</code> and <code class="PARAMETER">newNode</code> in the XML tree.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19779"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the current node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24303"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the current node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19784"><span style="white-space: nowrap"><code class="PARAMETER">newNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the new node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24308"><span style="white-space: nowrap"><code class="PARAMETER">newNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19789"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24313"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -540,27 +528,26 @@ node is not found.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECREPLACENODEANDRETURN"></a><h3>xmlSecReplaceNodeAndReturn ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecReplaceNodeAndReturn          (<font>xmlNodePtr</font> node,
-                                                         <font>xmlNodePtr</font> newNode,
-                                                         <font>xmlNodePtr</font> *replaced);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecReplaceNodeAndReturn          (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> newNode</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> *replaced</code>);</pre>
 <p>Swaps the <code class="PARAMETER">node</code> and <code class="PARAMETER">newNode</code> in the XML tree.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19808"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the current node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24338"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the current node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19813"><span style="white-space: nowrap"><code class="PARAMETER">newNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the new node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24343"><span style="white-space: nowrap"><code class="PARAMETER">newNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19818"><span style="white-space: nowrap"><code class="PARAMETER">replaced</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the replaced node, or release it if NULL is given</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24348"><span style="white-space: nowrap"><code class="PARAMETER">replaced</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the replaced node, or release it if NULL is given</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19823"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24353"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -568,22 +555,21 @@ node is not found.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECREPLACECONTENT"></a><h3>xmlSecReplaceContent ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecReplaceContent                (<font>xmlNodePtr</font> node,
-                                                         <font>xmlNodePtr</font> newNode);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecReplaceContent                (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> newNode</code>);</pre>
 <p>Swaps the content of <code class="PARAMETER">node</code> and <code class="PARAMETER">newNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19841"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the current node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24375"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the current node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19846"><span style="white-space: nowrap"><code class="PARAMETER">newNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the new node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24380"><span style="white-space: nowrap"><code class="PARAMETER">newNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19851"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24385"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -591,27 +577,26 @@ node is not found.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECREPLACECONTENTANDRETURN"></a><h3>xmlSecReplaceContentAndReturn ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecReplaceContentAndReturn       (<font>xmlNodePtr</font> node,
-                                                         <font>xmlNodePtr</font> newNode,
-                                                         <font>xmlNodePtr</font> *replaced);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecReplaceContentAndReturn       (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> newNode</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> *replaced</code>);</pre>
 <p>Swaps the content of <code class="PARAMETER">node</code> and <code class="PARAMETER">newNode</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19870"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the current node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24410"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the current node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19875"><span style="white-space: nowrap"><code class="PARAMETER">newNode</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>            the new node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24415"><span style="white-space: nowrap"><code class="PARAMETER">newNode</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the new node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19880"><span style="white-space: nowrap"><code class="PARAMETER">replaced</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the replaced nodes, or release them if NULL is given</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24420"><span style="white-space: nowrap"><code class="PARAMETER">replaced</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the replaced nodes, or release them if NULL is given</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19885"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24425"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -619,27 +604,26 @@ node is not found.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECREPLACENODEBUFFER"></a><h3>xmlSecReplaceNodeBuffer ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecReplaceNodeBuffer             (<font>xmlNodePtr</font> node,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecReplaceNodeBuffer             (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buffer</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>);</pre>
 <p>Swaps the <code class="PARAMETER">node</code> and the parsed XML data from the <code class="PARAMETER">buffer</code> in the XML tree.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19904"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the current node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24450"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the current node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19909"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the XML data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24455"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the XML data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19914"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the XML data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24460"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the XML data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19919"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24465"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -647,32 +631,31 @@ node is not found.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECREPLACENODEBUFFERANDRETURN"></a><h3>xmlSecReplaceNodeBufferAndReturn ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecReplaceNodeBufferAndReturn    (<font>xmlNodePtr</font> node,
-                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size,
-                                                         <font>xmlNodePtr</font> *replaced);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecReplaceNodeBufferAndReturn    (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <a href="xmlsec-xmlsec.html#XMLSECBYTE"><span class="TYPE">xmlSecByte</span></a> *buffer</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> size</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> *replaced</code>);</pre>
 <p>Swaps the <code class="PARAMETER">node</code> and the parsed XML data from the <code class="PARAMETER">buffer</code> in the XML tree.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19939"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the current node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24493"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the current node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19944"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the XML data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24498"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the XML data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19949"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the XML data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24503"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the XML data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19954"><span style="white-space: nowrap"><code class="PARAMETER">replaced</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the replaced nodes, or release them if NULL is given</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24508"><span style="white-space: nowrap"><code class="PARAMETER">replaced</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the replaced nodes, or release them if NULL is given</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19959"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24513"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -680,23 +663,22 @@ node is not found.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECNODEENCODEANDSETCONTENT"></a><h3>xmlSecNodeEncodeAndSetContent ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNodeEncodeAndSetContent       (<font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *buffer);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecNodeEncodeAndSetContent       (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *buffer</code>);</pre>
 <p>Encodes "special" characters in the <code class="PARAMETER">buffer</code> and sets the result
 as the node content.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19976"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                   the pointer to an XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24534"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19981"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to the node content.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24539"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to the node content.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19986"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24544"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -704,58 +686,56 @@ as the node content.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECADDIDS"></a><h3>xmlSecAddIDs ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecAddIDs                        (<font>xmlDocPtr</font> doc,
-                                                         <font>xmlNodePtr</font> cur,
-                                                         const <font>xmlChar</font> **ids);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecAddIDs                        (<code class="PARAMETER"><gtkdoclink href="XMLDOC"><span class="TYPE">xmlDocPtr</span></gtkdoclink> doc</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> cur</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> **ids</code>);</pre>
 <p>Walks thru all children of the <code class="PARAMETER">cur</code> node and adds all attributes
 from the <code class="PARAMETER">ids</code> list to the <code class="PARAMETER">doc</code> document IDs attributes hash.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20006"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to an XML document.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24570"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to an XML document.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20011"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to an XML node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24575"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20016"><span style="white-space: nowrap"><code class="PARAMETER">ids</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the pointer to a NULL terminated list of ID attributes.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24580"><span style="white-space: nowrap"><code class="PARAMETER">ids</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to a NULL terminated list of ID attributes.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGENERATEANDADDID"></a><h3>xmlSecGenerateAndAddID ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGenerateAndAddID              (<font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *attrName,
-                                                         const <font>xmlChar</font> *prefix,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecGenerateAndAddID              (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *attrName</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *prefix</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> len</code>);</pre>
 <p>Generates a unique ID in the format &lt;<code class="PARAMETER">prefix</code>&gt;base64-encoded(<code class="PARAMETER">len</code> random bytes)
 and puts it in the attribute <code class="PARAMETER">attrName</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20037"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                       the node to ID attr to.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24609"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the node to ID attr to.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20042"><span style="white-space: nowrap"><code class="PARAMETER">attrName</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                   the ID attr name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24614"><span style="white-space: nowrap"><code class="PARAMETER">attrName</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the ID attr name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20047"><span style="white-space: nowrap"><code class="PARAMETER">prefix</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                     the prefix to add to the generated ID (can be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24619"><span style="white-space: nowrap"><code class="PARAMETER">prefix</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the prefix to add to the generated ID (can be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20052"><span style="white-space: nowrap"><code class="PARAMETER">len</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                        the length of ID.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24624"><span style="white-space: nowrap"><code class="PARAMETER">len</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the length of ID.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20057"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24629"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -763,23 +743,22 @@ and puts it in the attribute <code class="PARAMETER">attrName</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGENERATEID"></a><h3>xmlSecGenerateID ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlChar</font>*            xmlSecGenerateID                    (const <font>xmlChar</font> *prefix,
-                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*            xmlSecGenerateID                    (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *prefix</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmlsec.html#XMLSECSIZE"><span class="TYPE">xmlSecSize</span></a> len</code>);</pre>
 <p>Generates a unique ID in the format &lt;<code class="PARAMETER">prefix</code>&gt;base64-encoded(<code class="PARAMETER">len</code> random bytes).
 The caller is responsible for freeing returned string using <code class="PARAMETER">xmlFree</code> function.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20076"><span style="white-space: nowrap"><code class="PARAMETER">prefix</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                     the prefix to add to the generated ID (can be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24652"><span style="white-space: nowrap"><code class="PARAMETER">prefix</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the prefix to add to the generated ID (can be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20081"><span style="white-space: nowrap"><code class="PARAMETER">len</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                        the length of ID.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24657"><span style="white-space: nowrap"><code class="PARAMETER">len</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the length of ID.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20086"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24662"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to generated ID string or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -787,22 +766,21 @@ The caller is responsible for freeing returned string using <code class="PARAMET
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECCREATETREE"></a><h3>xmlSecCreateTree ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlDocPtr</font>           xmlSecCreateTree                    (const <font>xmlChar</font> *rootNodeName,
-                                                         const <font>xmlChar</font> *rootNodeNs);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLDOC"><span class="RETURNVALUE">xmlDocPtr</span></gtkdoclink>           xmlSecCreateTree                    (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *rootNodeName</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *rootNodeNs</code>);</pre>
 <p>Creates a new XML tree with one root node <code class="PARAMETER">rootNodeName</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20103"><span style="white-space: nowrap"><code class="PARAMETER">rootNodeName</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>       the root node name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24683"><span style="white-space: nowrap"><code class="PARAMETER">rootNodeName</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the root node name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20108"><span style="white-space: nowrap"><code class="PARAMETER">rootNodeNs</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>         the root node namespace (otpional).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24688"><span style="white-space: nowrap"><code class="PARAMETER">rootNodeNs</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the root node namespace (otpional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20113"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24693"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the newly created tree or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -810,17 +788,16 @@ The caller is responsible for freeing returned string using <code class="PARAMET
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECISEMPTYNODE"></a><h3>xmlSecIsEmptyNode ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecIsEmptyNode                   (<font>xmlNodePtr</font> node);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecIsEmptyNode                   (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>);</pre>
 <p>Checks whethere the <code class="PARAMETER">node</code> is empty (i.e. has only whitespaces children).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20129"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the node to check</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24711"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the node to check</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20134"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24716"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 1 if <code class="PARAMETER">node</code> is empty, 0 otherwise or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -828,17 +805,16 @@ The caller is responsible for freeing returned string using <code class="PARAMET
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECISEMPTYSTRING"></a><h3>xmlSecIsEmptyString ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecIsEmptyString                 (const <font>xmlChar</font> *str);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecIsEmptyString                 (<code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *str</code>);</pre>
 <p>Checks whethere the <code class="PARAMETER">str</code> is empty (i.e. has only whitespaces children).</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20151"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the string to check</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24735"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the string to check</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20156"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24740"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 1 if <code class="PARAMETER">str</code> is empty, 0 otherwise or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -846,28 +822,27 @@ The caller is responsible for freeing returned string using <code class="PARAMET
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECGETQNAME"></a><h3>xmlSecGetQName ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlChar</font>*            xmlSecGetQName                      (<font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *href,
-                                                         const <font>xmlChar</font> *local);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink>*            xmlSecGetQName                      (<code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *href</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *local</code>);</pre>
 <p>Creates QName (prefix:local) from <code class="PARAMETER">href</code> and <code class="PARAMETER">local</code> in the context of the <code class="PARAMETER">node</code>.
 Caller is responsible for freeing returned string with xmlFree.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20177"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the context node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24767"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the context node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20182"><span style="white-space: nowrap"><code class="PARAMETER">href</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the QName href (can be NULL).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24772"><span style="white-space: nowrap"><code class="PARAMETER">href</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the QName href (can be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20187"><span style="white-space: nowrap"><code class="PARAMETER">local</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the QName local part.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24777"><span style="white-space: nowrap"><code class="PARAMETER">local</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the QName local part.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20192"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24782"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> qname or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -875,22 +850,21 @@ Caller is responsible for freeing returned string with xmlFree.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECPRINTXMLSTRING"></a><h3>xmlSecPrintXmlString ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecPrintXmlString                (<font>FILE</font> *fd,
-                                                         const <font>xmlChar</font> *str);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecPrintXmlString                (<code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *fd</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *str</code>);</pre>
 <p>Encodes the <code class="PARAMETER">str</code> (e.g. replaces '&amp;' with '&amp;amp;') and writes it to <code class="PARAMETER">fd</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20210"><span style="white-space: nowrap"><code class="PARAMETER">fd</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                the file descriptor to write the XML string to</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24804"><span style="white-space: nowrap"><code class="PARAMETER">fd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the file descriptor to write the XML string to</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20215"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the string</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24809"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the string</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20220"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24814"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> he number of bytes transmitted or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
@@ -901,10 +875,9 @@ Caller is responsible for freeing returned string with xmlFree.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecIsHex(c)</pre>
 <p>Macro. Returns 1 if <code class="PARAMETER">c</code> is a hex digit or 0 other wise.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN20234"><span style="white-space: nowrap"><code class="PARAMETER">c</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the character.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24827"><span style="white-space: nowrap"><code class="PARAMETER">c</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the character.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -913,10 +886,9 @@ Caller is responsible for freeing returned string with xmlFree.</p>
 <pre class="PROGRAMLISTING">#define             xmlSecGetHex(c)</pre>
 <p>Macro. Returns the hex value of the <code class="PARAMETER">c</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN20248"><span style="white-space: nowrap"><code class="PARAMETER">c</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>                  the character,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24840"><span style="white-space: nowrap"><code class="PARAMETER">c</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the character,</p></td>
 </tr></tbody></table>
 </div>
 <hr>
@@ -929,19 +901,18 @@ Caller is responsible for freeing returned string with xmlFree.</p>
 };</pre>
 <p>QName &lt;-&gt; Integer conversion definition.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20261"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">qnameHref</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the QName href</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24852"><span style="white-space: nowrap">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">qnameHref</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the QName href</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20267"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">qnameLocalPart</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the QName local</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24859"><span style="white-space: nowrap">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">qnameLocalPart</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the QName local</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20273"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">intValue</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the integer value</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24866"><span style="white-space: nowrap"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> <code class="STRUCTFIELD">intValue</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the integer value</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -950,28 +921,26 @@ Caller is responsible for freeing returned string with xmlFree.</p>
 <a name="XMLSECQNAME2INTEGERINFOCONSTPTR"></a><h3>xmlSecQName2IntegerInfoConstPtr</h3>
 <pre class="PROGRAMLISTING">typedef const xmlSecQName2IntegerInfo *         xmlSecQName2IntegerInfoConstPtr;</pre>
 <p>Pointer to constant QName &lt;-&gt; Integer conversion definition.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECQNAME2INTEGERGETINFO"></a><h3>xmlSecQName2IntegerGetInfo ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecQName2IntegerInfoConstPtr</font>  xmlSecQName2IntegerGetInfo
-                                                        (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                                         <font>int</font> intValue);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="RETURNVALUE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink>  xmlSecQName2IntegerGetInfo
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="TYPE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> intValue</code>);</pre>
 <p>Maps integer <code class="PARAMETER">intValue</code> to a QName prefix.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20298"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24895"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20303"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the integer value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24900"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20308"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24905"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the QName info that is mapped to <code class="PARAMETER">intValue</code> or NULL if such value
 is not found.</p></td>
 </tr>
@@ -980,32 +949,31 @@ is not found.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECQNAME2INTEGERGETINTEGER"></a><h3>xmlSecQName2IntegerGetInteger ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecQName2IntegerGetInteger       (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                                         const <font>xmlChar</font> *qnameHref,
-                                                         const <font>xmlChar</font> *qnameLocalPart,
-                                                         <font>int</font> *intValue);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecQName2IntegerGetInteger       (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="TYPE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *qnameHref</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *qnameLocalPart</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> *intValue</code>);</pre>
 <p>Maps qname qname to an integer and returns it in <code class="PARAMETER">intValue</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20328"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24933"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20333"><span style="white-space: nowrap"><code class="PARAMETER">qnameHref</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the qname href value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24938"><span style="white-space: nowrap"><code class="PARAMETER">qnameHref</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname href value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20338"><span style="white-space: nowrap"><code class="PARAMETER">qnameLocalPart</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the qname local part value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24943"><span style="white-space: nowrap"><code class="PARAMETER">qnameLocalPart</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname local part value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20343"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to result integer value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24948"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to result integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20348"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24953"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs,</p></td>
 </tr>
 </tbody></table>
@@ -1013,33 +981,32 @@ is not found.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECQNAME2INTEGERGETINTEGERFROMSTRING"></a><h3>xmlSecQName2IntegerGetIntegerFromString ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecQName2IntegerGetIntegerFromString
-                                                        (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                                         <font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *qname,
-                                                         <font>int</font> *intValue);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecQName2IntegerGetIntegerFromString
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="TYPE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *qname</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> *intValue</code>);</pre>
 <p>Converts <code class="PARAMETER">qname</code> into integer in context of <code class="PARAMETER">node</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20368"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24981"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20373"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24986"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20378"><span style="white-space: nowrap"><code class="PARAMETER">qname</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the qname string.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24991"><span style="white-space: nowrap"><code class="PARAMETER">qname</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname string.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20383"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to result integer value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24996"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to result integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20388"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25001"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs,</p></td>
 </tr>
 </tbody></table>
@@ -1047,29 +1014,28 @@ is not found.</p></td>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECQNAME2INTEGERGETSTRINGFROMINTEGER"></a><h3>xmlSecQName2IntegerGetStringFromInteger ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlChar</font> *           xmlSecQName2IntegerGetStringFromInteger
-                                                        (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <font>int</font> intValue);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink> *           xmlSecQName2IntegerGetStringFromInteger
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="TYPE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> intValue</code>);</pre>
 <p>Creates qname string for <code class="PARAMETER">intValue</code> in context of given <code class="PARAMETER">node</code>. Caller
 is responsible for freeing returned string with <code class="PARAMETER">xmlFree</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20408"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25027"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20413"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25032"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20418"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the integer value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25037"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20423"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25042"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly allocated string on success or NULL if an error occurs,</p></td>
 </tr>
 </tbody></table>
@@ -1077,28 +1043,27 @@ is responsible for freeing returned string with <code class="PARAMETER">xmlFree<
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECQNAME2INTEGERNODEREAD"></a><h3>xmlSecQName2IntegerNodeRead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecQName2IntegerNodeRead         (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <font>int</font> *intValue);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecQName2IntegerNodeRead         (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="TYPE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> *intValue</code>);</pre>
 <p>Reads the content of <code class="PARAMETER">node</code> and converts it to an integer using mapping
 from <code class="PARAMETER">info</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20442"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25067"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20447"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25072"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20452"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to result integer value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25077"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to result integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20457"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25082"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs,</p></td>
 </tr>
 </tbody></table>
@@ -1106,37 +1071,36 @@ from <code class="PARAMETER">info</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECQNAME2INTEGERNODEWRITE"></a><h3>xmlSecQName2IntegerNodeWrite ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecQName2IntegerNodeWrite        (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                                         <font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *nodeName,
-                                                         const <font>xmlChar</font> *nodeNs,
-                                                         <font>int</font> intValue);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecQName2IntegerNodeWrite        (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="TYPE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *nodeName</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *nodeNs</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> intValue</code>);</pre>
 <p>Creates new child node in <code class="PARAMETER">node</code> and sets its value to <code class="PARAMETER">intValue</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20478"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25113"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20483"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the parent node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25118"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the parent node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20488"><span style="white-space: nowrap"><code class="PARAMETER">nodeName</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the child node name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25123"><span style="white-space: nowrap"><code class="PARAMETER">nodeName</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the child node name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20493"><span style="white-space: nowrap"><code class="PARAMETER">nodeNs</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the child node namespace.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25128"><span style="white-space: nowrap"><code class="PARAMETER">nodeNs</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the child node namespace.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20498"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the integer value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25133"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20503"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25138"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs,</p></td>
 </tr>
 </tbody></table>
@@ -1144,33 +1108,32 @@ from <code class="PARAMETER">info</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECQNAME2INTEGERATTRIBUTEREAD"></a><h3>xmlSecQName2IntegerAttributeRead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecQName2IntegerAttributeRead    (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                                         <font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *attrName,
-                                                         <font>int</font> *intValue);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecQName2IntegerAttributeRead    (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="TYPE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *attrName</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> *intValue</code>);</pre>
 <p>Gets the value of <code class="PARAMETER">attrName</code> atrtibute from <code class="PARAMETER">node</code> and converts it to integer
 according to <code class="PARAMETER">info</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20524"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25167"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20529"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the element node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25172"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the element node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20534"><span style="white-space: nowrap"><code class="PARAMETER">attrName</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the attribute name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25177"><span style="white-space: nowrap"><code class="PARAMETER">attrName</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the attribute name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20539"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the pointer to result integer value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25182"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to result integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20544"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25187"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs,</p></td>
 </tr>
 </tbody></table>
@@ -1178,33 +1141,32 @@ according to <code class="PARAMETER">info</code>.</p>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECQNAME2INTEGERATTRIBUTEWRITE"></a><h3>xmlSecQName2IntegerAttributeWrite ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecQName2IntegerAttributeWrite   (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                                         <font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *attrName,
-                                                         <font>int</font> intValue);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecQName2IntegerAttributeWrite   (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="TYPE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *attrName</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> intValue</code>);</pre>
 <p>Converts <code class="PARAMETER">intValue</code> to a qname and sets it to the value of
 attribute <code class="PARAMETER">attrName</code> in <code class="PARAMETER">node</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20565"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25216"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20570"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the parent node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25221"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the parent node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20575"><span style="white-space: nowrap"><code class="PARAMETER">attrName</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the name of attribute.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25226"><span style="white-space: nowrap"><code class="PARAMETER">attrName</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the name of attribute.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20580"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the integer value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25231"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20585"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25236"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs,</p></td>
 </tr>
 </tbody></table>
@@ -1212,58 +1174,56 @@ attribute <code class="PARAMETER">attrName</code> in <code class="PARAMETER">nod
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECQNAME2INTEGERDEBUGDUMP"></a><h3>xmlSecQName2IntegerDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecQName2IntegerDebugDump        (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                                         <font>int</font> intValue,
-                                                         const <font>xmlChar</font> *name,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecQName2IntegerDebugDump        (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="TYPE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> intValue</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints <code class="PARAMETER">intValue</code> into <code class="PARAMETER">output</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20605"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25264"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20610"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the integer value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25269"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20615"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the value name to print.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25274"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the value name to print.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20620"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25279"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECQNAME2INTEGERDEBUGXMLDUMP"></a><h3>xmlSecQName2IntegerDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecQName2IntegerDebugXmlDump     (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                                         <font>int</font> intValue,
-                                                         const <font>xmlChar</font> *name,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecQName2IntegerDebugXmlDump     (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2INTEGERINFOCONST"><span class="TYPE">xmlSecQName2IntegerInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> intValue</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints <code class="PARAMETER">intValue</code> into <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20640"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25307"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20645"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the integer value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25312"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20650"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the value name to print.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25317"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the value name to print.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20655"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25322"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -1272,7 +1232,6 @@ attribute <code class="PARAMETER">attrName</code> in <code class="PARAMETER">nod
 <a name="XMLSECBITMASK"></a><h3>xmlSecBitMask</h3>
 <pre class="PROGRAMLISTING">typedef unsigned int                                    xmlSecBitMask;</pre>
 <p>Bitmask datatype.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
@@ -1284,19 +1243,18 @@ attribute <code class="PARAMETER">attrName</code> in <code class="PARAMETER">nod
 };</pre>
 <p>QName &lt;-&gt; Bitmask conversion definition.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20675"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">qnameHref</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the QName href</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25340"><span style="white-space: nowrap">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">qnameHref</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the QName href</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20681"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">qnameLocalPart</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the QName local</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25347"><span style="white-space: nowrap">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *<code class="STRUCTFIELD">qnameLocalPart</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the QName local</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20687"><span style="white-space: nowrap"><a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> <code class="STRUCTFIELD">mask</code>;</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the bitmask value</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25354"><span style="white-space: nowrap"><a href="xmlsec-xmltree.html#XMLSECBITMASK"><span class="TYPE">xmlSecBitMask</span></a> <code class="STRUCTFIELD">mask</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>the bitmask value</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -1305,28 +1263,26 @@ attribute <code class="PARAMETER">attrName</code> in <code class="PARAMETER">nod
 <a name="XMLSECQNAME2BITMASKINFOCONSTPTR"></a><h3>xmlSecQName2BitMaskInfoConstPtr</h3>
 <pre class="PROGRAMLISTING">typedef const xmlSecQName2BitMaskInfo*          xmlSecQName2BitMaskInfoConstPtr;</pre>
 <p>Pointer to constant QName &lt;-&gt; Bitmask conversion definition.</p>
-<p></p>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECQNAME2BITMASKGETINFO"></a><h3>xmlSecQName2BitMaskGetInfo ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecQName2BitMaskInfoConstPtr</font>  xmlSecQName2BitMaskGetInfo
-                                                        (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLSECQNAME2BITMASKINFOCONST"><span class="RETURNVALUE">xmlSecQName2BitMaskInfoConstPtr</span></gtkdoclink>  xmlSecQName2BitMaskGetInfo
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2BITMASKINFOCONST"><span class="TYPE">xmlSecQName2BitMaskInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmltree.html#XMLSECBITMASK"><span class="TYPE">xmlSecBitMask</span></a> mask</code>);</pre>
 <p>Converts <code class="PARAMETER">mask</code> to qname.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20712"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;bit mask mapping information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25383"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname&lt;-&gt;bit mask mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20717"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the bit mask.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25388"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the bit mask.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20722"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25393"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to the qname info for <code class="PARAMETER">mask</code> or NULL if mask is unknown.</p></td>
 </tr>
 </tbody></table>
@@ -1334,32 +1290,31 @@ attribute <code class="PARAMETER">attrName</code> in <code class="PARAMETER">nod
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECQNAME2BITMASKGETBITMASK"></a><h3>xmlSecQName2BitMaskGetBitMask ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecQName2BitMaskGetBitMask       (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                                         const <font>xmlChar</font> *qnameLocalPart,
-                                                         const <font>xmlChar</font> *qnameHref,
-                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> *mask);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecQName2BitMaskGetBitMask       (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2BITMASKINFOCONST"><span class="TYPE">xmlSecQName2BitMaskInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *qnameLocalPart</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *qnameHref</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmltree.html#XMLSECBITMASK"><span class="TYPE">xmlSecBitMask</span></a> *mask</code>);</pre>
 <p>Converts <code class="PARAMETER">qnameLocalPart</code> to <code class="PARAMETER">mask</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20743"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;bit mask mapping information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25422"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname&lt;-&gt;bit mask mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20748"><span style="white-space: nowrap"><code class="PARAMETER">qnameLocalPart</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>     the qname LocalPart value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25427"><span style="white-space: nowrap"><code class="PARAMETER">qnameLocalPart</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname LocalPart value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20753"><span style="white-space: nowrap"><code class="PARAMETER">qnameHref</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>          the qname Href value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25432"><span style="white-space: nowrap"><code class="PARAMETER">qnameHref</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname Href value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20758"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to result mask.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25437"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to result mask.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20763"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25442"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs,</p></td>
 </tr>
 </tbody></table>
@@ -1367,45 +1322,44 @@ attribute <code class="PARAMETER">attrName</code> in <code class="PARAMETER">nod
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECQNAME2BITMASKNODESREAD"></a><h3>xmlSecQName2BitMaskNodesRead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecQName2BitMaskNodesRead        (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                                         <font>xmlNodePtr</font> *node,
-                                                         const <font>xmlChar</font> *nodeName,
-                                                         const <font>xmlChar</font> *nodeNs,
-                                                         <font>int</font> stopOnUnknown,
-                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> *mask);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecQName2BitMaskNodesRead        (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2BITMASKINFOCONST"><span class="TYPE">xmlSecQName2BitMaskInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> *node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *nodeName</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *nodeNs</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="INT"><span class="TYPE">int</span></gtkdoclink> stopOnUnknown</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmltree.html#XMLSECBITMASK"><span class="TYPE">xmlSecBitMask</span></a> *mask</code>);</pre>
 <p>Reads &lt;<code class="PARAMETER">nodeNs</code>:<code class="PARAMETER">nodeName</code>&gt; elements and puts the result bit mask
 into <code class="PARAMETER">mask</code>. When function exits, <code class="PARAMETER">node</code> points to the first element node
 after all the &lt;<code class="PARAMETER">nodeNs</code>:<code class="PARAMETER">nodeName</code>&gt; elements.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20789"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;bit mask mapping information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25480"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname&lt;-&gt;bit mask mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20794"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the start.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25485"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the start.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20799"><span style="white-space: nowrap"><code class="PARAMETER">nodeName</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the mask nodes name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25490"><span style="white-space: nowrap"><code class="PARAMETER">nodeName</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the mask nodes name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20804"><span style="white-space: nowrap"><code class="PARAMETER">nodeNs</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the mask nodes namespace.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25495"><span style="white-space: nowrap"><code class="PARAMETER">nodeNs</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the mask nodes namespace.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20809"><span style="white-space: nowrap"><code class="PARAMETER">stopOnUnknown</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>      if this flag is set then function exits if unknown
+<td align="LEFT" valign="TOP"><a name="AEN25500"><span style="white-space: nowrap"><code class="PARAMETER">stopOnUnknown</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>if this flag is set then function exits if unknown
                      value was found.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20814"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to result mask.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25505"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to result mask.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20819"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25510"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs,</p></td>
 </tr>
 </tbody></table>
@@ -1413,33 +1367,32 @@ after all the &lt;<code class="PARAMETER">nodeNs</code>:<code class="PARAMETER">
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECQNAME2BITMASKGETBITMASKFROMSTRING"></a><h3>xmlSecQName2BitMaskGetBitMaskFromString ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecQName2BitMaskGetBitMaskFromString
-                                                        (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                                         <font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *qname,
-                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> *mask);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecQName2BitMaskGetBitMaskFromString
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2BITMASKINFOCONST"><span class="TYPE">xmlSecQName2BitMaskInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *qname</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmltree.html#XMLSECBITMASK"><span class="TYPE">xmlSecBitMask</span></a> *mask</code>);</pre>
 <p>Converts <code class="PARAMETER">qname</code> into integer in context of <code class="PARAMETER">node</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20839"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25538"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20844"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25543"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20849"><span style="white-space: nowrap"><code class="PARAMETER">qname</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>              the qname string.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25548"><span style="white-space: nowrap"><code class="PARAMETER">qname</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname string.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20854"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to result msk value.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25553"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to result msk value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20859"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25558"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs,</p></td>
 </tr>
 </tbody></table>
@@ -1447,29 +1400,28 @@ after all the &lt;<code class="PARAMETER">nodeNs</code>:<code class="PARAMETER">
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECQNAME2BITMASKGETSTRINGFROMBITMASK"></a><h3>xmlSecQName2BitMaskGetStringFromBitMask ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlChar</font> *           xmlSecQName2BitMaskGetStringFromBitMask
-                                                        (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                                         <font>xmlNodePtr</font> node,
-                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="XMLCHAR"><span class="RETURNVALUE">xmlChar</span></gtkdoclink> *           xmlSecQName2BitMaskGetStringFromBitMask
+                                                        (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2BITMASKINFOCONST"><span class="TYPE">xmlSecQName2BitMaskInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmltree.html#XMLSECBITMASK"><span class="TYPE">xmlSecBitMask</span></a> mask</code>);</pre>
 <p>Creates qname string for <code class="PARAMETER">mask</code> in context of given <code class="PARAMETER">node</code>. Caller
 is responsible for freeing returned string with <code class="PARAMETER">xmlFree</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20879"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25584"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20884"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the pointer to node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25589"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20889"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the mask.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25594"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the mask.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20894"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25599"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> pointer to newly allocated string on success or NULL if an error occurs,</p></td>
 </tr>
 </tbody></table>
@@ -1477,37 +1429,36 @@ is responsible for freeing returned string with <code class="PARAMETER">xmlFree<
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECQNAME2BITMASKNODESWRITE"></a><h3>xmlSecQName2BitMaskNodesWrite ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecQName2BitMaskNodesWrite       (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                                         <font>xmlNodePtr</font> node,
-                                                         const <font>xmlChar</font> *nodeName,
-                                                         const <font>xmlChar</font> *nodeNs,
-                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="INT"><span class="RETURNVALUE">int</span></gtkdoclink>                 xmlSecQName2BitMaskNodesWrite       (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2BITMASKINFOCONST"><span class="TYPE">xmlSecQName2BitMaskInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="XMLNODE"><span class="TYPE">xmlNodePtr</span></gtkdoclink> node</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *nodeName</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *nodeNs</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmltree.html#XMLSECBITMASK"><span class="TYPE">xmlSecBitMask</span></a> mask</code>);</pre>
 <p>Writes &lt;<code class="PARAMETER">nodeNs</code>:<code class="PARAMETER">nodeName</code>&gt; elemnts with values from <code class="PARAMETER">mask</code> to <code class="PARAMETER">node</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20917"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;bit mask mapping information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25632"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname&lt;-&gt;bit mask mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20922"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the parent element for mask nodes.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25637"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the parent element for mask nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20927"><span style="white-space: nowrap"><code class="PARAMETER">nodeName</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>           the mask nodes name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25642"><span style="white-space: nowrap"><code class="PARAMETER">nodeName</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the mask nodes name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20932"><span style="white-space: nowrap"><code class="PARAMETER">nodeNs</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the mask nodes namespace.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25647"><span style="white-space: nowrap"><code class="PARAMETER">nodeNs</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the mask nodes namespace.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20937"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the bit mask.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25652"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the bit mask.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20942"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25657"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs,</p></td>
 </tr>
 </tbody></table>
@@ -1515,58 +1466,56 @@ is responsible for freeing returned string with <code class="PARAMETER">xmlFree<
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECQNAME2BITMASKDEBUGDUMP"></a><h3>xmlSecQName2BitMaskDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecQName2BitMaskDebugDump        (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask,
-                                                         const <font>xmlChar</font> *name,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecQName2BitMaskDebugDump        (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2BITMASKINFOCONST"><span class="TYPE">xmlSecQName2BitMaskInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmltree.html#XMLSECBITMASK"><span class="TYPE">xmlSecBitMask</span></a> mask</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints debug information about <code class="PARAMETER">mask</code> to <code class="PARAMETER">output</code>.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20962"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;bit mask mapping information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25685"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname&lt;-&gt;bit mask mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20967"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the bit mask.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25690"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the bit mask.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20972"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the value name to print.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25695"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the value name to print.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20977"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25700"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
 <a name="XMLSECQNAME2BITMASKDEBUGXMLDUMP"></a><h3>xmlSecQName2BitMaskDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>                xmlSecQName2BitMaskDebugXmlDump     (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask,
-                                                         const <font>xmlChar</font> *name,
-                                                         <font>FILE</font> *output);</pre>
+<pre class="PROGRAMLISTING"><gtkdoclink href="VOID"><span class="RETURNVALUE">void</span></gtkdoclink>                xmlSecQName2BitMaskDebugXmlDump     (<code class="PARAMETER"><gtkdoclink href="XMLSECQNAME2BITMASKINFOCONST"><span class="TYPE">xmlSecQName2BitMaskInfoConstPtr</span></gtkdoclink> info</code>,
+                                                         <code class="PARAMETER"><a href="xmlsec-xmltree.html#XMLSECBITMASK"><span class="TYPE">xmlSecBitMask</span></a> mask</code>,
+                                                         <code class="PARAMETER">const <gtkdoclink href="XMLCHAR"><span class="TYPE">xmlChar</span></gtkdoclink> *name</code>,
+                                                         <code class="PARAMETER"><gtkdoclink href="FILE:CAPS"><span class="TYPE">FILE</span></gtkdoclink> *output</code>);</pre>
 <p>Prints debug information about <code class="PARAMETER">mask</code> to <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
-<p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20997"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;bit mask mapping information.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25728"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the qname&lt;-&gt;bit mask mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21002"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the bit mask.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25733"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the bit mask.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21007"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>               the value name to print.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25738"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the value name to print.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21012"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25743"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
diff --git a/docs/api/xmlsec.sgml b/docs/api/xmlsec.sgml
index 8cad2a2..afdd9a7 100644
--- a/docs/api/xmlsec.sgml
+++ b/docs/api/xmlsec.sgml
@@ -48,6 +48,9 @@
 <!ENTITY xmlsec-gnutls-app 		SYSTEM "sgml/gnutls/app.sgml">
 <!ENTITY xmlsec-gnutls-crypto 		SYSTEM "sgml/gnutls/crypto.sgml">
 
+<!ENTITY xmlsec-gcrypt-app 		SYSTEM "sgml/gcrypt/app.sgml">
+<!ENTITY xmlsec-gcrypt-crypto 		SYSTEM "sgml/gcrypt/crypto.sgml">
+
 <!ENTITY xmlsec-nss-app 		SYSTEM "sgml/nss/app.sgml">
 <!ENTITY xmlsec-nss-bignum		SYSTEM "sgml/nss/bignum.sgml">
 <!ENTITY xmlsec-nss-crypto 		SYSTEM "sgml/nss/crypto.sgml">
@@ -143,14 +146,15 @@
 	<para>XML Security Library provides support for XML Digital Signature 
 	and XML Encryption. It is based on LibXML/LibXSLT and can use
 	practicaly any crypto library (currently there is "out of the box" 
-	support for OpenSSL, GnuTLS and NSS).
+	support for OpenSSL, MSCrypto, GnuTLS, GCrypt and NSS).
 	</para>
     </chapter>
     <chapter id="xmlsec-notes-structure">
 	<title>XML Security Library Structure.</title>
 	<para>In order to provide the an ability to use different crypto engines, 
 	the XML Security Library is splitted in two parts: core library (xmlsec)
-	and crypto library (xmlsec-openssl, xmlsec-gnutls, xmlsec-nss, ...). 
+	and crypto library (xmlsec-openssl, xmlsec-mscrypt, xmlsec-gnutls, 
+	xmlsec-gcrypt, xmlsec-nss, ...).
 	<figure>
 	    <title>The library structure and dependencies.</title>
 	    <graphic fileref="images/structure.png" align="center"></graphic>
@@ -254,6 +258,16 @@
     &xmlsec-gnutls-crypto;
     </chapter>
 
+    <chapter id="xmlsec-gcrypt-ref">
+    <title>XML Security Library for GCrypt API Reference.</title>
+    <para>This section contains the API reference for xmlsec-gcrypt. All
+    the public interfaces are documented here. This reference guide is
+    build by extracting comments from the code sources. </para>
+
+    &xmlsec-gcrypt-app;
+    &xmlsec-gcrypt-crypto;
+    </chapter>
+
     <chapter id="xmlsec-nss-ref">
     <title>XML Security Library for NSS API Reference.</title>
     <para>This section contains the API reference for xmlsec-nss. All
diff --git a/docs/download.html b/docs/download.html
index d938825..60d09a0 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -85,8 +85,9 @@
         </li>
 	<li>
 <a href="http://www.gnu.org/software/gnutls/";>GnuTLS</a>
-	and <a href="http://www.gnu.org/directory/security/libgcrypt.html";>Libgcrypt</a> - 
-	GNU SSL and cryptographic libraries.
+	</li>
+	<li>
+<a href="http://www.gnu.org/directory/security/libgcrypt.html";>Libgcrypt</a>
 	</li>
         <li>
 <a href="http://www.mozilla.org/projects/security/pki/nss/";>NSS</a> -
diff --git a/docs/faq.html b/docs/faq.html
index 53c36ea..2936178 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -134,6 +134,23 @@ the application is not distributed.<br>
 </td>
                 </tr>
 <tr>
+<td style="vertical-align: top;">xmlsec-gcrypt (also
+requires
+xmlsec-core library) </td>
+                  <td style="vertical-align: top;">
+<a href="http://www.gnupg.org/";>LibGCrypt</a><br>
+</td>
+                  <td style="vertical-align: top;">
+<a href="http://www.opensource.org/licenses/gpl-license.php";>GPL</a><br>
+</td>
+                  <td style="vertical-align: top;">Yes, but only if
+the application is not distributed.<br>
+</td>
+                  <td style="vertical-align: top;">Yes.</td>
+                  <td style="vertical-align: top;">Yes.<br>
+</td>
+                </tr>
+<tr>
 <td style="vertical-align: top;">xmlsec-nss (also
 requires
 xmlsec-core library) </td>
@@ -196,11 +213,15 @@ xmlsec?</h4>
 <li> <a href="http://www.openssl.org/";>OpenSSL</a>
 version
 0.9.7 (prefered or later) or version 0.9.6. </li>
-              <li>
+<li>
 <a href="http://www.gnu.org/software/gnutls/";>GnuTLS</a>
-and <a href="http://www.gnu.org/directory/security/libgcrypt.html";>Libgcrypt</a>
-- GNU SSL and cryptographic libraries. </li>
-              <li>
+</li>
+
+<li>
+<a href="http://www.gnu.org/directory/security/libgcrypt.html";>Libgcrypt</a>
+</li>
+
+<li>
 <a href="http://www.mozilla.org/projects/security/pki/nss/";>NSS</a> -
 Mozilla cryptographic library. </li>
             </ul>
diff --git a/docs/related.html b/docs/related.html
index c9ac05e..fe895c4 100644
--- a/docs/related.html
+++ b/docs/related.html
@@ -86,8 +86,10 @@ GNOME <a href="http://www.w3.org/TR/xslt";>XSLT</a> / <a href="http://www.exslt.o
               <li> <a href="http://www.openssl.org";>OpenSSL</a> - <a href="http://www.netscape.com/eng/ssl3/";>SSL</a> / <a href="http://www.consensus.com/ietf-tls/ietf-tls-home.html";>TLS</a>
 implementation.</li>
               <li> <a href="http://www.gnu.org/software/gnutls/";>GnuTLS</a>
-and <a href="http://www.gnu.org/directory/security/libgcrypt.html";>Libgcrypt</a>
-- GNU SSL and cryptographic libraries.</li>
+</li>
+              <li>
+<a href="http://www.gnu.org/directory/security/libgcrypt.html";>Libgcrypt</a>
+              </li>
               <li> <a href="http://www.mozilla.org/projects/security/pki/nss/";>NSS</a> -
 Mozilla cryptographic library. </li>
             </ul>
diff --git a/docs/xmldsig.html b/docs/xmldsig.html
index 74c45ec..2eaa284 100644
--- a/docs/xmldsig.html
+++ b/docs/xmldsig.html
@@ -74,6 +74,7 @@ algorithms<br></b></td>
                   <td align="left" valign="top"> <b>XMLSec with OpenSSL</b>
 </td>
                   <td style="vertical-align: top;"><b>XMLSec with GnuTLS</b></td>
+                  <td style="vertical-align: top;"><b>XMLSec with GCrypt</b></td>
                   <td style="vertical-align: top;"> <b>XMLSec with NSS</b>
 </td>
                   <td style="vertical-align: top;"> <b>XMLSec with MSCrypto</b>
@@ -91,6 +92,8 @@ Signature<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top"> <span class="link-def">Enveloping</span>
@@ -105,6 +108,8 @@ Signature: same document reference with fragment
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top"> <span class="link-def">Enveloped</span>
@@ -119,6 +124,8 @@ Transform .<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top">SignatureValue
@@ -132,6 +139,8 @@ generation/validation<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top">Manifest
@@ -146,6 +155,8 @@ generation/valdiation<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top">Feature:
@@ -161,6 +172,8 @@ Signature element generation<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top">XPointers
@@ -174,6 +187,8 @@ Signature element generation<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top">XPointers
@@ -187,6 +202,8 @@ Signature element generation<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top">XPointers:
@@ -199,6 +216,8 @@ full suppport </td>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top">XPath
@@ -212,6 +231,8 @@ full suppport </td>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top">the
@@ -226,6 +247,8 @@ function (can be used to implement enveloped signature)<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top">XSLT
@@ -241,6 +264,8 @@ element of Transform has been deprecated.)<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top">RetrievalMethod
@@ -255,6 +280,8 @@ X509Data)<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top">SHA1
@@ -268,6 +295,8 @@ X509Data)<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top">Base64
@@ -281,6 +310,8 @@ X509Data)<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top">HMAC-SHA1
@@ -288,6 +319,8 @@ X509Data)<br>
 </td>
                   <td align="left" valign="top">Y<br>
 </td>
+                  <td align="left" valign="top">Y<br>
+</td>
                   <td style="vertical-align: top;">Y<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
@@ -304,6 +337,8 @@ X509Data)<br>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                   <td style="vertical-align: top;">Y<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
@@ -317,6 +352,8 @@ X509Data)<br>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                   <td style="vertical-align: top;">Y<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
@@ -329,6 +366,8 @@ X509Data)<br>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                   <td style="vertical-align: top;">Y<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
@@ -346,6 +385,8 @@ C14N (deprecated)<br>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top">
@@ -359,6 +400,8 @@ C14N (deprecated)<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top">
@@ -372,6 +415,8 @@ C14N (deprecated)<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top">
@@ -385,6 +430,8 @@ C14N (deprecated)<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top">Enveloped
@@ -396,6 +443,8 @@ Signature <br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                   <td style="vertical-align: top;"><br></td>
                 </tr>
 </tbody></table>
@@ -409,6 +458,7 @@ algorithms<br></b></td>
                   <td align="left" valign="top"> <b>XMLSec with
 OpenSSL </b> </td>
                   <td style="vertical-align: top;"><b>XMLSec with GnuTLS</b></td>
+                  <td style="vertical-align: top;"><b>XMLSec with GCrypt</b></td>
                   <td style="vertical-align: top;"> <b>XMLSec with NSS</b>
                   </td>
                   <td style="vertical-align: top;"> <b>XMLSec with
@@ -425,6 +475,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">SHA224<br>
@@ -437,6 +489,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">SHA256<br>
@@ -449,6 +503,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">SHA384<br>
@@ -461,6 +517,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">SHA512<br>
@@ -473,6 +531,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top">HMAC-MD5<br>
@@ -485,6 +545,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">HMAC-SHA224<br>
@@ -497,6 +559,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">HMAC-SHA256</td>
@@ -508,6 +572,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">HMAC-SHA384</td>
@@ -519,6 +585,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top">HMAC-SHA512</td>
@@ -530,6 +598,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" valign="top">HMAC-RIPEMD160<br>
@@ -540,6 +610,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                   <td style="vertical-align: top;">N<br>
 </td>
                 </tr>
@@ -548,7 +620,9 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
-                  <td style="vertical-align: top;">Y<br>
+                  <td style="vertical-align: top;">N<br>
+</td>
+                  <td style="vertical-align: top;">N<br>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
@@ -566,42 +640,50 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">RSA-SHA256<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
-                  <td style="vertical-align: top;">Y<br>
+                  <td style="vertical-align: top;">N<br>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">RSA-SHA384<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
-                  <td style="vertical-align: top;">Y<br>
+                  <td style="vertical-align: top;">N<br>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">RSA-SHA512<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
-                  <td style="vertical-align: top;">Y<br>
+                  <td style="vertical-align: top;">N<br>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">RSA-RIPEMD160</td>
@@ -613,6 +695,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">ECDSA-SHA1<br>
@@ -625,6 +709,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">ECDSA-SHA224<br>
@@ -637,6 +723,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">ECDSA-SHA256</td>
@@ -648,6 +736,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">ECDSA-SHA384</td>
@@ -659,6 +749,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">ECDSA-SHA512</td>
@@ -670,6 +762,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">ESIGN-SHA1<br>
@@ -682,6 +776,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">ESIGN-SHA224</td>
@@ -693,6 +789,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">ESIGN-SHA256</td>
@@ -704,6 +802,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">ESIGN-SHA384</td>
@@ -715,6 +815,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">ESIGN-SHA512</td>
@@ -726,6 +828,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">Minimal C14N (deprecated) </td>
@@ -737,6 +841,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="width: 40%;" align="left" valign="top">XPointer
@@ -750,6 +856,8 @@ transform<br>
 </td>
                   <td style="vertical-align: top;">Y<br>
 </td>
+                  <td style="vertical-align: top;">Y<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">ARCFOUR
@@ -763,6 +871,8 @@ Encryption<br>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">Camellia
@@ -777,6 +887,8 @@ Encryption 128<br>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">Camellia
@@ -790,6 +902,8 @@ Encryption 192</td>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">Camellia
@@ -804,6 +918,8 @@ Encryption 256<br>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">Camellia
@@ -817,6 +933,8 @@ Key Wrap 128<br>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">Camellia
@@ -829,6 +947,8 @@ Key Wrap 192</td>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">Camellia
@@ -842,6 +962,8 @@ Key Wrap 256<br>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top; width: 40%;">PSEC-KEM<br>
@@ -854,6 +976,8 @@ Key Wrap 256<br>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                 </tr>
 </tbody></table>
 <div align="left"> <br><h4 style="text-align: center;">Other algorithms</h4>
@@ -865,6 +989,7 @@ algorithms<br></b></td>
                   <td align="left" valign="top"> <b>XMLSec with
 OpenSSL </b> </td>
                   <td style="vertical-align: top;"><b>XMLSec with GnuTLS</b></td>
+                  <td style="vertical-align: top;"><b>XMLSec with GCrypt</b></td>
                   <td style="vertical-align: top;"> <b>XMLSec with NSS</b>
                   </td>
                   <td style="vertical-align: top;"> <b>XMLSec with
@@ -879,6 +1004,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                   <td style="vertical-align: top;">Y<a href="#gost-mscrypto"><sup>(2)</sup></a><br>
 </td>
                 </tr>
@@ -891,6 +1018,8 @@ MSCrypto</b> </td>
 </td>
                   <td style="vertical-align: top;">N<br>
 </td>
+                  <td style="vertical-align: top;">N<br>
+</td>
                   <td style="vertical-align: top;">Y<a href="#gost-mscrypto"><sup>(2)</sup></a><br>
 </td>
                 </tr>
diff --git a/docs/xmlenc.html b/docs/xmlenc.html
index 011439f..415e110 100644
--- a/docs/xmlenc.html
+++ b/docs/xmlenc.html
@@ -60,345 +60,390 @@ data (including XML document). </div>
             <p> </p>
             <table style="width: 85%;" border="1" cellpadding="2" cellspacing="2"><tbody>
 <tr>
-    <td style="width: 40%;" align="left" valign="top"><b>Features and algorithms</b></td>
+<td style="width: 40%;" align="left" valign="top"><b>Features and algorithms</b></td>
     <td valign="top"><b>XMLSec with OpenSSL</b></td>
     <td valign="top"><b>XMLSec with GnuTLS</b></td>
+    <td valign="top"><b>XMLSec with GCrypt</b></td>
     <td valign="top"><b>XMLSec with NSS</b></td>
     <td valign="top"><b>XMLSec with MSCrypto</b></td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">Laxly valid schema 
+<td style="width: 40%;" align="left" valign="top">Laxly valid schema 
     generation of EncryptedData/EncryptedKey</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
+    <td valign="top">Y</td>
 </tr>
-
 <tr>
-    <td style="width: 40%;" align="left" valign="top">
+<td style="width: 40%;" align="left" valign="top">
     <ul><li>Normalized Form C generations.</li></ul>
-    </td>
+</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">Type, MimeType, and Encoding</td>
+<td style="width: 40%;" align="left" valign="top">Type, MimeType, and Encoding</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">CipherReference
+<td style="width: 40%;" align="left" valign="top">CipherReference
     URI derefencing</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
+    <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">
+<td style="width: 40%;" align="left" valign="top">
     <ul><li>Transforms </li></ul>
-    </td>
+</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">
+<td style="width: 40%;" align="left" valign="top">
     <ul><li>ds:KeyInfo</li></ul>
-    </td>
+</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">
+<td style="width: 40%;" align="left" valign="top">
     <ul><li>enc:DHKeyValue</li></ul>
-    </td>
+</td>
+    <td valign="top">N</td>
     <td valign="top">N</td>
     <td valign="top">N</td>
     <td valign="top">N</td>
     <td valign="top">N</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">
+<td style="width: 40%;" align="left" valign="top">
     <ul><li>ds:KeyName</li></ul>
-    </td>
+</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">
+<td style="width: 40%;" align="left" valign="top">
     <ul><li>ds:RetrievalMethod</li></ul>
-    </td>
+</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">ReferenceList</td>
+<td style="width: 40%;" align="left" valign="top">ReferenceList</td>
+    <td valign="top">N</td>
     <td valign="top">N</td>
     <td valign="top">N</td>
     <td valign="top">N</td>
     <td valign="top">N</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">EncryptionProperties</td>
+<td style="width: 40%;" align="left" valign="top">EncryptionProperties</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">Satisfactory Performance</td>
+<td style="width: 40%;" align="left" valign="top">Satisfactory Performance</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">Required Type
+<td style="width: 40%;" align="left" valign="top">Required Type
     support: Element and Content.</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
+    <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">Encryption</td>
+<td style="width: 40%;" align="left" valign="top">Encryption</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">
+<td style="width: 40%;" align="left" valign="top">
     <ul><li>Serialization of XML Element and Content
     (NFC conversion from non-Unicode encodings).
     </li></ul>
-    </td>
+</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">
+<td style="width: 40%;" align="left" valign="top">
     <ul><li>Encryptor returns EncryptedData structure. </li></ul>
-    </td>
+</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">
+<td style="width: 40%;" align="left" valign="top">
     <ul><li> Encryptor replaces EncryptedData into source
     document (when Type is Element or Content).</li></ul>
-    </td>
+</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">Decryption</td>
+<td style="width: 40%;" align="left" valign="top">Decryption</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">
+<td style="width: 40%;" align="left" valign="top">
     <ul><li>The decryptor returns the data and its Type to
     the application (be it an octet sequence or key value).</li></ul>
-    </td>
+</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">
+<td style="width: 40%;" align="left" valign="top">
     <ul><li>If data is Element or Content the decryptor
     return the UTF-8 encoding XML character data.</li></ul>
-    </td>
+</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">
+<td style="width: 40%;" align="left" valign="top">
     <ul><li>If data is Element or Content the decryptor
     replaces the EncryptedData in the source document with the decrypted
     data.</li></ul>
-    </td>
+</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">TRIPLEDES</td>
+<td style="width: 40%;" align="left" valign="top">TRIPLEDES</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">AES-128</td>
+<td style="width: 40%;" align="left" valign="top">AES-128</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">AES-256</td>
+<td style="width: 40%;" align="left" valign="top">AES-256</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">AES-192</td>
+<td style="width: 40%;" align="left" valign="top">AES-192</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">RSA-v1.5 (192 bit keys for AES or DES)</td>
+<td style="width: 40%;" align="left" valign="top">RSA-v1.5 (192 bit keys for AES or DES)</td>
     <td valign="top">Y</td>
     <td valign="top">N</td>
+    <td valign="top">N</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">RSA-OAEP (128 and 256 bit keys for AES)</td>
-    <td valign="top">Y<a href="#rsa-oaep"><sup>(1)</sup></a></td>
+<td style="width: 40%;" align="left" valign="top">RSA-OAEP (128 and 256 bit keys for AES)</td>
+    <td valign="top">Y<a href="#rsa-oaep"><sup>(1)</sup></a>
+</td>
+    <td valign="top">N</td>
     <td valign="top">N</td>
     <td valign="top">N</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">Diffie-Hellman Key Agreement</td>
+<td style="width: 40%;" align="left" valign="top">Diffie-Hellman Key Agreement</td>
+    <td valign="top">N</td>
     <td valign="top">N</td>
     <td valign="top">N</td>
     <td valign="top">N</td>
     <td valign="top">N</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">TRIPLEDES Key Wrap</td>
+<td style="width: 40%;" align="left" valign="top">TRIPLEDES Key Wrap</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">AES-128 Key Wrap (128 bit keys)</td>
+<td style="width: 40%;" align="left" valign="top">AES-128 Key Wrap (128 bit keys)</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">AES-192 Key Wrap</td>
+<td style="width: 40%;" align="left" valign="top">AES-192 Key Wrap</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">AES-256 Key Wrap (256 bit keys)</td>
+<td style="width: 40%;" align="left" valign="top">AES-256 Key Wrap (256 bit keys)</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">SHA1</td>
+<td style="width: 40%;" align="left" valign="top">SHA1</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">SHA256</td>
+<td style="width: 40%;" align="left" valign="top">SHA256</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">SHA512</td>
+<td style="width: 40%;" align="left" valign="top">SHA512</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">RIPEMD-160</td>
+<td style="width: 40%;" align="left" valign="top">RIPEMD-160</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">N</td>
     <td valign="top">N</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">XML Digital Signature</td>
+<td style="width: 40%;" align="left" valign="top">XML Digital Signature</td>
     <td valign="top">Y </td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
+    <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">Decryption Transform</td>
+<td style="width: 40%;" align="left" valign="top">Decryption Transform</td>
+    <td valign="top">N</td>
     <td valign="top">N</td>
     <td valign="top">N</td>
     <td valign="top">N</td>
     <td valign="top">N</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">
-    <ul><li>XPointer support in <code>Except URI</code></li></ul>
-    </td>
+<td style="width: 40%;" align="left" valign="top">
+    <ul><li>XPointer support in <code>Except URI</code>
+</li></ul>
+</td>
+    <td valign="top">N</td>
     <td valign="top">N</td>
     <td valign="top">N</td>
     <td valign="top">N</td>
     <td valign="top">N</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top"><a href="http://www.w3.org/TR/xml-c14n";>Canonical XML 1.0</a></td>
+<td style="width: 40%;" align="left" valign="top"><a href="http://www.w3.org/TR/xml-c14n";>Canonical XML 1.0</a></td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top"><a href="http://www.w3.org/TR/xml-exc-c14n";>Exlusive Canonical XML 1.0</a></td>
+<td style="width: 40%;" align="left" valign="top"><a href="http://www.w3.org/TR/xml-exc-c14n";>Exlusive Canonical XML 1.0</a></td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top"><a href="http://www.w3.org/TR/xml-c14n11/";>Canonical XML 1.1</a></td>
+<td style="width: 40%;" align="left" valign="top"><a href="http://www.w3.org/TR/xml-c14n11/";>Canonical XML 1.1</a></td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
 </tr>
 <tr>
-    <td style="width: 40%;" align="left" valign="top">Base64 Encoding</td>
+<td style="width: 40%;" align="left" valign="top">Base64 Encoding</td>
+    <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
     <td valign="top">Y</td>
diff --git a/docs/xmlsec-man.html b/docs/xmlsec-man.html
index 39b6ab6..c03d308 100644
--- a/docs/xmlsec-man.html
+++ b/docs/xmlsec-man.html
@@ -239,7 +239,7 @@
 </dd>
 <dt> <b>--crypto</b> &lt;name&gt; <dt></dt>
 </dt>
-<dd> <dd>the name of the crypto engine to use from the following list: openssl, gnutls, nss, mscrypto (if no crypto engine is specified then the default one is used) </dd>
+<dd> <dd>the name of the crypto engine to use from the following list: openssl, mscrypto, nss, gnutls, gcrypt (if no crypto engine is specified then the default one is used) </dd>
 </dd>
 <dt> <b>--crypto-config</b> &lt;path&gt; <dt></dt>
 </dt>
diff --git a/include/xmlsec/crypto.h b/include/xmlsec/crypto.h
index 9fe9695..f388aa1 100644
--- a/include/xmlsec/crypto.h
+++ b/include/xmlsec/crypto.h
@@ -34,11 +34,6 @@ extern "C" {
 #include <xmlsec/openssl/x509.h>
 #include <xmlsec/openssl/symbols.h>
 #else /* XMLSEC_CRYPTO_OPENSSL */
-#ifdef XMLSEC_CRYPTO_GNUTLS
-#include <xmlsec/gnutls/app.h>
-#include <xmlsec/gnutls/crypto.h>
-#include <xmlsec/gnutls/symbols.h>
-#else /* XMLSEC_CRYPTO_GNUTLS */
 #ifdef XMLSEC_CRYPTO_MSCRYPTO
 #include <xmlsec/mscrypto/app.h>
 #include <xmlsec/mscrypto/crypto.h>
@@ -51,10 +46,21 @@ extern "C" {
 #include <xmlsec/nss/x509.h>
 #include <xmlsec/nss/symbols.h>
 #else /* XMLSEC_CRYPTO_NSS */
+#ifdef XMLSEC_CRYPTO_GNUTLS
+#include <xmlsec/gnutls/app.h>
+#include <xmlsec/gnutls/crypto.h>
+#include <xmlsec/gnutls/symbols.h>
+#else /* XMLSEC_CRYPTO_GNUTLS */
+#ifdef XMLSEC_CRYPTO_GCRYPT
+#include <xmlsec/gcrypt/app.h>
+#include <xmlsec/gcrypt/crypto.h>
+#include <xmlsec/gcrypt/symbols.h>
+#else /* XMLSEC_CRYPTO_GCRYPT */
 #error No crypto library defined
+#endif /* XMLSEC_CRYPTO_GCRYPT */
 #endif /* XMLSEC_CRYPTO_GNUTLS */
-#endif /* XMLSEC_CRYPTO_MSCRYPTO */
 #endif /* XMLSEC_CRYPTO_NSS */
+#endif /* XMLSEC_CRYPTO_MSCRYPTO */
 #endif /* XMLSEC_CRYPTO_OPENSSL */
 #endif /* XMLSEC_CRYPTO_DYNAMIC_LOADING */
 
diff --git a/include/xmlsec/gcrypt/Makefile.am b/include/xmlsec/gcrypt/Makefile.am
index 45b03d6..82f4f90 100644
--- a/include/xmlsec/gcrypt/Makefile.am
+++ b/include/xmlsec/gcrypt/Makefile.am
@@ -1,13 +1,13 @@
 NULL =
 
-xmlsecgnutlsincdir = $(includedir)/xmlsec1/xmlsec/gnutls
+xmlsecgcryptincdir = $(includedir)/xmlsec1/xmlsec/gcrypt
 
-xmlsecgnutlsinc_HEADERS = \
+xmlsecgcryptinc_HEADERS = \
 app.h \
 crypto.h \
 symbols.h \
 $(NULL)
 
 install-exec-hook:
-	$(mkinstalldirs) $(DESTDIR)$(xmlsecgnutlsincdir)
+	$(mkinstalldirs) $(DESTDIR)$(xmlsecgcryptincdir)
 
diff --git a/include/xmlsec/gcrypt/app.h b/include/xmlsec/gcrypt/app.h
index 4a2f3e1..a0759d2 100644
--- a/include/xmlsec/gcrypt/app.h
+++ b/include/xmlsec/gcrypt/app.h
@@ -6,8 +6,8 @@
  *
  * Copyright (C) 2002-2003 Aleksey Sanin <aleksey aleksey com>
  */
-#ifndef __XMLSEC_GNUTLS_APP_H__
-#define __XMLSEC_GNUTLS_APP_H__
+#ifndef __XMLSEC_GCRYPT_APP_H__
+#define __XMLSEC_GCRYPT_APP_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -23,28 +23,28 @@ extern "C" {
  * Init/shutdown
  *
  ********************************************************************/
-XMLSEC_CRYPTO_EXPORT int        xmlSecGnuTLSAppInit                     (const char* config);
-XMLSEC_CRYPTO_EXPORT int        xmlSecGnuTLSAppShutdown                 (void);
+XMLSEC_CRYPTO_EXPORT int        xmlSecGCryptAppInit                     (const char* config);
+XMLSEC_CRYPTO_EXPORT int        xmlSecGCryptAppShutdown                 (void);
 
 /********************************************************************
  *
  * Keys Manager
  *
  ********************************************************************/
-XMLSEC_CRYPTO_EXPORT int        xmlSecGnuTLSAppDefaultKeysMngrInit      (xmlSecKeysMngrPtr mngr);
-XMLSEC_CRYPTO_EXPORT int        xmlSecGnuTLSAppDefaultKeysMngrAdoptKey  (xmlSecKeysMngrPtr mngr,
+XMLSEC_CRYPTO_EXPORT int        xmlSecGCryptAppDefaultKeysMngrInit      (xmlSecKeysMngrPtr mngr);
+XMLSEC_CRYPTO_EXPORT int        xmlSecGCryptAppDefaultKeysMngrAdoptKey  (xmlSecKeysMngrPtr mngr,
                                                                          xmlSecKeyPtr key);
-XMLSEC_CRYPTO_EXPORT int        xmlSecGnuTLSAppDefaultKeysMngrLoad      (xmlSecKeysMngrPtr mngr,
+XMLSEC_CRYPTO_EXPORT int        xmlSecGCryptAppDefaultKeysMngrLoad      (xmlSecKeysMngrPtr mngr,
                                                                          const char* uri);
-XMLSEC_CRYPTO_EXPORT int        xmlSecGnuTLSAppDefaultKeysMngrSave      (xmlSecKeysMngrPtr mngr,
+XMLSEC_CRYPTO_EXPORT int        xmlSecGCryptAppDefaultKeysMngrSave      (xmlSecKeysMngrPtr mngr,
                                                                          const char* filename,
                                                                          xmlSecKeyDataType type);
 #ifndef XMLSEC_NO_X509
-XMLSEC_CRYPTO_EXPORT int        xmlSecGnuTLSAppKeysMngrCertLoad         (xmlSecKeysMngrPtr mngr,
+XMLSEC_CRYPTO_EXPORT int        xmlSecGCryptAppKeysMngrCertLoad         (xmlSecKeysMngrPtr mngr,
                                                                          const char *filename,
                                                                          xmlSecKeyDataFormat format,
                                                                          xmlSecKeyDataType type);
-XMLSEC_CRYPTO_EXPORT int        xmlSecGnuTLSAppKeysMngrCertLoadMemory   (xmlSecKeysMngrPtr mngr,
+XMLSEC_CRYPTO_EXPORT int        xmlSecGCryptAppKeysMngrCertLoadMemory   (xmlSecKeysMngrPtr mngr,
                                                                          const xmlSecByte* data,
                                                                          xmlSecSize dataSize,
                                                                          xmlSecKeyDataFormat format,
@@ -57,40 +57,40 @@ XMLSEC_CRYPTO_EXPORT int        xmlSecGnuTLSAppKeysMngrCertLoadMemory   (xmlSecK
  * Keys
  *
  ********************************************************************/
-XMLSEC_CRYPTO_EXPORT xmlSecKeyPtr xmlSecGnuTLSAppKeyLoad                (const char *filename,
+XMLSEC_CRYPTO_EXPORT xmlSecKeyPtr xmlSecGCryptAppKeyLoad                (const char *filename,
                                                                          xmlSecKeyDataFormat format,
                                                                          const char *pwd,
                                                                          void *pwdCallback,
                                                                          void* pwdCallbackCtx);
-XMLSEC_CRYPTO_EXPORT xmlSecKeyPtr xmlSecGnuTLSAppKeyLoadMemory          (const xmlSecByte* data,
+XMLSEC_CRYPTO_EXPORT xmlSecKeyPtr xmlSecGCryptAppKeyLoadMemory          (const xmlSecByte* data,
                                                                          xmlSecSize dataSize,
                                                                          xmlSecKeyDataFormat format,
                                                                          const char *pwd,
                                                                          void* pwdCallback,
                                                                          void* pwdCallbackCtx);
 #ifndef XMLSEC_NO_X509
-XMLSEC_CRYPTO_EXPORT xmlSecKeyPtr xmlSecGnuTLSAppPkcs12Load             (const char *filename,
+XMLSEC_CRYPTO_EXPORT xmlSecKeyPtr xmlSecGCryptAppPkcs12Load             (const char *filename,
                                                                          const char *pwd,
                                                                          void* pwdCallback,
                                                                          void* pwdCallbackCtx);
-XMLSEC_CRYPTO_EXPORT xmlSecKeyPtr xmlSecGnuTLSAppPkcs12LoadMemory       (const xmlSecByte* data,
+XMLSEC_CRYPTO_EXPORT xmlSecKeyPtr xmlSecGCryptAppPkcs12LoadMemory       (const xmlSecByte* data,
                                                                          xmlSecSize dataSize,
                                                                          const char *pwd,
                                                                          void* pwdCallback,
                                                                          void* pwdCallbackCtx);
-XMLSEC_CRYPTO_EXPORT int        xmlSecGnuTLSAppKeyCertLoad              (xmlSecKeyPtr key,
+XMLSEC_CRYPTO_EXPORT int        xmlSecGCryptAppKeyCertLoad              (xmlSecKeyPtr key,
                                                                          const char* filename,
                                                                          xmlSecKeyDataFormat format);
-XMLSEC_CRYPTO_EXPORT int        xmlSecGnuTLSAppKeyCertLoadMemory        (xmlSecKeyPtr key,
+XMLSEC_CRYPTO_EXPORT int        xmlSecGCryptAppKeyCertLoadMemory        (xmlSecKeyPtr key,
                                                                          const xmlSecByte* data,
                                                                          xmlSecSize dataSize,
                                                                          xmlSecKeyDataFormat format);
 #endif /* XMLSEC_NO_X509 */
-XMLSEC_CRYPTO_EXPORT void*      xmlSecGnuTLSAppGetDefaultPwdCallback    (void);
+XMLSEC_CRYPTO_EXPORT void*      xmlSecGCryptAppGetDefaultPwdCallback    (void);
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __XMLSEC_GNUTLS_APP_H__ */
+#endif /* __XMLSEC_GCRYPT_APP_H__ */
 
diff --git a/include/xmlsec/gcrypt/crypto.h b/include/xmlsec/gcrypt/crypto.h
index 107ee0d..e576d8f 100644
--- a/include/xmlsec/gcrypt/crypto.h
+++ b/include/xmlsec/gcrypt/crypto.h
@@ -6,8 +6,8 @@
  *
  * Copyright (C) 2002-2003 Aleksey Sanin <aleksey aleksey com>
  */
-#ifndef __XMLSEC_GNUTLS_CRYPTO_H__
-#define __XMLSEC_GNUTLS_CRYPTO_H__
+#ifndef __XMLSEC_GCRYPT_CRYPTO_H__
+#define __XMLSEC_GCRYPT_CRYPTO_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -18,18 +18,18 @@ extern "C" {
 #include <xmlsec/transforms.h>
 #include <xmlsec/dl.h>
 
-XMLSEC_CRYPTO_EXPORT xmlSecCryptoDLFunctionsPtr xmlSecCryptoGetFunctions_gnutls(void);
+XMLSEC_CRYPTO_EXPORT xmlSecCryptoDLFunctionsPtr xmlSecCryptoGetFunctions_gcrypt(void);
 
 /********************************************************************
  *
  * Init shutdown
  *
  ********************************************************************/
-XMLSEC_CRYPTO_EXPORT int                xmlSecGnuTLSInit                (void);
-XMLSEC_CRYPTO_EXPORT int                xmlSecGnuTLSShutdown            (void);
+XMLSEC_CRYPTO_EXPORT int                xmlSecGCryptInit                (void);
+XMLSEC_CRYPTO_EXPORT int                xmlSecGCryptShutdown            (void);
 
-XMLSEC_CRYPTO_EXPORT int                xmlSecGnuTLSKeysMngrInit        (xmlSecKeysMngrPtr mngr);
-XMLSEC_CRYPTO_EXPORT int                xmlSecGnuTLSGenerateRandom      (xmlSecBufferPtr buffer,
+XMLSEC_CRYPTO_EXPORT int                xmlSecGCryptKeysMngrInit        (xmlSecKeysMngrPtr mngr);
+XMLSEC_CRYPTO_EXPORT int                xmlSecGCryptGenerateRandom      (xmlSecBufferPtr buffer,
                                                                          xmlSecSize size);
 
 
@@ -40,69 +40,69 @@ XMLSEC_CRYPTO_EXPORT int                xmlSecGnuTLSGenerateRandom      (xmlSecB
  *******************************************************************/
 #ifndef XMLSEC_NO_AES
 /**
- * xmlSecGnuTLSKeyDataAesId:
+ * xmlSecGCryptKeyDataAesId:
  *
  * The AES key data klass.
  */
-#define xmlSecGnuTLSKeyDataAesId \
-        xmlSecGnuTLSKeyDataAesGetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId    xmlSecGnuTLSKeyDataAesGetKlass  (void);
-XMLSEC_CRYPTO_EXPORT int                xmlSecGnuTLSKeyDataAesSet       (xmlSecKeyDataPtr data,
+#define xmlSecGCryptKeyDataAesId \
+        xmlSecGCryptKeyDataAesGetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId    xmlSecGCryptKeyDataAesGetKlass  (void);
+XMLSEC_CRYPTO_EXPORT int                xmlSecGCryptKeyDataAesSet       (xmlSecKeyDataPtr data,
                                                                          const xmlSecByte* buf,
                                                                          xmlSecSize bufSize);
 /**
- * xmlSecGnuTLSTransformAes128CbcId:
+ * xmlSecGCryptTransformAes128CbcId:
  *
  * The AES128 CBC cipher transform klass.
  */
-#define xmlSecGnuTLSTransformAes128CbcId \
-        xmlSecGnuTLSTransformAes128CbcGetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId  xmlSecGnuTLSTransformAes128CbcGetKlass(void);
+#define xmlSecGCryptTransformAes128CbcId \
+        xmlSecGCryptTransformAes128CbcGetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId  xmlSecGCryptTransformAes128CbcGetKlass(void);
 
 /**
- * xmlSecGnuTLSTransformAes192CbcId:
+ * xmlSecGCryptTransformAes192CbcId:
  *
  * The AES192 CBC cipher transform klass.
  */
-#define xmlSecGnuTLSTransformAes192CbcId \
-        xmlSecGnuTLSTransformAes192CbcGetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId  xmlSecGnuTLSTransformAes192CbcGetKlass(void);
+#define xmlSecGCryptTransformAes192CbcId \
+        xmlSecGCryptTransformAes192CbcGetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId  xmlSecGCryptTransformAes192CbcGetKlass(void);
 
 /**
- * xmlSecGnuTLSTransformAes256CbcId:
+ * xmlSecGCryptTransformAes256CbcId:
  *
  * The AES256 CBC cipher transform klass.
  */
-#define xmlSecGnuTLSTransformAes256CbcId \
-        xmlSecGnuTLSTransformAes256CbcGetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId  xmlSecGnuTLSTransformAes256CbcGetKlass(void);
+#define xmlSecGCryptTransformAes256CbcId \
+        xmlSecGCryptTransformAes256CbcGetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId  xmlSecGCryptTransformAes256CbcGetKlass(void);
 
 /**
- * xmlSecGnuTLSTransformKWAes128Id:
+ * xmlSecGCryptTransformKWAes128Id:
  *
  * The AES 128 key wrap transform klass.
  */
-#define xmlSecGnuTLSTransformKWAes128Id \
-        xmlSecGnuTLSTransformKWAes128GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId  xmlSecGnuTLSTransformKWAes128GetKlass(void);
+#define xmlSecGCryptTransformKWAes128Id \
+        xmlSecGCryptTransformKWAes128GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId  xmlSecGCryptTransformKWAes128GetKlass(void);
 
 /**
- * xmlSecGnuTLSTransformKWAes192Id:
+ * xmlSecGCryptTransformKWAes192Id:
  *
  * The AES 192 key wrap transform klass.
  */
-#define xmlSecGnuTLSTransformKWAes192Id \
-        xmlSecGnuTLSTransformKWAes192GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId  xmlSecGnuTLSTransformKWAes192GetKlass(void);
+#define xmlSecGCryptTransformKWAes192Id \
+        xmlSecGCryptTransformKWAes192GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId  xmlSecGCryptTransformKWAes192GetKlass(void);
 
 /**
- * xmlSecGnuTLSTransformKWAes256Id:
+ * xmlSecGCryptTransformKWAes256Id:
  *
  * The AES 256 key wrap transform klass.
  */
-#define xmlSecGnuTLSTransformKWAes256Id \
-        xmlSecGnuTLSTransformKWAes256GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId  xmlSecGnuTLSTransformKWAes256GetKlass(void);
+#define xmlSecGCryptTransformKWAes256Id \
+        xmlSecGCryptTransformKWAes256GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId  xmlSecGCryptTransformKWAes256GetKlass(void);
 
 
 #endif /* XMLSEC_NO_AES */
@@ -114,34 +114,34 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId  xmlSecGnuTLSTransformKWAes256GetKlass(vo
  *******************************************************************/
 #ifndef XMLSEC_NO_DES
 /**
- * xmlSecGnuTLSKeyDataDesId:
+ * xmlSecGCryptKeyDataDesId:
  *
  * The DES key data klass.
  */
-#define xmlSecGnuTLSKeyDataDesId \
-        xmlSecGnuTLSKeyDataDesGetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId    xmlSecGnuTLSKeyDataDesGetKlass  (void);
-XMLSEC_CRYPTO_EXPORT int                xmlSecGnuTLSKeyDataDesSet       (xmlSecKeyDataPtr data,
+#define xmlSecGCryptKeyDataDesId \
+        xmlSecGCryptKeyDataDesGetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId    xmlSecGCryptKeyDataDesGetKlass  (void);
+XMLSEC_CRYPTO_EXPORT int                xmlSecGCryptKeyDataDesSet       (xmlSecKeyDataPtr data,
                                                                          const xmlSecByte* buf,
                                                                          xmlSecSize bufSize);
 
 /**
- * xmlSecGnuTLSTransformDes3CbcId:
+ * xmlSecGCryptTransformDes3CbcId:
  *
  * The DES3 CBC cipher transform klass.
  */
-#define xmlSecGnuTLSTransformDes3CbcId \
-        xmlSecGnuTLSTransformDes3CbcGetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformDes3CbcGetKlass(void);
+#define xmlSecGCryptTransformDes3CbcId \
+        xmlSecGCryptTransformDes3CbcGetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformDes3CbcGetKlass(void);
 
 /**
- * xmlSecGnuTLSTransformKWDes3Id:
+ * xmlSecGCryptTransformKWDes3Id:
  *
  * The DES3 KW transform klass.
  */
-#define xmlSecGnuTLSTransformKWDes3Id \
-        xmlSecGnuTLSTransformKWDes3GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformKWDes3GetKlass(void);
+#define xmlSecGCryptTransformKWDes3Id \
+        xmlSecGCryptTransformKWDes3GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformKWDes3GetKlass(void);
 
 #endif /* XMLSEC_NO_DES */
 
@@ -154,30 +154,30 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformKWDes3GetKlass(void)
 #include <gcrypt.h>
 
 /**
- * xmlSecGnuTLSKeyDataDsaId:
+ * xmlSecGCryptKeyDataDsaId:
  *
  * The DSA key klass.
  */
-#define xmlSecGnuTLSKeyDataDsaId \
-        xmlSecGnuTLSKeyDataDsaGetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId    xmlSecGnuTLSKeyDataDsaGetKlass          (void);
-XMLSEC_CRYPTO_EXPORT int                xmlSecGnuTLSKeyDataDsaAdoptKey          (xmlSecKeyDataPtr data,
+#define xmlSecGCryptKeyDataDsaId \
+        xmlSecGCryptKeyDataDsaGetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId    xmlSecGCryptKeyDataDsaGetKlass          (void);
+XMLSEC_CRYPTO_EXPORT int                xmlSecGCryptKeyDataDsaAdoptKey          (xmlSecKeyDataPtr data,
                                                                                  gcry_sexp_t dsa_key);
-XMLSEC_CRYPTO_EXPORT int                xmlSecGnuTLSKeyDataDsaAdoptKeyPair      (xmlSecKeyDataPtr data,
+XMLSEC_CRYPTO_EXPORT int                xmlSecGCryptKeyDataDsaAdoptKeyPair      (xmlSecKeyDataPtr data,
                                                                                  gcry_sexp_t pub_key,
                                                                                  gcry_sexp_t priv_key);
-XMLSEC_CRYPTO_EXPORT gcry_sexp_t        xmlSecGnuTLSKeyDataDsaGetPublicKey      (xmlSecKeyDataPtr data);
-XMLSEC_CRYPTO_EXPORT gcry_sexp_t        xmlSecGnuTLSKeyDataDsaGetPrivateKey     (xmlSecKeyDataPtr data);
+XMLSEC_CRYPTO_EXPORT gcry_sexp_t        xmlSecGCryptKeyDataDsaGetPublicKey      (xmlSecKeyDataPtr data);
+XMLSEC_CRYPTO_EXPORT gcry_sexp_t        xmlSecGCryptKeyDataDsaGetPrivateKey     (xmlSecKeyDataPtr data);
 
 #ifndef XMLSEC_NO_SHA1
 /**
- * xmlSecGnuTLSTransformDsaSha1Id:
+ * xmlSecGCryptTransformDsaSha1Id:
  *
  * The DSA SHA1 signature transform klass.
  */
-#define xmlSecGnuTLSTransformDsaSha1Id \
-        xmlSecGnuTLSTransformDsaSha1GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformDsaSha1GetKlass(void);
+#define xmlSecGCryptTransformDsaSha1Id \
+        xmlSecGCryptTransformDsaSha1GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformDsaSha1GetKlass(void);
 #endif /* XMLSEC_NO_SHA1 */
 
 #endif /* XMLSEC_NO_DSA */
@@ -191,86 +191,86 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformDsaSha1GetKlass(void
  *******************************************************************/
 #ifndef XMLSEC_NO_HMAC
 
-XMLSEC_CRYPTO_EXPORT int               xmlSecGnuTLSHmacGetMinOutputLength(void);
-XMLSEC_CRYPTO_EXPORT void              xmlSecGnuTLSHmacSetMinOutputLength(int min_length);
+XMLSEC_CRYPTO_EXPORT int               xmlSecGCryptHmacGetMinOutputLength(void);
+XMLSEC_CRYPTO_EXPORT void              xmlSecGCryptHmacSetMinOutputLength(int min_length);
 
 /**
- * xmlSecGnuTLSKeyDataHmacId:
+ * xmlSecGCryptKeyDataHmacId:
  *
  * The HMAC key klass.
  */
-#define xmlSecGnuTLSKeyDataHmacId \
-        xmlSecGnuTLSKeyDataHmacGetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId    xmlSecGnuTLSKeyDataHmacGetKlass (void);
-XMLSEC_CRYPTO_EXPORT int                xmlSecGnuTLSKeyDataHmacSet      (xmlSecKeyDataPtr data,
+#define xmlSecGCryptKeyDataHmacId \
+        xmlSecGCryptKeyDataHmacGetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId    xmlSecGCryptKeyDataHmacGetKlass (void);
+XMLSEC_CRYPTO_EXPORT int                xmlSecGCryptKeyDataHmacSet      (xmlSecKeyDataPtr data,
                                                                          const xmlSecByte* buf,
                                                                          xmlSecSize bufSize);
 
 #ifndef XMLSEC_NO_MD5
 /**
- * xmlSecGnuTLSTransformHmacMd5Id:
+ * xmlSecGCryptTransformHmacMd5Id:
  *
  * The HMAC with MD5 signature transform klass.
  */
-#define xmlSecGnuTLSTransformHmacMd5Id \
-        xmlSecGnuTLSTransformHmacMd5GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformHmacMd5GetKlass(void);
+#define xmlSecGCryptTransformHmacMd5Id \
+        xmlSecGCryptTransformHmacMd5GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformHmacMd5GetKlass(void);
 
 #endif /* XMLSEC_NO_MD5 */
 
 #ifndef XMLSEC_NO_RIPEMD160
 /**
- * xmlSecGnuTLSTransformHmacRipemd160Id:
+ * xmlSecGCryptTransformHmacRipemd160Id:
  *
  * The HMAC with RipeMD160 signature transform klass.
  */
-#define xmlSecGnuTLSTransformHmacRipemd160Id \
-        xmlSecGnuTLSTransformHmacRipemd160GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformHmacRipemd160GetKlass(void);
+#define xmlSecGCryptTransformHmacRipemd160Id \
+        xmlSecGCryptTransformHmacRipemd160GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformHmacRipemd160GetKlass(void);
 #endif /* XMLSEC_NO_RIPEMD160 */
 
 #ifndef XMLSEC_NO_SHA1
 /**
- * xmlSecGnuTLSTransformHmacSha1Id:
+ * xmlSecGCryptTransformHmacSha1Id:
  *
  * The HMAC with SHA1 signature transform klass.
  */
-#define xmlSecGnuTLSTransformHmacSha1Id \
-        xmlSecGnuTLSTransformHmacSha1GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformHmacSha1GetKlass(void);
+#define xmlSecGCryptTransformHmacSha1Id \
+        xmlSecGCryptTransformHmacSha1GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformHmacSha1GetKlass(void);
 #endif /* XMLSEC_NO_SHA1 */
 
 #ifndef XMLSEC_NO_SHA256
 /**
- * xmlSecGnuTLSTransformHmacSha256Id:
+ * xmlSecGCryptTransformHmacSha256Id:
  *
  * The HMAC with SHA256 signature transform klass.
  */
-#define xmlSecGnuTLSTransformHmacSha256Id \
-        xmlSecGnuTLSTransformHmacSha256GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformHmacSha256GetKlass(void);
+#define xmlSecGCryptTransformHmacSha256Id \
+        xmlSecGCryptTransformHmacSha256GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformHmacSha256GetKlass(void);
 #endif /* XMLSEC_NO_SHA256 */
 
 #ifndef XMLSEC_NO_SHA384
 /**
- * xmlSecGnuTLSTransformHmacSha384Id:
+ * xmlSecGCryptTransformHmacSha384Id:
  *
  * The HMAC with SHA384 signature transform klass.
  */
-#define xmlSecGnuTLSTransformHmacSha384Id \
-        xmlSecGnuTLSTransformHmacSha384GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformHmacSha384GetKlass(void);
+#define xmlSecGCryptTransformHmacSha384Id \
+        xmlSecGCryptTransformHmacSha384GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformHmacSha384GetKlass(void);
 #endif /* XMLSEC_NO_SHA384 */
 
 #ifndef XMLSEC_NO_SHA512
 /**
- * xmlSecGnuTLSTransformHmacSha512Id:
+ * xmlSecGCryptTransformHmacSha512Id:
  *
  * The HMAC with SHA512 signature transform klass.
  */
-#define xmlSecGnuTLSTransformHmacSha512Id \
-        xmlSecGnuTLSTransformHmacSha512GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformHmacSha512GetKlass(void);
+#define xmlSecGCryptTransformHmacSha512Id \
+        xmlSecGCryptTransformHmacSha512GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformHmacSha512GetKlass(void);
 #endif /* XMLSEC_NO_SHA512 */
 
 #endif /* XMLSEC_NO_HMAC */
@@ -284,85 +284,85 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformHmacSha512GetKlass(v
 #include <gcrypt.h>
 
 /**
- * xmlSecGnuTLSKeyDataRsaId:
+ * xmlSecGCryptKeyDataRsaId:
  *
  * The RSA key klass.
  */
-#define xmlSecGnuTLSKeyDataRsaId \
-        xmlSecGnuTLSKeyDataRsaGetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId    xmlSecGnuTLSKeyDataRsaGetKlass (void);
-XMLSEC_CRYPTO_EXPORT int                xmlSecGnuTLSKeyDataRsaAdoptKey          (xmlSecKeyDataPtr data,
+#define xmlSecGCryptKeyDataRsaId \
+        xmlSecGCryptKeyDataRsaGetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId    xmlSecGCryptKeyDataRsaGetKlass (void);
+XMLSEC_CRYPTO_EXPORT int                xmlSecGCryptKeyDataRsaAdoptKey          (xmlSecKeyDataPtr data,
                                                                                  gcry_sexp_t rsa_key);
-XMLSEC_CRYPTO_EXPORT int                xmlSecGnuTLSKeyDataRsaAdoptKeyPair      (xmlSecKeyDataPtr data,
+XMLSEC_CRYPTO_EXPORT int                xmlSecGCryptKeyDataRsaAdoptKeyPair      (xmlSecKeyDataPtr data,
                                                                                  gcry_sexp_t pub_key,
                                                                                  gcry_sexp_t priv_key);
-XMLSEC_CRYPTO_EXPORT gcry_sexp_t        xmlSecGnuTLSKeyDataRsaGetPublicKey      (xmlSecKeyDataPtr data);
-XMLSEC_CRYPTO_EXPORT gcry_sexp_t        xmlSecGnuTLSKeyDataRsaGetPrivateKey     (xmlSecKeyDataPtr data);
+XMLSEC_CRYPTO_EXPORT gcry_sexp_t        xmlSecGCryptKeyDataRsaGetPublicKey      (xmlSecKeyDataPtr data);
+XMLSEC_CRYPTO_EXPORT gcry_sexp_t        xmlSecGCryptKeyDataRsaGetPrivateKey     (xmlSecKeyDataPtr data);
 
 #ifndef XMLSEC_NO_MD5
 /**
- * xmlSecGnuTLSTransformRsaMd5Id:
+ * xmlSecGCryptTransformRsaMd5Id:
  *
  * The RSA-MD5 signature transform klass.
  */
-#define xmlSecGnuTLSTransformRsaMd5Id  \
-        xmlSecGnuTLSTransformRsaMd5GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformRsaMd5GetKlass(void);
+#define xmlSecGCryptTransformRsaMd5Id  \
+        xmlSecGCryptTransformRsaMd5GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformRsaMd5GetKlass(void);
 #endif /* XMLSEC_NO_MD5 */
 
 #ifndef XMLSEC_NO_RIPEMD160
 /**
- * xmlSecGnuTLSTransformRsaRipemd160Id:
+ * xmlSecGCryptTransformRsaRipemd160Id:
  *
  * The RSA-RIPEMD160 signature transform klass.
  */
-#define xmlSecGnuTLSTransformRsaRipemd160Id    \
-        xmlSecGnuTLSTransformRsaRipemd160GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformRsaRipemd160GetKlass(void);
+#define xmlSecGCryptTransformRsaRipemd160Id    \
+        xmlSecGCryptTransformRsaRipemd160GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformRsaRipemd160GetKlass(void);
 #endif /* XMLSEC_NO_RIPEMD160 */
 
 #ifndef XMLSEC_NO_SHA1
 /**
- * xmlSecGnuTLSTransformRsaSha1Id:
+ * xmlSecGCryptTransformRsaSha1Id:
  *
  * The RSA-SHA1 signature transform klass.
  */
-#define xmlSecGnuTLSTransformRsaSha1Id \
-        xmlSecGnuTLSTransformRsaSha1GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformRsaSha1GetKlass(void);
+#define xmlSecGCryptTransformRsaSha1Id \
+        xmlSecGCryptTransformRsaSha1GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformRsaSha1GetKlass(void);
 #endif /* XMLSEC_NO_SHA1 */
 
 #ifndef XMLSEC_NO_SHA256
 /**
- * xmlSecGnuTLSTransformRsaSha256Id:
+ * xmlSecGCryptTransformRsaSha256Id:
  *
  * The RSA-SHA256 signature transform klass.
  */
-#define xmlSecGnuTLSTransformRsaSha256Id       \
-        xmlSecGnuTLSTransformRsaSha256GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformRsaSha256GetKlass(void);
+#define xmlSecGCryptTransformRsaSha256Id       \
+        xmlSecGCryptTransformRsaSha256GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformRsaSha256GetKlass(void);
 #endif /* XMLSEC_NO_SHA256 */
 
 #ifndef XMLSEC_NO_SHA384
 /**
- * xmlSecGnuTLSTransformRsaSha384Id:
+ * xmlSecGCryptTransformRsaSha384Id:
  *
  * The RSA-SHA384 signature transform klass.
  */
-#define xmlSecGnuTLSTransformRsaSha384Id       \
-        xmlSecGnuTLSTransformRsaSha384GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformRsaSha384GetKlass(void);
+#define xmlSecGCryptTransformRsaSha384Id       \
+        xmlSecGCryptTransformRsaSha384GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformRsaSha384GetKlass(void);
 #endif /* XMLSEC_NO_SHA384 */
 
 #ifndef XMLSEC_NO_SHA512
 /**
- * xmlSecGnuTLSTransformRsaSha512Id:
+ * xmlSecGCryptTransformRsaSha512Id:
  *
  * The RSA-SHA512 signature transform klass.
  */
-#define xmlSecGnuTLSTransformRsaSha512Id       \
-        xmlSecGnuTLSTransformRsaSha512GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformRsaSha512GetKlass(void);
+#define xmlSecGCryptTransformRsaSha512Id       \
+        xmlSecGCryptTransformRsaSha512GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformRsaSha512GetKlass(void);
 #endif /* XMLSEC_NO_SHA512 */
 
 #endif /* XMLSEC_NO_RSA */
@@ -375,46 +375,46 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformRsaSha512GetKlass(vo
  *******************************************************************/
 #ifndef XMLSEC_NO_SHA1
 /**
- * xmlSecGnuTLSTransformSha1Id:
+ * xmlSecGCryptTransformSha1Id:
  *
  * The HMAC with SHA1 signature transform klass.
  */
-#define xmlSecGnuTLSTransformSha1Id \
-        xmlSecGnuTLSTransformSha1GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformSha1GetKlass(void);
+#define xmlSecGCryptTransformSha1Id \
+        xmlSecGCryptTransformSha1GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformSha1GetKlass(void);
 #endif /* XMLSEC_NO_SHA1 */
 
 #ifndef XMLSEC_NO_SHA256
 /**
- * xmlSecGnuTLSTransformSha256Id:
+ * xmlSecGCryptTransformSha256Id:
  *
  * The HMAC with SHA256 signature transform klass.
  */
-#define xmlSecGnuTLSTransformSha256Id \
-        xmlSecGnuTLSTransformSha256GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformSha256GetKlass(void);
+#define xmlSecGCryptTransformSha256Id \
+        xmlSecGCryptTransformSha256GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformSha256GetKlass(void);
 #endif /* XMLSEC_NO_SHA256 */
 
 #ifndef XMLSEC_NO_SHA384
 /**
- * xmlSecGnuTLSTransformSha384Id:
+ * xmlSecGCryptTransformSha384Id:
  *
  * The HMAC with SHA384 signature transform klass.
  */
-#define xmlSecGnuTLSTransformSha384Id \
-        xmlSecGnuTLSTransformSha384GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformSha384GetKlass(void);
+#define xmlSecGCryptTransformSha384Id \
+        xmlSecGCryptTransformSha384GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformSha384GetKlass(void);
 #endif /* XMLSEC_NO_SHA384 */
 
 #ifndef XMLSEC_NO_SHA512
 /**
- * xmlSecGnuTLSTransformSha512Id:
+ * xmlSecGCryptTransformSha512Id:
  *
  * The HMAC with SHA512 signature transform klass.
  */
-#define xmlSecGnuTLSTransformSha512Id \
-        xmlSecGnuTLSTransformSha512GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformSha512GetKlass(void);
+#define xmlSecGCryptTransformSha512Id \
+        xmlSecGCryptTransformSha512GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformSha512GetKlass(void);
 #endif /* XMLSEC_NO_SHA512 */
 
 /********************************************************************
@@ -424,13 +424,13 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformSha512GetKlass(void)
  *******************************************************************/
 #ifndef XMLSEC_NO_MD5
 /**
- * xmlSecGnuTLSTransformMd5Id:
+ * xmlSecGCryptTransformMd5Id:
  *
  * The MD5 digest transform klass.
  */
-#define xmlSecGnuTLSTransformMd5Id \
-        xmlSecGnuTLSTransformMd5GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformMd5GetKlass(void);
+#define xmlSecGCryptTransformMd5Id \
+        xmlSecGCryptTransformMd5GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformMd5GetKlass(void);
 #endif /* XMLSEC_NO_MD5 */
 
 
@@ -441,13 +441,13 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformMd5GetKlass(void);
  *******************************************************************/
 #ifndef XMLSEC_NO_RIPEMD160
 /**
- * xmlSecGnuTLSTransformRipemd160Id:
+ * xmlSecGCryptTransformRipemd160Id:
  *
  * The RIPEMD160 digest transform klass.
  */
-#define xmlSecGnuTLSTransformRipemd160Id \
-        xmlSecGnuTLSTransformRipemd160GetKlass()
-XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformRipemd160GetKlass(void);
+#define xmlSecGCryptTransformRipemd160Id \
+        xmlSecGCryptTransformRipemd160GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGCryptTransformRipemd160GetKlass(void);
 #endif /* XMLSEC_NO_RIPEMD160 */
 
 
@@ -455,6 +455,6 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformRipemd160GetKlass(vo
 }
 #endif /* __cplusplus */
 
-#endif /* __XMLSEC_GNUTLS_CRYPTO_H__ */
+#endif /* __XMLSEC_GCRYPT_CRYPTO_H__ */
 
-#define __XMLSEC_GNUTLS_CRYPTO_H__
+#define __XMLSEC_GCRYPT_CRYPTO_H__
diff --git a/include/xmlsec/gcrypt/symbols.h b/include/xmlsec/gcrypt/symbols.h
index 818035d..db6c6e9 100644
--- a/include/xmlsec/gcrypt/symbols.h
+++ b/include/xmlsec/gcrypt/symbols.h
@@ -6,8 +6,8 @@
  *
  * Copyright (C) 2002-2003 Aleksey Sanin <aleksey aleksey com>
  */
-#ifndef __XMLSEC_GNUTLS_SYMBOLS_H__
-#define __XMLSEC_GNUTLS_SYMBOLS_H__
+#ifndef __XMLSEC_GCRYPT_SYMBOLS_H__
+#define __XMLSEC_GCRYPT_SYMBOLS_H__
 
 #if !defined(IN_XMLSEC) && defined(XMLSEC_CRYPTO_DYNAMIC_LOADING)
 #error To disable dynamic loading of xmlsec-crypto libraries undefine XMLSEC_CRYPTO_DYNAMIC_LOADING
@@ -17,88 +17,88 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#ifdef XMLSEC_CRYPTO_GNUTLS
+#ifdef XMLSEC_CRYPTO_GCRYPT
 
 /********************************************************************
  *
  * Crypto Init/shutdown
  *
  ********************************************************************/
-#define xmlSecCryptoInit                        xmlSecGnuTLSInit
-#define xmlSecCryptoShutdown                    xmlSecGnuTLSShutdown
+#define xmlSecCryptoInit                        xmlSecGCryptInit
+#define xmlSecCryptoShutdown                    xmlSecGCryptShutdown
 
-#define xmlSecCryptoKeysMngrInit                xmlSecGnuTLSKeysMngrInit
+#define xmlSecCryptoKeysMngrInit                xmlSecGCryptKeysMngrInit
 
 /********************************************************************
  *
  * Key data ids
  *
  ********************************************************************/
-#define xmlSecKeyDataAesId                      xmlSecGnuTLSKeyDataAesId
-#define xmlSecKeyDataDesId                      xmlSecGnuTLSKeyDataDesId
-#define xmlSecKeyDataDsaId                      xmlSecGnuTLSKeyDataDsaId
-#define xmlSecKeyDataHmacId                     xmlSecGnuTLSKeyDataHmacId
-#define xmlSecKeyDataRsaId                      xmlSecGnuTLSKeyDataRsaId
-#define xmlSecKeyDataX509Id                     xmlSecGnuTLSKeyDataX509Id
-#define xmlSecKeyDataRawX509CertId              xmlSecGnuTLSKeyDataRawX509CertId
+#define xmlSecKeyDataAesId                      xmlSecGCryptKeyDataAesId
+#define xmlSecKeyDataDesId                      xmlSecGCryptKeyDataDesId
+#define xmlSecKeyDataDsaId                      xmlSecGCryptKeyDataDsaId
+#define xmlSecKeyDataHmacId                     xmlSecGCryptKeyDataHmacId
+#define xmlSecKeyDataRsaId                      xmlSecGCryptKeyDataRsaId
+#define xmlSecKeyDataX509Id                     xmlSecGCryptKeyDataX509Id
+#define xmlSecKeyDataRawX509CertId              xmlSecGCryptKeyDataRawX509CertId
 
 /********************************************************************
  *
  * Key data store ids
  *
  ********************************************************************/
-#define xmlSecX509StoreId                       xmlSecGnuTLSX509StoreId
+#define xmlSecX509StoreId                       xmlSecGCryptX509StoreId
 
 /********************************************************************
  *
  * Crypto transforms ids
  *
  ********************************************************************/
-#define xmlSecTransformAes128CbcId              xmlSecGnuTLSTransformAes128CbcId
-#define xmlSecTransformAes192CbcId              xmlSecGnuTLSTransformAes192CbcId
-#define xmlSecTransformAes256CbcId              xmlSecGnuTLSTransformAes256CbcId
-#define xmlSecTransformKWAes128Id               xmlSecGnuTLSTransformKWAes128Id
-#define xmlSecTransformKWAes192Id               xmlSecGnuTLSTransformKWAes192Id
-#define xmlSecTransformKWAes256Id               xmlSecGnuTLSTransformKWAes256Id
-#define xmlSecTransformDes3CbcId                xmlSecGnuTLSTransformDes3CbcId
-#define xmlSecTransformKWDes3Id                 xmlSecGnuTLSTransformKWDes3Id
-#define xmlSecTransformDsaSha1Id                xmlSecGnuTLSTransformDsaSha1Id
-#define xmlSecTransformHmacMd5Id                xmlSecGnuTLSTransformHmacMd5Id
-#define xmlSecTransformHmacRipemd160Id          xmlSecGnuTLSTransformHmacRipemd160Id
-#define xmlSecTransformHmacSha1Id               xmlSecGnuTLSTransformHmacSha1Id
-#define xmlSecTransformRipemd160Id              xmlSecGnuTLSTransformRipemd160Id
-#define xmlSecTransformRsaSha1Id                xmlSecGnuTLSTransformRsaSha1Id
-#define xmlSecTransformRsaPkcs1Id               xmlSecGnuTLSTransformRsaPkcs1Id
-#define xmlSecTransformRsaOaepId                xmlSecGnuTLSTransformRsaOaepId
-#define xmlSecTransformSha1Id                   xmlSecGnuTLSTransformSha1Id
+#define xmlSecTransformAes128CbcId              xmlSecGCryptTransformAes128CbcId
+#define xmlSecTransformAes192CbcId              xmlSecGCryptTransformAes192CbcId
+#define xmlSecTransformAes256CbcId              xmlSecGCryptTransformAes256CbcId
+#define xmlSecTransformKWAes128Id               xmlSecGCryptTransformKWAes128Id
+#define xmlSecTransformKWAes192Id               xmlSecGCryptTransformKWAes192Id
+#define xmlSecTransformKWAes256Id               xmlSecGCryptTransformKWAes256Id
+#define xmlSecTransformDes3CbcId                xmlSecGCryptTransformDes3CbcId
+#define xmlSecTransformKWDes3Id                 xmlSecGCryptTransformKWDes3Id
+#define xmlSecTransformDsaSha1Id                xmlSecGCryptTransformDsaSha1Id
+#define xmlSecTransformHmacMd5Id                xmlSecGCryptTransformHmacMd5Id
+#define xmlSecTransformHmacRipemd160Id          xmlSecGCryptTransformHmacRipemd160Id
+#define xmlSecTransformHmacSha1Id               xmlSecGCryptTransformHmacSha1Id
+#define xmlSecTransformRipemd160Id              xmlSecGCryptTransformRipemd160Id
+#define xmlSecTransformRsaSha1Id                xmlSecGCryptTransformRsaSha1Id
+#define xmlSecTransformRsaPkcs1Id               xmlSecGCryptTransformRsaPkcs1Id
+#define xmlSecTransformRsaOaepId                xmlSecGCryptTransformRsaOaepId
+#define xmlSecTransformSha1Id                   xmlSecGCryptTransformSha1Id
 
 /********************************************************************
  *
  * High level routines form xmlsec command line utility
  *
  ********************************************************************/
-#define xmlSecCryptoAppInit                     xmlSecGnuTLSAppInit
-#define xmlSecCryptoAppShutdown                 xmlSecGnuTLSAppShutdown
-#define xmlSecCryptoAppDefaultKeysMngrInit      xmlSecGnuTLSAppDefaultKeysMngrInit
-#define xmlSecCryptoAppDefaultKeysMngrAdoptKey  xmlSecGnuTLSAppDefaultKeysMngrAdoptKey
-#define xmlSecCryptoAppDefaultKeysMngrLoad      xmlSecGnuTLSAppDefaultKeysMngrLoad
-#define xmlSecCryptoAppDefaultKeysMngrSave      xmlSecGnuTLSAppDefaultKeysMngrSave
-#define xmlSecCryptoAppKeysMngrCertLoad         xmlSecGnuTLSAppKeysMngrCertLoad
-#define xmlSecCryptoAppKeysMngrCertLoadMemory   xmlSecGnuTLSAppKeysMngrCertLoadMemory
-#define xmlSecCryptoAppKeyLoad                  xmlSecGnuTLSAppKeyLoad
-#define xmlSecCryptoAppPkcs12Load               xmlSecGnuTLSAppPkcs12Load
-#define xmlSecCryptoAppKeyCertLoad              xmlSecGnuTLSAppKeyCertLoad
-#define xmlSecCryptoAppKeyLoadMemory            xmlSecGnuTLSAppKeyLoadMemory
-#define xmlSecCryptoAppPkcs12LoadMemory         xmlSecGnuTLSAppPkcs12LoadMemory
-#define xmlSecCryptoAppKeyCertLoadMemory        xmlSecGnuTLSAppKeyCertLoadMemory
-#define xmlSecCryptoAppGetDefaultPwdCallback    xmlSecGnuTLSAppGetDefaultPwdCallback
+#define xmlSecCryptoAppInit                     xmlSecGCryptAppInit
+#define xmlSecCryptoAppShutdown                 xmlSecGCryptAppShutdown
+#define xmlSecCryptoAppDefaultKeysMngrInit      xmlSecGCryptAppDefaultKeysMngrInit
+#define xmlSecCryptoAppDefaultKeysMngrAdoptKey  xmlSecGCryptAppDefaultKeysMngrAdoptKey
+#define xmlSecCryptoAppDefaultKeysMngrLoad      xmlSecGCryptAppDefaultKeysMngrLoad
+#define xmlSecCryptoAppDefaultKeysMngrSave      xmlSecGCryptAppDefaultKeysMngrSave
+#define xmlSecCryptoAppKeysMngrCertLoad         xmlSecGCryptAppKeysMngrCertLoad
+#define xmlSecCryptoAppKeysMngrCertLoadMemory   xmlSecGCryptAppKeysMngrCertLoadMemory
+#define xmlSecCryptoAppKeyLoad                  xmlSecGCryptAppKeyLoad
+#define xmlSecCryptoAppPkcs12Load               xmlSecGCryptAppPkcs12Load
+#define xmlSecCryptoAppKeyCertLoad              xmlSecGCryptAppKeyCertLoad
+#define xmlSecCryptoAppKeyLoadMemory            xmlSecGCryptAppKeyLoadMemory
+#define xmlSecCryptoAppPkcs12LoadMemory         xmlSecGCryptAppPkcs12LoadMemory
+#define xmlSecCryptoAppKeyCertLoadMemory        xmlSecGCryptAppKeyCertLoadMemory
+#define xmlSecCryptoAppGetDefaultPwdCallback    xmlSecGCryptAppGetDefaultPwdCallback
 
-#endif /* XMLSEC_CRYPTO_GNUTLS */
+#endif /* XMLSEC_CRYPTO_GCRYPT */
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __XMLSEC_GNUTLS_CRYPTO_H__ */
+#endif /* __XMLSEC_GCRYPT_CRYPTO_H__ */
 
-#define __XMLSEC_GNUTLS_CRYPTO_H__
+#define __XMLSEC_GCRYPT_CRYPTO_H__
diff --git a/man/xmlsec1-config.1 b/man/xmlsec1-config.1
index c66f631..30f40c7 100644
--- a/man/xmlsec1-config.1
+++ b/man/xmlsec1-config.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH XMLSEC1-CONFIG "1" "April 2010" "xmlsec1-config 1.2.15" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
+.TH XMLSEC1-CONFIG "1" "May 2010" "xmlsec1-config 1.2.15" "User Commands"
 .SH NAME
 xmlsec1-config \- detail installed version of xmlsec library
 .SH SYNOPSIS
@@ -31,4 +31,4 @@ output version information
 .TP
 \fB\-\-crypto\fR=\fILIB\fR
 configure with XMLSEC crypto library (one of the
-following: none default openssl gnutls nss)
+following: none default openssl nss gnutls gcrypt)
diff --git a/man/xmlsec1.1 b/man/xmlsec1.1
index 67b6a5e..9fda2d6 100644
--- a/man/xmlsec1.1
+++ b/man/xmlsec1.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH XMLSEC1 "1" "April 2010" "xmlsec1 1.2.15 (openssl)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
+.TH XMLSEC1 "1" "May 2010" "xmlsec1 1.2.15 (openssl)" "User Commands"
 .SH NAME
 xmlsec1 \- sign, verify, encrypt and decrypt XML documents
 .SH SYNOPSIS
@@ -237,7 +237,7 @@ skip strict checking of X509 data
 \fB\-\-crypto\fR <name>
 .IP
 the name of the crypto engine to use from the following
-list: openssl, gnutls, nss, mscrypto (if no crypto engine is
+list: openssl, mscrypto, nss, gnutls, gcrypt (if no crypto engine is
 specified then the default one is used)
 .HP
 \fB\-\-crypto\-config\fR <path>
@@ -264,6 +264,6 @@ Written by Aleksey Sanin <aleksey aleksey com>.
 .SH "REPORTING BUGS"
 Report bugs to http://www.aleksey.com/xmlsec/bugs.html
 .SH COPYRIGHT
-Copyright \(co 2002-2003 Aleksey Sanin.
+Copyright \(co 2002\-2003 Aleksey Sanin.
 .br
 This is free software: see the source for copying information.
diff --git a/src/gcrypt/Makefile.am b/src/gcrypt/Makefile.am
index 4e12161..0b68359 100644
--- a/src/gcrypt/Makefile.am
+++ b/src/gcrypt/Makefile.am
@@ -5,20 +5,20 @@ EXTRA_DIST = \
 	$(NULL)
 
 lib_LTLIBRARIES = \
-	libxmlsec1-gnutls.la \
+	libxmlsec1-gcrypt.la \
 	$(NULL)
 
-libxmlsec1_gnutls_la_CPPFLAGS = \
+libxmlsec1_gcrypt_la_CPPFLAGS = \
 	-DPACKAGE=\"@PACKAGE \" \
 	-I../../include \
 	-I$(top_srcdir)/include \
 	$(XMLSEC_DEFINES) \
-	$(GNUTLS_CFLAGS) \
+	$(GCRYPT_CFLAGS) \
 	$(LIBXSLT_CFLAGS) \
 	$(LIBXML_CFLAGS) \
 	$(NULL)
 
-libxmlsec1_gnutls_la_SOURCES =\
+libxmlsec1_gcrypt_la_SOURCES =\
 	app.c \
 	ciphers.c \
 	crypto.c \
@@ -32,20 +32,20 @@ libxmlsec1_gnutls_la_SOURCES =\
 	$(NULL)
 
 if SHAREDLIB_HACK
-libxmlsec1_gnutls_la_SOURCES += ../strings.c
+libxmlsec1_gcrypt_la_SOURCES += ../strings.c
 endif
 
-libxmlsec1_gnutls_la_LIBADD = \
-	$(GNUTLS_LIBS) \
+libxmlsec1_gcrypt_la_LIBADD = \
+	$(GCRYPT_LIBS) \
 	$(LIBXSLT_LIBS) \
 	$(LIBXML_LIBS) \
 	../libxmlsec1.la \
 	$(NULL)
 
-libxmlsec1_gnutls_la_DEPENDENCIES = \
+libxmlsec1_gcrypt_la_DEPENDENCIES = \
 	$(NULL)
 
-libxmlsec1_gnutls_la_LDFLAGS = \
+libxmlsec1_gcrypt_la_LDFLAGS = \
 	@XMLSEC_CRYPTO_EXTRA_LDFLAGS@ \
 	-version-info @XMLSEC_VERSION_INFO@ \
 	$(NULL)
diff --git a/src/gcrypt/README b/src/gcrypt/README
index 23f7d8a..dcaa5a0 100644
--- a/src/gcrypt/README
+++ b/src/gcrypt/README
@@ -1,4 +1,4 @@
-The xmlsec-gnutls implementation is really limited and is not ready
+The xmlsec-gcrypt implementation is really limited and is not ready
 for production use. The only supported crypto transforms are:
 
     - HMAC
diff --git a/src/gcrypt/app.c b/src/gcrypt/app.c
index 264a489..6fe32d0 100644
--- a/src/gcrypt/app.c
+++ b/src/gcrypt/app.c
@@ -10,19 +10,19 @@
 
 #include <string.h>
 
-#include <gnutls/gnutls.h>
+#include <gcrypt.h>
 
 #include <xmlsec/xmlsec.h>
 #include <xmlsec/keys.h>
 #include <xmlsec/transforms.h>
 #include <xmlsec/errors.h>
 
-#include <xmlsec/gnutls/app.h>
-#include <xmlsec/gnutls/crypto.h>
+#include <xmlsec/gcrypt/app.h>
+#include <xmlsec/gcrypt/crypto.h>
 
 /**
- * xmlSecGnuTLSAppInit:
- * @config:             the path to GnuTLS configuration (unused).
+ * xmlSecGCryptAppInit:
+ * @config:             the path to GCrypt configuration (unused).
  *
  * General crypto engine initialization. This function is used
  * by XMLSec command line utility and called before
@@ -31,23 +31,13 @@
  * Returns: 0 on success or a negative value otherwise.
  */
 int
-xmlSecGnuTLSAppInit(const char* config ATTRIBUTE_UNUSED) {
-    int ret;
-
-    ret = gnutls_global_init();
-    if(ret != 0) {
-        xmlSecError(XMLSEC_ERRORS_HERE,
-                    NULL,
-                    "gnutls_global_init",
-                    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-                    "ret=%d", ret);
-        return(-1);
-    }
+xmlSecGCryptAppInit(const char* config ATTRIBUTE_UNUSED) {
+    /* TODO - do we need to initialize? */
     return(0);
 }
 
 /**
- * xmlSecGnuTLSAppShutdown:
+ * xmlSecGCryptAppShutdown:
  *
  * General crypto engine shutdown. This function is used
  * by XMLSec command line utility and called after
@@ -56,13 +46,13 @@ xmlSecGnuTLSAppInit(const char* config ATTRIBUTE_UNUSED) {
  * Returns: 0 on success or a negative value otherwise.
  */
 int
-xmlSecGnuTLSAppShutdown(void) {
-    gnutls_global_deinit();
+xmlSecGCryptAppShutdown(void) {
+    /* TODO - do we need to shutdown? */
     return(0);
 }
 
 /**
- * xmlSecGnuTLSAppKeyLoad:
+ * xmlSecGCryptAppKeyLoad:
  * @filename:           the key filename.
  * @format:             the key file format.
  * @pwd:                the key file password.
@@ -74,7 +64,7 @@ xmlSecGnuTLSAppShutdown(void) {
  * Returns: pointer to the key or NULL if an error occurs.
  */
 xmlSecKeyPtr
-xmlSecGnuTLSAppKeyLoad(const char *filename, xmlSecKeyDataFormat format,
+xmlSecGCryptAppKeyLoad(const char *filename, xmlSecKeyDataFormat format,
                         const char *pwd,
                         void* pwdCallback,
                         void* pwdCallbackCtx) {
@@ -83,21 +73,21 @@ xmlSecGnuTLSAppKeyLoad(const char *filename, xmlSecKeyDataFormat format,
 
 
     if (format == xmlSecKeyDataFormatPkcs12) {
-        return (xmlSecGnuTLSAppPkcs12Load(filename, pwd, pwdCallback,
+        return (xmlSecGCryptAppPkcs12Load(filename, pwd, pwdCallback,
                                           pwdCallbackCtx));
     }
 
     /* TODO */
     xmlSecError(XMLSEC_ERRORS_HERE,
                 NULL,
-                "xmlSecGnuTLSAppKeyLoad",
+                "xmlSecGCryptAppKeyLoad",
                 XMLSEC_ERRORS_R_NOT_IMPLEMENTED,
                 XMLSEC_ERRORS_NO_MESSAGE);
     return(NULL);
 }
 
 /**
- * xmlSecGnuTLSAppKeyLoadMemory:
+ * xmlSecGCryptAppKeyLoadMemory:
  * @data:               the binary key data.
  * @dataSize:           the size of binary key.
  * @format:             the key file format.
@@ -110,21 +100,21 @@ xmlSecGnuTLSAppKeyLoad(const char *filename, xmlSecKeyDataFormat format,
  * Returns: pointer to the key or NULL if an error occurs.
  */
 xmlSecKeyPtr
-xmlSecGnuTLSAppKeyLoadMemory(const xmlSecByte* data, xmlSecSize dataSize,
+xmlSecGCryptAppKeyLoadMemory(const xmlSecByte* data, xmlSecSize dataSize,
                         xmlSecKeyDataFormat format, const char *pwd,
                         void* pwdCallback, void* pwdCallbackCtx) {
     xmlSecAssert2(data != NULL, NULL);
     xmlSecAssert2(format != xmlSecKeyDataFormatUnknown, NULL);
 
     if (format == xmlSecKeyDataFormatPkcs12) {
-        return (xmlSecGnuTLSAppPkcs12LoadMemory(data, dataSize, pwd,
+        return (xmlSecGCryptAppPkcs12LoadMemory(data, dataSize, pwd,
                                         pwdCallback, pwdCallbackCtx));
     }
 
     /* TODO */
     xmlSecError(XMLSEC_ERRORS_HERE,
                 NULL,
-                "xmlSecGnuTLSAppKeyLoadMemory",
+                "xmlSecGCryptAppKeyLoadMemory",
                 XMLSEC_ERRORS_R_NOT_IMPLEMENTED,
                 XMLSEC_ERRORS_NO_MESSAGE);
     return(NULL);
@@ -132,7 +122,7 @@ xmlSecGnuTLSAppKeyLoadMemory(const xmlSecByte* data, xmlSecSize dataSize,
 
 #ifndef XMLSEC_NO_X509
 /**
- * xmlSecGnuTLSAppKeyCertLoad:
+ * xmlSecGCryptAppKeyCertLoad:
  * @key:                the pointer to key.
  * @filename:           the certificate filename.
  * @format:             the certificate file format.
@@ -143,7 +133,7 @@ xmlSecGnuTLSAppKeyLoadMemory(const xmlSecByte* data, xmlSecSize dataSize,
  * Returns: 0 on success or a negative value otherwise.
  */
 int
-xmlSecGnuTLSAppKeyCertLoad(xmlSecKeyPtr key, const char* filename,
+xmlSecGCryptAppKeyCertLoad(xmlSecKeyPtr key, const char* filename,
                           xmlSecKeyDataFormat format) {
     xmlSecAssert2(key != NULL, -1);
     xmlSecAssert2(filename != NULL, -1);
@@ -152,14 +142,14 @@ xmlSecGnuTLSAppKeyCertLoad(xmlSecKeyPtr key, const char* filename,
     /* TODO */
     xmlSecError(XMLSEC_ERRORS_HERE,
                 NULL,
-                "xmlSecGnuTLSAppKeyCertLoad",
+                "xmlSecGCryptAppKeyCertLoad",
                 XMLSEC_ERRORS_R_NOT_IMPLEMENTED,
                 XMLSEC_ERRORS_NO_MESSAGE);
     return(-1);
 }
 
 /**
- * xmlSecGnuTLSAppKeyCertLoadMemory:
+ * xmlSecGCryptAppKeyCertLoadMemory:
  * @key:                the pointer to key.
  * @data:               the certificate binary data.
  * @dataSize:           the certificate binary data size.
@@ -170,7 +160,7 @@ xmlSecGnuTLSAppKeyCertLoad(xmlSecKeyPtr key, const char* filename,
  * Returns: 0 on success or a negative value otherwise.
  */
 int
-xmlSecGnuTLSAppKeyCertLoadMemory(xmlSecKeyPtr key,
+xmlSecGCryptAppKeyCertLoadMemory(xmlSecKeyPtr key,
                                  const xmlSecByte* data,
                                  xmlSecSize dataSize,
                                  xmlSecKeyDataFormat format) {
@@ -182,14 +172,14 @@ xmlSecGnuTLSAppKeyCertLoadMemory(xmlSecKeyPtr key,
     /* TODO */
     xmlSecError(XMLSEC_ERRORS_HERE,
                 NULL,
-                "xmlSecGnuTLSAppKeyCertLoadMemory",
+                "xmlSecGCryptAppKeyCertLoadMemory",
                 XMLSEC_ERRORS_R_NOT_IMPLEMENTED,
                 XMLSEC_ERRORS_NO_MESSAGE);
     return(-1);
 }
 
 /**
- * xmlSecGnuTLSAppPkcs12Load:
+ * xmlSecGCryptAppPkcs12Load:
  * @filename:           the PKCS12 key filename.
  * @pwd:                the PKCS12 file password.
  * @pwdCallback:        the password callback.
@@ -197,13 +187,13 @@ xmlSecGnuTLSAppKeyCertLoadMemory(xmlSecKeyPtr key,
  *
  * Reads key and all associated certificates from the PKCS12 file
  * (not implemented yet).
- * For uniformity, call xmlSecGnuTLSAppKeyLoad instead of this function. Pass
+ * For uniformity, call xmlSecGCryptAppKeyLoad instead of this function. Pass
  * in format=xmlSecKeyDataFormatPkcs12.
  *
  * Returns: pointer to the key or NULL if an error occurs.
  */
 xmlSecKeyPtr
-xmlSecGnuTLSAppPkcs12Load(const char *filename,
+xmlSecGCryptAppPkcs12Load(const char *filename,
                           const char *pwd ATTRIBUTE_UNUSED,
                           void* pwdCallback ATTRIBUTE_UNUSED,
                           void* pwdCallbackCtx ATTRIBUTE_UNUSED) {
@@ -212,14 +202,14 @@ xmlSecGnuTLSAppPkcs12Load(const char *filename,
     /* TODO */
     xmlSecError(XMLSEC_ERRORS_HERE,
                 NULL,
-                "xmlSecGnuTLSAppPkcs12Load",
+                "xmlSecGCryptAppPkcs12Load",
                 XMLSEC_ERRORS_R_NOT_IMPLEMENTED,
                 XMLSEC_ERRORS_NO_MESSAGE);
     return(NULL);
 }
 
 /**
- * xmlSecGnuTLSAppPkcs12LoadMemory:
+ * xmlSecGCryptAppPkcs12LoadMemory:
  * @data:               the PKCS12 binary data.
  * @dataSize:           the PKCS12 binary data size.
  * @pwd:                the PKCS12 file password.
@@ -227,13 +217,13 @@ xmlSecGnuTLSAppPkcs12Load(const char *filename,
  * @pwdCallbackCtx:     the user context for password callback.
  *
  * Reads key and all associated certificates from the PKCS12 data in memory buffer.
- * For uniformity, call xmlSecGnuTLSAppKeyLoadMemory instead of this function. Pass
+ * For uniformity, call xmlSecGCryptAppKeyLoadMemory instead of this function. Pass
  * in format=xmlSecKeyDataFormatPkcs12 (not implemented yet).
  *
  * Returns: pointer to the key or NULL if an error occurs.
  */
 xmlSecKeyPtr
-xmlSecGnuTLSAppPkcs12LoadMemory(const xmlSecByte* data, xmlSecSize dataSize,
+xmlSecGCryptAppPkcs12LoadMemory(const xmlSecByte* data, xmlSecSize dataSize,
                            const char *pwd ATTRIBUTE_UNUSED,
                            void* pwdCallback ATTRIBUTE_UNUSED,
                            void* pwdCallbackCtx ATTRIBUTE_UNUSED) {
@@ -243,14 +233,14 @@ xmlSecGnuTLSAppPkcs12LoadMemory(const xmlSecByte* data, xmlSecSize dataSize,
     /* TODO */
     xmlSecError(XMLSEC_ERRORS_HERE,
                 NULL,
-                "xmlSecGnuTLSAppPkcs12LoadMemory",
+                "xmlSecGCryptAppPkcs12LoadMemory",
                 XMLSEC_ERRORS_R_NOT_IMPLEMENTED,
                 XMLSEC_ERRORS_NO_MESSAGE);
     return(NULL);
 }
 
 /**
- * xmlSecGnuTLSAppKeysMngrCertLoad:
+ * xmlSecGCryptAppKeysMngrCertLoad:
  * @mngr:               the keys manager.
  * @filename:           the certificate file.
  * @format:             the certificate file format.
@@ -263,7 +253,7 @@ xmlSecGnuTLSAppPkcs12LoadMemory(const xmlSecByte* data, xmlSecSize dataSize,
  * Returns: 0 on success or a negative value otherwise.
  */
 int
-xmlSecGnuTLSAppKeysMngrCertLoad(xmlSecKeysMngrPtr mngr, 
+xmlSecGCryptAppKeysMngrCertLoad(xmlSecKeysMngrPtr mngr, 
                                 const char *filename,
                                 xmlSecKeyDataFormat format,
                                 xmlSecKeyDataType type ATTRIBUTE_UNUSED) {
@@ -274,14 +264,14 @@ xmlSecGnuTLSAppKeysMngrCertLoad(xmlSecKeysMngrPtr mngr,
     /* TODO */
     xmlSecError(XMLSEC_ERRORS_HERE,
                 NULL,
-                "xmlSecGnuTLSAppKeysMngrCertLoad",
+                "xmlSecGCryptAppKeysMngrCertLoad",
                 XMLSEC_ERRORS_R_NOT_IMPLEMENTED,
                 XMLSEC_ERRORS_NO_MESSAGE);
     return(-1);
 }
 
 /**
- * xmlSecGnuTLSAppKeysMngrCertLoadMemory:
+ * xmlSecGCryptAppKeysMngrCertLoadMemory:
  * @mngr:               the keys manager.
  * @data:               the certificate binary data.
  * @dataSize:           the certificate binary data size.
@@ -294,7 +284,7 @@ xmlSecGnuTLSAppKeysMngrCertLoad(xmlSecKeysMngrPtr mngr,
  * Returns: 0 on success or a negative value otherwise.
  */
 int
-xmlSecGnuTLSAppKeysMngrCertLoadMemory(xmlSecKeysMngrPtr mngr,
+xmlSecGCryptAppKeysMngrCertLoadMemory(xmlSecKeysMngrPtr mngr,
                                       const xmlSecByte* data,
                                       xmlSecSize dataSize,
                                       xmlSecKeyDataFormat format,
@@ -307,7 +297,7 @@ xmlSecGnuTLSAppKeysMngrCertLoadMemory(xmlSecKeysMngrPtr mngr,
     /* TODO */
     xmlSecError(XMLSEC_ERRORS_HERE,
                 NULL,
-                "xmlSecGnuTLSAppKeysMngrCertLoadMemory",
+                "xmlSecGCryptAppKeysMngrCertLoadMemory",
                 XMLSEC_ERRORS_R_NOT_IMPLEMENTED,
                 XMLSEC_ERRORS_NO_MESSAGE);
     return(-1);
@@ -316,16 +306,16 @@ xmlSecGnuTLSAppKeysMngrCertLoadMemory(xmlSecKeysMngrPtr mngr,
 #endif /* XMLSEC_NO_X509 */
 
 /**
- * xmlSecGnuTLSAppDefaultKeysMngrInit:
+ * xmlSecGCryptAppDefaultKeysMngrInit:
  * @mngr:               the pointer to keys manager.
  *
  * Initializes @mngr with simple keys store #xmlSecSimpleKeysStoreId
- * and a default GnuTLS crypto key data stores.
+ * and a default GCrypt crypto key data stores.
  *
  * Returns: 0 on success or a negative value otherwise.
  */
 int
-xmlSecGnuTLSAppDefaultKeysMngrInit(xmlSecKeysMngrPtr mngr) {
+xmlSecGCryptAppDefaultKeysMngrInit(xmlSecKeysMngrPtr mngr) {
     int ret;
 
     xmlSecAssert2(mngr != NULL, -1);
@@ -356,11 +346,11 @@ xmlSecGnuTLSAppDefaultKeysMngrInit(xmlSecKeysMngrPtr mngr) {
         }
     }
 
-    ret = xmlSecGnuTLSKeysMngrInit(mngr);
+    ret = xmlSecGCryptKeysMngrInit(mngr);
     if(ret < 0) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     NULL,
-                    "xmlSecGnuTLSKeysMngrInit",
+                    "xmlSecGCryptKeysMngrInit",
                     XMLSEC_ERRORS_R_XMLSEC_FAILED,
                     XMLSEC_ERRORS_NO_MESSAGE);
         return(-1);
@@ -372,17 +362,17 @@ xmlSecGnuTLSAppDefaultKeysMngrInit(xmlSecKeysMngrPtr mngr) {
 }
 
 /**
- * xmlSecGnuTLSAppDefaultKeysMngrAdoptKey:
+ * xmlSecGCryptAppDefaultKeysMngrAdoptKey:
  * @mngr:               the pointer to keys manager.
  * @key:                the pointer to key.
  *
- * Adds @key to the keys manager @mngr created with #xmlSecGnuTLSAppDefaultKeysMngrInit
+ * Adds @key to the keys manager @mngr created with #xmlSecGCryptAppDefaultKeysMngrInit
  * function.
  *
  * Returns: 0 on success or a negative value otherwise.
  */
 int
-xmlSecGnuTLSAppDefaultKeysMngrAdoptKey(xmlSecKeysMngrPtr mngr, xmlSecKeyPtr key) {
+xmlSecGCryptAppDefaultKeysMngrAdoptKey(xmlSecKeysMngrPtr mngr, xmlSecKeyPtr key) {
     xmlSecKeyStorePtr store;
     int ret;
 
@@ -413,17 +403,17 @@ xmlSecGnuTLSAppDefaultKeysMngrAdoptKey(xmlSecKeysMngrPtr mngr, xmlSecKeyPtr key)
 }
 
 /**
- * xmlSecGnuTLSAppDefaultKeysMngrLoad:
+ * xmlSecGCryptAppDefaultKeysMngrLoad:
  * @mngr:               the pointer to keys manager.
  * @uri:                the uri.
  *
  * Loads XML keys file from @uri to the keys manager @mngr created
- * with #xmlSecGnuTLSAppDefaultKeysMngrInit function.
+ * with #xmlSecGCryptAppDefaultKeysMngrInit function.
  *
  * Returns: 0 on success or a negative value otherwise.
  */
 int
-xmlSecGnuTLSAppDefaultKeysMngrLoad(xmlSecKeysMngrPtr mngr, const char* uri) {
+xmlSecGCryptAppDefaultKeysMngrLoad(xmlSecKeysMngrPtr mngr, const char* uri) {
     xmlSecKeyStorePtr store;
     int ret;
 
@@ -454,7 +444,7 @@ xmlSecGnuTLSAppDefaultKeysMngrLoad(xmlSecKeysMngrPtr mngr, const char* uri) {
 }
 
 /**
- * xmlSecGnuTLSAppDefaultKeysMngrSave:
+ * xmlSecGCryptAppDefaultKeysMngrSave:
  * @mngr:               the pointer to keys manager.
  * @filename:           the destination filename.
  * @type:               the type of keys to save (public/private/symmetric).
@@ -464,7 +454,7 @@ xmlSecGnuTLSAppDefaultKeysMngrLoad(xmlSecKeysMngrPtr mngr, const char* uri) {
  * Returns: 0 on success or a negative value otherwise.
  */
 int
-xmlSecGnuTLSAppDefaultKeysMngrSave(xmlSecKeysMngrPtr mngr, const char* filename, xmlSecKeyDataType type) {
+xmlSecGCryptAppDefaultKeysMngrSave(xmlSecKeysMngrPtr mngr, const char* filename, xmlSecKeyDataType type) {
     xmlSecKeyStorePtr store;
     int ret;
 
@@ -496,14 +486,14 @@ xmlSecGnuTLSAppDefaultKeysMngrSave(xmlSecKeysMngrPtr mngr, const char* filename,
 }
 
 /**
- * xmlSecGnuTLSAppGetDefaultPwdCallback:
+ * xmlSecGCryptAppGetDefaultPwdCallback:
  *
  * Gets default password callback.
  *
  * Returns: default password callback.
  */
 void*
-xmlSecGnuTLSAppGetDefaultPwdCallback(void) {
+xmlSecGCryptAppGetDefaultPwdCallback(void) {
     return(NULL);
 }
 
diff --git a/src/gcrypt/asymkeys.c b/src/gcrypt/asymkeys.c
index 992374b..0154a77 100644
--- a/src/gcrypt/asymkeys.c
+++ b/src/gcrypt/asymkeys.c
@@ -10,7 +10,6 @@
 
 #include <string.h>
 
-#include <gnutls/gnutls.h>
 #include <gcrypt.h>
 
 #include <xmlsec/xmlsec.h>
@@ -21,24 +20,24 @@
 #include <xmlsec/transforms.h>
 #include <xmlsec/errors.h>
 
-#include <xmlsec/gnutls/crypto.h>
+#include <xmlsec/gcrypt/crypto.h>
 
 /**************************************************************************
  *
  * Helpers
  *
  *************************************************************************/
-static gcry_sexp_t              xmlSecGnuTLSAsymSExpDup          (gcry_sexp_t sexp);
+static gcry_sexp_t              xmlSecGCryptAsymSExpDup          (gcry_sexp_t sexp);
 
 
 /**************************************************************************
  *
- * Internal GnuTLS asym key CTX
+ * Internal GCrypt asym key CTX
  *
  *************************************************************************/
-typedef struct _xmlSecGnuTLSAsymKeyDataCtx       xmlSecGnuTLSAsymKeyDataCtx,
-                                                *xmlSecGnuTLSAsymKeyDataCtxPtr;
-struct _xmlSecGnuTLSAsymKeyDataCtx {
+typedef struct _xmlSecGCryptAsymKeyDataCtx       xmlSecGCryptAsymKeyDataCtx,
+                                                *xmlSecGCryptAsymKeyDataCtxPtr;
+struct _xmlSecGCryptAsymKeyDataCtx {
     gcry_sexp_t pub_key;
     gcry_sexp_t priv_key;
 };
@@ -47,72 +46,72 @@ struct _xmlSecGnuTLSAsymKeyDataCtx {
  *
  * Asym key (dsa/rsa)
  *
- * xmlSecGnuTLSAsymKeyDataCtx is located after xmlSecTransform
+ * xmlSecGCryptAsymKeyDataCtx is located after xmlSecTransform
  *
  *****************************************************************************/
-#define xmlSecGnuTLSAsymKeyDataSize     \
-    (sizeof(xmlSecKeyData) + sizeof(xmlSecGnuTLSAsymKeyDataCtx))
-#define xmlSecGnuTLSAsymKeyDataGetCtx(data) \
-    ((xmlSecGnuTLSAsymKeyDataCtxPtr)(((xmlSecByte*)(data)) + sizeof(xmlSecKeyData)))
+#define xmlSecGCryptAsymKeyDataSize     \
+    (sizeof(xmlSecKeyData) + sizeof(xmlSecGCryptAsymKeyDataCtx))
+#define xmlSecGCryptAsymKeyDataGetCtx(data) \
+    ((xmlSecGCryptAsymKeyDataCtxPtr)(((xmlSecByte*)(data)) + sizeof(xmlSecKeyData)))
 
-static int              xmlSecGnuTLSAsymKeyDataInitialize       (xmlSecKeyDataPtr data);
-static int              xmlSecGnuTLSAsymKeyDataDuplicate        (xmlSecKeyDataPtr dst,
+static int              xmlSecGCryptAsymKeyDataInitialize       (xmlSecKeyDataPtr data);
+static int              xmlSecGCryptAsymKeyDataDuplicate        (xmlSecKeyDataPtr dst,
                                                                  xmlSecKeyDataPtr src);
-static void             xmlSecGnuTLSAsymKeyDataFinalize         (xmlSecKeyDataPtr data);
+static void             xmlSecGCryptAsymKeyDataFinalize         (xmlSecKeyDataPtr data);
 
-static int              xmlSecGnuTLSAsymKeyDataAdoptKey         (xmlSecKeyDataPtr data,
+static int              xmlSecGCryptAsymKeyDataAdoptKey         (xmlSecKeyDataPtr data,
                                                                  gcry_sexp_t key_pair);
-static int              xmlSecGnuTLSAsymKeyDataAdoptKeyPair     (xmlSecKeyDataPtr data,
+static int              xmlSecGCryptAsymKeyDataAdoptKeyPair     (xmlSecKeyDataPtr data,
                                                                  gcry_sexp_t pub_key,
                                                                  gcry_sexp_t priv_key);
-static gcry_sexp_t      xmlSecGnuTLSAsymKeyDataGetPublicKey     (xmlSecKeyDataPtr data);
-static gcry_sexp_t      xmlSecGnuTLSAsymKeyDataGetPrivateKey    (xmlSecKeyDataPtr data);
-static int              xmlSecGnuTLSAsymKeyDataGenerate         (xmlSecKeyDataPtr data,
+static gcry_sexp_t      xmlSecGCryptAsymKeyDataGetPublicKey     (xmlSecKeyDataPtr data);
+static gcry_sexp_t      xmlSecGCryptAsymKeyDataGetPrivateKey    (xmlSecKeyDataPtr data);
+static int              xmlSecGCryptAsymKeyDataGenerate         (xmlSecKeyDataPtr data,
                                                                  const char * alg,
                                                                  xmlSecSize key_size);
-static xmlSecKeyDataType xmlSecGnuTLSAsymKeyDataGetType         (xmlSecKeyDataPtr data);
-static xmlSecSize       xmlSecGnuTLSAsymKeyDataGetSize          (xmlSecKeyDataPtr data);
+static xmlSecKeyDataType xmlSecGCryptAsymKeyDataGetType         (xmlSecKeyDataPtr data);
+static xmlSecSize       xmlSecGCryptAsymKeyDataGetSize          (xmlSecKeyDataPtr data);
 
 
 static int
-xmlSecGnuTLSAsymKeyDataInitialize(xmlSecKeyDataPtr data) {
-    xmlSecGnuTLSAsymKeyDataCtxPtr ctx;
+xmlSecGCryptAsymKeyDataInitialize(xmlSecKeyDataPtr data) {
+    xmlSecGCryptAsymKeyDataCtxPtr ctx;
 
     xmlSecAssert2(xmlSecKeyDataIsValid(data), -1);
-    xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecGnuTLSAsymKeyDataSize), -1);
+    xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecGCryptAsymKeyDataSize), -1);
 
-    ctx = xmlSecGnuTLSAsymKeyDataGetCtx(data);
+    ctx = xmlSecGCryptAsymKeyDataGetCtx(data);
     xmlSecAssert2(ctx != NULL, -1);
 
-    memset(ctx, 0, sizeof(xmlSecGnuTLSAsymKeyDataCtx));
+    memset(ctx, 0, sizeof(xmlSecGCryptAsymKeyDataCtx));
 
     return(0);
 }
 
 static int
-xmlSecGnuTLSAsymKeyDataDuplicate(xmlSecKeyDataPtr dst, xmlSecKeyDataPtr src) {
-    xmlSecGnuTLSAsymKeyDataCtxPtr ctxDst;
-    xmlSecGnuTLSAsymKeyDataCtxPtr ctxSrc;
+xmlSecGCryptAsymKeyDataDuplicate(xmlSecKeyDataPtr dst, xmlSecKeyDataPtr src) {
+    xmlSecGCryptAsymKeyDataCtxPtr ctxDst;
+    xmlSecGCryptAsymKeyDataCtxPtr ctxSrc;
 
     xmlSecAssert2(xmlSecKeyDataIsValid(dst), -1);
-    xmlSecAssert2(xmlSecKeyDataCheckSize(dst, xmlSecGnuTLSAsymKeyDataSize), -1);
+    xmlSecAssert2(xmlSecKeyDataCheckSize(dst, xmlSecGCryptAsymKeyDataSize), -1);
     xmlSecAssert2(xmlSecKeyDataIsValid(src), -1);
-    xmlSecAssert2(xmlSecKeyDataCheckSize(src, xmlSecGnuTLSAsymKeyDataSize), -1);
+    xmlSecAssert2(xmlSecKeyDataCheckSize(src, xmlSecGCryptAsymKeyDataSize), -1);
 
-    ctxDst = xmlSecGnuTLSAsymKeyDataGetCtx(dst);
+    ctxDst = xmlSecGCryptAsymKeyDataGetCtx(dst);
     xmlSecAssert2(ctxDst != NULL, -1);
     xmlSecAssert2(ctxDst->pub_key == NULL, -1);
     xmlSecAssert2(ctxDst->priv_key == NULL, -1);
 
-    ctxSrc = xmlSecGnuTLSAsymKeyDataGetCtx(src);
+    ctxSrc = xmlSecGCryptAsymKeyDataGetCtx(src);
     xmlSecAssert2(ctxSrc != NULL, -1);
 
     if(ctxSrc->pub_key != NULL) {
-        ctxDst->pub_key = xmlSecGnuTLSAsymSExpDup(ctxSrc->pub_key);
+        ctxDst->pub_key = xmlSecGCryptAsymSExpDup(ctxSrc->pub_key);
         if(ctxDst->pub_key == NULL) {
             xmlSecError(XMLSEC_ERRORS_HERE,
                         xmlSecErrorsSafeString(xmlSecKeyDataGetName(dst)),
-                        "xmlSecGnuTLSAsymSExpDup(pub_key)",
+                        "xmlSecGCryptAsymSExpDup(pub_key)",
                         XMLSEC_ERRORS_R_XMLSEC_FAILED,
                         XMLSEC_ERRORS_NO_MESSAGE);
             return(-1);
@@ -120,11 +119,11 @@ xmlSecGnuTLSAsymKeyDataDuplicate(xmlSecKeyDataPtr dst, xmlSecKeyDataPtr src) {
     }
 
     if(ctxSrc->priv_key != NULL) {
-        ctxDst->priv_key = xmlSecGnuTLSAsymSExpDup(ctxSrc->priv_key);
+        ctxDst->priv_key = xmlSecGCryptAsymSExpDup(ctxSrc->priv_key);
         if(ctxDst->priv_key == NULL) {
             xmlSecError(XMLSEC_ERRORS_HERE,
                         xmlSecErrorsSafeString(xmlSecKeyDataGetName(dst)),
-                        "xmlSecGnuTLSAsymSExpDup(priv_key)",
+                        "xmlSecGCryptAsymSExpDup(priv_key)",
                         XMLSEC_ERRORS_R_XMLSEC_FAILED,
                         XMLSEC_ERRORS_NO_MESSAGE);
             return(-1);
@@ -135,13 +134,13 @@ xmlSecGnuTLSAsymKeyDataDuplicate(xmlSecKeyDataPtr dst, xmlSecKeyDataPtr src) {
 }
 
 static void
-xmlSecGnuTLSAsymKeyDataFinalize(xmlSecKeyDataPtr data) {
-    xmlSecGnuTLSAsymKeyDataCtxPtr ctx;
+xmlSecGCryptAsymKeyDataFinalize(xmlSecKeyDataPtr data) {
+    xmlSecGCryptAsymKeyDataCtxPtr ctx;
 
     xmlSecAssert(xmlSecKeyDataIsValid(data));
-    xmlSecAssert(xmlSecKeyDataCheckSize(data, xmlSecGnuTLSAsymKeyDataSize));
+    xmlSecAssert(xmlSecKeyDataCheckSize(data, xmlSecGCryptAsymKeyDataSize));
 
-    ctx = xmlSecGnuTLSAsymKeyDataGetCtx(data);
+    ctx = xmlSecGCryptAsymKeyDataGetCtx(data);
     xmlSecAssert(ctx != NULL);
 
     if(ctx->pub_key != NULL) {
@@ -150,21 +149,21 @@ xmlSecGnuTLSAsymKeyDataFinalize(xmlSecKeyDataPtr data) {
     if(ctx->priv_key != NULL) {
         gcry_sexp_release(ctx->priv_key);
     }
-    memset(ctx, 0, sizeof(xmlSecGnuTLSAsymKeyDataCtx));
+    memset(ctx, 0, sizeof(xmlSecGCryptAsymKeyDataCtx));
 }
 
 static int
-xmlSecGnuTLSAsymKeyDataAdoptKey(xmlSecKeyDataPtr data, gcry_sexp_t key_pair) {
-    xmlSecGnuTLSAsymKeyDataCtxPtr ctx;
+xmlSecGCryptAsymKeyDataAdoptKey(xmlSecKeyDataPtr data, gcry_sexp_t key_pair) {
+    xmlSecGCryptAsymKeyDataCtxPtr ctx;
     gcry_sexp_t pub_key = NULL;
     gcry_sexp_t priv_key = NULL;
     int res = -1;
 
     xmlSecAssert2(xmlSecKeyDataIsValid(data), -1);
-    xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecGnuTLSAsymKeyDataSize), -1);
+    xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecGCryptAsymKeyDataSize), -1);
     xmlSecAssert2(key_pair != NULL, -1);
 
-    ctx = xmlSecGnuTLSAsymKeyDataGetCtx(data);
+    ctx = xmlSecGCryptAsymKeyDataGetCtx(data);
     xmlSecAssert2(ctx != NULL, -1);
 
     /* split the key pair, public part should be always present, private might 
@@ -181,10 +180,10 @@ xmlSecGnuTLSAsymKeyDataAdoptKey(xmlSecKeyDataPtr data, gcry_sexp_t key_pair) {
     priv_key = gcry_sexp_find_token(key_pair, "private-key", 0);
 
     /* assign */
-    if(xmlSecGnuTLSAsymKeyDataAdoptKeyPair(data, pub_key, priv_key) < 0) {
+    if(xmlSecGCryptAsymKeyDataAdoptKeyPair(data, pub_key, priv_key) < 0) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     NULL,
-                    "xmlSecGnuTLSAsymKeyDataAdoptKeyPair",
+                    "xmlSecGCryptAsymKeyDataAdoptKeyPair",
                     XMLSEC_ERRORS_R_XMLSEC_FAILED,
                     XMLSEC_ERRORS_NO_MESSAGE);
         goto done;
@@ -209,11 +208,11 @@ done:
 }
 
 static int
-xmlSecGnuTLSAsymKeyDataAdoptKeyPair(xmlSecKeyDataPtr data, gcry_sexp_t pub_key, gcry_sexp_t priv_key) {
-    xmlSecGnuTLSAsymKeyDataCtxPtr ctx;
+xmlSecGCryptAsymKeyDataAdoptKeyPair(xmlSecKeyDataPtr data, gcry_sexp_t pub_key, gcry_sexp_t priv_key) {
+    xmlSecGCryptAsymKeyDataCtxPtr ctx;
 
     xmlSecAssert2(xmlSecKeyDataIsValid(data), -1);
-    xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecGnuTLSAsymKeyDataSize), -1);
+    xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecGCryptAsymKeyDataSize), -1);
     xmlSecAssert2(pub_key != NULL, -1); /* public key should present always */
 /*
     aleksey - we don't set optional parameters for RSA keys (p, k, u) and
@@ -222,7 +221,7 @@ xmlSecGnuTLSAsymKeyDataAdoptKeyPair(xmlSecKeyDataPtr data, gcry_sexp_t pub_key,
     xmlSecAssert2(((priv_key == NULL) || (gcry_pk_testkey(priv_key) == GPG_ERR_NO_ERROR)), -1);
 */
 
-    ctx = xmlSecGnuTLSAsymKeyDataGetCtx(data);
+    ctx = xmlSecGCryptAsymKeyDataGetCtx(data);
     xmlSecAssert2(ctx != NULL, -1);
 
     /* release prev values and assign new ones */
@@ -241,34 +240,34 @@ xmlSecGnuTLSAsymKeyDataAdoptKeyPair(xmlSecKeyDataPtr data, gcry_sexp_t pub_key,
 }
 
 static gcry_sexp_t
-xmlSecGnuTLSAsymKeyDataGetPublicKey(xmlSecKeyDataPtr data) {
-    xmlSecGnuTLSAsymKeyDataCtxPtr ctx;
+xmlSecGCryptAsymKeyDataGetPublicKey(xmlSecKeyDataPtr data) {
+    xmlSecGCryptAsymKeyDataCtxPtr ctx;
 
     xmlSecAssert2(xmlSecKeyDataIsValid(data), NULL);
-    xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecGnuTLSAsymKeyDataSize), NULL);
+    xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecGCryptAsymKeyDataSize), NULL);
 
-    ctx = xmlSecGnuTLSAsymKeyDataGetCtx(data);
+    ctx = xmlSecGCryptAsymKeyDataGetCtx(data);
     xmlSecAssert2(ctx != NULL, NULL);
 
     return(ctx->pub_key);
 }
 
 static gcry_sexp_t
-xmlSecGnuTLSAsymKeyDataGetPrivateKey(xmlSecKeyDataPtr data) {
-    xmlSecGnuTLSAsymKeyDataCtxPtr ctx;
+xmlSecGCryptAsymKeyDataGetPrivateKey(xmlSecKeyDataPtr data) {
+    xmlSecGCryptAsymKeyDataCtxPtr ctx;
 
     xmlSecAssert2(xmlSecKeyDataIsValid(data), NULL);
-    xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecGnuTLSAsymKeyDataSize), NULL);
+    xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecGCryptAsymKeyDataSize), NULL);
 
-    ctx = xmlSecGnuTLSAsymKeyDataGetCtx(data);
+    ctx = xmlSecGCryptAsymKeyDataGetCtx(data);
     xmlSecAssert2(ctx != NULL, NULL);
 
     return(ctx->priv_key);
 }
 
 static int
-xmlSecGnuTLSAsymKeyDataGenerate(xmlSecKeyDataPtr data, const char * alg, xmlSecSize key_size) {
-    xmlSecGnuTLSAsymKeyDataCtxPtr ctx;
+xmlSecGCryptAsymKeyDataGenerate(xmlSecKeyDataPtr data, const char * alg, xmlSecSize key_size) {
+    xmlSecGCryptAsymKeyDataCtxPtr ctx;
     gcry_sexp_t key_spec = NULL;
     gcry_sexp_t key_pair = NULL;
     gcry_error_t err;
@@ -276,11 +275,11 @@ xmlSecGnuTLSAsymKeyDataGenerate(xmlSecKeyDataPtr data, const char * alg, xmlSecS
     int res = -1;
 
     xmlSecAssert2(xmlSecKeyDataIsValid(data), -1);
-    xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecGnuTLSAsymKeyDataSize), -1);
+    xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecGCryptAsymKeyDataSize), -1);
     xmlSecAssert2(alg != NULL, -1);
     xmlSecAssert2(key_size > 0, -1);
 
-    ctx = xmlSecGnuTLSAsymKeyDataGetCtx(data);
+    ctx = xmlSecGCryptAsymKeyDataGetCtx(data);
     xmlSecAssert2(ctx != NULL, -1);
 
     err = gcry_sexp_build(&key_spec, NULL,
@@ -305,11 +304,11 @@ xmlSecGnuTLSAsymKeyDataGenerate(xmlSecKeyDataPtr data, const char * alg, xmlSecS
         goto done;
     }
 
-    ret = xmlSecGnuTLSAsymKeyDataAdoptKey(data, key_pair);
+    ret = xmlSecGCryptAsymKeyDataAdoptKey(data, key_pair);
     if(ret < 0) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     NULL,
-                    "xmlSecGnuTLSAsymKeyDataAdopt",
+                    "xmlSecGCryptAsymKeyDataAdopt",
                     XMLSEC_ERRORS_R_XMLSEC_FAILED,
                     "ret=%d", (int)ret);
         goto done;
@@ -331,13 +330,13 @@ done:
 }
 
 static xmlSecKeyDataType
-xmlSecGnuTLSAsymKeyDataGetType(xmlSecKeyDataPtr data) {
-    xmlSecGnuTLSAsymKeyDataCtxPtr ctx;
+xmlSecGCryptAsymKeyDataGetType(xmlSecKeyDataPtr data) {
+    xmlSecGCryptAsymKeyDataCtxPtr ctx;
 
     xmlSecAssert2(xmlSecKeyDataIsValid(data), xmlSecKeyDataTypeUnknown);
-    xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecGnuTLSAsymKeyDataSize), xmlSecKeyDataTypeUnknown);
+    xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecGCryptAsymKeyDataSize), xmlSecKeyDataTypeUnknown);
 
-    ctx = xmlSecGnuTLSAsymKeyDataGetCtx(data);
+    ctx = xmlSecGCryptAsymKeyDataGetCtx(data);
     xmlSecAssert2(ctx != NULL, xmlSecKeyDataTypeUnknown);
 
     if((ctx->priv_key != NULL) && (ctx->pub_key != NULL)) {
@@ -350,13 +349,13 @@ xmlSecGnuTLSAsymKeyDataGetType(xmlSecKeyDataPtr data) {
 }
 
 static xmlSecSize
-xmlSecGnuTLSAsymKeyDataGetSize(xmlSecKeyDataPtr data) {
-    xmlSecGnuTLSAsymKeyDataCtxPtr ctx;
+xmlSecGCryptAsymKeyDataGetSize(xmlSecKeyDataPtr data) {
+    xmlSecGCryptAsymKeyDataCtxPtr ctx;
 
     xmlSecAssert2(xmlSecKeyDataIsValid(data), xmlSecKeyDataTypeUnknown);
-    xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecGnuTLSAsymKeyDataSize), xmlSecKeyDataTypeUnknown);
+    xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecGCryptAsymKeyDataSize), xmlSecKeyDataTypeUnknown);
 
-    ctx = xmlSecGnuTLSAsymKeyDataGetCtx(data);
+    ctx = xmlSecGCryptAsymKeyDataGetCtx(data);
     xmlSecAssert2(ctx != NULL, 0);
 
     /* use pub key since it is more often you have it than not */
@@ -369,7 +368,7 @@ xmlSecGnuTLSAsymKeyDataGetSize(xmlSecKeyDataPtr data) {
  *
  *****************************************************************************/
 static gcry_sexp_t
-xmlSecGnuTLSAsymSExpDup(gcry_sexp_t pKey) {
+xmlSecGCryptAsymSExpDup(gcry_sexp_t pKey) {
     gcry_sexp_t res = NULL;
     xmlSecByte *buf = NULL;
     gcry_error_t ret;
@@ -425,7 +424,7 @@ done:
 }
 
 /**
- * xmlSecGnuTLSNodeGetMpiValue:
+ * xmlSecGCryptNodeGetMpiValue:
  * @cur: the poitner to an XML node.
  *
  * Converts the node content from CryptoBinary format
@@ -437,7 +436,7 @@ done:
  * or NULL if an error occurs.
  */
 static gcry_mpi_t
-xmlSecGnuTLSNodeGetMpiValue(const xmlNodePtr cur) {
+xmlSecGCryptNodeGetMpiValue(const xmlNodePtr cur) {
     xmlSecBuffer buf;
     gcry_mpi_t res = NULL;
     gcry_error_t err;
@@ -486,7 +485,7 @@ xmlSecGnuTLSNodeGetMpiValue(const xmlNodePtr cur) {
 }
 
 /**
- * xmlSecGnuTLSNodeSetMpiValue:
+ * xmlSecGCryptNodeSetMpiValue:
  * @cur: the pointer to an XML node.
  * @a: the mpi value
  * @addLineBreaks: if the flag is equal to 1 then
@@ -502,7 +501,7 @@ xmlSecGnuTLSNodeGetMpiValue(const xmlNodePtr cur) {
  * Returns: 0 on success or -1 otherwise.
  */
 static int
-xmlSecGnuTLSNodeSetMpiValue(xmlNodePtr cur, const gcry_mpi_t a, int addLineBreaks) {
+xmlSecGCryptNodeSetMpiValue(xmlNodePtr cur, const gcry_mpi_t a, int addLineBreaks) {
     xmlSecBuffer buf;
     gcry_error_t err;
     size_t written = 0;
@@ -585,7 +584,7 @@ xmlSecGnuTLSNodeSetMpiValue(xmlNodePtr cur, const gcry_mpi_t a, int addLineBreak
 }
 
 /**
- * xmlSecGnuTLSNodeSetSExpTokValue:
+ * xmlSecGCryptNodeSetSExpTokValue:
  * @cur: the pointer to an XML node.
  * @sexp: the sexp
  * @tok: the token
@@ -602,7 +601,7 @@ xmlSecGnuTLSNodeSetMpiValue(xmlNodePtr cur, const gcry_mpi_t a, int addLineBreak
  * Returns: 0 on success or -1 otherwise.
  */
 static int
-xmlSecGnuTLSNodeSetSExpTokValue(xmlNodePtr cur, const gcry_sexp_t sexp,
+xmlSecGCryptNodeSetSExpTokValue(xmlNodePtr cur, const gcry_sexp_t sexp,
                                 const char * tok, int addLineBreaks)
 {
     gcry_sexp_t val = NULL;
@@ -636,7 +635,7 @@ xmlSecGnuTLSNodeSetSExpTokValue(xmlNodePtr cur, const gcry_sexp_t sexp,
     }
 
     /* almost done */
-    res = xmlSecGnuTLSNodeSetMpiValue(cur, mpi, addLineBreaks);
+    res = xmlSecGCryptNodeSetMpiValue(cur, mpi, addLineBreaks);
 
 done:
     if(mpi != NULL) {
@@ -723,32 +722,32 @@ done:
  * by this the P, Q and G are *required*!
  *
  *************************************************************************/
-static int              xmlSecGnuTLSKeyDataDsaInitialize        (xmlSecKeyDataPtr data);
-static int              xmlSecGnuTLSKeyDataDsaDuplicate         (xmlSecKeyDataPtr dst,
+static int              xmlSecGCryptKeyDataDsaInitialize        (xmlSecKeyDataPtr data);
+static int              xmlSecGCryptKeyDataDsaDuplicate         (xmlSecKeyDataPtr dst,
                                                                  xmlSecKeyDataPtr src);
-static void             xmlSecGnuTLSKeyDataDsaFinalize          (xmlSecKeyDataPtr data);
-static int              xmlSecGnuTLSKeyDataDsaXmlRead           (xmlSecKeyDataId id,
+static void             xmlSecGCryptKeyDataDsaFinalize          (xmlSecKeyDataPtr data);
+static int              xmlSecGCryptKeyDataDsaXmlRead           (xmlSecKeyDataId id,
                                                                  xmlSecKeyPtr key,
                                                                  xmlNodePtr node,
                                                                  xmlSecKeyInfoCtxPtr keyInfoCtx);
-static int              xmlSecGnuTLSKeyDataDsaXmlWrite          (xmlSecKeyDataId id,
+static int              xmlSecGCryptKeyDataDsaXmlWrite          (xmlSecKeyDataId id,
                                                                  xmlSecKeyPtr key,
                                                                  xmlNodePtr node,
                                                                  xmlSecKeyInfoCtxPtr keyInfoCtx);
-static int              xmlSecGnuTLSKeyDataDsaGenerate          (xmlSecKeyDataPtr data,
+static int              xmlSecGCryptKeyDataDsaGenerate          (xmlSecKeyDataPtr data,
                                                                  xmlSecSize sizeBits,
                                                                  xmlSecKeyDataType type);
 
-static xmlSecKeyDataType xmlSecGnuTLSKeyDataDsaGetType          (xmlSecKeyDataPtr data);
-static xmlSecSize       xmlSecGnuTLSKeyDataDsaGetSize           (xmlSecKeyDataPtr data);
-static void             xmlSecGnuTLSKeyDataDsaDebugDump         (xmlSecKeyDataPtr data,
+static xmlSecKeyDataType xmlSecGCryptKeyDataDsaGetType          (xmlSecKeyDataPtr data);
+static xmlSecSize       xmlSecGCryptKeyDataDsaGetSize           (xmlSecKeyDataPtr data);
+static void             xmlSecGCryptKeyDataDsaDebugDump         (xmlSecKeyDataPtr data,
                                                                  FILE* output);
-static void             xmlSecGnuTLSKeyDataDsaDebugXmlDump      (xmlSecKeyDataPtr data,
+static void             xmlSecGCryptKeyDataDsaDebugXmlDump      (xmlSecKeyDataPtr data,
                                                                  FILE* output);
 
-static xmlSecKeyDataKlass xmlSecGnuTLSKeyDataDsaKlass = {
+static xmlSecKeyDataKlass xmlSecGCryptKeyDataDsaKlass = {
     sizeof(xmlSecKeyDataKlass),
-    xmlSecGnuTLSAsymKeyDataSize,
+    xmlSecGCryptAsymKeyDataSize,
 
     /* data */
     xmlSecNameDSAKeyValue,
@@ -759,25 +758,25 @@ static xmlSecKeyDataKlass xmlSecGnuTLSKeyDataDsaKlass = {
     xmlSecDSigNs,                               /* const xmlChar* dataNodeNs; */
 
     /* constructors/destructor */
-    xmlSecGnuTLSKeyDataDsaInitialize,          /* xmlSecKeyDataInitializeMethod initialize; */
-    xmlSecGnuTLSKeyDataDsaDuplicate,           /* xmlSecKeyDataDuplicateMethod duplicate; */
-    xmlSecGnuTLSKeyDataDsaFinalize,            /* xmlSecKeyDataFinalizeMethod finalize; */
-    xmlSecGnuTLSKeyDataDsaGenerate,            /* xmlSecKeyDataGenerateMethod generate; */
+    xmlSecGCryptKeyDataDsaInitialize,          /* xmlSecKeyDataInitializeMethod initialize; */
+    xmlSecGCryptKeyDataDsaDuplicate,           /* xmlSecKeyDataDuplicateMethod duplicate; */
+    xmlSecGCryptKeyDataDsaFinalize,            /* xmlSecKeyDataFinalizeMethod finalize; */
+    xmlSecGCryptKeyDataDsaGenerate,            /* xmlSecKeyDataGenerateMethod generate; */
 
     /* get info */
-    xmlSecGnuTLSKeyDataDsaGetType,             /* xmlSecKeyDataGetTypeMethod getType; */
-    xmlSecGnuTLSKeyDataDsaGetSize,             /* xmlSecKeyDataGetSizeMethod getSize; */
+    xmlSecGCryptKeyDataDsaGetType,             /* xmlSecKeyDataGetTypeMethod getType; */
+    xmlSecGCryptKeyDataDsaGetSize,             /* xmlSecKeyDataGetSizeMethod getSize; */
     NULL,                                       /* xmlSecKeyDataGetIdentifier getIdentifier; */
 
     /* read/write */
-    xmlSecGnuTLSKeyDataDsaXmlRead,             /* xmlSecKeyDataXmlReadMethod xmlRead; */
-    xmlSecGnuTLSKeyDataDsaXmlWrite,            /* xmlSecKeyDataXmlWriteMethod xmlWrite; */
+    xmlSecGCryptKeyDataDsaXmlRead,             /* xmlSecKeyDataXmlReadMethod xmlRead; */
+    xmlSecGCryptKeyDataDsaXmlWrite,            /* xmlSecKeyDataXmlWriteMethod xmlWrite; */
     NULL,                                       /* xmlSecKeyDataBinReadMethod binRead; */
     NULL,                                       /* xmlSecKeyDataBinWriteMethod binWrite; */
 
     /* debug */
-    xmlSecGnuTLSKeyDataDsaDebugDump,           /* xmlSecKeyDataDebugDumpMethod debugDump; */
-    xmlSecGnuTLSKeyDataDsaDebugXmlDump,        /* xmlSecKeyDataDebugDumpMethod debugXmlDump; */
+    xmlSecGCryptKeyDataDsaDebugDump,           /* xmlSecKeyDataDebugDumpMethod debugDump; */
+    xmlSecGCryptKeyDataDsaDebugXmlDump,        /* xmlSecKeyDataDebugDumpMethod debugXmlDump; */
 
     /* reserved for the future */
     NULL,                                       /* void* reserved0; */
@@ -785,145 +784,145 @@ static xmlSecKeyDataKlass xmlSecGnuTLSKeyDataDsaKlass = {
 };
 
 /**
- * xmlSecGnuTLSKeyDataDsaGetKlass:
+ * xmlSecGCryptKeyDataDsaGetKlass:
  *
  * The DSA key data klass.
  *
  * Returns: pointer to DSA key data klass.
  */
 xmlSecKeyDataId
-xmlSecGnuTLSKeyDataDsaGetKlass(void) {
-    return(&xmlSecGnuTLSKeyDataDsaKlass);
+xmlSecGCryptKeyDataDsaGetKlass(void) {
+    return(&xmlSecGCryptKeyDataDsaKlass);
 }
 
 /**
- * xmlSecGnuTLSKeyDataDsaAdoptKey:
+ * xmlSecGCryptKeyDataDsaAdoptKey:
  * @data:               the pointer to DSA key data.
- * @dsa_key:            the pointer to GnuTLS DSA key.
+ * @dsa_key:            the pointer to GCrypt DSA key.
  *
  * Sets the value of DSA key data.
  *
  * Returns: 0 on success or a negative value otherwise.
  */
 int
-xmlSecGnuTLSKeyDataDsaAdoptKey(xmlSecKeyDataPtr data, gcry_sexp_t dsa_key) {
-    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataDsaId), -1);
+xmlSecGCryptKeyDataDsaAdoptKey(xmlSecKeyDataPtr data, gcry_sexp_t dsa_key) {
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataDsaId), -1);
     xmlSecAssert2(dsa_key != NULL, -1);
 
-    return xmlSecGnuTLSAsymKeyDataAdoptKey(data, dsa_key);
+    return xmlSecGCryptAsymKeyDataAdoptKey(data, dsa_key);
 }
 
 
 /**
- * xmlSecGnuTLSKeyDataDsaAdoptKeyPair:
+ * xmlSecGCryptKeyDataDsaAdoptKeyPair:
  * @data:               the pointer to DSA key data.
- * @pub_key:            the pointer to GnuTLS DSA pub key.
- * @priv_key:           the pointer to GnuTLS DSA priv key.
+ * @pub_key:            the pointer to GCrypt DSA pub key.
+ * @priv_key:           the pointer to GCrypt DSA priv key.
  *
  * Sets the value of DSA key data.
  *
  * Returns: 0 on success or a negative value otherwise.
  */
 int
-xmlSecGnuTLSKeyDataDsaAdoptKeyPair(xmlSecKeyDataPtr data, gcry_sexp_t pub_key, gcry_sexp_t priv_key) {
-    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataDsaId), -1);
+xmlSecGCryptKeyDataDsaAdoptKeyPair(xmlSecKeyDataPtr data, gcry_sexp_t pub_key, gcry_sexp_t priv_key) {
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataDsaId), -1);
     xmlSecAssert2(pub_key != NULL, -1);
 
-    return xmlSecGnuTLSAsymKeyDataAdoptKeyPair(data, pub_key, priv_key);
+    return xmlSecGCryptAsymKeyDataAdoptKeyPair(data, pub_key, priv_key);
 }
 
 /**
- * xmlSecGnuTLSKeyDataDsaGetPublicKey:
+ * xmlSecGCryptKeyDataDsaGetPublicKey:
  * @data:               the pointer to DSA key data.
  *
- * Gets the GnuTLS DSA public key from DSA key data.
+ * Gets the GCrypt DSA public key from DSA key data.
  *
- * Returns: pointer to GnuTLS public DSA key or NULL if an error occurs.
+ * Returns: pointer to GCrypt public DSA key or NULL if an error occurs.
  */
 gcry_sexp_t
-xmlSecGnuTLSKeyDataDsaGetPublicKey(xmlSecKeyDataPtr data) {
-    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataDsaId), NULL);
-    return xmlSecGnuTLSAsymKeyDataGetPublicKey(data);
+xmlSecGCryptKeyDataDsaGetPublicKey(xmlSecKeyDataPtr data) {
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataDsaId), NULL);
+    return xmlSecGCryptAsymKeyDataGetPublicKey(data);
 }
 
 /**
- * xmlSecGnuTLSKeyDataDsaGetPrivateKey:
+ * xmlSecGCryptKeyDataDsaGetPrivateKey:
  * @data:               the pointer to DSA key data.
  *
- * Gets the GnuTLS DSA private key from DSA key data.
+ * Gets the GCrypt DSA private key from DSA key data.
  *
- * Returns: pointer to GnuTLS private DSA key or NULL if an error occurs.
+ * Returns: pointer to GCrypt private DSA key or NULL if an error occurs.
  */
 gcry_sexp_t
-xmlSecGnuTLSKeyDataDsaGetPrivateKey(xmlSecKeyDataPtr data) {
-    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataDsaId), NULL);
-    return xmlSecGnuTLSAsymKeyDataGetPrivateKey(data);
+xmlSecGCryptKeyDataDsaGetPrivateKey(xmlSecKeyDataPtr data) {
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataDsaId), NULL);
+    return xmlSecGCryptAsymKeyDataGetPrivateKey(data);
 }
 
 static int
-xmlSecGnuTLSKeyDataDsaInitialize(xmlSecKeyDataPtr data) {
-    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataDsaId), -1);
+xmlSecGCryptKeyDataDsaInitialize(xmlSecKeyDataPtr data) {
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataDsaId), -1);
 
-    return(xmlSecGnuTLSAsymKeyDataInitialize(data));
+    return(xmlSecGCryptAsymKeyDataInitialize(data));
 }
 
 static int
-xmlSecGnuTLSKeyDataDsaDuplicate(xmlSecKeyDataPtr dst, xmlSecKeyDataPtr src) {
-    xmlSecAssert2(xmlSecKeyDataCheckId(dst, xmlSecGnuTLSKeyDataDsaId), -1);
-    xmlSecAssert2(xmlSecKeyDataCheckId(src, xmlSecGnuTLSKeyDataDsaId), -1);
+xmlSecGCryptKeyDataDsaDuplicate(xmlSecKeyDataPtr dst, xmlSecKeyDataPtr src) {
+    xmlSecAssert2(xmlSecKeyDataCheckId(dst, xmlSecGCryptKeyDataDsaId), -1);
+    xmlSecAssert2(xmlSecKeyDataCheckId(src, xmlSecGCryptKeyDataDsaId), -1);
 
-    return(xmlSecGnuTLSAsymKeyDataDuplicate(dst, src));
+    return(xmlSecGCryptAsymKeyDataDuplicate(dst, src));
 }
 
 static void
-xmlSecGnuTLSKeyDataDsaFinalize(xmlSecKeyDataPtr data) {
-    xmlSecAssert(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataDsaId));
+xmlSecGCryptKeyDataDsaFinalize(xmlSecKeyDataPtr data) {
+    xmlSecAssert(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataDsaId));
 
-    xmlSecGnuTLSAsymKeyDataFinalize(data);
+    xmlSecGCryptAsymKeyDataFinalize(data);
 }
 
 static int
-xmlSecGnuTLSKeyDataDsaGenerate(xmlSecKeyDataPtr data, xmlSecSize sizeBits, xmlSecKeyDataType type ATTRIBUTE_UNUSED) {
-    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataDsaId), -1);
+xmlSecGCryptKeyDataDsaGenerate(xmlSecKeyDataPtr data, xmlSecSize sizeBits, xmlSecKeyDataType type ATTRIBUTE_UNUSED) {
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataDsaId), -1);
     xmlSecAssert2(sizeBits > 0, -1);
 
-    return xmlSecGnuTLSAsymKeyDataGenerate(data, "dsa", sizeBits);
+    return xmlSecGCryptAsymKeyDataGenerate(data, "dsa", sizeBits);
 }
 
 static xmlSecKeyDataType
-xmlSecGnuTLSKeyDataDsaGetType(xmlSecKeyDataPtr data) {
-    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataDsaId), xmlSecKeyDataTypeUnknown);
+xmlSecGCryptKeyDataDsaGetType(xmlSecKeyDataPtr data) {
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataDsaId), xmlSecKeyDataTypeUnknown);
 
-    return xmlSecGnuTLSAsymKeyDataGetType(data);
+    return xmlSecGCryptAsymKeyDataGetType(data);
 }
 
 static xmlSecSize
-xmlSecGnuTLSKeyDataDsaGetSize(xmlSecKeyDataPtr data) {
-    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataDsaId), 0);
+xmlSecGCryptKeyDataDsaGetSize(xmlSecKeyDataPtr data) {
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataDsaId), 0);
 
-    return xmlSecGnuTLSAsymKeyDataGetSize(data);
+    return xmlSecGCryptAsymKeyDataGetSize(data);
 }
 
 static void
-xmlSecGnuTLSKeyDataDsaDebugDump(xmlSecKeyDataPtr data, FILE* output) {
-    xmlSecAssert(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataDsaId));
+xmlSecGCryptKeyDataDsaDebugDump(xmlSecKeyDataPtr data, FILE* output) {
+    xmlSecAssert(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataDsaId));
     xmlSecAssert(output != NULL);
 
     fprintf(output, "=== dsa key: size = %d\n",
-            xmlSecGnuTLSKeyDataDsaGetSize(data));
+            xmlSecGCryptKeyDataDsaGetSize(data));
 }
 
 static void
-xmlSecGnuTLSKeyDataDsaDebugXmlDump(xmlSecKeyDataPtr data, FILE* output) {
-    xmlSecAssert(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataDsaId));
+xmlSecGCryptKeyDataDsaDebugXmlDump(xmlSecKeyDataPtr data, FILE* output) {
+    xmlSecAssert(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataDsaId));
     xmlSecAssert(output != NULL);
 
     fprintf(output, "<DSAKeyValue size=\"%d\" />\n",
-            xmlSecGnuTLSKeyDataDsaGetSize(data));
+            xmlSecGCryptKeyDataDsaGetSize(data));
 }
 
 static int
-xmlSecGnuTLSKeyDataDsaXmlRead(xmlSecKeyDataId id,
+xmlSecGCryptKeyDataDsaXmlRead(xmlSecKeyDataId id,
                               xmlSecKeyPtr key,
                               xmlNodePtr node,
                               xmlSecKeyInfoCtxPtr keyInfoCtx)
@@ -941,7 +940,7 @@ xmlSecGnuTLSKeyDataDsaXmlRead(xmlSecKeyDataId id,
     int res = -1;
     int ret;
 
-    xmlSecAssert2(id == xmlSecGnuTLSKeyDataDsaId, -1);
+    xmlSecAssert2(id == xmlSecGCryptKeyDataDsaId, -1);
     xmlSecAssert2(key != NULL, -1);
     xmlSecAssert2(node != NULL, -1);
     xmlSecAssert2(keyInfoCtx != NULL, -1);
@@ -967,11 +966,11 @@ xmlSecGnuTLSKeyDataDsaXmlRead(xmlSecKeyDataId id,
                     xmlSecErrorsSafeString(xmlSecNodeDSAP));
         goto done;
     }
-    p = xmlSecGnuTLSNodeGetMpiValue(cur);
+    p = xmlSecGCryptNodeGetMpiValue(cur);
     if(p == NULL) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-                    "xmlSecGnuTLSNodeGetMpiValue",
+                    "xmlSecGCryptNodeGetMpiValue",
                     XMLSEC_ERRORS_R_XMLSEC_FAILED,
                     "node=%s",
                     xmlSecErrorsSafeString(xmlSecNodeDSAP));
@@ -989,11 +988,11 @@ xmlSecGnuTLSKeyDataDsaXmlRead(xmlSecKeyDataId id,
                     xmlSecErrorsSafeString(xmlSecNodeDSAQ));
         goto done;
     }
-    q = xmlSecGnuTLSNodeGetMpiValue(cur);
+    q = xmlSecGCryptNodeGetMpiValue(cur);
     if(q == NULL) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-                    "xmlSecGnuTLSNodeGetMpiValue",
+                    "xmlSecGCryptNodeGetMpiValue",
                     XMLSEC_ERRORS_R_XMLSEC_FAILED,
                     "node=%s",
                     xmlSecErrorsSafeString(xmlSecNodeDSAQ));
@@ -1011,11 +1010,11 @@ xmlSecGnuTLSKeyDataDsaXmlRead(xmlSecKeyDataId id,
                     xmlSecErrorsSafeString(xmlSecNodeDSAG));
         goto done;
     }
-    g = xmlSecGnuTLSNodeGetMpiValue(cur);
+    g = xmlSecGCryptNodeGetMpiValue(cur);
     if(g == NULL) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-                    "xmlSecGnuTLSNodeGetMpiValue",
+                    "xmlSecGCryptNodeGetMpiValue",
                     XMLSEC_ERRORS_R_XMLSEC_FAILED,
                     "node=%s",
                     xmlSecErrorsSafeString(xmlSecNodeDSAG));
@@ -1026,11 +1025,11 @@ xmlSecGnuTLSKeyDataDsaXmlRead(xmlSecKeyDataId id,
     if((cur != NULL) && (xmlSecCheckNodeName(cur, xmlSecNodeDSAX, xmlSecNs))) {
         /* next is X node. It is REQUIRED for private key but
          * we are not sure exactly what do we read */
-        x = xmlSecGnuTLSNodeGetMpiValue(cur);
+        x = xmlSecGCryptNodeGetMpiValue(cur);
         if(x == NULL) {
             xmlSecError(XMLSEC_ERRORS_HERE,
                         xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-                        "xmlSecGnuTLSNodeGetMpiValue",
+                        "xmlSecGCryptNodeGetMpiValue",
                         XMLSEC_ERRORS_R_XMLSEC_FAILED,
                         "node=%s",
                         xmlSecErrorsSafeString(xmlSecNodeDSAX));
@@ -1049,11 +1048,11 @@ xmlSecGnuTLSKeyDataDsaXmlRead(xmlSecKeyDataId id,
                     xmlSecErrorsSafeString(xmlSecNodeDSAY));
         goto done;
     }
-    y = xmlSecGnuTLSNodeGetMpiValue(cur);
+    y = xmlSecGCryptNodeGetMpiValue(cur);
     if(y == NULL) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-                    "xmlSecGnuTLSNodeGetMpiValue",
+                    "xmlSecGCryptNodeGetMpiValue",
                     XMLSEC_ERRORS_R_XMLSEC_FAILED,
                     "node=%s", xmlSecErrorsSafeString(xmlSecNodeDSAY));
         goto done;
@@ -1122,11 +1121,11 @@ xmlSecGnuTLSKeyDataDsaXmlRead(xmlSecKeyDataId id,
         goto done;
     }
 
-    ret = xmlSecGnuTLSKeyDataDsaAdoptKeyPair(data, pub_key, priv_key);
+    ret = xmlSecGCryptKeyDataDsaAdoptKeyPair(data, pub_key, priv_key);
     if(ret < 0) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
-                    "xmlSecGnuTLSKeyDataDsaAdoptKeyPair",
+                    "xmlSecGCryptKeyDataDsaAdoptKeyPair",
                     XMLSEC_ERRORS_R_XMLSEC_FAILED,
                     XMLSEC_ERRORS_NO_MESSAGE);
         goto done;
@@ -1186,7 +1185,7 @@ done:
 }
 
 static int
-xmlSecGnuTLSKeyDataDsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
+xmlSecGCryptKeyDataDsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
                                 xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) {
     xmlNodePtr cur;
     gcry_sexp_t pub_priv_key;
@@ -1195,9 +1194,9 @@ xmlSecGnuTLSKeyDataDsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
     int res = -1;
     int ret;
 
-    xmlSecAssert2(id == xmlSecGnuTLSKeyDataDsaId, -1);
+    xmlSecAssert2(id == xmlSecGCryptKeyDataDsaId, -1);
     xmlSecAssert2(key != NULL, -1);
-    xmlSecAssert2(xmlSecKeyDataCheckId(xmlSecKeyGetValue(key), xmlSecGnuTLSKeyDataDsaId), -1);
+    xmlSecAssert2(xmlSecKeyDataCheckId(xmlSecKeyGetValue(key), xmlSecGCryptKeyDataDsaId), -1);
     xmlSecAssert2(node != NULL, -1);
     xmlSecAssert2(keyInfoCtx != NULL, -1);
 
@@ -1207,13 +1206,13 @@ xmlSecGnuTLSKeyDataDsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
     }
 
     /* find the private or public key */
-    pub_priv_key = xmlSecGnuTLSKeyDataDsaGetPrivateKey(xmlSecKeyGetValue(key));
+    pub_priv_key = xmlSecGCryptKeyDataDsaGetPrivateKey(xmlSecKeyGetValue(key));
     if(pub_priv_key == NULL) {
-        pub_priv_key = xmlSecGnuTLSKeyDataDsaGetPublicKey(xmlSecKeyGetValue(key));
+        pub_priv_key = xmlSecGCryptKeyDataDsaGetPublicKey(xmlSecKeyGetValue(key));
         if(pub_priv_key == NULL) {
             xmlSecError(XMLSEC_ERRORS_HERE,
                         xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-                        "xmlSecGnuTLSKeyDataDsaGetPublicKey()",
+                        "xmlSecGCryptKeyDataDsaGetPublicKey()",
                         XMLSEC_ERRORS_R_XMLSEC_FAILED,
                         XMLSEC_ERRORS_NO_MESSAGE);
             goto done;
@@ -1243,11 +1242,11 @@ xmlSecGnuTLSKeyDataDsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
                     xmlSecErrorsSafeString(xmlSecNodeDSAP));
         goto done;
     }
-    ret = xmlSecGnuTLSNodeSetSExpTokValue(cur, dsa, "p", 1);
+    ret = xmlSecGCryptNodeSetSExpTokValue(cur, dsa, "p", 1);
     if(ret < 0) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-                    "xmlSecGnuTLSNodeSetSExpTokValue",
+                    "xmlSecGCryptNodeSetSExpTokValue",
                     XMLSEC_ERRORS_R_XMLSEC_FAILED,
                     "node=%s",
                     xmlSecErrorsSafeString(xmlSecNodeDSAP));
@@ -1265,11 +1264,11 @@ xmlSecGnuTLSKeyDataDsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
                     xmlSecErrorsSafeString(xmlSecNodeDSAQ));
         goto done;
     }
-    ret = xmlSecGnuTLSNodeSetSExpTokValue(cur, dsa, "q", 1);
+    ret = xmlSecGCryptNodeSetSExpTokValue(cur, dsa, "q", 1);
     if(ret < 0) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-                    "xmlSecGnuTLSNodeSetSExpTokValue",
+                    "xmlSecGCryptNodeSetSExpTokValue",
                     XMLSEC_ERRORS_R_XMLSEC_FAILED,
                     "node=%s",
                     xmlSecErrorsSafeString(xmlSecNodeDSAQ));
@@ -1287,11 +1286,11 @@ xmlSecGnuTLSKeyDataDsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
                     xmlSecErrorsSafeString(xmlSecNodeDSAG));
         goto done;
     }
-    ret = xmlSecGnuTLSNodeSetSExpTokValue(cur, dsa, "g", 1);
+    ret = xmlSecGCryptNodeSetSExpTokValue(cur, dsa, "g", 1);
     if(ret < 0) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-                    "xmlSecGnuTLSNodeSetSExpTokValue",
+                    "xmlSecGCryptNodeSetSExpTokValue",
                     XMLSEC_ERRORS_R_XMLSEC_FAILED,
                     "node=%s",
                     xmlSecErrorsSafeString(xmlSecNodeDSAG));
@@ -1310,11 +1309,11 @@ xmlSecGnuTLSKeyDataDsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
                         xmlSecErrorsSafeString(xmlSecNodeDSAX));
             goto done;
         }
-        ret = xmlSecGnuTLSNodeSetSExpTokValue(cur, dsa, "x", 1);
+        ret = xmlSecGCryptNodeSetSExpTokValue(cur, dsa, "x", 1);
         if(ret < 0) {
             xmlSecError(XMLSEC_ERRORS_HERE,
                         xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-                        "xmlSecGnuTLSNodeSetSExpTokValue",
+                        "xmlSecGCryptNodeSetSExpTokValue",
                         XMLSEC_ERRORS_R_XMLSEC_FAILED,
                         "node=%s",
                         xmlSecErrorsSafeString(xmlSecNodeDSAX));
@@ -1333,11 +1332,11 @@ xmlSecGnuTLSKeyDataDsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
                     xmlSecErrorsSafeString(xmlSecNodeDSAY));
         goto done;
     }
-    ret = xmlSecGnuTLSNodeSetSExpTokValue(cur, dsa, "y", 1);
+    ret = xmlSecGCryptNodeSetSExpTokValue(cur, dsa, "y", 1);
     if(ret < 0) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-                    "xmlSecGnuTLSNodeSetSExpTokValue",
+                    "xmlSecGCryptNodeSetSExpTokValue",
                     XMLSEC_ERRORS_R_XMLSEC_FAILED,
                     "node=%s",
                     xmlSecErrorsSafeString(xmlSecNodeDSAY));
@@ -1402,31 +1401,31 @@ done:
  *
  *************************************************************************/
 
-static int              xmlSecGnuTLSKeyDataRsaInitialize       (xmlSecKeyDataPtr data);
-static int              xmlSecGnuTLSKeyDataRsaDuplicate        (xmlSecKeyDataPtr dst,
+static int              xmlSecGCryptKeyDataRsaInitialize       (xmlSecKeyDataPtr data);
+static int              xmlSecGCryptKeyDataRsaDuplicate        (xmlSecKeyDataPtr dst,
                                                                  xmlSecKeyDataPtr src);
-static void             xmlSecGnuTLSKeyDataRsaFinalize         (xmlSecKeyDataPtr data);
-static int              xmlSecGnuTLSKeyDataRsaXmlRead          (xmlSecKeyDataId id,
+static void             xmlSecGCryptKeyDataRsaFinalize         (xmlSecKeyDataPtr data);
+static int              xmlSecGCryptKeyDataRsaXmlRead          (xmlSecKeyDataId id,
                                                                  xmlSecKeyPtr key,
                                                                  xmlNodePtr node,
                                                                  xmlSecKeyInfoCtxPtr keyInfoCtx);
-static int              xmlSecGnuTLSKeyDataRsaXmlWrite         (xmlSecKeyDataId id,
+static int              xmlSecGCryptKeyDataRsaXmlWrite         (xmlSecKeyDataId id,
                                                                  xmlSecKeyPtr key,
                                                                  xmlNodePtr node,
                                                                  xmlSecKeyInfoCtxPtr keyInfoCtx);
-static int              xmlSecGnuTLSKeyDataRsaGenerate         (xmlSecKeyDataPtr data,
+static int              xmlSecGCryptKeyDataRsaGenerate         (xmlSecKeyDataPtr data,
                                                                  xmlSecSize sizeBits,
                                                                  xmlSecKeyDataType type);
 
-static xmlSecKeyDataType xmlSecGnuTLSKeyDataRsaGetType         (xmlSecKeyDataPtr data);
-static xmlSecSize               xmlSecGnuTLSKeyDataRsaGetSize          (xmlSecKeyDataPtr data);
-static void             xmlSecGnuTLSKeyDataRsaDebugDump        (xmlSecKeyDataPtr data,
+static xmlSecKeyDataType xmlSecGCryptKeyDataRsaGetType         (xmlSecKeyDataPtr data);
+static xmlSecSize               xmlSecGCryptKeyDataRsaGetSize          (xmlSecKeyDataPtr data);
+static void             xmlSecGCryptKeyDataRsaDebugDump        (xmlSecKeyDataPtr data,
                                                                  FILE* output);
-static void             xmlSecGnuTLSKeyDataRsaDebugXmlDump     (xmlSecKeyDataPtr data,
+static void             xmlSecGCryptKeyDataRsaDebugXmlDump     (xmlSecKeyDataPtr data,
                                                                  FILE* output);
-static xmlSecKeyDataKlass xmlSecGnuTLSKeyDataRsaKlass = {
+static xmlSecKeyDataKlass xmlSecGCryptKeyDataRsaKlass = {
     sizeof(xmlSecKeyDataKlass),
-    xmlSecGnuTLSAsymKeyDataSize,
+    xmlSecGCryptAsymKeyDataSize,
 
     /* data */
     xmlSecNameRSAKeyValue,
@@ -1437,25 +1436,25 @@ static xmlSecKeyDataKlass xmlSecGnuTLSKeyDataRsaKlass = {
     xmlSecDSigNs,                               /* const xmlChar* dataNodeNs; */
 
     /* constructors/destructor */
-    xmlSecGnuTLSKeyDataRsaInitialize,          /* xmlSecKeyDataInitializeMethod initialize; */
-    xmlSecGnuTLSKeyDataRsaDuplicate,           /* xmlSecKeyDataDuplicateMethod duplicate; */
-    xmlSecGnuTLSKeyDataRsaFinalize,            /* xmlSecKeyDataFinalizeMethod finalize; */
-    xmlSecGnuTLSKeyDataRsaGenerate,            /* xmlSecKeyDataGenerateMethod generate; */
+    xmlSecGCryptKeyDataRsaInitialize,          /* xmlSecKeyDataInitializeMethod initialize; */
+    xmlSecGCryptKeyDataRsaDuplicate,           /* xmlSecKeyDataDuplicateMethod duplicate; */
+    xmlSecGCryptKeyDataRsaFinalize,            /* xmlSecKeyDataFinalizeMethod finalize; */
+    xmlSecGCryptKeyDataRsaGenerate,            /* xmlSecKeyDataGenerateMethod generate; */
 
     /* get info */
-    xmlSecGnuTLSKeyDataRsaGetType,             /* xmlSecKeyDataGetTypeMethod getType; */
-    xmlSecGnuTLSKeyDataRsaGetSize,             /* xmlSecKeyDataGetSizeMethod getSize; */
+    xmlSecGCryptKeyDataRsaGetType,             /* xmlSecKeyDataGetTypeMethod getType; */
+    xmlSecGCryptKeyDataRsaGetSize,             /* xmlSecKeyDataGetSizeMethod getSize; */
     NULL,                                       /* xmlSecKeyDataGetIdentifier getIdentifier; */
 
     /* read/write */
-    xmlSecGnuTLSKeyDataRsaXmlRead,             /* xmlSecKeyDataXmlReadMethod xmlRead; */
-    xmlSecGnuTLSKeyDataRsaXmlWrite,            /* xmlSecKeyDataXmlWriteMethod xmlWrite; */
+    xmlSecGCryptKeyDataRsaXmlRead,             /* xmlSecKeyDataXmlReadMethod xmlRead; */
+    xmlSecGCryptKeyDataRsaXmlWrite,            /* xmlSecKeyDataXmlWriteMethod xmlWrite; */
     NULL,                                       /* xmlSecKeyDataBinReadMethod binRead; */
     NULL,                                       /* xmlSecKeyDataBinWriteMethod binWrite; */
 
     /* debug */
-    xmlSecGnuTLSKeyDataRsaDebugDump,           /* xmlSecKeyDataDebugDumpMethod debugDump; */
-    xmlSecGnuTLSKeyDataRsaDebugXmlDump,        /* xmlSecKeyDataDebugDumpMethod debugXmlDump; */
+    xmlSecGCryptKeyDataRsaDebugDump,           /* xmlSecKeyDataDebugDumpMethod debugDump; */
+    xmlSecGCryptKeyDataRsaDebugXmlDump,        /* xmlSecKeyDataDebugDumpMethod debugXmlDump; */
 
     /* reserved for the future */
     NULL,                                       /* void* reserved0; */
@@ -1463,145 +1462,145 @@ static xmlSecKeyDataKlass xmlSecGnuTLSKeyDataRsaKlass = {
 };
 
 /**
- * xmlSecGnuTLSKeyDataRsaGetKlass:
+ * xmlSecGCryptKeyDataRsaGetKlass:
  *
- * The GnuTLS RSA key data klass.
+ * The GCrypt RSA key data klass.
  *
- * Returns: pointer to GnuTLS RSA key data klass.
+ * Returns: pointer to GCrypt RSA key data klass.
  */
 xmlSecKeyDataId
-xmlSecGnuTLSKeyDataRsaGetKlass(void) {
-    return(&xmlSecGnuTLSKeyDataRsaKlass);
+xmlSecGCryptKeyDataRsaGetKlass(void) {
+    return(&xmlSecGCryptKeyDataRsaKlass);
 }
 
 /**
- * xmlSecGnuTLSKeyDataRsaAdoptKey:
+ * xmlSecGCryptKeyDataRsaAdoptKey:
  * @data:               the pointer to RSA key data.
- * @rsa_key:            the pointer to GnuTLS RSA key.
+ * @rsa_key:            the pointer to GCrypt RSA key.
  *
  * Sets the value of RSA key data.
  *
  * Returns: 0 on success or a negative value otherwise.
  */
 int
-xmlSecGnuTLSKeyDataRsaAdoptKey(xmlSecKeyDataPtr data, gcry_sexp_t rsa_key) {
-    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataRsaId), -1);
+xmlSecGCryptKeyDataRsaAdoptKey(xmlSecKeyDataPtr data, gcry_sexp_t rsa_key) {
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataRsaId), -1);
     xmlSecAssert2(rsa_key != NULL, -1);
 
-    return xmlSecGnuTLSAsymKeyDataAdoptKey(data, rsa_key);
+    return xmlSecGCryptAsymKeyDataAdoptKey(data, rsa_key);
 }
 
 
 /**
- * xmlSecGnuTLSKeyDataRsaAdoptKeyPair:
+ * xmlSecGCryptKeyDataRsaAdoptKeyPair:
  * @data:               the pointer to RSA key data.
- * @pub_key:            the pointer to GnuTLS RSA pub key.
- * @priv_key:           the pointer to GnuTLS RSA priv key.
+ * @pub_key:            the pointer to GCrypt RSA pub key.
+ * @priv_key:           the pointer to GCrypt RSA priv key.
  *
  * Sets the value of RSA key data.
  *
  * Returns: 0 on success or a negative value otherwise.
  */
 int
-xmlSecGnuTLSKeyDataRsaAdoptKeyPair(xmlSecKeyDataPtr data, gcry_sexp_t pub_key, gcry_sexp_t priv_key) {
-    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataRsaId), -1);
+xmlSecGCryptKeyDataRsaAdoptKeyPair(xmlSecKeyDataPtr data, gcry_sexp_t pub_key, gcry_sexp_t priv_key) {
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataRsaId), -1);
     xmlSecAssert2(pub_key != NULL, -1);
 
-    return xmlSecGnuTLSAsymKeyDataAdoptKeyPair(data, pub_key, priv_key);
+    return xmlSecGCryptAsymKeyDataAdoptKeyPair(data, pub_key, priv_key);
 }
 
 /**
- * xmlSecGnuTLSKeyDataRsaGetPublicKey:
+ * xmlSecGCryptKeyDataRsaGetPublicKey:
  * @data:               the pointer to RSA key data.
  *
- * Gets the GnuTLS RSA public key from RSA key data.
+ * Gets the GCrypt RSA public key from RSA key data.
  *
- * Returns: pointer to GnuTLS public RSA key or NULL if an error occurs.
+ * Returns: pointer to GCrypt public RSA key or NULL if an error occurs.
  */
 gcry_sexp_t
-xmlSecGnuTLSKeyDataRsaGetPublicKey(xmlSecKeyDataPtr data) {
-    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataRsaId), NULL);
-    return xmlSecGnuTLSAsymKeyDataGetPublicKey(data);
+xmlSecGCryptKeyDataRsaGetPublicKey(xmlSecKeyDataPtr data) {
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataRsaId), NULL);
+    return xmlSecGCryptAsymKeyDataGetPublicKey(data);
 }
 
 /**
- * xmlSecGnuTLSKeyDataRsaGetPrivateKey:
+ * xmlSecGCryptKeyDataRsaGetPrivateKey:
  * @data:               the pointer to RSA key data.
  *
- * Gets the GnuTLS RSA private key from RSA key data.
+ * Gets the GCrypt RSA private key from RSA key data.
  *
- * Returns: pointer to GnuTLS private RSA key or NULL if an error occurs.
+ * Returns: pointer to GCrypt private RSA key or NULL if an error occurs.
  */
 gcry_sexp_t
-xmlSecGnuTLSKeyDataRsaGetPrivateKey(xmlSecKeyDataPtr data) {
-    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataRsaId), NULL);
-    return xmlSecGnuTLSAsymKeyDataGetPrivateKey(data);
+xmlSecGCryptKeyDataRsaGetPrivateKey(xmlSecKeyDataPtr data) {
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataRsaId), NULL);
+    return xmlSecGCryptAsymKeyDataGetPrivateKey(data);
 }
 
 static int
-xmlSecGnuTLSKeyDataRsaInitialize(xmlSecKeyDataPtr data) {
-    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataRsaId), -1);
+xmlSecGCryptKeyDataRsaInitialize(xmlSecKeyDataPtr data) {
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataRsaId), -1);
 
-    return(xmlSecGnuTLSAsymKeyDataInitialize(data));
+    return(xmlSecGCryptAsymKeyDataInitialize(data));
 }
 
 static int
-xmlSecGnuTLSKeyDataRsaDuplicate(xmlSecKeyDataPtr dst, xmlSecKeyDataPtr src) {
-    xmlSecAssert2(xmlSecKeyDataCheckId(dst, xmlSecGnuTLSKeyDataRsaId), -1);
-    xmlSecAssert2(xmlSecKeyDataCheckId(src, xmlSecGnuTLSKeyDataRsaId), -1);
+xmlSecGCryptKeyDataRsaDuplicate(xmlSecKeyDataPtr dst, xmlSecKeyDataPtr src) {
+    xmlSecAssert2(xmlSecKeyDataCheckId(dst, xmlSecGCryptKeyDataRsaId), -1);
+    xmlSecAssert2(xmlSecKeyDataCheckId(src, xmlSecGCryptKeyDataRsaId), -1);
 
-    return(xmlSecGnuTLSAsymKeyDataDuplicate(dst, src));
+    return(xmlSecGCryptAsymKeyDataDuplicate(dst, src));
 }
 
 static void
-xmlSecGnuTLSKeyDataRsaFinalize(xmlSecKeyDataPtr data) {
-    xmlSecAssert(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataRsaId));
+xmlSecGCryptKeyDataRsaFinalize(xmlSecKeyDataPtr data) {
+    xmlSecAssert(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataRsaId));
 
-    xmlSecGnuTLSAsymKeyDataFinalize(data);
+    xmlSecGCryptAsymKeyDataFinalize(data);
 }
 
 static int
-xmlSecGnuTLSKeyDataRsaGenerate(xmlSecKeyDataPtr data, xmlSecSize sizeBits, xmlSecKeyDataType type ATTRIBUTE_UNUSED) {
-    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataRsaId), -1);
+xmlSecGCryptKeyDataRsaGenerate(xmlSecKeyDataPtr data, xmlSecSize sizeBits, xmlSecKeyDataType type ATTRIBUTE_UNUSED) {
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataRsaId), -1);
     xmlSecAssert2(sizeBits > 0, -1);
 
-    return xmlSecGnuTLSAsymKeyDataGenerate(data, "rsa", sizeBits);
+    return xmlSecGCryptAsymKeyDataGenerate(data, "rsa", sizeBits);
 }
 
 static xmlSecKeyDataType
-xmlSecGnuTLSKeyDataRsaGetType(xmlSecKeyDataPtr data) {
-    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataRsaId), xmlSecKeyDataTypeUnknown);
+xmlSecGCryptKeyDataRsaGetType(xmlSecKeyDataPtr data) {
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataRsaId), xmlSecKeyDataTypeUnknown);
 
-    return xmlSecGnuTLSAsymKeyDataGetType(data);
+    return xmlSecGCryptAsymKeyDataGetType(data);
 }
 
 static xmlSecSize
-xmlSecGnuTLSKeyDataRsaGetSize(xmlSecKeyDataPtr data) {
-    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataRsaId), 0);
+xmlSecGCryptKeyDataRsaGetSize(xmlSecKeyDataPtr data) {
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataRsaId), 0);
 
-    return xmlSecGnuTLSAsymKeyDataGetSize(data);
+    return xmlSecGCryptAsymKeyDataGetSize(data);
 }
 
 static void
-xmlSecGnuTLSKeyDataRsaDebugDump(xmlSecKeyDataPtr data, FILE* output) {
-    xmlSecAssert(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataRsaId));
+xmlSecGCryptKeyDataRsaDebugDump(xmlSecKeyDataPtr data, FILE* output) {
+    xmlSecAssert(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataRsaId));
     xmlSecAssert(output != NULL);
 
     fprintf(output, "=== rsa key: size = %d\n",
-            xmlSecGnuTLSKeyDataRsaGetSize(data));
+            xmlSecGCryptKeyDataRsaGetSize(data));
 }
 
 static void
-xmlSecGnuTLSKeyDataRsaDebugXmlDump(xmlSecKeyDataPtr data, FILE* output) {
-    xmlSecAssert(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataRsaId));
+xmlSecGCryptKeyDataRsaDebugXmlDump(xmlSecKeyDataPtr data, FILE* output) {
+    xmlSecAssert(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataRsaId));
     xmlSecAssert(output != NULL);
 
     fprintf(output, "<RSAKeyValue size=\"%d\" />\n",
-            xmlSecGnuTLSKeyDataRsaGetSize(data));
+            xmlSecGCryptKeyDataRsaGetSize(data));
 }
 
 static int
-xmlSecGnuTLSKeyDataRsaXmlRead(xmlSecKeyDataId id, xmlSecKeyPtr key,
+xmlSecGCryptKeyDataRsaXmlRead(xmlSecKeyDataId id, xmlSecKeyPtr key,
                                     xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) {
     xmlNodePtr cur;
     xmlSecKeyDataPtr data = NULL;
@@ -1614,7 +1613,7 @@ xmlSecGnuTLSKeyDataRsaXmlRead(xmlSecKeyDataId id, xmlSecKeyPtr key,
     int res = -1;
     int ret;
 
-    xmlSecAssert2(id == xmlSecGnuTLSKeyDataRsaId, -1);
+    xmlSecAssert2(id == xmlSecGCryptKeyDataRsaId, -1);
     xmlSecAssert2(key != NULL, -1);
     xmlSecAssert2(node != NULL, -1);
     xmlSecAssert2(keyInfoCtx != NULL, -1);
@@ -1640,11 +1639,11 @@ xmlSecGnuTLSKeyDataRsaXmlRead(xmlSecKeyDataId id, xmlSecKeyPtr key,
                     xmlSecErrorsSafeString(xmlSecNodeRSAModulus));
         goto done;
     }
-    n = xmlSecGnuTLSNodeGetMpiValue(cur);
+    n = xmlSecGCryptNodeGetMpiValue(cur);
     if(n == NULL) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-                    "xmlSecGnuTLSNodeGetMpiValue",
+                    "xmlSecGCryptNodeGetMpiValue",
                     XMLSEC_ERRORS_R_XMLSEC_FAILED,
                     "node=%s",
                     xmlSecErrorsSafeString(xmlSecNodeRSAModulus));
@@ -1662,11 +1661,11 @@ xmlSecGnuTLSKeyDataRsaXmlRead(xmlSecKeyDataId id, xmlSecKeyPtr key,
                     xmlSecErrorsSafeString(xmlSecNodeRSAExponent));
         goto done;
     }
-    e = xmlSecGnuTLSNodeGetMpiValue(cur);
+    e = xmlSecGCryptNodeGetMpiValue(cur);
     if(e == NULL) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-                    "xmlSecGnuTLSNodeGetMpiValue",
+                    "xmlSecGCryptNodeGetMpiValue",
                     XMLSEC_ERRORS_R_XMLSEC_FAILED,
                     "node=%s",
                     xmlSecErrorsSafeString(xmlSecNodeRSAExponent));
@@ -1676,11 +1675,11 @@ xmlSecGnuTLSKeyDataRsaXmlRead(xmlSecKeyDataId id, xmlSecKeyPtr key,
 
     if((cur != NULL) && (xmlSecCheckNodeName(cur, xmlSecNodeRSAPrivateExponent, xmlSecNs))) {
         /* next is PrivateExponent node. It is REQUIRED for private key */
-        d = xmlSecGnuTLSNodeGetMpiValue(cur);
+        d = xmlSecGCryptNodeGetMpiValue(cur);
         if(d == NULL) {
             xmlSecError(XMLSEC_ERRORS_HERE,
                         xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-                        "xmlSecGnuTLSNodeGetMpiValue",
+                        "xmlSecGCryptNodeGetMpiValue",
                         XMLSEC_ERRORS_R_XMLSEC_FAILED,
                         "node=%s",
                         xmlSecErrorsSafeString(xmlSecNodeRSAPrivateExponent));
@@ -1736,11 +1735,11 @@ xmlSecGnuTLSKeyDataRsaXmlRead(xmlSecKeyDataId id, xmlSecKeyPtr key,
         goto done;
     }
 
-    ret = xmlSecGnuTLSKeyDataRsaAdoptKeyPair(data, pub_key, priv_key);
+    ret = xmlSecGCryptKeyDataRsaAdoptKeyPair(data, pub_key, priv_key);
     if(ret < 0) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
-                    "xmlSecGnuTLSKeyDataRsaAdoptKeyPair",
+                    "xmlSecGCryptKeyDataRsaAdoptKeyPair",
                     XMLSEC_ERRORS_R_XMLSEC_FAILED,
                     XMLSEC_ERRORS_NO_MESSAGE);
         goto done;
@@ -1794,7 +1793,7 @@ done:
 }
 
 static int
-xmlSecGnuTLSKeyDataRsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
+xmlSecGCryptKeyDataRsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
                             xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) {
     xmlNodePtr cur;
     gcry_sexp_t pub_priv_key;
@@ -1803,9 +1802,9 @@ xmlSecGnuTLSKeyDataRsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
     int res = -1;
     int ret;
 
-    xmlSecAssert2(id == xmlSecGnuTLSKeyDataRsaId, -1);
+    xmlSecAssert2(id == xmlSecGCryptKeyDataRsaId, -1);
     xmlSecAssert2(key != NULL, -1);
-    xmlSecAssert2(xmlSecKeyDataCheckId(xmlSecKeyGetValue(key), xmlSecGnuTLSKeyDataRsaId), -1);
+    xmlSecAssert2(xmlSecKeyDataCheckId(xmlSecKeyGetValue(key), xmlSecGCryptKeyDataRsaId), -1);
     xmlSecAssert2(node != NULL, -1);
     xmlSecAssert2(keyInfoCtx != NULL, -1);
 
@@ -1815,13 +1814,13 @@ xmlSecGnuTLSKeyDataRsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
     }
 
     /* find the private or public key */
-    pub_priv_key = xmlSecGnuTLSKeyDataRsaGetPrivateKey(xmlSecKeyGetValue(key));
+    pub_priv_key = xmlSecGCryptKeyDataRsaGetPrivateKey(xmlSecKeyGetValue(key));
     if(pub_priv_key == NULL) {
-        pub_priv_key = xmlSecGnuTLSKeyDataRsaGetPublicKey(xmlSecKeyGetValue(key));
+        pub_priv_key = xmlSecGCryptKeyDataRsaGetPublicKey(xmlSecKeyGetValue(key));
         if(pub_priv_key == NULL) {
             xmlSecError(XMLSEC_ERRORS_HERE,
                         xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-                        "xmlSecGnuTLSKeyDataRsaGetPublicKey()",
+                        "xmlSecGCryptKeyDataRsaGetPublicKey()",
                         XMLSEC_ERRORS_R_XMLSEC_FAILED,
                         XMLSEC_ERRORS_NO_MESSAGE);
             goto done;
@@ -1851,11 +1850,11 @@ xmlSecGnuTLSKeyDataRsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
                     xmlSecErrorsSafeString(xmlSecNodeRSAModulus));
        goto done;
     }
-    ret = xmlSecGnuTLSNodeSetSExpTokValue(cur, rsa, "n", 1);
+    ret = xmlSecGCryptNodeSetSExpTokValue(cur, rsa, "n", 1);
     if(ret < 0) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-                    "xmlSecGnuTLSNodeSetSExpTokValue",
+                    "xmlSecGCryptNodeSetSExpTokValue",
                     XMLSEC_ERRORS_R_XMLSEC_FAILED,
                     "node=%s",
                     xmlSecErrorsSafeString(xmlSecNodeRSAModulus));
@@ -1873,11 +1872,11 @@ xmlSecGnuTLSKeyDataRsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
                     xmlSecErrorsSafeString(xmlSecNodeRSAExponent));
        goto done;
     }
-    ret = xmlSecGnuTLSNodeSetSExpTokValue(cur, rsa, "e", 1);
+    ret = xmlSecGCryptNodeSetSExpTokValue(cur, rsa, "e", 1);
     if(ret < 0) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-                    "xmlSecGnuTLSNodeSetSExpTokValue",
+                    "xmlSecGCryptNodeSetSExpTokValue",
                     XMLSEC_ERRORS_R_XMLSEC_FAILED,
                     "node=%s",
                     xmlSecErrorsSafeString(xmlSecNodeRSAExponent));
@@ -1896,11 +1895,11 @@ xmlSecGnuTLSKeyDataRsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
                         xmlSecErrorsSafeString(xmlSecNodeRSAPrivateExponent));
            goto done;
         }
-        ret = xmlSecGnuTLSNodeSetSExpTokValue(cur, rsa, "d", 1);
+        ret = xmlSecGCryptNodeSetSExpTokValue(cur, rsa, "d", 1);
         if(ret < 0) {
             xmlSecError(XMLSEC_ERRORS_HERE,
                         xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-                        "xmlSecGnuTLSNodeSetSExpTokValue",
+                        "xmlSecGCryptNodeSetSExpTokValue",
                         XMLSEC_ERRORS_R_XMLSEC_FAILED,
                         "node=%s",
                         xmlSecErrorsSafeString(xmlSecNodeRSAPrivateExponent));
diff --git a/src/gcrypt/ciphers.c b/src/gcrypt/ciphers.c
index a137ac8..70d5cff 100644
--- a/src/gcrypt/ciphers.c
+++ b/src/gcrypt/ciphers.c
@@ -10,7 +10,6 @@
 
 #include <string.h>
 
-#include <gnutls/gnutls.h>
 #include <gcrypt.h>
 
 #include <xmlsec/xmlsec.h>
@@ -18,16 +17,16 @@
 #include <xmlsec/transforms.h>
 #include <xmlsec/errors.h>
 
-#include <xmlsec/gnutls/crypto.h>
+#include <xmlsec/gcrypt/crypto.h>
 
 /**************************************************************************
  *
- * Internal GnuTLS Block cipher CTX
+ * Internal GCrypt Block cipher CTX
  *
  *****************************************************************************/
-typedef struct _xmlSecGnuTLSBlockCipherCtx              xmlSecGnuTLSBlockCipherCtx,
-                                                        *xmlSecGnuTLSBlockCipherCtxPtr;
-struct _xmlSecGnuTLSBlockCipherCtx {
+typedef struct _xmlSecGCryptBlockCipherCtx              xmlSecGCryptBlockCipherCtx,
+                                                        *xmlSecGCryptBlockCipherCtxPtr;
+struct _xmlSecGCryptBlockCipherCtx {
     int                 cipher;
     int                 mode;
     gcry_cipher_hd_t    cipherCtx;
@@ -36,26 +35,26 @@ struct _xmlSecGnuTLSBlockCipherCtx {
     int                 ctxInitialized;
 };
 
-static int      xmlSecGnuTLSBlockCipherCtxInit          (xmlSecGnuTLSBlockCipherCtxPtr ctx,
+static int      xmlSecGCryptBlockCipherCtxInit          (xmlSecGCryptBlockCipherCtxPtr ctx,
                                                          xmlSecBufferPtr in,
                                                          xmlSecBufferPtr out,
                                                          int encrypt,
                                                          const xmlChar* cipherName,
                                                          xmlSecTransformCtxPtr transformCtx);
-static int      xmlSecGnuTLSBlockCipherCtxUpdate        (xmlSecGnuTLSBlockCipherCtxPtr ctx,
+static int      xmlSecGCryptBlockCipherCtxUpdate        (xmlSecGCryptBlockCipherCtxPtr ctx,
                                                          xmlSecBufferPtr in,
                                                          xmlSecBufferPtr out,
                                                          int encrypt,
                                                          const xmlChar* cipherName,
                                                          xmlSecTransformCtxPtr transformCtx);
-static int      xmlSecGnuTLSBlockCipherCtxFinal         (xmlSecGnuTLSBlockCipherCtxPtr ctx,
+static int      xmlSecGCryptBlockCipherCtxFinal         (xmlSecGCryptBlockCipherCtxPtr ctx,
                                                          xmlSecBufferPtr in,
                                                          xmlSecBufferPtr out,
                                                          int encrypt,
                                                          const xmlChar* cipherName,
                                                          xmlSecTransformCtxPtr transformCtx);
 static int
-xmlSecGnuTLSBlockCipherCtxInit(xmlSecGnuTLSBlockCipherCtxPtr ctx,
+xmlSecGCryptBlockCipherCtxInit(xmlSecGCryptBlockCipherCtxPtr ctx,
                                 xmlSecBufferPtr in, xmlSecBufferPtr out,
                                 int encrypt,
                                 const xmlChar* cipherName,
@@ -140,7 +139,7 @@ xmlSecGnuTLSBlockCipherCtxInit(xmlSecGnuTLSBlockCipherCtxPtr ctx,
 }
 
 static int
-xmlSecGnuTLSBlockCipherCtxUpdate(xmlSecGnuTLSBlockCipherCtxPtr ctx,
+xmlSecGCryptBlockCipherCtxUpdate(xmlSecGCryptBlockCipherCtxPtr ctx,
                                   xmlSecBufferPtr in, xmlSecBufferPtr out,
                                   int encrypt,
                                   const xmlChar* cipherName,
@@ -238,7 +237,7 @@ xmlSecGnuTLSBlockCipherCtxUpdate(xmlSecGnuTLSBlockCipherCtxPtr ctx,
 }
 
 static int
-xmlSecGnuTLSBlockCipherCtxFinal(xmlSecGnuTLSBlockCipherCtxPtr ctx,
+xmlSecGCryptBlockCipherCtxFinal(xmlSecGCryptBlockCipherCtxPtr ctx,
                                  xmlSecBufferPtr in,
                                  xmlSecBufferPtr out,
                                  int encrypt,
@@ -402,39 +401,39 @@ xmlSecGnuTLSBlockCipherCtxFinal(xmlSecGnuTLSBlockCipherCtxPtr ctx,
  *
  *  Block Cipher transforms
  *
- * xmlSecGnuTLSBlockCipherCtx block is located after xmlSecTransform structure
+ * xmlSecGCryptBlockCipherCtx block is located after xmlSecTransform structure
  *
  *****************************************************************************/
-#define xmlSecGnuTLSBlockCipherSize     \
-    (sizeof(xmlSecTransform) + sizeof(xmlSecGnuTLSBlockCipherCtx))
-#define xmlSecGnuTLSBlockCipherGetCtx(transform) \
-    ((xmlSecGnuTLSBlockCipherCtxPtr)(((xmlSecByte*)(transform)) + sizeof(xmlSecTransform)))
-
-static int      xmlSecGnuTLSBlockCipherInitialize       (xmlSecTransformPtr transform);
-static void     xmlSecGnuTLSBlockCipherFinalize         (xmlSecTransformPtr transform);
-static int      xmlSecGnuTLSBlockCipherSetKeyReq        (xmlSecTransformPtr transform,
+#define xmlSecGCryptBlockCipherSize     \
+    (sizeof(xmlSecTransform) + sizeof(xmlSecGCryptBlockCipherCtx))
+#define xmlSecGCryptBlockCipherGetCtx(transform) \
+    ((xmlSecGCryptBlockCipherCtxPtr)(((xmlSecByte*)(transform)) + sizeof(xmlSecTransform)))
+
+static int      xmlSecGCryptBlockCipherInitialize       (xmlSecTransformPtr transform);
+static void     xmlSecGCryptBlockCipherFinalize         (xmlSecTransformPtr transform);
+static int      xmlSecGCryptBlockCipherSetKeyReq        (xmlSecTransformPtr transform,
                                                          xmlSecKeyReqPtr keyReq);
-static int      xmlSecGnuTLSBlockCipherSetKey           (xmlSecTransformPtr transform,
+static int      xmlSecGCryptBlockCipherSetKey           (xmlSecTransformPtr transform,
                                                          xmlSecKeyPtr key);
-static int      xmlSecGnuTLSBlockCipherExecute          (xmlSecTransformPtr transform,
+static int      xmlSecGCryptBlockCipherExecute          (xmlSecTransformPtr transform,
                                                          int last,
                                                          xmlSecTransformCtxPtr transformCtx);
-static int      xmlSecGnuTLSBlockCipherCheckId          (xmlSecTransformPtr transform);
+static int      xmlSecGCryptBlockCipherCheckId          (xmlSecTransformPtr transform);
 
 
 
 static int
-xmlSecGnuTLSBlockCipherCheckId(xmlSecTransformPtr transform) {
+xmlSecGCryptBlockCipherCheckId(xmlSecTransformPtr transform) {
 #ifndef XMLSEC_NO_DES
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformDes3CbcId)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformDes3CbcId)) {
         return(1);
     }
 #endif /* XMLSEC_NO_DES */
 
 #ifndef XMLSEC_NO_AES
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformAes128CbcId) ||
-       xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformAes192CbcId) ||
-       xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformAes256CbcId)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformAes128CbcId) ||
+       xmlSecTransformCheckId(transform, xmlSecGCryptTransformAes192CbcId) ||
+       xmlSecTransformCheckId(transform, xmlSecGCryptTransformAes256CbcId)) {
 
        return(1);
     }
@@ -444,39 +443,39 @@ xmlSecGnuTLSBlockCipherCheckId(xmlSecTransformPtr transform) {
 }
 
 static int
-xmlSecGnuTLSBlockCipherInitialize(xmlSecTransformPtr transform) {
-    xmlSecGnuTLSBlockCipherCtxPtr ctx;
+xmlSecGCryptBlockCipherInitialize(xmlSecTransformPtr transform) {
+    xmlSecGCryptBlockCipherCtxPtr ctx;
     gpg_err_code_t ret;
 
-    xmlSecAssert2(xmlSecGnuTLSBlockCipherCheckId(transform), -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSBlockCipherSize), -1);
+    xmlSecAssert2(xmlSecGCryptBlockCipherCheckId(transform), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptBlockCipherSize), -1);
 
-    ctx = xmlSecGnuTLSBlockCipherGetCtx(transform);
+    ctx = xmlSecGCryptBlockCipherGetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
 
-    memset(ctx, 0, sizeof(xmlSecGnuTLSBlockCipherCtx));
+    memset(ctx, 0, sizeof(xmlSecGCryptBlockCipherCtx));
 
 #ifndef XMLSEC_NO_DES
-    if(transform->id == xmlSecGnuTLSTransformDes3CbcId) {
+    if(transform->id == xmlSecGCryptTransformDes3CbcId) {
         ctx->cipher     = GCRY_CIPHER_3DES;
         ctx->mode       = GCRY_CIPHER_MODE_CBC;
-        ctx->keyId      = xmlSecGnuTLSKeyDataDesId;
+        ctx->keyId      = xmlSecGCryptKeyDataDesId;
     } else
 #endif /* XMLSEC_NO_DES */
 
 #ifndef XMLSEC_NO_AES
-    if(transform->id == xmlSecGnuTLSTransformAes128CbcId) {
+    if(transform->id == xmlSecGCryptTransformAes128CbcId) {
         ctx->cipher     = GCRY_CIPHER_AES128;
         ctx->mode       = GCRY_CIPHER_MODE_CBC;
-        ctx->keyId      = xmlSecGnuTLSKeyDataAesId;
-    } else if(transform->id == xmlSecGnuTLSTransformAes192CbcId) {
+        ctx->keyId      = xmlSecGCryptKeyDataAesId;
+    } else if(transform->id == xmlSecGCryptTransformAes192CbcId) {
         ctx->cipher     = GCRY_CIPHER_AES192;
         ctx->mode       = GCRY_CIPHER_MODE_CBC;
-        ctx->keyId      = xmlSecGnuTLSKeyDataAesId;
-    } else if(transform->id == xmlSecGnuTLSTransformAes256CbcId) {
+        ctx->keyId      = xmlSecGCryptKeyDataAesId;
+    } else if(transform->id == xmlSecGCryptTransformAes256CbcId) {
         ctx->cipher     = GCRY_CIPHER_AES256;
         ctx->mode       = GCRY_CIPHER_MODE_CBC;
-        ctx->keyId      = xmlSecGnuTLSKeyDataAesId;
+        ctx->keyId      = xmlSecGCryptKeyDataAesId;
     } else
 #endif /* XMLSEC_NO_AES */
 
@@ -502,32 +501,32 @@ xmlSecGnuTLSBlockCipherInitialize(xmlSecTransformPtr transform) {
 }
 
 static void
-xmlSecGnuTLSBlockCipherFinalize(xmlSecTransformPtr transform) {
-    xmlSecGnuTLSBlockCipherCtxPtr ctx;
+xmlSecGCryptBlockCipherFinalize(xmlSecTransformPtr transform) {
+    xmlSecGCryptBlockCipherCtxPtr ctx;
 
-    xmlSecAssert(xmlSecGnuTLSBlockCipherCheckId(transform));
-    xmlSecAssert(xmlSecTransformCheckSize(transform, xmlSecGnuTLSBlockCipherSize));
+    xmlSecAssert(xmlSecGCryptBlockCipherCheckId(transform));
+    xmlSecAssert(xmlSecTransformCheckSize(transform, xmlSecGCryptBlockCipherSize));
 
-    ctx = xmlSecGnuTLSBlockCipherGetCtx(transform);
+    ctx = xmlSecGCryptBlockCipherGetCtx(transform);
     xmlSecAssert(ctx != NULL);
 
     if(ctx->cipherCtx != NULL) {
         gcry_cipher_close(ctx->cipherCtx);
     }
 
-    memset(ctx, 0, sizeof(xmlSecGnuTLSBlockCipherCtx));
+    memset(ctx, 0, sizeof(xmlSecGCryptBlockCipherCtx));
 }
 
 static int
-xmlSecGnuTLSBlockCipherSetKeyReq(xmlSecTransformPtr transform,  xmlSecKeyReqPtr keyReq) {
-    xmlSecGnuTLSBlockCipherCtxPtr ctx;
+xmlSecGCryptBlockCipherSetKeyReq(xmlSecTransformPtr transform,  xmlSecKeyReqPtr keyReq) {
+    xmlSecGCryptBlockCipherCtxPtr ctx;
 
-    xmlSecAssert2(xmlSecGnuTLSBlockCipherCheckId(transform), -1);
+    xmlSecAssert2(xmlSecGCryptBlockCipherCheckId(transform), -1);
     xmlSecAssert2((transform->operation == xmlSecTransformOperationEncrypt) || (transform->operation == xmlSecTransformOperationDecrypt), -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSBlockCipherSize), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptBlockCipherSize), -1);
     xmlSecAssert2(keyReq != NULL, -1);
 
-    ctx = xmlSecGnuTLSBlockCipherGetCtx(transform);
+    ctx = xmlSecGCryptBlockCipherGetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
     xmlSecAssert2(ctx->cipher != 0, -1);
     xmlSecAssert2(ctx->keyId != NULL, -1);
@@ -545,18 +544,18 @@ xmlSecGnuTLSBlockCipherSetKeyReq(xmlSecTransformPtr transform,  xmlSecKeyReqPtr
 }
 
 static int
-xmlSecGnuTLSBlockCipherSetKey(xmlSecTransformPtr transform, xmlSecKeyPtr key) {
-    xmlSecGnuTLSBlockCipherCtxPtr ctx;
+xmlSecGCryptBlockCipherSetKey(xmlSecTransformPtr transform, xmlSecKeyPtr key) {
+    xmlSecGCryptBlockCipherCtxPtr ctx;
     xmlSecBufferPtr buffer;
     xmlSecSize keySize;
     int ret;
 
-    xmlSecAssert2(xmlSecGnuTLSBlockCipherCheckId(transform), -1);
+    xmlSecAssert2(xmlSecGCryptBlockCipherCheckId(transform), -1);
     xmlSecAssert2((transform->operation == xmlSecTransformOperationEncrypt) || (transform->operation == xmlSecTransformOperationDecrypt), -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSBlockCipherSize), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptBlockCipherSize), -1);
     xmlSecAssert2(key != NULL, -1);
 
-    ctx = xmlSecGnuTLSBlockCipherGetCtx(transform);
+    ctx = xmlSecGCryptBlockCipherGetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
     xmlSecAssert2(ctx->cipherCtx != NULL, -1);
     xmlSecAssert2(ctx->cipher != 0, -1);
@@ -596,20 +595,20 @@ xmlSecGnuTLSBlockCipherSetKey(xmlSecTransformPtr transform, xmlSecKeyPtr key) {
 }
 
 static int
-xmlSecGnuTLSBlockCipherExecute(xmlSecTransformPtr transform, int last, xmlSecTransformCtxPtr transformCtx) {
-    xmlSecGnuTLSBlockCipherCtxPtr ctx;
+xmlSecGCryptBlockCipherExecute(xmlSecTransformPtr transform, int last, xmlSecTransformCtxPtr transformCtx) {
+    xmlSecGCryptBlockCipherCtxPtr ctx;
     xmlSecBufferPtr in, out;
     int ret;
 
-    xmlSecAssert2(xmlSecGnuTLSBlockCipherCheckId(transform), -1);
+    xmlSecAssert2(xmlSecGCryptBlockCipherCheckId(transform), -1);
     xmlSecAssert2((transform->operation == xmlSecTransformOperationEncrypt) || (transform->operation == xmlSecTransformOperationDecrypt), -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSBlockCipherSize), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptBlockCipherSize), -1);
     xmlSecAssert2(transformCtx != NULL, -1);
 
     in = &(transform->inBuf);
     out = &(transform->outBuf);
 
-    ctx = xmlSecGnuTLSBlockCipherGetCtx(transform);
+    ctx = xmlSecGCryptBlockCipherGetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
 
     if(transform->status == xmlSecTransformStatusNone) {
@@ -618,13 +617,13 @@ xmlSecGnuTLSBlockCipherExecute(xmlSecTransformPtr transform, int last, xmlSecTra
 
     if(transform->status == xmlSecTransformStatusWorking) {
         if(ctx->ctxInitialized == 0) {
-            ret = xmlSecGnuTLSBlockCipherCtxInit(ctx, in, out,
+            ret = xmlSecGCryptBlockCipherCtxInit(ctx, in, out,
                         (transform->operation == xmlSecTransformOperationEncrypt) ? 1 : 0,
                         xmlSecTransformGetName(transform), transformCtx);
             if(ret < 0) {
                 xmlSecError(XMLSEC_ERRORS_HERE,
                             xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
-                            "xmlSecGnuTLSBlockCipherCtxInit",
+                            "xmlSecGCryptBlockCipherCtxInit",
                             XMLSEC_ERRORS_R_XMLSEC_FAILED,
                             XMLSEC_ERRORS_NO_MESSAGE);
                 return(-1);
@@ -639,13 +638,13 @@ xmlSecGnuTLSBlockCipherExecute(xmlSecTransformPtr transform, int last, xmlSecTra
             return(-1);
         }
         if(ctx->ctxInitialized != 0) {
-            ret = xmlSecGnuTLSBlockCipherCtxUpdate(ctx, in, out,
+            ret = xmlSecGCryptBlockCipherCtxUpdate(ctx, in, out,
                         (transform->operation == xmlSecTransformOperationEncrypt) ? 1 : 0,
                         xmlSecTransformGetName(transform), transformCtx);
             if(ret < 0) {
                 xmlSecError(XMLSEC_ERRORS_HERE,
                             xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
-                            "xmlSecGnuTLSBlockCipherCtxUpdate",
+                            "xmlSecGCryptBlockCipherCtxUpdate",
                             XMLSEC_ERRORS_R_XMLSEC_FAILED,
                             XMLSEC_ERRORS_NO_MESSAGE);
                 return(-1);
@@ -653,13 +652,13 @@ xmlSecGnuTLSBlockCipherExecute(xmlSecTransformPtr transform, int last, xmlSecTra
         }
 
         if(last) {
-            ret = xmlSecGnuTLSBlockCipherCtxFinal(ctx, in, out,
+            ret = xmlSecGCryptBlockCipherCtxFinal(ctx, in, out,
                         (transform->operation == xmlSecTransformOperationEncrypt) ? 1 : 0,
                         xmlSecTransformGetName(transform), transformCtx);
             if(ret < 0) {
                 xmlSecError(XMLSEC_ERRORS_HERE,
                             xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
-                            "xmlSecGnuTLSBlockCipherCtxFinal",
+                            "xmlSecGCryptBlockCipherCtxFinal",
                             XMLSEC_ERRORS_R_XMLSEC_FAILED,
                             XMLSEC_ERRORS_NO_MESSAGE);
                 return(-1);
@@ -691,163 +690,163 @@ xmlSecGnuTLSBlockCipherExecute(xmlSecTransformPtr transform, int last, xmlSecTra
  * AES CBC cipher transforms
  *
  ********************************************************************/
-static xmlSecTransformKlass xmlSecGnuTLSAes128CbcKlass = {
+static xmlSecTransformKlass xmlSecGCryptAes128CbcKlass = {
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),               /* xmlSecSize klassSize */
-    xmlSecGnuTLSBlockCipherSize,                /* xmlSecSize objSize */
+    xmlSecGCryptBlockCipherSize,                /* xmlSecSize objSize */
 
     xmlSecNameAes128Cbc,                        /* const xmlChar* name; */
     xmlSecHrefAes128Cbc,                        /* const xmlChar* href; */
     xmlSecTransformUsageEncryptionMethod,       /* xmlSecAlgorithmUsage usage; */
 
-    xmlSecGnuTLSBlockCipherInitialize,          /* xmlSecTransformInitializeMethod initialize; */
-    xmlSecGnuTLSBlockCipherFinalize,            /* xmlSecTransformFinalizeMethod finalize; */
+    xmlSecGCryptBlockCipherInitialize,          /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecGCryptBlockCipherFinalize,            /* xmlSecTransformFinalizeMethod finalize; */
     NULL,                                       /* xmlSecTransformNodeReadMethod readNode; */
     NULL,                                       /* xmlSecTransformNodeWriteMethod writeNode; */
-    xmlSecGnuTLSBlockCipherSetKeyReq,           /* xmlSecTransformSetKeyMethod setKeyReq; */
-    xmlSecGnuTLSBlockCipherSetKey,              /* xmlSecTransformSetKeyMethod setKey; */
+    xmlSecGCryptBlockCipherSetKeyReq,           /* xmlSecTransformSetKeyMethod setKeyReq; */
+    xmlSecGCryptBlockCipherSetKey,              /* xmlSecTransformSetKeyMethod setKey; */
     NULL,                                       /* xmlSecTransformValidateMethod validate; */
     xmlSecTransformDefaultGetDataType,          /* xmlSecTransformGetDataTypeMethod getDataType; */
     xmlSecTransformDefaultPushBin,              /* xmlSecTransformPushBinMethod pushBin; */
     xmlSecTransformDefaultPopBin,               /* xmlSecTransformPopBinMethod popBin; */
     NULL,                                       /* xmlSecTransformPushXmlMethod pushXml; */
     NULL,                                       /* xmlSecTransformPopXmlMethod popXml; */
-    xmlSecGnuTLSBlockCipherExecute,             /* xmlSecTransformExecuteMethod execute; */
+    xmlSecGCryptBlockCipherExecute,             /* xmlSecTransformExecuteMethod execute; */
 
     NULL,                                       /* void* reserved0; */
     NULL,                                       /* void* reserved1; */
 };
 
 /**
- * xmlSecGnuTLSTransformAes128CbcGetKlass:
+ * xmlSecGCryptTransformAes128CbcGetKlass:
  *
  * AES 128 CBC encryption transform klass.
  *
  * Returns: pointer to AES 128 CBC encryption transform.
  */
 xmlSecTransformId
-xmlSecGnuTLSTransformAes128CbcGetKlass(void) {
-    return(&xmlSecGnuTLSAes128CbcKlass);
+xmlSecGCryptTransformAes128CbcGetKlass(void) {
+    return(&xmlSecGCryptAes128CbcKlass);
 }
 
-static xmlSecTransformKlass xmlSecGnuTLSAes192CbcKlass = {
+static xmlSecTransformKlass xmlSecGCryptAes192CbcKlass = {
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),               /* xmlSecSize klassSize */
-    xmlSecGnuTLSBlockCipherSize,                /* xmlSecSize objSize */
+    xmlSecGCryptBlockCipherSize,                /* xmlSecSize objSize */
 
     xmlSecNameAes192Cbc,                        /* const xmlChar* name; */
     xmlSecHrefAes192Cbc,                        /* const xmlChar* href; */
     xmlSecTransformUsageEncryptionMethod,       /* xmlSecAlgorithmUsage usage; */
 
-    xmlSecGnuTLSBlockCipherInitialize,          /* xmlSecTransformInitializeMethod initialize; */
-    xmlSecGnuTLSBlockCipherFinalize,            /* xmlSecTransformFinalizeMethod finalize; */
+    xmlSecGCryptBlockCipherInitialize,          /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecGCryptBlockCipherFinalize,            /* xmlSecTransformFinalizeMethod finalize; */
     NULL,                                       /* xmlSecTransformNodeReadMethod readNode; */
     NULL,                                       /* xmlSecTransformNodeWriteMethod writeNode; */
-    xmlSecGnuTLSBlockCipherSetKeyReq,           /* xmlSecTransformSetKeyMethod setKeyReq; */
-    xmlSecGnuTLSBlockCipherSetKey,              /* xmlSecTransformSetKeyMethod setKey; */
+    xmlSecGCryptBlockCipherSetKeyReq,           /* xmlSecTransformSetKeyMethod setKeyReq; */
+    xmlSecGCryptBlockCipherSetKey,              /* xmlSecTransformSetKeyMethod setKey; */
     NULL,                                       /* xmlSecTransformValidateMethod validate; */
     xmlSecTransformDefaultGetDataType,          /* xmlSecTransformGetDataTypeMethod getDataType; */
     xmlSecTransformDefaultPushBin,              /* xmlSecTransformPushBinMethod pushBin; */
     xmlSecTransformDefaultPopBin,               /* xmlSecTransformPopBinMethod popBin; */
     NULL,                                       /* xmlSecTransformPushXmlMethod pushXml; */
     NULL,                                       /* xmlSecTransformPopXmlMethod popXml; */
-    xmlSecGnuTLSBlockCipherExecute,             /* xmlSecTransformExecuteMethod execute; */
+    xmlSecGCryptBlockCipherExecute,             /* xmlSecTransformExecuteMethod execute; */
 
     NULL,                                       /* void* reserved0; */
     NULL,                                       /* void* reserved1; */
 };
 
 /**
- * xmlSecGnuTLSTransformAes192CbcGetKlass:
+ * xmlSecGCryptTransformAes192CbcGetKlass:
  *
  * AES 192 CBC encryption transform klass.
  *
  * Returns: pointer to AES 192 CBC encryption transform.
  */
 xmlSecTransformId
-xmlSecGnuTLSTransformAes192CbcGetKlass(void) {
-    return(&xmlSecGnuTLSAes192CbcKlass);
+xmlSecGCryptTransformAes192CbcGetKlass(void) {
+    return(&xmlSecGCryptAes192CbcKlass);
 }
 
-static xmlSecTransformKlass xmlSecGnuTLSAes256CbcKlass = {
+static xmlSecTransformKlass xmlSecGCryptAes256CbcKlass = {
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),               /* xmlSecSize klassSize */
-    xmlSecGnuTLSBlockCipherSize,                /* xmlSecSize objSize */
+    xmlSecGCryptBlockCipherSize,                /* xmlSecSize objSize */
 
     xmlSecNameAes256Cbc,                        /* const xmlChar* name; */
     xmlSecHrefAes256Cbc,                        /* const xmlChar* href; */
     xmlSecTransformUsageEncryptionMethod,       /* xmlSecAlgorithmUsage usage; */
 
-    xmlSecGnuTLSBlockCipherInitialize,          /* xmlSecTransformInitializeMethod initialize; */
-    xmlSecGnuTLSBlockCipherFinalize,            /* xmlSecTransformFinalizeMethod finalize; */
+    xmlSecGCryptBlockCipherInitialize,          /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecGCryptBlockCipherFinalize,            /* xmlSecTransformFinalizeMethod finalize; */
     NULL,                                       /* xmlSecTransformNodeReadMethod readNode; */
     NULL,                                       /* xmlSecTransformNodeWriteMethod writeNode; */
-    xmlSecGnuTLSBlockCipherSetKeyReq,           /* xmlSecTransformSetKeyMethod setKeyReq; */
-    xmlSecGnuTLSBlockCipherSetKey,              /* xmlSecTransformSetKeyMethod setKey; */
+    xmlSecGCryptBlockCipherSetKeyReq,           /* xmlSecTransformSetKeyMethod setKeyReq; */
+    xmlSecGCryptBlockCipherSetKey,              /* xmlSecTransformSetKeyMethod setKey; */
     NULL,                                       /* xmlSecTransformValidateMethod validate; */
     xmlSecTransformDefaultGetDataType,          /* xmlSecTransformGetDataTypeMethod getDataType; */
     xmlSecTransformDefaultPushBin,              /* xmlSecTransformPushBinMethod pushBin; */
     xmlSecTransformDefaultPopBin,               /* xmlSecTransformPopBinMethod popBin; */
     NULL,                                       /* xmlSecTransformPushXmlMethod pushXml; */
     NULL,                                       /* xmlSecTransformPopXmlMethod popXml; */
-    xmlSecGnuTLSBlockCipherExecute,             /* xmlSecTransformExecuteMethod execute; */
+    xmlSecGCryptBlockCipherExecute,             /* xmlSecTransformExecuteMethod execute; */
 
     NULL,                                       /* void* reserved0; */
     NULL,                                       /* void* reserved1; */
 };
 
 /**
- * xmlSecGnuTLSTransformAes256CbcGetKlass:
+ * xmlSecGCryptTransformAes256CbcGetKlass:
  *
  * AES 256 CBC encryption transform klass.
  *
  * Returns: pointer to AES 256 CBC encryption transform.
  */
 xmlSecTransformId
-xmlSecGnuTLSTransformAes256CbcGetKlass(void) {
-    return(&xmlSecGnuTLSAes256CbcKlass);
+xmlSecGCryptTransformAes256CbcGetKlass(void) {
+    return(&xmlSecGCryptAes256CbcKlass);
 }
 
 #endif /* XMLSEC_NO_AES */
 
 #ifndef XMLSEC_NO_DES
-static xmlSecTransformKlass xmlSecGnuTLSDes3CbcKlass = {
+static xmlSecTransformKlass xmlSecGCryptDes3CbcKlass = {
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),               /* xmlSecSize klassSize */
-    xmlSecGnuTLSBlockCipherSize,                /* xmlSecSize objSize */
+    xmlSecGCryptBlockCipherSize,                /* xmlSecSize objSize */
 
     xmlSecNameDes3Cbc,                          /* const xmlChar* name; */
     xmlSecHrefDes3Cbc,                          /* const xmlChar* href; */
     xmlSecTransformUsageEncryptionMethod,       /* xmlSecAlgorithmUsage usage; */
 
-    xmlSecGnuTLSBlockCipherInitialize,          /* xmlSecTransformInitializeMethod initialize; */
-    xmlSecGnuTLSBlockCipherFinalize,            /* xmlSecTransformFinalizeMethod finalize; */
+    xmlSecGCryptBlockCipherInitialize,          /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecGCryptBlockCipherFinalize,            /* xmlSecTransformFinalizeMethod finalize; */
     NULL,                                       /* xmlSecTransformNodeReadMethod readNode; */
     NULL,                                       /* xmlSecTransformNodeWriteMethod writeNode; */
-    xmlSecGnuTLSBlockCipherSetKeyReq,           /* xmlSecTransformSetKeyMethod setKeyReq; */
-    xmlSecGnuTLSBlockCipherSetKey,              /* xmlSecTransformSetKeyMethod setKey; */
+    xmlSecGCryptBlockCipherSetKeyReq,           /* xmlSecTransformSetKeyMethod setKeyReq; */
+    xmlSecGCryptBlockCipherSetKey,              /* xmlSecTransformSetKeyMethod setKey; */
     NULL,                                       /* xmlSecTransformValidateMethod validate; */
     xmlSecTransformDefaultGetDataType,          /* xmlSecTransformGetDataTypeMethod getDataType; */
     xmlSecTransformDefaultPushBin,              /* xmlSecTransformPushBinMethod pushBin; */
     xmlSecTransformDefaultPopBin,               /* xmlSecTransformPopBinMethod popBin; */
     NULL,                                       /* xmlSecTransformPushXmlMethod pushXml; */
     NULL,                                       /* xmlSecTransformPopXmlMethod popXml; */
-    xmlSecGnuTLSBlockCipherExecute,             /* xmlSecTransformExecuteMethod execute; */
+    xmlSecGCryptBlockCipherExecute,             /* xmlSecTransformExecuteMethod execute; */
 
     NULL,                                       /* void* reserved0; */
     NULL,                                       /* void* reserved1; */
 };
 
 /**
- * xmlSecGnuTLSTransformDes3CbcGetKlass:
+ * xmlSecGCryptTransformDes3CbcGetKlass:
  *
  * Triple DES CBC encryption transform klass.
  *
  * Returns: pointer to Triple DES encryption transform.
  */
 xmlSecTransformId
-xmlSecGnuTLSTransformDes3CbcGetKlass(void) {
-    return(&xmlSecGnuTLSDes3CbcKlass);
+xmlSecGCryptTransformDes3CbcGetKlass(void) {
+    return(&xmlSecGCryptDes3CbcKlass);
 }
 #endif /* XMLSEC_NO_DES */
 
diff --git a/src/gcrypt/crypto.c b/src/gcrypt/crypto.c
index 3687c65..ecd0e52 100644
--- a/src/gcrypt/crypto.c
+++ b/src/gcrypt/crypto.c
@@ -10,7 +10,6 @@
 
 #include <string.h>
 
-#include <gnutls/gnutls.h>
 #include <gcrypt.h>
 
 #include <xmlsec/xmlsec.h>
@@ -20,37 +19,37 @@
 #include <xmlsec/dl.h>
 #include <xmlsec/private.h>
 
-#include <xmlsec/gnutls/app.h>
-#include <xmlsec/gnutls/crypto.h>
+#include <xmlsec/gcrypt/app.h>
+#include <xmlsec/gcrypt/crypto.h>
 
-static xmlSecCryptoDLFunctionsPtr gXmlSecGnuTLSFunctions = NULL;
+static xmlSecCryptoDLFunctionsPtr gXmlSecGCryptFunctions = NULL;
 
 /**
- * xmlSecCryptoGetFunctions_gnutls:
+ * xmlSecCryptoGetFunctions_gcrypt:
  *
- * Gets the pointer to xmlsec-gnutls functions table.
+ * Gets the pointer to xmlsec-gcrypt functions table.
  *
- * Returns: the xmlsec-gnutls functions table or NULL if an error occurs.
+ * Returns: the xmlsec-gcrypt functions table or NULL if an error occurs.
  */
 xmlSecCryptoDLFunctionsPtr
-xmlSecCryptoGetFunctions_gnutls(void) {
+xmlSecCryptoGetFunctions_gcrypt(void) {
     static xmlSecCryptoDLFunctions functions;
 
-    if(gXmlSecGnuTLSFunctions != NULL) {
-        return(gXmlSecGnuTLSFunctions);
+    if(gXmlSecGCryptFunctions != NULL) {
+        return(gXmlSecGCryptFunctions);
     }
 
     memset(&functions, 0, sizeof(functions));
-    gXmlSecGnuTLSFunctions = &functions;
+    gXmlSecGCryptFunctions = &functions;
 
     /********************************************************************
      *
      * Crypto Init/shutdown
      *
      ********************************************************************/
-    gXmlSecGnuTLSFunctions->cryptoInit                  = xmlSecGnuTLSInit;
-    gXmlSecGnuTLSFunctions->cryptoShutdown              = xmlSecGnuTLSShutdown;
-    gXmlSecGnuTLSFunctions->cryptoKeysMngrInit          = xmlSecGnuTLSKeysMngrInit;
+    gXmlSecGCryptFunctions->cryptoInit                  = xmlSecGCryptInit;
+    gXmlSecGCryptFunctions->cryptoShutdown              = xmlSecGCryptShutdown;
+    gXmlSecGCryptFunctions->cryptoKeysMngrInit          = xmlSecGCryptKeysMngrInit;
 
     /********************************************************************
      *
@@ -58,23 +57,23 @@ xmlSecCryptoGetFunctions_gnutls(void) {
      *
      ********************************************************************/
 #ifndef XMLSEC_NO_AES
-    gXmlSecGnuTLSFunctions->keyDataAesGetKlass          = xmlSecGnuTLSKeyDataAesGetKlass;
+    gXmlSecGCryptFunctions->keyDataAesGetKlass          = xmlSecGCryptKeyDataAesGetKlass;
 #endif /* XMLSEC_NO_AES */
 
 #ifndef XMLSEC_NO_DES
-    gXmlSecGnuTLSFunctions->keyDataDesGetKlass          = xmlSecGnuTLSKeyDataDesGetKlass;
+    gXmlSecGCryptFunctions->keyDataDesGetKlass          = xmlSecGCryptKeyDataDesGetKlass;
 #endif /* XMLSEC_NO_DES */
 
 #ifndef XMLSEC_NO_DSA
-    gXmlSecGnuTLSFunctions->keyDataDsaGetKlass          = xmlSecGnuTLSKeyDataDsaGetKlass;
+    gXmlSecGCryptFunctions->keyDataDsaGetKlass          = xmlSecGCryptKeyDataDsaGetKlass;
 #endif /* XMLSEC_NO_DSA */
 
 #ifndef XMLSEC_NO_HMAC
-    gXmlSecGnuTLSFunctions->keyDataHmacGetKlass         = xmlSecGnuTLSKeyDataHmacGetKlass;
+    gXmlSecGCryptFunctions->keyDataHmacGetKlass         = xmlSecGCryptKeyDataHmacGetKlass;
 #endif /* XMLSEC_NO_HMAC */
 
 #ifndef XMLSEC_NO_RSA
-    gXmlSecGnuTLSFunctions->keyDataRsaGetKlass          = xmlSecGnuTLSKeyDataRsaGetKlass;
+    gXmlSecGCryptFunctions->keyDataRsaGetKlass          = xmlSecGCryptKeyDataRsaGetKlass;
 #endif /* XMLSEC_NO_RSA */
 
 
@@ -92,18 +91,18 @@ xmlSecCryptoGetFunctions_gnutls(void) {
 
     /******************************* AES ********************************/
 #ifndef XMLSEC_NO_AES
-    gXmlSecGnuTLSFunctions->transformAes128CbcGetKlass          = xmlSecGnuTLSTransformAes128CbcGetKlass;
-    gXmlSecGnuTLSFunctions->transformAes192CbcGetKlass          = xmlSecGnuTLSTransformAes192CbcGetKlass;
-    gXmlSecGnuTLSFunctions->transformAes256CbcGetKlass          = xmlSecGnuTLSTransformAes256CbcGetKlass;
-    gXmlSecGnuTLSFunctions->transformKWAes128GetKlass           = xmlSecGnuTLSTransformKWAes128GetKlass;
-    gXmlSecGnuTLSFunctions->transformKWAes192GetKlass           = xmlSecGnuTLSTransformKWAes192GetKlass;
-    gXmlSecGnuTLSFunctions->transformKWAes256GetKlass           = xmlSecGnuTLSTransformKWAes256GetKlass;
+    gXmlSecGCryptFunctions->transformAes128CbcGetKlass          = xmlSecGCryptTransformAes128CbcGetKlass;
+    gXmlSecGCryptFunctions->transformAes192CbcGetKlass          = xmlSecGCryptTransformAes192CbcGetKlass;
+    gXmlSecGCryptFunctions->transformAes256CbcGetKlass          = xmlSecGCryptTransformAes256CbcGetKlass;
+    gXmlSecGCryptFunctions->transformKWAes128GetKlass           = xmlSecGCryptTransformKWAes128GetKlass;
+    gXmlSecGCryptFunctions->transformKWAes192GetKlass           = xmlSecGCryptTransformKWAes192GetKlass;
+    gXmlSecGCryptFunctions->transformKWAes256GetKlass           = xmlSecGCryptTransformKWAes256GetKlass;
 #endif /* XMLSEC_NO_AES */
 
     /******************************* DES ********************************/
 #ifndef XMLSEC_NO_DES
-    gXmlSecGnuTLSFunctions->transformDes3CbcGetKlass            = xmlSecGnuTLSTransformDes3CbcGetKlass;
-    gXmlSecGnuTLSFunctions->transformKWDes3GetKlass             = xmlSecGnuTLSTransformKWDes3GetKlass;
+    gXmlSecGCryptFunctions->transformDes3CbcGetKlass            = xmlSecGCryptTransformDes3CbcGetKlass;
+    gXmlSecGCryptFunctions->transformKWDes3GetKlass             = xmlSecGCryptTransformKWDes3GetKlass;
 #endif /* XMLSEC_NO_DES */
 
     /******************************* DSA ********************************/
@@ -112,7 +111,7 @@ xmlSecCryptoGetFunctions_gnutls(void) {
 #ifndef XMLSEC_NO_DSA
 
 #ifndef XMLSEC_NO_SHA1
-    gXmlSecGnuTLSFunctions->transformDsaSha1GetKlass            = xmlSecGnuTLSTransformDsaSha1GetKlass;
+    gXmlSecGCryptFunctions->transformDsaSha1GetKlass            = xmlSecGCryptTransformDsaSha1GetKlass;
 #endif /* XMLSEC_NO_SHA1 */
 
 #endif /* XMLSEC_NO_DSA */
@@ -123,39 +122,39 @@ xmlSecCryptoGetFunctions_gnutls(void) {
 #ifndef XMLSEC_NO_HMAC
 
 #ifndef XMLSEC_NO_MD5
-    gXmlSecGnuTLSFunctions->transformHmacMd5GetKlass            = xmlSecGnuTLSTransformHmacMd5GetKlass;
+    gXmlSecGCryptFunctions->transformHmacMd5GetKlass            = xmlSecGCryptTransformHmacMd5GetKlass;
 #endif /* XMLSEC_NO_MD5 */
 
 #ifndef XMLSEC_NO_RIPEMD160
-    gXmlSecGnuTLSFunctions->transformHmacRipemd160GetKlass      = xmlSecGnuTLSTransformHmacRipemd160GetKlass;
+    gXmlSecGCryptFunctions->transformHmacRipemd160GetKlass      = xmlSecGCryptTransformHmacRipemd160GetKlass;
 #endif /* XMLSEC_NO_RIPEMD160 */
 
 #ifndef XMLSEC_NO_SHA1
-    gXmlSecGnuTLSFunctions->transformHmacSha1GetKlass           = xmlSecGnuTLSTransformHmacSha1GetKlass;
+    gXmlSecGCryptFunctions->transformHmacSha1GetKlass           = xmlSecGCryptTransformHmacSha1GetKlass;
 #endif /* XMLSEC_NO_SHA1 */
 
 #ifndef XMLSEC_NO_SHA256
-    gXmlSecGnuTLSFunctions->transformHmacSha256GetKlass         = xmlSecGnuTLSTransformHmacSha256GetKlass;
+    gXmlSecGCryptFunctions->transformHmacSha256GetKlass         = xmlSecGCryptTransformHmacSha256GetKlass;
 #endif /* XMLSEC_NO_SHA256 */
 
 #ifndef XMLSEC_NO_SHA384
-    gXmlSecGnuTLSFunctions->transformHmacSha384GetKlass         = xmlSecGnuTLSTransformHmacSha384GetKlass;
+    gXmlSecGCryptFunctions->transformHmacSha384GetKlass         = xmlSecGCryptTransformHmacSha384GetKlass;
 #endif /* XMLSEC_NO_SHA384 */
 
 #ifndef XMLSEC_NO_SHA512
-    gXmlSecGnuTLSFunctions->transformHmacSha512GetKlass         = xmlSecGnuTLSTransformHmacSha512GetKlass;
+    gXmlSecGCryptFunctions->transformHmacSha512GetKlass         = xmlSecGCryptTransformHmacSha512GetKlass;
 #endif /* XMLSEC_NO_SHA512 */
 
 #endif /* XMLSEC_NO_HMAC */
 
     /******************************* MD5 ********************************/
 #ifndef XMLSEC_NO_MD5
-    gXmlSecGnuTLSFunctions->transformMd5GetKlass                = xmlSecGnuTLSTransformMd5GetKlass;
+    gXmlSecGCryptFunctions->transformMd5GetKlass                = xmlSecGCryptTransformMd5GetKlass;
 #endif /* XMLSEC_NO_MD5 */
 
     /******************************* RIPEMD160 ********************************/
 #ifndef XMLSEC_NO_RIPEMD160
-    gXmlSecGnuTLSFunctions->transformRipemd160GetKlass          = xmlSecGnuTLSTransformRipemd160GetKlass;
+    gXmlSecGCryptFunctions->transformRipemd160GetKlass          = xmlSecGCryptTransformRipemd160GetKlass;
 #endif /* XMLSEC_NO_RIPEMD160 */
 
     /******************************* RSA ********************************/
@@ -164,54 +163,54 @@ xmlSecCryptoGetFunctions_gnutls(void) {
 #ifndef XMLSEC_NO_RSA
 
 #ifndef XMLSEC_NO_MD5
-    gXmlSecGnuTLSFunctions->transformRsaMd5GetKlass            = xmlSecGnuTLSTransformRsaMd5GetKlass;
+    gXmlSecGCryptFunctions->transformRsaMd5GetKlass            = xmlSecGCryptTransformRsaMd5GetKlass;
 #endif /* XMLSEC_NO_MD5 */
 
 #ifndef XMLSEC_NO_RIPEMD160
-    gXmlSecGnuTLSFunctions->transformRsaRipemd160GetKlass      = xmlSecGnuTLSTransformRsaRipemd160GetKlass;
+    gXmlSecGCryptFunctions->transformRsaRipemd160GetKlass      = xmlSecGCryptTransformRsaRipemd160GetKlass;
 #endif /* XMLSEC_NO_RIPEMD160 */
 
 #ifndef XMLSEC_NO_SHA1
-    gXmlSecGnuTLSFunctions->transformRsaSha1GetKlass           = xmlSecGnuTLSTransformRsaSha1GetKlass;
+    gXmlSecGCryptFunctions->transformRsaSha1GetKlass           = xmlSecGCryptTransformRsaSha1GetKlass;
 #endif /* XMLSEC_NO_SHA1 */
 
 #ifndef XMLSEC_NO_SHA224
-    gXmlSecGnuTLSFunctions->transformRsaSha224GetKlass         = xmlSecGnuTLSTransformRsaSha224GetKlass;
+    gXmlSecGCryptFunctions->transformRsaSha224GetKlass         = xmlSecGCryptTransformRsaSha224GetKlass;
 #endif /* XMLSEC_NO_SHA224 */
 
 #ifndef XMLSEC_NO_SHA256
-    gXmlSecGnuTLSFunctions->transformRsaSha256GetKlass         = xmlSecGnuTLSTransformRsaSha256GetKlass;
+    gXmlSecGCryptFunctions->transformRsaSha256GetKlass         = xmlSecGCryptTransformRsaSha256GetKlass;
 #endif /* XMLSEC_NO_SHA256 */
 
 #ifndef XMLSEC_NO_SHA384
-    gXmlSecGnuTLSFunctions->transformRsaSha384GetKlass         = xmlSecGnuTLSTransformRsaSha384GetKlass;
+    gXmlSecGCryptFunctions->transformRsaSha384GetKlass         = xmlSecGCryptTransformRsaSha384GetKlass;
 #endif /* XMLSEC_NO_SHA384 */
 
 #ifndef XMLSEC_NO_SHA512
-    gXmlSecGnuTLSFunctions->transformRsaSha512GetKlass         = xmlSecGnuTLSTransformRsaSha512GetKlass;
+    gXmlSecGCryptFunctions->transformRsaSha512GetKlass         = xmlSecGCryptTransformRsaSha512GetKlass;
 #endif /* XMLSEC_NO_SHA512 */
 
-    gXmlSecGnuTLSFunctions->transformRsaPkcs1GetKlass          = xmlSecGnuTLSTransformRsaPkcs1GetKlass;
-    gXmlSecGnuTLSFunctions->transformRsaOaepGetKlass           = xmlSecGnuTLSTransformRsaOaepGetKlass;
+    gXmlSecGCryptFunctions->transformRsaPkcs1GetKlass          = xmlSecGCryptTransformRsaPkcs1GetKlass;
+    gXmlSecGCryptFunctions->transformRsaOaepGetKlass           = xmlSecGCryptTransformRsaOaepGetKlass;
 #endif /* XMLSEC_NO_RSA */
 
 #endif /* ALEKSEY_TODO */
 
     /******************************* SHA ********************************/
 #ifndef XMLSEC_NO_SHA1
-    gXmlSecGnuTLSFunctions->transformSha1GetKlass               = xmlSecGnuTLSTransformSha1GetKlass;
+    gXmlSecGCryptFunctions->transformSha1GetKlass               = xmlSecGCryptTransformSha1GetKlass;
 #endif /* XMLSEC_NO_SHA1 */
 
 #ifndef XMLSEC_NO_SHA256
-    gXmlSecGnuTLSFunctions->transformSha256GetKlass             = xmlSecGnuTLSTransformSha256GetKlass;
+    gXmlSecGCryptFunctions->transformSha256GetKlass             = xmlSecGCryptTransformSha256GetKlass;
 #endif /* XMLSEC_NO_SHA256 */
 
 #ifndef XMLSEC_NO_SHA384
-    gXmlSecGnuTLSFunctions->transformSha384GetKlass             = xmlSecGnuTLSTransformSha384GetKlass;
+    gXmlSecGCryptFunctions->transformSha384GetKlass             = xmlSecGCryptTransformSha384GetKlass;
 #endif /* XMLSEC_NO_SHA384 */
 
 #ifndef XMLSEC_NO_SHA512
-    gXmlSecGnuTLSFunctions->transformSha512GetKlass             = xmlSecGnuTLSTransformSha512GetKlass;
+    gXmlSecGCryptFunctions->transformSha512GetKlass             = xmlSecGCryptTransformSha512GetKlass;
 #endif /* XMLSEC_NO_SHA512 */
 
 
@@ -220,33 +219,33 @@ xmlSecCryptoGetFunctions_gnutls(void) {
      * High level routines form xmlsec command line utility
      *
      ********************************************************************/
-    gXmlSecGnuTLSFunctions->cryptoAppInit                       = xmlSecGnuTLSAppInit;
-    gXmlSecGnuTLSFunctions->cryptoAppShutdown                   = xmlSecGnuTLSAppShutdown;
-    gXmlSecGnuTLSFunctions->cryptoAppDefaultKeysMngrInit        = xmlSecGnuTLSAppDefaultKeysMngrInit;
-    gXmlSecGnuTLSFunctions->cryptoAppDefaultKeysMngrAdoptKey    = xmlSecGnuTLSAppDefaultKeysMngrAdoptKey;
-    gXmlSecGnuTLSFunctions->cryptoAppDefaultKeysMngrLoad        = xmlSecGnuTLSAppDefaultKeysMngrLoad;
-    gXmlSecGnuTLSFunctions->cryptoAppDefaultKeysMngrSave        = xmlSecGnuTLSAppDefaultKeysMngrSave;
+    gXmlSecGCryptFunctions->cryptoAppInit                       = xmlSecGCryptAppInit;
+    gXmlSecGCryptFunctions->cryptoAppShutdown                   = xmlSecGCryptAppShutdown;
+    gXmlSecGCryptFunctions->cryptoAppDefaultKeysMngrInit        = xmlSecGCryptAppDefaultKeysMngrInit;
+    gXmlSecGCryptFunctions->cryptoAppDefaultKeysMngrAdoptKey    = xmlSecGCryptAppDefaultKeysMngrAdoptKey;
+    gXmlSecGCryptFunctions->cryptoAppDefaultKeysMngrLoad        = xmlSecGCryptAppDefaultKeysMngrLoad;
+    gXmlSecGCryptFunctions->cryptoAppDefaultKeysMngrSave        = xmlSecGCryptAppDefaultKeysMngrSave;
 #ifndef XMLSEC_NO_X509
-    gXmlSecGnuTLSFunctions->cryptoAppKeysMngrCertLoad           = xmlSecGnuTLSAppKeysMngrCertLoad;
-    gXmlSecGnuTLSFunctions->cryptoAppPkcs12Load                 = xmlSecGnuTLSAppPkcs12Load;
-    gXmlSecGnuTLSFunctions->cryptoAppKeyCertLoad                = xmlSecGnuTLSAppKeyCertLoad;
+    gXmlSecGCryptFunctions->cryptoAppKeysMngrCertLoad           = xmlSecGCryptAppKeysMngrCertLoad;
+    gXmlSecGCryptFunctions->cryptoAppPkcs12Load                 = xmlSecGCryptAppPkcs12Load;
+    gXmlSecGCryptFunctions->cryptoAppKeyCertLoad                = xmlSecGCryptAppKeyCertLoad;
 #endif /* XMLSEC_NO_X509 */
-    gXmlSecGnuTLSFunctions->cryptoAppKeyLoad                    = xmlSecGnuTLSAppKeyLoad;
-    gXmlSecGnuTLSFunctions->cryptoAppDefaultPwdCallback         = (void*)xmlSecGnuTLSAppGetDefaultPwdCallback();
+    gXmlSecGCryptFunctions->cryptoAppKeyLoad                    = xmlSecGCryptAppKeyLoad;
+    gXmlSecGCryptFunctions->cryptoAppDefaultPwdCallback         = (void*)xmlSecGCryptAppGetDefaultPwdCallback();
 
-    return(gXmlSecGnuTLSFunctions);
+    return(gXmlSecGCryptFunctions);
 }
 
 
 /**
- * xmlSecGnuTLSInit:
+ * xmlSecGCryptInit:
  *
  * XMLSec library specific crypto engine initialization.
  *
  * Returns: 0 on success or a negative value otherwise.
  */
 int
-xmlSecGnuTLSInit (void)  {
+xmlSecGCryptInit (void)  {
     /* Check loaded xmlsec library version */
     if(xmlSecCheckVersionExact() != 1) {
         xmlSecError(XMLSEC_ERRORS_HERE,
@@ -258,7 +257,7 @@ xmlSecGnuTLSInit (void)  {
     }
 
     /* register our klasses */
-    if(xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms(xmlSecCryptoGetFunctions_gnutls()) < 0) {
+    if(xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms(xmlSecCryptoGetFunctions_gcrypt()) < 0) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     NULL,
                     "xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms",
@@ -271,27 +270,27 @@ xmlSecGnuTLSInit (void)  {
 }
 
 /**
- * xmlSecGnuTLSShutdown:
+ * xmlSecGCryptShutdown:
  *
  * XMLSec library specific crypto engine shutdown.
  *
  * Returns: 0 on success or a negative value otherwise.
  */
 int
-xmlSecGnuTLSShutdown(void) {
+xmlSecGCryptShutdown(void) {
     return(0);
 }
 
 /**
- * xmlSecGnuTLSKeysMngrInit:
+ * xmlSecGCryptKeysMngrInit:
  * @mngr:               the pointer to keys manager.
  *
- * Adds GnuTLS specific key data stores in keys manager.
+ * Adds GCrypt specific key data stores in keys manager.
  *
  * Returns: 0 on success or a negative value otherwise.
  */
 int
-xmlSecGnuTLSKeysMngrInit(xmlSecKeysMngrPtr mngr) {
+xmlSecGCryptKeysMngrInit(xmlSecKeysMngrPtr mngr) {
     xmlSecAssert2(mngr != NULL, -1);
 
     /* TODO: add key data stores */
@@ -299,7 +298,7 @@ xmlSecGnuTLSKeysMngrInit(xmlSecKeysMngrPtr mngr) {
 }
 
 /**
- * xmlSecGnuTLSGenerateRandom:
+ * xmlSecGCryptGenerateRandom:
  * @buffer:             the destination buffer.
  * @size:               the numer of bytes to generate.
  *
@@ -308,7 +307,7 @@ xmlSecGnuTLSKeysMngrInit(xmlSecKeysMngrPtr mngr) {
  * Returns: 0 on success or a negative value otherwise.
  */
 int
-xmlSecGnuTLSGenerateRandom(xmlSecBufferPtr buffer, xmlSecSize size) {
+xmlSecGCryptGenerateRandom(xmlSecBufferPtr buffer, xmlSecSize size) {
     int ret;
 
     xmlSecAssert2(buffer != NULL, -1);
diff --git a/src/gcrypt/digests.c b/src/gcrypt/digests.c
index c43cd08..caa8f26 100644
--- a/src/gcrypt/digests.c
+++ b/src/gcrypt/digests.c
@@ -10,7 +10,6 @@
 
 #include <string.h>
 
-#include <gnutls/gnutls.h>
 #include <gcrypt.h>
 
 #include <xmlsec/xmlsec.h>
@@ -18,21 +17,21 @@
 #include <xmlsec/transforms.h>
 #include <xmlsec/errors.h>
 
-#include <xmlsec/gnutls/app.h>
-#include <xmlsec/gnutls/crypto.h>
+#include <xmlsec/gcrypt/app.h>
+#include <xmlsec/gcrypt/crypto.h>
 
-#define XMLSEC_GNUTLS_MAX_DIGEST_SIZE           256
+#define XMLSEC_GCRYPT_MAX_DIGEST_SIZE           256
 
 /**************************************************************************
  *
- * Internal GNUTLS Digest CTX
+ * Internal GCRYPT Digest CTX
  *
  *****************************************************************************/
-typedef struct _xmlSecGnuTLSDigestCtx           xmlSecGnuTLSDigestCtx, *xmlSecGnuTLSDigestCtxPtr;
-struct _xmlSecGnuTLSDigestCtx {
+typedef struct _xmlSecGCryptDigestCtx           xmlSecGCryptDigestCtx, *xmlSecGCryptDigestCtxPtr;
+struct _xmlSecGCryptDigestCtx {
     int                 digest;
     gcry_md_hd_t        digestCtx;
-    xmlSecByte          dgst[XMLSEC_GNUTLS_MAX_DIGEST_SIZE];
+    xmlSecByte          dgst[XMLSEC_GCRYPT_MAX_DIGEST_SIZE];
     xmlSecSize          dgstSize;       /* dgst size in bytes */
 };
 
@@ -40,60 +39,60 @@ struct _xmlSecGnuTLSDigestCtx {
  *
  * Digest transforms
  *
- * xmlSecGnuTLSDigestCtx is located after xmlSecTransform
+ * xmlSecGCryptDigestCtx is located after xmlSecTransform
  *
  *****************************************************************************/
-#define xmlSecGnuTLSDigestSize  \
-    (sizeof(xmlSecTransform) + sizeof(xmlSecGnuTLSDigestCtx))
-#define xmlSecGnuTLSDigestGetCtx(transform) \
-    ((xmlSecGnuTLSDigestCtxPtr)(((xmlSecByte*)(transform)) + sizeof(xmlSecTransform)))
-
-static int      xmlSecGnuTLSDigestInitialize            (xmlSecTransformPtr transform);
-static void     xmlSecGnuTLSDigestFinalize              (xmlSecTransformPtr transform);
-static int      xmlSecGnuTLSDigestVerify                (xmlSecTransformPtr transform,
+#define xmlSecGCryptDigestSize  \
+    (sizeof(xmlSecTransform) + sizeof(xmlSecGCryptDigestCtx))
+#define xmlSecGCryptDigestGetCtx(transform) \
+    ((xmlSecGCryptDigestCtxPtr)(((xmlSecByte*)(transform)) + sizeof(xmlSecTransform)))
+
+static int      xmlSecGCryptDigestInitialize            (xmlSecTransformPtr transform);
+static void     xmlSecGCryptDigestFinalize              (xmlSecTransformPtr transform);
+static int      xmlSecGCryptDigestVerify                (xmlSecTransformPtr transform,
                                                          const xmlSecByte* data,
                                                          xmlSecSize dataSize,
                                                          xmlSecTransformCtxPtr transformCtx);
-static int      xmlSecGnuTLSDigestExecute               (xmlSecTransformPtr transform,
+static int      xmlSecGCryptDigestExecute               (xmlSecTransformPtr transform,
                                                          int last,
                                                          xmlSecTransformCtxPtr transformCtx);
-static int      xmlSecGnuTLSDigestCheckId               (xmlSecTransformPtr transform);
+static int      xmlSecGCryptDigestCheckId               (xmlSecTransformPtr transform);
 
 static int
-xmlSecGnuTLSDigestCheckId(xmlSecTransformPtr transform) {
+xmlSecGCryptDigestCheckId(xmlSecTransformPtr transform) {
 
 #ifndef XMLSEC_NO_SHA1
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformSha1Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformSha1Id)) {
         return(1);
     } else
 #endif /* XMLSEC_NO_SHA1 */
 
 #ifndef XMLSEC_NO_SHA256
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformSha256Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformSha256Id)) {
         return(1);
     } else
 #endif /* XMLSEC_NO_SHA256 */
 
 #ifndef XMLSEC_NO_SHA384
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformSha384Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformSha384Id)) {
         return(1);
     } else
 #endif /* XMLSEC_NO_SHA384 */
 
 #ifndef XMLSEC_NO_SHA512
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformSha512Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformSha512Id)) {
         return(1);
     } else
 #endif /* XMLSEC_NO_SHA512 */
 
 #ifndef XMLSEC_NO_MD5
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformMd5Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformMd5Id)) {
         return(1);
     } else
 #endif /* XMLSEC_NO_MD5 */
 
 #ifndef XMLSEC_NO_RIPEMD160
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformRipemd160Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformRipemd160Id)) {
         return(1);
     } else
 #endif /* XMLSEC_NO_RIPEMD160 */
@@ -108,51 +107,51 @@ xmlSecGnuTLSDigestCheckId(xmlSecTransformPtr transform) {
 }
 
 static int
-xmlSecGnuTLSDigestInitialize(xmlSecTransformPtr transform) {
-    xmlSecGnuTLSDigestCtxPtr ctx;
+xmlSecGCryptDigestInitialize(xmlSecTransformPtr transform) {
+    xmlSecGCryptDigestCtxPtr ctx;
     gpg_err_code_t ret;
 
-    xmlSecAssert2(xmlSecGnuTLSDigestCheckId(transform), -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSDigestSize), -1);
+    xmlSecAssert2(xmlSecGCryptDigestCheckId(transform), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptDigestSize), -1);
 
-    ctx = xmlSecGnuTLSDigestGetCtx(transform);
+    ctx = xmlSecGCryptDigestGetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
 
     /* initialize context */
-    memset(ctx, 0, sizeof(xmlSecGnuTLSDigestCtx));
+    memset(ctx, 0, sizeof(xmlSecGCryptDigestCtx));
 
 #ifndef XMLSEC_NO_SHA1
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformSha1Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformSha1Id)) {
         ctx->digest = GCRY_MD_SHA1;
     } else
 #endif /* XMLSEC_NO_SHA1 */
 
 #ifndef XMLSEC_NO_SHA256
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformSha256Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformSha256Id)) {
         ctx->digest = GCRY_MD_SHA256;
     } else
 #endif /* XMLSEC_NO_SHA256 */
 
 #ifndef XMLSEC_NO_SHA384
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformSha384Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformSha384Id)) {
         ctx->digest = GCRY_MD_SHA384;
     } else
 #endif /* XMLSEC_NO_SHA384 */
 
 #ifndef XMLSEC_NO_SHA512
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformSha512Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformSha512Id)) {
         ctx->digest = GCRY_MD_SHA512;
     } else
 #endif /* XMLSEC_NO_SHA512 */
 
 #ifndef XMLSEC_NO_MD5
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformMd5Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformMd5Id)) {
         ctx->digest = GCRY_MD_MD5;
     } else
 #endif /* XMLSEC_NO_MD5 */
 
 #ifndef XMLSEC_NO_RIPEMD160
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformRipemd160Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformRipemd160Id)) {
         ctx->digest = GCRY_MD_RMD160;
     } else
 #endif /* XMLSEC_NO_RIPEMD160 */
@@ -179,35 +178,35 @@ xmlSecGnuTLSDigestInitialize(xmlSecTransformPtr transform) {
 }
 
 static void
-xmlSecGnuTLSDigestFinalize(xmlSecTransformPtr transform) {
-    xmlSecGnuTLSDigestCtxPtr ctx;
+xmlSecGCryptDigestFinalize(xmlSecTransformPtr transform) {
+    xmlSecGCryptDigestCtxPtr ctx;
 
-    xmlSecAssert(xmlSecGnuTLSDigestCheckId(transform));
-    xmlSecAssert(xmlSecTransformCheckSize(transform, xmlSecGnuTLSDigestSize));
+    xmlSecAssert(xmlSecGCryptDigestCheckId(transform));
+    xmlSecAssert(xmlSecTransformCheckSize(transform, xmlSecGCryptDigestSize));
 
-    ctx = xmlSecGnuTLSDigestGetCtx(transform);
+    ctx = xmlSecGCryptDigestGetCtx(transform);
     xmlSecAssert(ctx != NULL);
 
     if(ctx->digestCtx != NULL) {
         gcry_md_close(ctx->digestCtx);
     }
-    memset(ctx, 0, sizeof(xmlSecGnuTLSDigestCtx));
+    memset(ctx, 0, sizeof(xmlSecGCryptDigestCtx));
 }
 
 static int
-xmlSecGnuTLSDigestVerify(xmlSecTransformPtr transform,
+xmlSecGCryptDigestVerify(xmlSecTransformPtr transform,
                         const xmlSecByte* data, xmlSecSize dataSize,
                         xmlSecTransformCtxPtr transformCtx) {
-    xmlSecGnuTLSDigestCtxPtr ctx;
+    xmlSecGCryptDigestCtxPtr ctx;
 
-    xmlSecAssert2(xmlSecGnuTLSDigestCheckId(transform), -1);
+    xmlSecAssert2(xmlSecGCryptDigestCheckId(transform), -1);
     xmlSecAssert2(transform->operation == xmlSecTransformOperationVerify, -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSDigestSize), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptDigestSize), -1);
     xmlSecAssert2(transform->status == xmlSecTransformStatusFinished, -1);
     xmlSecAssert2(data != NULL, -1);
     xmlSecAssert2(transformCtx != NULL, -1);
 
-    ctx = xmlSecGnuTLSDigestGetCtx(transform);
+    ctx = xmlSecGCryptDigestGetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
     xmlSecAssert2(ctx->dgstSize > 0, -1);
 
@@ -237,17 +236,17 @@ xmlSecGnuTLSDigestVerify(xmlSecTransformPtr transform,
 }
 
 static int
-xmlSecGnuTLSDigestExecute(xmlSecTransformPtr transform, int last, xmlSecTransformCtxPtr transformCtx) {
-    xmlSecGnuTLSDigestCtxPtr ctx;
+xmlSecGCryptDigestExecute(xmlSecTransformPtr transform, int last, xmlSecTransformCtxPtr transformCtx) {
+    xmlSecGCryptDigestCtxPtr ctx;
     xmlSecBufferPtr in, out;
     int ret;
 
-    xmlSecAssert2(xmlSecGnuTLSDigestCheckId(transform), -1);
+    xmlSecAssert2(xmlSecGCryptDigestCheckId(transform), -1);
     xmlSecAssert2((transform->operation == xmlSecTransformOperationSign) || (transform->operation == xmlSecTransformOperationVerify), -1);
     xmlSecAssert2(transformCtx != NULL, -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSDigestSize), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptDigestSize), -1);
 
-    ctx = xmlSecGnuTLSDigestGetCtx(transform);
+    ctx = xmlSecGCryptDigestGetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
     xmlSecAssert2(ctx->digest != GCRY_MD_NONE, -1);
     xmlSecAssert2(ctx->digestCtx != NULL, -1);
@@ -332,10 +331,10 @@ xmlSecGnuTLSDigestExecute(xmlSecTransformPtr transform, int last, xmlSecTransfor
  * SHA1 Digest transforms
  *
  *****************************************************************************/
-static xmlSecTransformKlass xmlSecGnuTLSSha1Klass = {
+static xmlSecTransformKlass xmlSecGCryptSha1Klass = {
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),               /* xmlSecSize klassSize */
-    xmlSecGnuTLSDigestSize,                     /* xmlSecSize objSize */
+    xmlSecGCryptDigestSize,                     /* xmlSecSize objSize */
 
     /* data */
     xmlSecNameSha1,                             /* const xmlChar* name; */
@@ -343,34 +342,34 @@ static xmlSecTransformKlass xmlSecGnuTLSSha1Klass = {
     xmlSecTransformUsageDigestMethod,           /* xmlSecTransformUsage usage; */
 
     /* methods */
-    xmlSecGnuTLSDigestInitialize,               /* xmlSecTransformInitializeMethod initialize; */
-    xmlSecGnuTLSDigestFinalize,                 /* xmlSecTransformFinalizeMethod finalize; */
+    xmlSecGCryptDigestInitialize,               /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecGCryptDigestFinalize,                 /* xmlSecTransformFinalizeMethod finalize; */
     NULL,                                       /* xmlSecTransformNodeReadMethod readNode; */
     NULL,                                       /* xmlSecTransformNodeWriteMethod writeNode; */
     NULL,                                       /* xmlSecTransformSetKeyReqMethod setKeyReq; */
     NULL,                                       /* xmlSecTransformSetKeyMethod setKey; */
-    xmlSecGnuTLSDigestVerify,                   /* xmlSecTransformVerifyMethod verify; */
+    xmlSecGCryptDigestVerify,                   /* xmlSecTransformVerifyMethod verify; */
     xmlSecTransformDefaultGetDataType,          /* xmlSecTransformGetDataTypeMethod getDataType; */
     xmlSecTransformDefaultPushBin,              /* xmlSecTransformPushBinMethod pushBin; */
     xmlSecTransformDefaultPopBin,               /* xmlSecTransformPopBinMethod popBin; */
     NULL,                                       /* xmlSecTransformPushXmlMethod pushXml; */
     NULL,                                       /* xmlSecTransformPopXmlMethod popXml; */
-    xmlSecGnuTLSDigestExecute,                  /* xmlSecTransformExecuteMethod execute; */
+    xmlSecGCryptDigestExecute,                  /* xmlSecTransformExecuteMethod execute; */
 
     NULL,                                       /* void* reserved0; */
     NULL,                                       /* void* reserved1; */
 };
 
 /**
- * xmlSecGnuTLSTransformSha1GetKlass:
+ * xmlSecGCryptTransformSha1GetKlass:
  *
  * SHA-1 digest transform klass.
  *
  * Returns: pointer to SHA-1 digest transform klass.
  */
 xmlSecTransformId
-xmlSecGnuTLSTransformSha1GetKlass(void) {
-    return(&xmlSecGnuTLSSha1Klass);
+xmlSecGCryptTransformSha1GetKlass(void) {
+    return(&xmlSecGCryptSha1Klass);
 }
 #endif /* XMLSEC_NO_SHA1 */
 
@@ -381,10 +380,10 @@ xmlSecGnuTLSTransformSha1GetKlass(void) {
  * SHA256 Digest transforms
  *
  *****************************************************************************/
-static xmlSecTransformKlass xmlSecGnuTLSSha256Klass = {
+static xmlSecTransformKlass xmlSecGCryptSha256Klass = {
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),               /* xmlSecSize klassSize */
-    xmlSecGnuTLSDigestSize,                     /* xmlSecSize objSize */
+    xmlSecGCryptDigestSize,                     /* xmlSecSize objSize */
 
     /* data */
     xmlSecNameSha256,                           /* const xmlChar* name; */
@@ -392,34 +391,34 @@ static xmlSecTransformKlass xmlSecGnuTLSSha256Klass = {
     xmlSecTransformUsageDigestMethod,           /* xmlSecTransformUsage usage; */
 
     /* methods */
-    xmlSecGnuTLSDigestInitialize,               /* xmlSecTransformInitializeMethod initialize; */
-    xmlSecGnuTLSDigestFinalize,                 /* xmlSecTransformFinalizeMethod finalize; */
+    xmlSecGCryptDigestInitialize,               /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecGCryptDigestFinalize,                 /* xmlSecTransformFinalizeMethod finalize; */
     NULL,                                       /* xmlSecTransformNodeReadMethod readNode; */
     NULL,                                       /* xmlSecTransformNodeWriteMethod writeNode; */
     NULL,                                       /* xmlSecTransformSetKeyReqMethod setKeyReq; */
     NULL,                                       /* xmlSecTransformSetKeyMethod setKey; */
-    xmlSecGnuTLSDigestVerify,                   /* xmlSecTransformVerifyMethod verify; */
+    xmlSecGCryptDigestVerify,                   /* xmlSecTransformVerifyMethod verify; */
     xmlSecTransformDefaultGetDataType,          /* xmlSecTransformGetDataTypeMethod getDataType; */
     xmlSecTransformDefaultPushBin,              /* xmlSecTransformPushBinMethod pushBin; */
     xmlSecTransformDefaultPopBin,               /* xmlSecTransformPopBinMethod popBin; */
     NULL,                                       /* xmlSecTransformPushXmlMethod pushXml; */
     NULL,                                       /* xmlSecTransformPopXmlMethod popXml; */
-    xmlSecGnuTLSDigestExecute,                  /* xmlSecTransformExecuteMethod execute; */
+    xmlSecGCryptDigestExecute,                  /* xmlSecTransformExecuteMethod execute; */
 
     NULL,                                       /* void* reserved0; */
     NULL,                                       /* void* reserved1; */
 };
 
 /**
- * xmlSecGnuTLSTransformSha256GetKlass:
+ * xmlSecGCryptTransformSha256GetKlass:
  *
  * SHA256 digest transform klass.
  *
  * Returns: pointer to SHA256 digest transform klass.
  */
 xmlSecTransformId
-xmlSecGnuTLSTransformSha256GetKlass(void) {
-    return(&xmlSecGnuTLSSha256Klass);
+xmlSecGCryptTransformSha256GetKlass(void) {
+    return(&xmlSecGCryptSha256Klass);
 }
 #endif /* XMLSEC_NO_SHA256 */
 
@@ -429,10 +428,10 @@ xmlSecGnuTLSTransformSha256GetKlass(void) {
  * SHA384 Digest transforms
  *
  *****************************************************************************/
-static xmlSecTransformKlass xmlSecGnuTLSSha384Klass = {
+static xmlSecTransformKlass xmlSecGCryptSha384Klass = {
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),               /* xmlSecSize klassSize */
-    xmlSecGnuTLSDigestSize,                     /* xmlSecSize objSize */
+    xmlSecGCryptDigestSize,                     /* xmlSecSize objSize */
 
     /* data */
     xmlSecNameSha384,                           /* const xmlChar* name; */
@@ -440,34 +439,34 @@ static xmlSecTransformKlass xmlSecGnuTLSSha384Klass = {
     xmlSecTransformUsageDigestMethod,           /* xmlSecTransformUsage usage; */
 
     /* methods */
-    xmlSecGnuTLSDigestInitialize,               /* xmlSecTransformInitializeMethod initialize; */
-    xmlSecGnuTLSDigestFinalize,                 /* xmlSecTransformFinalizeMethod finalize; */
+    xmlSecGCryptDigestInitialize,               /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecGCryptDigestFinalize,                 /* xmlSecTransformFinalizeMethod finalize; */
     NULL,                                       /* xmlSecTransformNodeReadMethod readNode; */
     NULL,                                       /* xmlSecTransformNodeWriteMethod writeNode; */
     NULL,                                       /* xmlSecTransformSetKeyReqMethod setKeyReq; */
     NULL,                                       /* xmlSecTransformSetKeyMethod setKey; */
-    xmlSecGnuTLSDigestVerify,                   /* xmlSecTransformVerifyMethod verify; */
+    xmlSecGCryptDigestVerify,                   /* xmlSecTransformVerifyMethod verify; */
     xmlSecTransformDefaultGetDataType,          /* xmlSecTransformGetDataTypeMethod getDataType; */
     xmlSecTransformDefaultPushBin,              /* xmlSecTransformPushBinMethod pushBin; */
     xmlSecTransformDefaultPopBin,               /* xmlSecTransformPopBinMethod popBin; */
     NULL,                                       /* xmlSecTransformPushXmlMethod pushXml; */
     NULL,                                       /* xmlSecTransformPopXmlMethod popXml; */
-    xmlSecGnuTLSDigestExecute,                  /* xmlSecTransformExecuteMethod execute; */
+    xmlSecGCryptDigestExecute,                  /* xmlSecTransformExecuteMethod execute; */
 
     NULL,                                       /* void* reserved0; */
     NULL,                                       /* void* reserved1; */
 };
 
 /**
- * xmlSecGnuTLSTransformSha384GetKlass:
+ * xmlSecGCryptTransformSha384GetKlass:
  *
  * SHA384 digest transform klass.
  *
  * Returns: pointer to SHA384 digest transform klass.
  */
 xmlSecTransformId
-xmlSecGnuTLSTransformSha384GetKlass(void) {
-    return(&xmlSecGnuTLSSha384Klass);
+xmlSecGCryptTransformSha384GetKlass(void) {
+    return(&xmlSecGCryptSha384Klass);
 }
 #endif /* XMLSEC_NO_SHA384 */
 
@@ -477,10 +476,10 @@ xmlSecGnuTLSTransformSha384GetKlass(void) {
  * SHA512 Digest transforms
  *
  *****************************************************************************/
-static xmlSecTransformKlass xmlSecGnuTLSSha512Klass = {
+static xmlSecTransformKlass xmlSecGCryptSha512Klass = {
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),               /* xmlSecSize klassSize */
-    xmlSecGnuTLSDigestSize,                     /* xmlSecSize objSize */
+    xmlSecGCryptDigestSize,                     /* xmlSecSize objSize */
 
     /* data */
     xmlSecNameSha512,                           /* const xmlChar* name; */
@@ -488,34 +487,34 @@ static xmlSecTransformKlass xmlSecGnuTLSSha512Klass = {
     xmlSecTransformUsageDigestMethod,           /* xmlSecTransformUsage usage; */
 
     /* methods */
-    xmlSecGnuTLSDigestInitialize,               /* xmlSecTransformInitializeMethod initialize; */
-    xmlSecGnuTLSDigestFinalize,                 /* xmlSecTransformFinalizeMethod finalize; */
+    xmlSecGCryptDigestInitialize,               /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecGCryptDigestFinalize,                 /* xmlSecTransformFinalizeMethod finalize; */
     NULL,                                       /* xmlSecTransformNodeReadMethod readNode; */
     NULL,                                       /* xmlSecTransformNodeWriteMethod writeNode; */
     NULL,                                       /* xmlSecTransformSetKeyReqMethod setKeyReq; */
     NULL,                                       /* xmlSecTransformSetKeyMethod setKey; */
-    xmlSecGnuTLSDigestVerify,                   /* xmlSecTransformVerifyMethod verify; */
+    xmlSecGCryptDigestVerify,                   /* xmlSecTransformVerifyMethod verify; */
     xmlSecTransformDefaultGetDataType,          /* xmlSecTransformGetDataTypeMethod getDataType; */
     xmlSecTransformDefaultPushBin,              /* xmlSecTransformPushBinMethod pushBin; */
     xmlSecTransformDefaultPopBin,               /* xmlSecTransformPopBinMethod popBin; */
     NULL,                                       /* xmlSecTransformPushXmlMethod pushXml; */
     NULL,                                       /* xmlSecTransformPopXmlMethod popXml; */
-    xmlSecGnuTLSDigestExecute,                  /* xmlSecTransformExecuteMethod execute; */
+    xmlSecGCryptDigestExecute,                  /* xmlSecTransformExecuteMethod execute; */
 
     NULL,                                       /* void* reserved0; */
     NULL,                                       /* void* reserved1; */
 };
 
 /**
- * xmlSecGnuTLSTransformSha512GetKlass:
+ * xmlSecGCryptTransformSha512GetKlass:
  *
  * SHA512 digest transform klass.
  *
  * Returns: pointer to SHA512 digest transform klass.
  */
 xmlSecTransformId
-xmlSecGnuTLSTransformSha512GetKlass(void) {
-    return(&xmlSecGnuTLSSha512Klass);
+xmlSecGCryptTransformSha512GetKlass(void) {
+    return(&xmlSecGCryptSha512Klass);
 }
 #endif /* XMLSEC_NO_SHA512 */
 
@@ -525,10 +524,10 @@ xmlSecGnuTLSTransformSha512GetKlass(void) {
  * MD5 Digest transforms
  *
  *****************************************************************************/
-static xmlSecTransformKlass xmlSecGnuTLSMd5Klass = {
+static xmlSecTransformKlass xmlSecGCryptMd5Klass = {
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),               /* xmlSecSize klassSize */
-    xmlSecGnuTLSDigestSize,                     /* xmlSecSize objSize */
+    xmlSecGCryptDigestSize,                     /* xmlSecSize objSize */
 
     /* data */
     xmlSecNameMd5,                           /* const xmlChar* name; */
@@ -536,34 +535,34 @@ static xmlSecTransformKlass xmlSecGnuTLSMd5Klass = {
     xmlSecTransformUsageDigestMethod,           /* xmlSecTransformUsage usage; */
 
     /* methods */
-    xmlSecGnuTLSDigestInitialize,               /* xmlSecTransformInitializeMethod initialize; */
-    xmlSecGnuTLSDigestFinalize,                 /* xmlSecTransformFinalizeMethod finalize; */
+    xmlSecGCryptDigestInitialize,               /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecGCryptDigestFinalize,                 /* xmlSecTransformFinalizeMethod finalize; */
     NULL,                                       /* xmlSecTransformNodeReadMethod readNode; */
     NULL,                                       /* xmlSecTransformNodeWriteMethod writeNode; */
     NULL,                                       /* xmlSecTransformSetKeyReqMethod setKeyReq; */
     NULL,                                       /* xmlSecTransformSetKeyMethod setKey; */
-    xmlSecGnuTLSDigestVerify,                   /* xmlSecTransformVerifyMethod verify; */
+    xmlSecGCryptDigestVerify,                   /* xmlSecTransformVerifyMethod verify; */
     xmlSecTransformDefaultGetDataType,          /* xmlSecTransformGetDataTypeMethod getDataType; */
     xmlSecTransformDefaultPushBin,              /* xmlSecTransformPushBinMethod pushBin; */
     xmlSecTransformDefaultPopBin,               /* xmlSecTransformPopBinMethod popBin; */
     NULL,                                       /* xmlSecTransformPushXmlMethod pushXml; */
     NULL,                                       /* xmlSecTransformPopXmlMethod popXml; */
-    xmlSecGnuTLSDigestExecute,                  /* xmlSecTransformExecuteMethod execute; */
+    xmlSecGCryptDigestExecute,                  /* xmlSecTransformExecuteMethod execute; */
 
     NULL,                                       /* void* reserved0; */
     NULL,                                       /* void* reserved1; */
 };
 
 /**
- * xmlSecGnuTLSTransformMd5GetKlass:
+ * xmlSecGCryptTransformMd5GetKlass:
  *
  * MD5 digest transform klass.
  *
  * Returns: pointer to MD5 digest transform klass.
  */
 xmlSecTransformId
-xmlSecGnuTLSTransformMd5GetKlass(void) {
-    return(&xmlSecGnuTLSMd5Klass);
+xmlSecGCryptTransformMd5GetKlass(void) {
+    return(&xmlSecGCryptMd5Klass);
 }
 #endif /* XMLSEC_NO_MD5 */
 
@@ -573,10 +572,10 @@ xmlSecGnuTLSTransformMd5GetKlass(void) {
  * RIPEMD160 Digest transforms
  *
  *****************************************************************************/
-static xmlSecTransformKlass xmlSecGnuTLSRipemd160Klass = {
+static xmlSecTransformKlass xmlSecGCryptRipemd160Klass = {
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),               /* xmlSecSize klassSize */
-    xmlSecGnuTLSDigestSize,                     /* xmlSecSize objSize */
+    xmlSecGCryptDigestSize,                     /* xmlSecSize objSize */
 
     /* data */
     xmlSecNameRipemd160,                           /* const xmlChar* name; */
@@ -584,33 +583,33 @@ static xmlSecTransformKlass xmlSecGnuTLSRipemd160Klass = {
     xmlSecTransformUsageDigestMethod,           /* xmlSecTransformUsage usage; */
 
     /* methods */
-    xmlSecGnuTLSDigestInitialize,               /* xmlSecTransformInitializeMethod initialize; */
-    xmlSecGnuTLSDigestFinalize,                 /* xmlSecTransformFinalizeMethod finalize; */
+    xmlSecGCryptDigestInitialize,               /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecGCryptDigestFinalize,                 /* xmlSecTransformFinalizeMethod finalize; */
     NULL,                                       /* xmlSecTransformNodeReadMethod readNode; */
     NULL,                                       /* xmlSecTransformNodeWriteMethod writeNode; */
     NULL,                                       /* xmlSecTransformSetKeyReqMethod setKeyReq; */
     NULL,                                       /* xmlSecTransformSetKeyMethod setKey; */
-    xmlSecGnuTLSDigestVerify,                   /* xmlSecTransformVerifyMethod verify; */
+    xmlSecGCryptDigestVerify,                   /* xmlSecTransformVerifyMethod verify; */
     xmlSecTransformDefaultGetDataType,          /* xmlSecTransformGetDataTypeMethod getDataType; */
     xmlSecTransformDefaultPushBin,              /* xmlSecTransformPushBinMethod pushBin; */
     xmlSecTransformDefaultPopBin,               /* xmlSecTransformPopBinMethod popBin; */
     NULL,                                       /* xmlSecTransformPushXmlMethod pushXml; */
     NULL,                                       /* xmlSecTransformPopXmlMethod popXml; */
-    xmlSecGnuTLSDigestExecute,                  /* xmlSecTransformExecuteMethod execute; */
+    xmlSecGCryptDigestExecute,                  /* xmlSecTransformExecuteMethod execute; */
 
     NULL,                                       /* void* reserved0; */
     NULL,                                       /* void* reserved1; */
 };
 
 /**
- * xmlSecGnuTLSTransformRipemd160GetKlass:
+ * xmlSecGCryptTransformRipemd160GetKlass:
  *
  * RIPEMD160 digest transform klass.
  *
  * Returns: pointer to RIPEMD160 digest transform klass.
  */
 xmlSecTransformId
-xmlSecGnuTLSTransformRipemd160GetKlass(void) {
-    return(&xmlSecGnuTLSRipemd160Klass);
+xmlSecGCryptTransformRipemd160GetKlass(void) {
+    return(&xmlSecGCryptRipemd160Klass);
 }
 #endif /* XMLSEC_NO_RIPEMD160 */
diff --git a/src/gcrypt/hmac.c b/src/gcrypt/hmac.c
index f965b8d..a2e164e 100644
--- a/src/gcrypt/hmac.c
+++ b/src/gcrypt/hmac.c
@@ -11,7 +11,6 @@
 
 #include <string.h>
 
-#include <gnutls/gnutls.h>
 #include <gcrypt.h>
 
 #include <xmlsec/xmlsec.h>
@@ -20,53 +19,53 @@
 #include <xmlsec/transforms.h>
 #include <xmlsec/errors.h>
 
-#include <xmlsec/gnutls/app.h>
-#include <xmlsec/gnutls/crypto.h>
+#include <xmlsec/gcrypt/app.h>
+#include <xmlsec/gcrypt/crypto.h>
 
 /* sizes in bits */
-#define XMLSEC_GNUTLS_MIN_HMAC_SIZE             80
-#define XMLSEC_GNUTLS_MAX_HMAC_SIZE             (128 * 8)
+#define XMLSEC_GCRYPT_MIN_HMAC_SIZE             80
+#define XMLSEC_GCRYPT_MAX_HMAC_SIZE             (128 * 8)
 
 /**************************************************************************
  *
  * Configuration
  *
  *****************************************************************************/
-static int g_xmlsec_gnutls_hmac_min_length = XMLSEC_GNUTLS_MIN_HMAC_SIZE;
+static int g_xmlsec_gcrypt_hmac_min_length = XMLSEC_GCRYPT_MIN_HMAC_SIZE;
 
 /**
- * xmlSecGnuTLSHmacGetMinOutputLength:
+ * xmlSecGCryptHmacGetMinOutputLength:
  *
  * Gets the value of min HMAC length.
  *
  * Returns: the min HMAC output length
  */
-int xmlSecGnuTLSHmacGetMinOutputLength(void)
+int xmlSecGCryptHmacGetMinOutputLength(void)
 {
-    return g_xmlsec_gnutls_hmac_min_length;
+    return g_xmlsec_gcrypt_hmac_min_length;
 }
 
 /**
- * xmlSecGnuTLSHmacSetMinOutputLength:
+ * xmlSecGCryptHmacSetMinOutputLength:
  * @min_length: the new min length
  *
  * Sets the min HMAC output length
  */
-void xmlSecGnuTLSHmacSetMinOutputLength(int min_length)
+void xmlSecGCryptHmacSetMinOutputLength(int min_length)
 {
-    g_xmlsec_gnutls_hmac_min_length = min_length;
+    g_xmlsec_gcrypt_hmac_min_length = min_length;
 }
 
 /**************************************************************************
  *
- * Internal GNUTLS HMAC CTX
+ * Internal GCRYPT HMAC CTX
  *
  *****************************************************************************/
-typedef struct _xmlSecGnuTLSHmacCtx             xmlSecGnuTLSHmacCtx, *xmlSecGnuTLSHmacCtxPtr;
-struct _xmlSecGnuTLSHmacCtx {
+typedef struct _xmlSecGCryptHmacCtx             xmlSecGCryptHmacCtx, *xmlSecGCryptHmacCtxPtr;
+struct _xmlSecGCryptHmacCtx {
     int                 digest;
     gcry_md_hd_t        digestCtx;
-    xmlSecByte          dgst[XMLSEC_GNUTLS_MAX_HMAC_SIZE / 8];
+    xmlSecByte          dgst[XMLSEC_GCRYPT_MAX_HMAC_SIZE / 8];
     xmlSecSize          dgstSize;       /* dgst size in bits */
 };
 
@@ -74,67 +73,67 @@ struct _xmlSecGnuTLSHmacCtx {
  *
  * HMAC transforms
  *
- * xmlSecGnuTLSHmacCtx is located after xmlSecTransform
+ * xmlSecGCryptHmacCtx is located after xmlSecTransform
  *
  *****************************************************************************/
-#define xmlSecGnuTLSHmacGetCtx(transform) \
-    ((xmlSecGnuTLSHmacCtxPtr)(((xmlSecByte*)(transform)) + sizeof(xmlSecTransform)))
-#define xmlSecGnuTLSHmacSize    \
-    (sizeof(xmlSecTransform) + sizeof(xmlSecGnuTLSHmacCtx))
-
-static int      xmlSecGnuTLSHmacCheckId                 (xmlSecTransformPtr transform);
-static int      xmlSecGnuTLSHmacInitialize              (xmlSecTransformPtr transform);
-static void     xmlSecGnuTLSHmacFinalize                (xmlSecTransformPtr transform);
-static int      xmlSecGnuTLSHmacNodeRead                (xmlSecTransformPtr transform,
+#define xmlSecGCryptHmacGetCtx(transform) \
+    ((xmlSecGCryptHmacCtxPtr)(((xmlSecByte*)(transform)) + sizeof(xmlSecTransform)))
+#define xmlSecGCryptHmacSize    \
+    (sizeof(xmlSecTransform) + sizeof(xmlSecGCryptHmacCtx))
+
+static int      xmlSecGCryptHmacCheckId                 (xmlSecTransformPtr transform);
+static int      xmlSecGCryptHmacInitialize              (xmlSecTransformPtr transform);
+static void     xmlSecGCryptHmacFinalize                (xmlSecTransformPtr transform);
+static int      xmlSecGCryptHmacNodeRead                (xmlSecTransformPtr transform,
                                                          xmlNodePtr node,
                                                          xmlSecTransformCtxPtr transformCtx);
-static int      xmlSecGnuTLSHmacSetKeyReq               (xmlSecTransformPtr transform,
+static int      xmlSecGCryptHmacSetKeyReq               (xmlSecTransformPtr transform,
                                                          xmlSecKeyReqPtr keyReq);
-static int      xmlSecGnuTLSHmacSetKey                  (xmlSecTransformPtr transform,
+static int      xmlSecGCryptHmacSetKey                  (xmlSecTransformPtr transform,
                                                          xmlSecKeyPtr key);
-static int      xmlSecGnuTLSHmacVerify                  (xmlSecTransformPtr transform,
+static int      xmlSecGCryptHmacVerify                  (xmlSecTransformPtr transform,
                                                          const xmlSecByte* data,
                                                          xmlSecSize dataSize,
                                                          xmlSecTransformCtxPtr transformCtx);
-static int      xmlSecGnuTLSHmacExecute                 (xmlSecTransformPtr transform,
+static int      xmlSecGCryptHmacExecute                 (xmlSecTransformPtr transform,
                                                          int last,
                                                          xmlSecTransformCtxPtr transformCtx);
 
 static int
-xmlSecGnuTLSHmacCheckId(xmlSecTransformPtr transform) {
+xmlSecGCryptHmacCheckId(xmlSecTransformPtr transform) {
 
 #ifndef XMLSEC_NO_SHA1
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformHmacSha1Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformHmacSha1Id)) {
         return(1);
     } else
 #endif /* XMLSEC_NO_SHA1 */
 
 #ifndef XMLSEC_NO_SHA256
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformHmacSha256Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformHmacSha256Id)) {
         return(1);
     } else
 #endif /* XMLSEC_NO_SHA256 */
 
 #ifndef XMLSEC_NO_SHA384
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformHmacSha384Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformHmacSha384Id)) {
         return(1);
     } else
 #endif /* XMLSEC_NO_SHA384 */
 
 #ifndef XMLSEC_NO_SHA512
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformHmacSha512Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformHmacSha512Id)) {
         return(1);
     } else
 #endif /* XMLSEC_NO_SHA512 */
 
 #ifndef XMLSEC_NO_RIPEMD160
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformHmacRipemd160Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformHmacRipemd160Id)) {
         return(1);
     } else
 #endif /* XMLSEC_NO_RIPEMD160 */
 
 #ifndef XMLSEC_NO_MD5
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformHmacMd5Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformHmacMd5Id)) {
         return(1);
     } else
 #endif /* XMLSEC_NO_MD5 */
@@ -150,50 +149,50 @@ xmlSecGnuTLSHmacCheckId(xmlSecTransformPtr transform) {
 
 
 static int
-xmlSecGnuTLSHmacInitialize(xmlSecTransformPtr transform) {
-    xmlSecGnuTLSHmacCtxPtr ctx;
+xmlSecGCryptHmacInitialize(xmlSecTransformPtr transform) {
+    xmlSecGCryptHmacCtxPtr ctx;
     gpg_err_code_t ret;
 
-    xmlSecAssert2(xmlSecGnuTLSHmacCheckId(transform), -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSHmacSize), -1);
+    xmlSecAssert2(xmlSecGCryptHmacCheckId(transform), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptHmacSize), -1);
 
-    ctx = xmlSecGnuTLSHmacGetCtx(transform);
+    ctx = xmlSecGCryptHmacGetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
 
-    memset(ctx, 0, sizeof(xmlSecGnuTLSHmacCtx));
+    memset(ctx, 0, sizeof(xmlSecGCryptHmacCtx));
 
 #ifndef XMLSEC_NO_SHA1
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformHmacSha1Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformHmacSha1Id)) {
         ctx->digest = GCRY_MD_SHA1;
     } else
 #endif /* XMLSEC_NO_SHA1 */
 
 #ifndef XMLSEC_NO_SHA256
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformHmacSha256Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformHmacSha256Id)) {
         ctx->digest = GCRY_MD_SHA256;
     } else
 #endif /* XMLSEC_NO_SHA256 */
 
 #ifndef XMLSEC_NO_SHA384
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformHmacSha384Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformHmacSha384Id)) {
         ctx->digest = GCRY_MD_SHA384;
     } else
 #endif /* XMLSEC_NO_SHA384 */
 
 #ifndef XMLSEC_NO_SHA512
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformHmacSha512Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformHmacSha512Id)) {
         ctx->digest = GCRY_MD_SHA512;
     } else
 #endif /* XMLSEC_NO_SHA512 */
 
 #ifndef XMLSEC_NO_RIPEMD160
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformHmacRipemd160Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformHmacRipemd160Id)) {
         ctx->digest = GCRY_MD_RMD160;
     } else
 #endif /* XMLSEC_NO_RIPEMD160 */
 
 #ifndef XMLSEC_NO_MD5
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformHmacMd5Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformHmacMd5Id)) {
         ctx->digest = GCRY_MD_MD5;
     } else
 #endif /* XMLSEC_NO_MD5 */
@@ -223,23 +222,23 @@ xmlSecGnuTLSHmacInitialize(xmlSecTransformPtr transform) {
 }
 
 static void
-xmlSecGnuTLSHmacFinalize(xmlSecTransformPtr transform) {
-    xmlSecGnuTLSHmacCtxPtr ctx;
+xmlSecGCryptHmacFinalize(xmlSecTransformPtr transform) {
+    xmlSecGCryptHmacCtxPtr ctx;
 
-    xmlSecAssert(xmlSecGnuTLSHmacCheckId(transform));
-    xmlSecAssert(xmlSecTransformCheckSize(transform, xmlSecGnuTLSHmacSize));
+    xmlSecAssert(xmlSecGCryptHmacCheckId(transform));
+    xmlSecAssert(xmlSecTransformCheckSize(transform, xmlSecGCryptHmacSize));
 
-    ctx = xmlSecGnuTLSHmacGetCtx(transform);
+    ctx = xmlSecGCryptHmacGetCtx(transform);
     xmlSecAssert(ctx != NULL);
 
     if(ctx->digestCtx != NULL) {
         gcry_md_close(ctx->digestCtx);
     }
-    memset(ctx, 0, sizeof(xmlSecGnuTLSHmacCtx));
+    memset(ctx, 0, sizeof(xmlSecGCryptHmacCtx));
 }
 
 /**
- * xmlSecGnuTLSHmacNodeRead:
+ * xmlSecGCryptHmacNodeRead:
  *
  * HMAC (http://www.w3.org/TR/xmldsig-core/#sec-HMAC):
  *
@@ -261,16 +260,16 @@ xmlSecGnuTLSHmacFinalize(xmlSecTransformPtr transform) {
  * <!ELEMENT HMACOutputLength (#PCDATA)>
  */
 static int
-xmlSecGnuTLSHmacNodeRead(xmlSecTransformPtr transform, xmlNodePtr node, xmlSecTransformCtxPtr transformCtx) {
-    xmlSecGnuTLSHmacCtxPtr ctx;
+xmlSecGCryptHmacNodeRead(xmlSecTransformPtr transform, xmlNodePtr node, xmlSecTransformCtxPtr transformCtx) {
+    xmlSecGCryptHmacCtxPtr ctx;
     xmlNodePtr cur;
 
-    xmlSecAssert2(xmlSecGnuTLSHmacCheckId(transform), -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSHmacSize), -1);
+    xmlSecAssert2(xmlSecGCryptHmacCheckId(transform), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptHmacSize), -1);
     xmlSecAssert2(node != NULL, -1);
     xmlSecAssert2(transformCtx != NULL, -1);
 
-    ctx = xmlSecGnuTLSHmacGetCtx(transform);
+    ctx = xmlSecGCryptHmacGetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
 
     cur = xmlSecGetNextElementNode(node->children);
@@ -287,7 +286,7 @@ xmlSecGnuTLSHmacNodeRead(xmlSecTransformPtr transform, xmlNodePtr node, xmlSecTr
            Otherwise, an attacker can set this lenght to 0 or very
            small value
         */
-        if((int)ctx->dgstSize < xmlSecGnuTLSHmacGetMinOutputLength()) {
+        if((int)ctx->dgstSize < xmlSecGCryptHmacGetMinOutputLength()) {
            xmlSecError(XMLSEC_ERRORS_HERE,
                     xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
                     xmlSecErrorsSafeString(xmlSecNodeGetName(cur)),
@@ -312,18 +311,18 @@ xmlSecGnuTLSHmacNodeRead(xmlSecTransformPtr transform, xmlNodePtr node, xmlSecTr
 
 
 static int
-xmlSecGnuTLSHmacSetKeyReq(xmlSecTransformPtr transform,  xmlSecKeyReqPtr keyReq) {
-    xmlSecGnuTLSHmacCtxPtr ctx;
+xmlSecGCryptHmacSetKeyReq(xmlSecTransformPtr transform,  xmlSecKeyReqPtr keyReq) {
+    xmlSecGCryptHmacCtxPtr ctx;
 
-    xmlSecAssert2(xmlSecGnuTLSHmacCheckId(transform), -1);
+    xmlSecAssert2(xmlSecGCryptHmacCheckId(transform), -1);
     xmlSecAssert2((transform->operation == xmlSecTransformOperationSign) || (transform->operation == xmlSecTransformOperationVerify), -1);
     xmlSecAssert2(keyReq != NULL, -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSHmacSize), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptHmacSize), -1);
 
-    ctx = xmlSecGnuTLSHmacGetCtx(transform);
+    ctx = xmlSecGCryptHmacGetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
 
-    keyReq->keyId  = xmlSecGnuTLSKeyDataHmacId;
+    keyReq->keyId  = xmlSecGCryptKeyDataHmacId;
     keyReq->keyType= xmlSecKeyDataTypeSymmetric;
     if(transform->operation == xmlSecTransformOperationSign) {
         keyReq->keyUsage = xmlSecKeyUsageSign;
@@ -335,23 +334,23 @@ xmlSecGnuTLSHmacSetKeyReq(xmlSecTransformPtr transform,  xmlSecKeyReqPtr keyReq)
 }
 
 static int
-xmlSecGnuTLSHmacSetKey(xmlSecTransformPtr transform, xmlSecKeyPtr key) {
-    xmlSecGnuTLSHmacCtxPtr ctx;
+xmlSecGCryptHmacSetKey(xmlSecTransformPtr transform, xmlSecKeyPtr key) {
+    xmlSecGCryptHmacCtxPtr ctx;
     xmlSecKeyDataPtr value;
     xmlSecBufferPtr buffer;
     int ret;
 
-    xmlSecAssert2(xmlSecGnuTLSHmacCheckId(transform), -1);
+    xmlSecAssert2(xmlSecGCryptHmacCheckId(transform), -1);
     xmlSecAssert2((transform->operation == xmlSecTransformOperationSign) || (transform->operation == xmlSecTransformOperationVerify), -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSHmacSize), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptHmacSize), -1);
     xmlSecAssert2(key != NULL, -1);
 
-    ctx = xmlSecGnuTLSHmacGetCtx(transform);
+    ctx = xmlSecGCryptHmacGetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
     xmlSecAssert2(ctx->digestCtx != NULL, -1);
 
     value = xmlSecKeyGetValue(key);
-    xmlSecAssert2(xmlSecKeyDataCheckId(value, xmlSecGnuTLSKeyDataHmacId), -1);
+    xmlSecAssert2(xmlSecKeyDataCheckId(value, xmlSecGCryptKeyDataHmacId), -1);
 
     buffer = xmlSecKeyDataBinaryValueGetBuffer(value);
     xmlSecAssert2(buffer != NULL, -1);
@@ -379,23 +378,23 @@ xmlSecGnuTLSHmacSetKey(xmlSecTransformPtr transform, xmlSecKeyPtr key) {
 }
 
 static int
-xmlSecGnuTLSHmacVerify(xmlSecTransformPtr transform,
+xmlSecGCryptHmacVerify(xmlSecTransformPtr transform,
                         const xmlSecByte* data, xmlSecSize dataSize,
                         xmlSecTransformCtxPtr transformCtx) {
     static xmlSecByte last_byte_masks[] =
                 { 0xFF, 0x80, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC, 0xFE };
 
-    xmlSecGnuTLSHmacCtxPtr ctx;
+    xmlSecGCryptHmacCtxPtr ctx;
     xmlSecByte mask;
 
     xmlSecAssert2(xmlSecTransformIsValid(transform), -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSHmacSize), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptHmacSize), -1);
     xmlSecAssert2(transform->operation == xmlSecTransformOperationVerify, -1);
     xmlSecAssert2(transform->status == xmlSecTransformStatusFinished, -1);
     xmlSecAssert2(data != NULL, -1);
     xmlSecAssert2(transformCtx != NULL, -1);
 
-    ctx = xmlSecGnuTLSHmacGetCtx(transform);
+    ctx = xmlSecGCryptHmacGetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
     xmlSecAssert2(ctx->digestCtx != NULL, -1);
     xmlSecAssert2(ctx->dgstSize > 0, -1);
@@ -441,19 +440,19 @@ xmlSecGnuTLSHmacVerify(xmlSecTransformPtr transform,
 }
 
 static int
-xmlSecGnuTLSHmacExecute(xmlSecTransformPtr transform, int last, xmlSecTransformCtxPtr transformCtx) {
-    xmlSecGnuTLSHmacCtxPtr ctx;
+xmlSecGCryptHmacExecute(xmlSecTransformPtr transform, int last, xmlSecTransformCtxPtr transformCtx) {
+    xmlSecGCryptHmacCtxPtr ctx;
     xmlSecBufferPtr in, out;
     xmlSecByte* dgst;
     xmlSecSize dgstSize;
     int ret;
 
-    xmlSecAssert2(xmlSecGnuTLSHmacCheckId(transform), -1);
+    xmlSecAssert2(xmlSecGCryptHmacCheckId(transform), -1);
     xmlSecAssert2((transform->operation == xmlSecTransformOperationSign) || (transform->operation == xmlSecTransformOperationVerify), -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSHmacSize), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptHmacSize), -1);
     xmlSecAssert2(transformCtx != NULL, -1);
 
-    ctx = xmlSecGnuTLSHmacGetCtx(transform);
+    ctx = xmlSecGCryptHmacGetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
     xmlSecAssert2(ctx->digestCtx != NULL, -1);
 
@@ -549,43 +548,43 @@ xmlSecGnuTLSHmacExecute(xmlSecTransformPtr transform, int last, xmlSecTransformC
  * HMAC SHA1
  *
  ******************************************************************************/
-static xmlSecTransformKlass xmlSecGnuTLSHmacSha1Klass = {
+static xmlSecTransformKlass xmlSecGCryptHmacSha1Klass = {
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),               /* xmlSecSize klassSize */
-    xmlSecGnuTLSHmacSize,                       /* xmlSecSize objSize */
+    xmlSecGCryptHmacSize,                       /* xmlSecSize objSize */
 
     xmlSecNameHmacSha1,                         /* const xmlChar* name; */
     xmlSecHrefHmacSha1,                         /* const xmlChar *href; */
     xmlSecTransformUsageSignatureMethod,        /* xmlSecTransformUsage usage; */
 
-    xmlSecGnuTLSHmacInitialize,                 /* xmlSecTransformInitializeMethod initialize; */
-    xmlSecGnuTLSHmacFinalize,                   /* xmlSecTransformFinalizeMethod finalize; */
-    xmlSecGnuTLSHmacNodeRead,                   /* xmlSecTransformNodeReadMethod readNode; */
+    xmlSecGCryptHmacInitialize,                 /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecGCryptHmacFinalize,                   /* xmlSecTransformFinalizeMethod finalize; */
+    xmlSecGCryptHmacNodeRead,                   /* xmlSecTransformNodeReadMethod readNode; */
     NULL,                                       /* xmlSecTransformNodeWriteMethod writeNode; */
-    xmlSecGnuTLSHmacSetKeyReq,                  /* xmlSecTransformSetKeyReqMethod setKeyReq; */
-    xmlSecGnuTLSHmacSetKey,                     /* xmlSecTransformSetKeyMethod setKey; */
-    xmlSecGnuTLSHmacVerify,                     /* xmlSecTransformValidateMethod validate; */
+    xmlSecGCryptHmacSetKeyReq,                  /* xmlSecTransformSetKeyReqMethod setKeyReq; */
+    xmlSecGCryptHmacSetKey,                     /* xmlSecTransformSetKeyMethod setKey; */
+    xmlSecGCryptHmacVerify,                     /* xmlSecTransformValidateMethod validate; */
     xmlSecTransformDefaultGetDataType,          /* xmlSecTransformGetDataTypeMethod getDataType; */
     xmlSecTransformDefaultPushBin,              /* xmlSecTransformPushBinMethod pushBin; */
     xmlSecTransformDefaultPopBin,               /* xmlSecTransformPopBinMethod popBin; */
     NULL,                                       /* xmlSecTransformPushXmlMethod pushXml; */
     NULL,                                       /* xmlSecTransformPopXmlMethod popXml; */
-    xmlSecGnuTLSHmacExecute,                    /* xmlSecTransformExecuteMethod execute; */
+    xmlSecGCryptHmacExecute,                    /* xmlSecTransformExecuteMethod execute; */
 
     NULL,                                       /* void* reserved0; */
     NULL,                                       /* void* reserved1; */
 };
 
 /**
- * xmlSecGnuTLSTransformHmacSha1GetKlass:
+ * xmlSecGCryptTransformHmacSha1GetKlass:
  *
  * The HMAC-SHA1 transform klass.
  *
  * Returns: the HMAC-SHA1 transform klass.
  */
 xmlSecTransformId
-xmlSecGnuTLSTransformHmacSha1GetKlass(void) {
-    return(&xmlSecGnuTLSHmacSha1Klass);
+xmlSecGCryptTransformHmacSha1GetKlass(void) {
+    return(&xmlSecGCryptHmacSha1Klass);
 }
 #endif /* XMLSEC_NO_SHA1 */
 
@@ -595,43 +594,43 @@ xmlSecGnuTLSTransformHmacSha1GetKlass(void) {
  * HMAC SHA256
  *
  ******************************************************************************/
-static xmlSecTransformKlass xmlSecGnuTLSHmacSha256Klass = {
+static xmlSecTransformKlass xmlSecGCryptHmacSha256Klass = {
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),               /* xmlSecSize klassSize */
-    xmlSecGnuTLSHmacSize,                       /* xmlSecSize objSize */
+    xmlSecGCryptHmacSize,                       /* xmlSecSize objSize */
 
     xmlSecNameHmacSha256,                       /* const xmlChar* name; */
     xmlSecHrefHmacSha256,                       /* const xmlChar *href; */
     xmlSecTransformUsageSignatureMethod,        /* xmlSecTransformUsage usage; */
 
-    xmlSecGnuTLSHmacInitialize,                 /* xmlSecTransformInitializeMethod initialize; */
-    xmlSecGnuTLSHmacFinalize,                   /* xmlSecTransformFinalizeMethod finalize; */
-    xmlSecGnuTLSHmacNodeRead,                   /* xmlSecTransformNodeReadMethod readNode; */
+    xmlSecGCryptHmacInitialize,                 /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecGCryptHmacFinalize,                   /* xmlSecTransformFinalizeMethod finalize; */
+    xmlSecGCryptHmacNodeRead,                   /* xmlSecTransformNodeReadMethod readNode; */
     NULL,                                       /* xmlSecTransformNodeWriteMethod writeNode; */
-    xmlSecGnuTLSHmacSetKeyReq,                  /* xmlSecTransformSetKeyReqMethod setKeyReq; */
-    xmlSecGnuTLSHmacSetKey,                     /* xmlSecTransformSetKeyMethod setKey; */
-    xmlSecGnuTLSHmacVerify,                     /* xmlSecTransformValidateMethod validate; */
+    xmlSecGCryptHmacSetKeyReq,                  /* xmlSecTransformSetKeyReqMethod setKeyReq; */
+    xmlSecGCryptHmacSetKey,                     /* xmlSecTransformSetKeyMethod setKey; */
+    xmlSecGCryptHmacVerify,                     /* xmlSecTransformValidateMethod validate; */
     xmlSecTransformDefaultGetDataType,          /* xmlSecTransformGetDataTypeMethod getDataType; */
     xmlSecTransformDefaultPushBin,              /* xmlSecTransformPushBinMethod pushBin; */
     xmlSecTransformDefaultPopBin,               /* xmlSecTransformPopBinMethod popBin; */
     NULL,                                       /* xmlSecTransformPushXmlMethod pushXml; */
     NULL,                                       /* xmlSecTransformPopXmlMethod popXml; */
-    xmlSecGnuTLSHmacExecute,                    /* xmlSecTransformExecuteMethod execute; */
+    xmlSecGCryptHmacExecute,                    /* xmlSecTransformExecuteMethod execute; */
 
     NULL,                                       /* void* reserved0; */
     NULL,                                       /* void* reserved1; */
 };
 
 /**
- * xmlSecGnuTLSTransformHmacSha256GetKlass:
+ * xmlSecGCryptTransformHmacSha256GetKlass:
  *
  * The HMAC-SHA256 transform klass.
  *
  * Returns: the HMAC-SHA256 transform klass.
  */
 xmlSecTransformId
-xmlSecGnuTLSTransformHmacSha256GetKlass(void) {
-    return(&xmlSecGnuTLSHmacSha256Klass);
+xmlSecGCryptTransformHmacSha256GetKlass(void) {
+    return(&xmlSecGCryptHmacSha256Klass);
 }
 #endif /* XMLSEC_NO_SHA256 */
 
@@ -641,43 +640,43 @@ xmlSecGnuTLSTransformHmacSha256GetKlass(void) {
  * HMAC SHA384
  *
  ******************************************************************************/
-static xmlSecTransformKlass xmlSecGnuTLSHmacSha384Klass = {
+static xmlSecTransformKlass xmlSecGCryptHmacSha384Klass = {
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),               /* xmlSecSize klassSize */
-    xmlSecGnuTLSHmacSize,                       /* xmlSecSize objSize */
+    xmlSecGCryptHmacSize,                       /* xmlSecSize objSize */
 
     xmlSecNameHmacSha384,                       /* const xmlChar* name; */
     xmlSecHrefHmacSha384,                       /* const xmlChar *href; */
     xmlSecTransformUsageSignatureMethod,        /* xmlSecTransformUsage usage; */
 
-    xmlSecGnuTLSHmacInitialize,                 /* xmlSecTransformInitializeMethod initialize; */
-    xmlSecGnuTLSHmacFinalize,                   /* xmlSecTransformFinalizeMethod finalize; */
-    xmlSecGnuTLSHmacNodeRead,                   /* xmlSecTransformNodeReadMethod readNode; */
+    xmlSecGCryptHmacInitialize,                 /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecGCryptHmacFinalize,                   /* xmlSecTransformFinalizeMethod finalize; */
+    xmlSecGCryptHmacNodeRead,                   /* xmlSecTransformNodeReadMethod readNode; */
     NULL,                                       /* xmlSecTransformNodeWriteMethod writeNode; */
-    xmlSecGnuTLSHmacSetKeyReq,                  /* xmlSecTransformSetKeyReqMethod setKeyReq; */
-    xmlSecGnuTLSHmacSetKey,                     /* xmlSecTransformSetKeyMethod setKey; */
-    xmlSecGnuTLSHmacVerify,                     /* xmlSecTransformValidateMethod validate; */
+    xmlSecGCryptHmacSetKeyReq,                  /* xmlSecTransformSetKeyReqMethod setKeyReq; */
+    xmlSecGCryptHmacSetKey,                     /* xmlSecTransformSetKeyMethod setKey; */
+    xmlSecGCryptHmacVerify,                     /* xmlSecTransformValidateMethod validate; */
     xmlSecTransformDefaultGetDataType,          /* xmlSecTransformGetDataTypeMethod getDataType; */
     xmlSecTransformDefaultPushBin,              /* xmlSecTransformPushBinMethod pushBin; */
     xmlSecTransformDefaultPopBin,               /* xmlSecTransformPopBinMethod popBin; */
     NULL,                                       /* xmlSecTransformPushXmlMethod pushXml; */
     NULL,                                       /* xmlSecTransformPopXmlMethod popXml; */
-    xmlSecGnuTLSHmacExecute,                    /* xmlSecTransformExecuteMethod execute; */
+    xmlSecGCryptHmacExecute,                    /* xmlSecTransformExecuteMethod execute; */
 
     NULL,                                       /* void* reserved0; */
     NULL,                                       /* void* reserved1; */
 };
 
 /**
- * xmlSecGnuTLSTransformHmacSha384GetKlass:
+ * xmlSecGCryptTransformHmacSha384GetKlass:
  *
  * The HMAC-SHA384 transform klass.
  *
  * Returns: the HMAC-SHA384 transform klass.
  */
 xmlSecTransformId
-xmlSecGnuTLSTransformHmacSha384GetKlass(void) {
-    return(&xmlSecGnuTLSHmacSha384Klass);
+xmlSecGCryptTransformHmacSha384GetKlass(void) {
+    return(&xmlSecGCryptHmacSha384Klass);
 }
 #endif /* XMLSEC_NO_SHA384 */
 
@@ -687,43 +686,43 @@ xmlSecGnuTLSTransformHmacSha384GetKlass(void) {
  * HMAC SHA512
  *
  ******************************************************************************/
-static xmlSecTransformKlass xmlSecGnuTLSHmacSha512Klass = {
+static xmlSecTransformKlass xmlSecGCryptHmacSha512Klass = {
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),               /* xmlSecSize klassSize */
-    xmlSecGnuTLSHmacSize,                       /* xmlSecSize objSize */
+    xmlSecGCryptHmacSize,                       /* xmlSecSize objSize */
 
     xmlSecNameHmacSha512,                       /* const xmlChar* name; */
     xmlSecHrefHmacSha512,                       /* const xmlChar *href; */
     xmlSecTransformUsageSignatureMethod,        /* xmlSecTransformUsage usage; */
 
-    xmlSecGnuTLSHmacInitialize,                 /* xmlSecTransformInitializeMethod initialize; */
-    xmlSecGnuTLSHmacFinalize,                   /* xmlSecTransformFinalizeMethod finalize; */
-    xmlSecGnuTLSHmacNodeRead,                   /* xmlSecTransformNodeReadMethod readNode; */
+    xmlSecGCryptHmacInitialize,                 /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecGCryptHmacFinalize,                   /* xmlSecTransformFinalizeMethod finalize; */
+    xmlSecGCryptHmacNodeRead,                   /* xmlSecTransformNodeReadMethod readNode; */
     NULL,                                       /* xmlSecTransformNodeWriteMethod writeNode; */
-    xmlSecGnuTLSHmacSetKeyReq,                  /* xmlSecTransformSetKeyReqMethod setKeyReq; */
-    xmlSecGnuTLSHmacSetKey,                     /* xmlSecTransformSetKeyMethod setKey; */
-    xmlSecGnuTLSHmacVerify,                     /* xmlSecTransformValidateMethod validate; */
+    xmlSecGCryptHmacSetKeyReq,                  /* xmlSecTransformSetKeyReqMethod setKeyReq; */
+    xmlSecGCryptHmacSetKey,                     /* xmlSecTransformSetKeyMethod setKey; */
+    xmlSecGCryptHmacVerify,                     /* xmlSecTransformValidateMethod validate; */
     xmlSecTransformDefaultGetDataType,          /* xmlSecTransformGetDataTypeMethod getDataType; */
     xmlSecTransformDefaultPushBin,              /* xmlSecTransformPushBinMethod pushBin; */
     xmlSecTransformDefaultPopBin,               /* xmlSecTransformPopBinMethod popBin; */
     NULL,                                       /* xmlSecTransformPushXmlMethod pushXml; */
     NULL,                                       /* xmlSecTransformPopXmlMethod popXml; */
-    xmlSecGnuTLSHmacExecute,                    /* xmlSecTransformExecuteMethod execute; */
+    xmlSecGCryptHmacExecute,                    /* xmlSecTransformExecuteMethod execute; */
 
     NULL,                                       /* void* reserved0; */
     NULL,                                       /* void* reserved1; */
 };
 
 /**
- * xmlSecGnuTLSTransformHmacSha512GetKlass:
+ * xmlSecGCryptTransformHmacSha512GetKlass:
  *
  * The HMAC-SHA512 transform klass.
  *
  * Returns: the HMAC-SHA512 transform klass.
  */
 xmlSecTransformId
-xmlSecGnuTLSTransformHmacSha512GetKlass(void) {
-    return(&xmlSecGnuTLSHmacSha512Klass);
+xmlSecGCryptTransformHmacSha512GetKlass(void) {
+    return(&xmlSecGCryptHmacSha512Klass);
 }
 #endif /* XMLSEC_NO_SHA512 */
 
@@ -734,43 +733,43 @@ xmlSecGnuTLSTransformHmacSha512GetKlass(void) {
  * HMAC Ripemd160
  *
  ******************************************************************************/
-static xmlSecTransformKlass xmlSecGnuTLSHmacRipemd160Klass = {
+static xmlSecTransformKlass xmlSecGCryptHmacRipemd160Klass = {
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),               /* xmlSecSize klassSize */
-    xmlSecGnuTLSHmacSize,                       /* xmlSecSize objSize */
+    xmlSecGCryptHmacSize,                       /* xmlSecSize objSize */
 
     xmlSecNameHmacRipemd160,                    /* const xmlChar* name; */
     xmlSecHrefHmacRipemd160,                    /* const xmlChar* href; */
     xmlSecTransformUsageSignatureMethod,        /* xmlSecTransformUsage usage; */
 
-    xmlSecGnuTLSHmacInitialize,                 /* xmlSecTransformInitializeMethod initialize; */
-    xmlSecGnuTLSHmacFinalize,                   /* xmlSecTransformFinalizeMethod finalize; */
-    xmlSecGnuTLSHmacNodeRead,                   /* xmlSecTransformNodeReadMethod readNode; */
+    xmlSecGCryptHmacInitialize,                 /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecGCryptHmacFinalize,                   /* xmlSecTransformFinalizeMethod finalize; */
+    xmlSecGCryptHmacNodeRead,                   /* xmlSecTransformNodeReadMethod readNode; */
     NULL,                                       /* xmlSecTransformNodeWriteMethod writeNode; */
-    xmlSecGnuTLSHmacSetKeyReq,                  /* xmlSecTransformSetKeyReqMethod setKeyReq; */
-    xmlSecGnuTLSHmacSetKey,                     /* xmlSecTransformSetKeyMethod setKey; */
-    xmlSecGnuTLSHmacVerify,                     /* xmlSecTransformValidateMethod validate; */
+    xmlSecGCryptHmacSetKeyReq,                  /* xmlSecTransformSetKeyReqMethod setKeyReq; */
+    xmlSecGCryptHmacSetKey,                     /* xmlSecTransformSetKeyMethod setKey; */
+    xmlSecGCryptHmacVerify,                     /* xmlSecTransformValidateMethod validate; */
     xmlSecTransformDefaultGetDataType,          /* xmlSecTransformGetDataTypeMethod getDataType; */
     xmlSecTransformDefaultPushBin,              /* xmlSecTransformPushBinMethod pushBin; */
     xmlSecTransformDefaultPopBin,               /* xmlSecTransformPopBinMethod popBin; */
     NULL,                                       /* xmlSecTransformPushXmlMethod pushXml; */
     NULL,                                       /* xmlSecTransformPopXmlMethod popXml; */
-    xmlSecGnuTLSHmacExecute,                    /* xmlSecTransformExecuteMethod execute; */
+    xmlSecGCryptHmacExecute,                    /* xmlSecTransformExecuteMethod execute; */
 
     NULL,                                       /* void* reserved0; */
     NULL,                                       /* void* reserved1; */
 };
 
 /**
- * xmlSecGnuTLSTransformHmacRipemd160GetKlass:
+ * xmlSecGCryptTransformHmacRipemd160GetKlass:
  *
  * The HMAC-RIPEMD160 transform klass.
  *
  * Returns: the HMAC-RIPEMD160 transform klass.
  */
 xmlSecTransformId
-xmlSecGnuTLSTransformHmacRipemd160GetKlass(void) {
-    return(&xmlSecGnuTLSHmacRipemd160Klass);
+xmlSecGCryptTransformHmacRipemd160GetKlass(void) {
+    return(&xmlSecGCryptHmacRipemd160Klass);
 }
 #endif /* XMLSEC_NO_RIPEMD160 */
 
@@ -780,43 +779,43 @@ xmlSecGnuTLSTransformHmacRipemd160GetKlass(void) {
  * HMAC MD5
  *
  ******************************************************************************/
-static xmlSecTransformKlass xmlSecGnuTLSHmacMd5Klass = {
+static xmlSecTransformKlass xmlSecGCryptHmacMd5Klass = {
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),               /* xmlSecSize klassSize */
-    xmlSecGnuTLSHmacSize,                       /* xmlSecSize objSize */
+    xmlSecGCryptHmacSize,                       /* xmlSecSize objSize */
 
     xmlSecNameHmacMd5,                          /* const xmlChar* name; */
     xmlSecHrefHmacMd5,                          /* const xmlChar* href; */
     xmlSecTransformUsageSignatureMethod,        /* xmlSecTransformUsage usage; */
 
-    xmlSecGnuTLSHmacInitialize,                 /* xmlSecTransformInitializeMethod initialize; */
-    xmlSecGnuTLSHmacFinalize,                   /* xmlSecTransformFinalizeMethod finalize; */
-    xmlSecGnuTLSHmacNodeRead,                   /* xmlSecTransformNodeReadMethod readNode; */
+    xmlSecGCryptHmacInitialize,                 /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecGCryptHmacFinalize,                   /* xmlSecTransformFinalizeMethod finalize; */
+    xmlSecGCryptHmacNodeRead,                   /* xmlSecTransformNodeReadMethod readNode; */
     NULL,                                       /* xmlSecTransformNodeWriteMethod writeNode; */
-    xmlSecGnuTLSHmacSetKeyReq,                  /* xmlSecTransformSetKeyReqMethod setKeyReq; */
-    xmlSecGnuTLSHmacSetKey,                     /* xmlSecTransformSetKeyMethod setKey; */
-    xmlSecGnuTLSHmacVerify,                     /* xmlSecTransformValidateMethod validate; */
+    xmlSecGCryptHmacSetKeyReq,                  /* xmlSecTransformSetKeyReqMethod setKeyReq; */
+    xmlSecGCryptHmacSetKey,                     /* xmlSecTransformSetKeyMethod setKey; */
+    xmlSecGCryptHmacVerify,                     /* xmlSecTransformValidateMethod validate; */
     xmlSecTransformDefaultGetDataType,          /* xmlSecTransformGetDataTypeMethod getDataType; */
     xmlSecTransformDefaultPushBin,              /* xmlSecTransformPushBinMethod pushBin; */
     xmlSecTransformDefaultPopBin,               /* xmlSecTransformPopBinMethod popBin; */
     NULL,                                       /* xmlSecTransformPushXmlMethod pushXml; */
     NULL,                                       /* xmlSecTransformPopXmlMethod popXml; */
-    xmlSecGnuTLSHmacExecute,                    /* xmlSecTransformExecuteMethod execute; */
+    xmlSecGCryptHmacExecute,                    /* xmlSecTransformExecuteMethod execute; */
 
     NULL,                                       /* void* reserved0; */
     NULL,                                       /* void* reserved1; */
 };
 
 /**
- * xmlSecGnuTLSTransformHmacMd5GetKlass:
+ * xmlSecGCryptTransformHmacMd5GetKlass:
  *
  * The HMAC-MD5 transform klass.
  *
  * Returns: the HMAC-MD5 transform klass.
  */
 xmlSecTransformId
-xmlSecGnuTLSTransformHmacMd5GetKlass(void) {
-    return(&xmlSecGnuTLSHmacMd5Klass);
+xmlSecGCryptTransformHmacMd5GetKlass(void) {
+    return(&xmlSecGCryptHmacMd5Klass);
 }
 #endif /* XMLSEC_NO_MD5 */
 
diff --git a/src/gcrypt/kw_aes.c b/src/gcrypt/kw_aes.c
index b47eec4..7864b80 100644
--- a/src/gcrypt/kw_aes.c
+++ b/src/gcrypt/kw_aes.c
@@ -16,7 +16,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <gnutls/gnutls.h>
 #include <gcrypt.h>
 
 #include <xmlsec/xmlsec.h>
@@ -25,7 +24,7 @@
 #include <xmlsec/transforms.h>
 #include <xmlsec/errors.h>
 
-#include <xmlsec/gnutls/crypto.h>
+#include <xmlsec/gcrypt/crypto.h>
 
 #include "../kw_aes_des.h"
 
@@ -35,20 +34,20 @@
  * AES KW implementation
  *
  *********************************************************************/
-static int        xmlSecGnuTLSKWAesBlockEncrypt                 (const xmlSecByte * in, 
+static int        xmlSecGCryptKWAesBlockEncrypt                 (const xmlSecByte * in, 
                                                                  xmlSecSize inSize,
                                                                  xmlSecByte * out, 
                                                                  xmlSecSize outSize,
                                                                  void * context);
-static int        xmlSecGnuTLSKWAesBlockDecrypt                 (const xmlSecByte * in, 
+static int        xmlSecGCryptKWAesBlockDecrypt                 (const xmlSecByte * in, 
                                                                  xmlSecSize inSize,
                                                                  xmlSecByte * out, 
                                                                  xmlSecSize outSize,
                                                                  void * context);
-static xmlSecKWAesKlass xmlSecGnuTLSKWAesKlass = {
+static xmlSecKWAesKlass xmlSecGCryptKWAesKlass = {
     /* callbacks */
-    xmlSecGnuTLSKWAesBlockEncrypt,          /* xmlSecKWAesBlockEncryptMethod       encrypt; */
-    xmlSecGnuTLSKWAesBlockDecrypt,          /* xmlSecKWAesBlockDecryptMethod       decrypt; */
+    xmlSecGCryptKWAesBlockEncrypt,          /* xmlSecKWAesBlockEncryptMethod       encrypt; */
+    xmlSecGCryptKWAesBlockDecrypt,          /* xmlSecKWAesBlockDecryptMethod       decrypt; */
 
     /* for the future */
     NULL,                                   /* void*                               reserved0; */
@@ -61,9 +60,9 @@ static xmlSecKWAesKlass xmlSecGnuTLSKWAesKlass = {
  * AES KW transforms
  *
  ********************************************************************/
-typedef struct _xmlSecGnuTLSKWAesCtx              xmlSecGnuTLSKWAesCtx,
-                                                  *xmlSecGnuTLSKWAesCtxPtr;
-struct _xmlSecGnuTLSKWAesCtx {
+typedef struct _xmlSecGCryptKWAesCtx              xmlSecGCryptKWAesCtx,
+                                                  *xmlSecGCryptKWAesCtxPtr;
+struct _xmlSecGCryptKWAesCtx {
     int                 cipher;
     int                 mode;
     int                 flags;
@@ -72,43 +71,43 @@ struct _xmlSecGnuTLSKWAesCtx {
 
     xmlSecBuffer        keyBuffer;
 };
-#define xmlSecGnuTLSKWAesSize     \
-    (sizeof(xmlSecTransform) + sizeof(xmlSecGnuTLSKWAesCtx))
-#define xmlSecGnuTLSKWAesGetCtx(transform) \
-    ((xmlSecGnuTLSKWAesCtxPtr)(((xmlSecByte*)(transform)) + sizeof(xmlSecTransform)))
-#define xmlSecGnuTLSKWAesCheckId(transform) \
-    (xmlSecTransformCheckId((transform), xmlSecGnuTLSTransformKWAes128Id) || \
-     xmlSecTransformCheckId((transform), xmlSecGnuTLSTransformKWAes192Id) || \
-     xmlSecTransformCheckId((transform), xmlSecGnuTLSTransformKWAes256Id))
-
-static int      xmlSecGnuTLSKWAesInitialize                     (xmlSecTransformPtr transform);
-static void     xmlSecGnuTLSKWAesFinalize                       (xmlSecTransformPtr transform);
-static int      xmlSecGnuTLSKWAesSetKeyReq                      (xmlSecTransformPtr transform,
+#define xmlSecGCryptKWAesSize     \
+    (sizeof(xmlSecTransform) + sizeof(xmlSecGCryptKWAesCtx))
+#define xmlSecGCryptKWAesGetCtx(transform) \
+    ((xmlSecGCryptKWAesCtxPtr)(((xmlSecByte*)(transform)) + sizeof(xmlSecTransform)))
+#define xmlSecGCryptKWAesCheckId(transform) \
+    (xmlSecTransformCheckId((transform), xmlSecGCryptTransformKWAes128Id) || \
+     xmlSecTransformCheckId((transform), xmlSecGCryptTransformKWAes192Id) || \
+     xmlSecTransformCheckId((transform), xmlSecGCryptTransformKWAes256Id))
+
+static int      xmlSecGCryptKWAesInitialize                     (xmlSecTransformPtr transform);
+static void     xmlSecGCryptKWAesFinalize                       (xmlSecTransformPtr transform);
+static int      xmlSecGCryptKWAesSetKeyReq                      (xmlSecTransformPtr transform,
                                                                  xmlSecKeyReqPtr keyReq);
-static int      xmlSecGnuTLSKWAesSetKey                         (xmlSecTransformPtr transform,
+static int      xmlSecGCryptKWAesSetKey                         (xmlSecTransformPtr transform,
                                                                  xmlSecKeyPtr key);
-static int      xmlSecGnuTLSKWAesExecute                        (xmlSecTransformPtr transform,
+static int      xmlSecGCryptKWAesExecute                        (xmlSecTransformPtr transform,
                                                                  int last,
                                                                  xmlSecTransformCtxPtr transformCtx);
 
 static int
-xmlSecGnuTLSKWAesInitialize(xmlSecTransformPtr transform) {
-    xmlSecGnuTLSKWAesCtxPtr ctx;
+xmlSecGCryptKWAesInitialize(xmlSecTransformPtr transform) {
+    xmlSecGCryptKWAesCtxPtr ctx;
     int ret;
 
-    xmlSecAssert2(xmlSecGnuTLSKWAesCheckId(transform), -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSKWAesSize), -1);
+    xmlSecAssert2(xmlSecGCryptKWAesCheckId(transform), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptKWAesSize), -1);
 
-    ctx = xmlSecGnuTLSKWAesGetCtx(transform);
+    ctx = xmlSecGCryptKWAesGetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
 
-    if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformKWAes128Id)) {
+    if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformKWAes128Id)) {
         ctx->cipher             = GCRY_CIPHER_AES128;
         ctx->keyExpectedSize    = XMLSEC_KW_AES128_KEY_SIZE;
-    } else if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformKWAes192Id)) {
+    } else if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformKWAes192Id)) {
         ctx->cipher             = GCRY_CIPHER_AES192;
         ctx->keyExpectedSize    = XMLSEC_KW_AES192_KEY_SIZE;
-    } else if(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformKWAes256Id)) {
+    } else if(xmlSecTransformCheckId(transform, xmlSecGCryptTransformKWAes256Id)) {
         ctx->cipher             = GCRY_CIPHER_AES256;
         ctx->keyExpectedSize    = XMLSEC_KW_AES256_KEY_SIZE;
     } else {
@@ -128,7 +127,7 @@ xmlSecGnuTLSKWAesInitialize(xmlSecTransformPtr transform) {
     if(ret < 0) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
-                    "xmlSecGnuTLSKWAesGetKey",
+                    "xmlSecGCryptKWAesGetKey",
                     XMLSEC_ERRORS_R_XMLSEC_FAILED,
                     XMLSEC_ERRORS_NO_MESSAGE);
         return(-1);
@@ -138,31 +137,31 @@ xmlSecGnuTLSKWAesInitialize(xmlSecTransformPtr transform) {
 }
 
 static void
-xmlSecGnuTLSKWAesFinalize(xmlSecTransformPtr transform) {
-    xmlSecGnuTLSKWAesCtxPtr ctx;
+xmlSecGCryptKWAesFinalize(xmlSecTransformPtr transform) {
+    xmlSecGCryptKWAesCtxPtr ctx;
 
-    xmlSecAssert(xmlSecGnuTLSKWAesCheckId(transform));
-    xmlSecAssert(xmlSecTransformCheckSize(transform, xmlSecGnuTLSKWAesSize));
+    xmlSecAssert(xmlSecGCryptKWAesCheckId(transform));
+    xmlSecAssert(xmlSecTransformCheckSize(transform, xmlSecGCryptKWAesSize));
 
-    ctx = xmlSecGnuTLSKWAesGetCtx(transform);
+    ctx = xmlSecGCryptKWAesGetCtx(transform);
     xmlSecAssert(ctx != NULL);
 
     xmlSecBufferFinalize(&(ctx->keyBuffer));
 }
 
 static int
-xmlSecGnuTLSKWAesSetKeyReq(xmlSecTransformPtr transform,  xmlSecKeyReqPtr keyReq) {
-    xmlSecGnuTLSKWAesCtxPtr ctx;
+xmlSecGCryptKWAesSetKeyReq(xmlSecTransformPtr transform,  xmlSecKeyReqPtr keyReq) {
+    xmlSecGCryptKWAesCtxPtr ctx;
 
-    xmlSecAssert2(xmlSecGnuTLSKWAesCheckId(transform), -1);
+    xmlSecAssert2(xmlSecGCryptKWAesCheckId(transform), -1);
     xmlSecAssert2((transform->operation == xmlSecTransformOperationEncrypt) || (transform->operation == xmlSecTransformOperationDecrypt), -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSKWAesSize), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptKWAesSize), -1);
     xmlSecAssert2(keyReq != NULL, -1);
 
-    ctx = xmlSecGnuTLSKWAesGetCtx(transform);
+    ctx = xmlSecGCryptKWAesGetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
 
-    keyReq->keyId    = xmlSecGnuTLSKeyDataAesId;
+    keyReq->keyId    = xmlSecGCryptKeyDataAesId;
     keyReq->keyType  = xmlSecKeyDataTypeSymmetric;
     if(transform->operation == xmlSecTransformOperationEncrypt) {
         keyReq->keyUsage = xmlSecKeyUsageEncrypt;
@@ -175,19 +174,19 @@ xmlSecGnuTLSKWAesSetKeyReq(xmlSecTransformPtr transform,  xmlSecKeyReqPtr keyReq
 }
 
 static int
-xmlSecGnuTLSKWAesSetKey(xmlSecTransformPtr transform, xmlSecKeyPtr key) {
-    xmlSecGnuTLSKWAesCtxPtr ctx;
+xmlSecGCryptKWAesSetKey(xmlSecTransformPtr transform, xmlSecKeyPtr key) {
+    xmlSecGCryptKWAesCtxPtr ctx;
     xmlSecBufferPtr buffer;
     xmlSecSize keySize;
     int ret;
 
-    xmlSecAssert2(xmlSecGnuTLSKWAesCheckId(transform), -1);
+    xmlSecAssert2(xmlSecGCryptKWAesCheckId(transform), -1);
     xmlSecAssert2((transform->operation == xmlSecTransformOperationEncrypt) || (transform->operation == xmlSecTransformOperationDecrypt), -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSKWAesSize), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptKWAesSize), -1);
     xmlSecAssert2(key != NULL, -1);
-    xmlSecAssert2(xmlSecKeyDataCheckId(xmlSecKeyGetValue(key), xmlSecGnuTLSKeyDataAesId), -1);
+    xmlSecAssert2(xmlSecKeyDataCheckId(xmlSecKeyGetValue(key), xmlSecGCryptKeyDataAesId), -1);
 
-    ctx = xmlSecGnuTLSKWAesGetCtx(transform);
+    ctx = xmlSecGCryptKWAesGetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
 
     buffer = xmlSecKeyDataBinaryValueGetBuffer(xmlSecKeyGetValue(key));
@@ -221,18 +220,18 @@ xmlSecGnuTLSKWAesSetKey(xmlSecTransformPtr transform, xmlSecKeyPtr key) {
 }
 
 static int
-xmlSecGnuTLSKWAesExecute(xmlSecTransformPtr transform, int last, xmlSecTransformCtxPtr transformCtx) {
-    xmlSecGnuTLSKWAesCtxPtr ctx;
+xmlSecGCryptKWAesExecute(xmlSecTransformPtr transform, int last, xmlSecTransformCtxPtr transformCtx) {
+    xmlSecGCryptKWAesCtxPtr ctx;
     xmlSecBufferPtr in, out;
     xmlSecSize inSize, outSize, keySize;
     int ret;
 
-    xmlSecAssert2(xmlSecGnuTLSKWAesCheckId(transform), -1);
+    xmlSecAssert2(xmlSecGCryptKWAesCheckId(transform), -1);
     xmlSecAssert2((transform->operation == xmlSecTransformOperationEncrypt) || (transform->operation == xmlSecTransformOperationDecrypt), -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSKWAesSize), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptKWAesSize), -1);
     xmlSecAssert2(transformCtx != NULL, -1);
 
-    ctx = xmlSecGnuTLSKWAesGetCtx(transform);
+    ctx = xmlSecGCryptKWAesGetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
 
     keySize = xmlSecBufferGetSize(&(ctx->keyBuffer));
@@ -279,7 +278,7 @@ xmlSecGnuTLSKWAesExecute(xmlSecTransformPtr transform, int last, xmlSecTransform
         }
 
         if(transform->operation == xmlSecTransformOperationEncrypt) {
-            ret = xmlSecKWAesEncode(&xmlSecGnuTLSKWAesKlass, ctx,
+            ret = xmlSecKWAesEncode(&xmlSecGCryptKWAesKlass, ctx,
                                     xmlSecBufferGetData(in), inSize,
                                     xmlSecBufferGetData(out), outSize);
             if(ret < 0) {
@@ -292,7 +291,7 @@ xmlSecGnuTLSKWAesExecute(xmlSecTransformPtr transform, int last, xmlSecTransform
             }
             outSize = ret;
         } else {
-            ret = xmlSecKWAesDecode(&xmlSecGnuTLSKWAesKlass, ctx,
+            ret = xmlSecKWAesDecode(&xmlSecGCryptKWAesKlass, ctx,
                                     xmlSecBufferGetData(in), inSize,
                                     xmlSecBufferGetData(out), outSize);
             if(ret < 0) {
@@ -342,67 +341,67 @@ xmlSecGnuTLSKWAesExecute(xmlSecTransformPtr transform, int last, xmlSecTransform
 }
 
 
-static xmlSecTransformKlass xmlSecGnuTLSKWAes128Klass = {
+static xmlSecTransformKlass xmlSecGCryptKWAes128Klass = {
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),               /* xmlSecSize klassSize */
-    xmlSecGnuTLSKWAesSize,                      /* xmlSecSize objSize */
+    xmlSecGCryptKWAesSize,                      /* xmlSecSize objSize */
 
     xmlSecNameKWAes128,                         /* const xmlChar* name; */
     xmlSecHrefKWAes128,                         /* const xmlChar* href; */
     xmlSecTransformUsageEncryptionMethod,       /* xmlSecAlgorithmUsage usage; */
 
-    xmlSecGnuTLSKWAesInitialize,                /* xmlSecTransformInitializeMethod initialize; */
-    xmlSecGnuTLSKWAesFinalize,                  /* xmlSecTransformFinalizeMethod finalize; */
+    xmlSecGCryptKWAesInitialize,                /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecGCryptKWAesFinalize,                  /* xmlSecTransformFinalizeMethod finalize; */
     NULL,                                       /* xmlSecTransformNodeReadMethod readNode; */
     NULL,                                       /* xmlSecTransformNodeWriteMethod writeNode; */
-    xmlSecGnuTLSKWAesSetKeyReq,                 /* xmlSecTransformSetKeyMethod setKeyReq; */
-    xmlSecGnuTLSKWAesSetKey,                    /* xmlSecTransformSetKeyMethod setKey; */
+    xmlSecGCryptKWAesSetKeyReq,                 /* xmlSecTransformSetKeyMethod setKeyReq; */
+    xmlSecGCryptKWAesSetKey,                    /* xmlSecTransformSetKeyMethod setKey; */
     NULL,                                       /* xmlSecTransformValidateMethod validate; */
     xmlSecTransformDefaultGetDataType,          /* xmlSecTransformGetDataTypeMethod getDataType; */
     xmlSecTransformDefaultPushBin,              /* xmlSecTransformPushBinMethod pushBin; */
     xmlSecTransformDefaultPopBin,               /* xmlSecTransformPopBinMethod popBin; */
     NULL,                                       /* xmlSecTransformPushXmlMethod pushXml; */
     NULL,                                       /* xmlSecTransformPopXmlMethod popXml; */
-    xmlSecGnuTLSKWAesExecute,                   /* xmlSecTransformExecuteMethod execute; */
+    xmlSecGCryptKWAesExecute,                   /* xmlSecTransformExecuteMethod execute; */
 
     NULL,                                       /* void* reserved0; */
     NULL,                                       /* void* reserved1; */
 };
 
 /**
- * xmlSecGnuTLSTransformKWAes128GetKlass:
+ * xmlSecGCryptTransformKWAes128GetKlass:
  *
  * The AES-128 kew wrapper transform klass.
  *
  * Returns: AES-128 kew wrapper transform klass.
  */
 xmlSecTransformId
-xmlSecGnuTLSTransformKWAes128GetKlass(void) {
-    return(&xmlSecGnuTLSKWAes128Klass);
+xmlSecGCryptTransformKWAes128GetKlass(void) {
+    return(&xmlSecGCryptKWAes128Klass);
 }
 
-static xmlSecTransformKlass xmlSecGnuTLSKWAes192Klass = {
+static xmlSecTransformKlass xmlSecGCryptKWAes192Klass = {
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),               /* xmlSecSize klassSize */
-    xmlSecGnuTLSKWAesSize,                      /* xmlSecSize objSize */
+    xmlSecGCryptKWAesSize,                      /* xmlSecSize objSize */
 
     xmlSecNameKWAes192,                         /* const xmlChar* name; */
     xmlSecHrefKWAes192,                         /* const xmlChar* href; */
     xmlSecTransformUsageEncryptionMethod,       /* xmlSecAlgorithmUsage usage; */
 
-    xmlSecGnuTLSKWAesInitialize,                /* xmlSecTransformInitializeMethod initialize; */
-    xmlSecGnuTLSKWAesFinalize,                  /* xmlSecTransformFinalizeMethod finalize; */
+    xmlSecGCryptKWAesInitialize,                /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecGCryptKWAesFinalize,                  /* xmlSecTransformFinalizeMethod finalize; */
     NULL,                                       /* xmlSecTransformNodeReadMethod readNode; */
     NULL,                                       /* xmlSecTransformNodeWriteMethod writeNode; */
-    xmlSecGnuTLSKWAesSetKeyReq,                 /* xmlSecTransformSetKeyMethod setKeyReq; */
-    xmlSecGnuTLSKWAesSetKey,                    /* xmlSecTransformSetKeyMethod setKey; */
+    xmlSecGCryptKWAesSetKeyReq,                 /* xmlSecTransformSetKeyMethod setKeyReq; */
+    xmlSecGCryptKWAesSetKey,                    /* xmlSecTransformSetKeyMethod setKey; */
     NULL,                                       /* xmlSecTransformValidateMethod validate; */
     xmlSecTransformDefaultGetDataType,          /* xmlSecTransformGetDataTypeMethod getDataType; */
     xmlSecTransformDefaultPushBin,              /* xmlSecTransformPushBinMethod pushBin; */
     xmlSecTransformDefaultPopBin,               /* xmlSecTransformPopBinMethod popBin; */
     NULL,                                       /* xmlSecTransformPushXmlMethod pushXml; */
     NULL,                                       /* xmlSecTransformPopXmlMethod popXml; */
-    xmlSecGnuTLSKWAesExecute,                   /* xmlSecTransformExecuteMethod execute; */
+    xmlSecGCryptKWAesExecute,                   /* xmlSecTransformExecuteMethod execute; */
 
     NULL,                                       /* void* reserved0; */
     NULL,                                       /* void* reserved1; */
@@ -410,54 +409,54 @@ static xmlSecTransformKlass xmlSecGnuTLSKWAes192Klass = {
 
 
 /**
- * xmlSecGnuTLSTransformKWAes192GetKlass:
+ * xmlSecGCryptTransformKWAes192GetKlass:
  *
  * The AES-192 kew wrapper transform klass.
  *
  * Returns: AES-192 kew wrapper transform klass.
  */
 xmlSecTransformId
-xmlSecGnuTLSTransformKWAes192GetKlass(void) {
-    return(&xmlSecGnuTLSKWAes192Klass);
+xmlSecGCryptTransformKWAes192GetKlass(void) {
+    return(&xmlSecGCryptKWAes192Klass);
 }
 
-static xmlSecTransformKlass xmlSecGnuTLSKWAes256Klass = {
+static xmlSecTransformKlass xmlSecGCryptKWAes256Klass = {
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),               /* xmlSecSize klassSize */
-    xmlSecGnuTLSKWAesSize,                      /* xmlSecSize objSize */
+    xmlSecGCryptKWAesSize,                      /* xmlSecSize objSize */
 
     xmlSecNameKWAes256,                         /* const xmlChar* name; */
     xmlSecHrefKWAes256,                         /* const xmlChar* href; */
     xmlSecTransformUsageEncryptionMethod,       /* xmlSecAlgorithmUsage usage; */
 
-    xmlSecGnuTLSKWAesInitialize,                /* xmlSecTransformInitializeMethod initialize; */
-    xmlSecGnuTLSKWAesFinalize,                  /* xmlSecTransformFinalizeMethod finalize; */
+    xmlSecGCryptKWAesInitialize,                /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecGCryptKWAesFinalize,                  /* xmlSecTransformFinalizeMethod finalize; */
     NULL,                                       /* xmlSecTransformNodeReadMethod readNode; */
     NULL,                                       /* xmlSecTransformNodeWriteMethod writeNode; */
-    xmlSecGnuTLSKWAesSetKeyReq,                 /* xmlSecTransformSetKeyMethod setKeyReq; */
-    xmlSecGnuTLSKWAesSetKey,                    /* xmlSecTransformSetKeyMethod setKey; */
+    xmlSecGCryptKWAesSetKeyReq,                 /* xmlSecTransformSetKeyMethod setKeyReq; */
+    xmlSecGCryptKWAesSetKey,                    /* xmlSecTransformSetKeyMethod setKey; */
     NULL,                                       /* xmlSecTransformValidateMethod validate; */
     xmlSecTransformDefaultGetDataType,          /* xmlSecTransformGetDataTypeMethod getDataType; */
     xmlSecTransformDefaultPushBin,              /* xmlSecTransformPushBinMethod pushBin; */
     xmlSecTransformDefaultPopBin,               /* xmlSecTransformPopBinMethod popBin; */
     NULL,                                       /* xmlSecTransformPushXmlMethod pushXml; */
     NULL,                                       /* xmlSecTransformPopXmlMethod popXml; */
-    xmlSecGnuTLSKWAesExecute,                   /* xmlSecTransformExecuteMethod execute; */
+    xmlSecGCryptKWAesExecute,                   /* xmlSecTransformExecuteMethod execute; */
 
     NULL,                                       /* void* reserved0; */
     NULL,                                       /* void* reserved1; */
 };
 
 /**
- * xmlSecGnuTLSTransformKWAes256GetKlass:
+ * xmlSecGCryptTransformKWAes256GetKlass:
  *
  * The AES-256 kew wrapper transform klass.
  *
  * Returns: AES-256 kew wrapper transform klass.
  */
 xmlSecTransformId
-xmlSecGnuTLSTransformKWAes256GetKlass(void) {
-    return(&xmlSecGnuTLSKWAes256Klass);
+xmlSecGCryptTransformKWAes256GetKlass(void) {
+    return(&xmlSecGCryptKWAes256Klass);
 }
 
 /*********************************************************************
@@ -468,10 +467,10 @@ xmlSecGnuTLSTransformKWAes256GetKlass(void) {
 static unsigned char g_zero_iv[XMLSEC_KW_AES_BLOCK_SIZE] =
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 static int
-xmlSecGnuTLSKWAesBlockEncrypt(const xmlSecByte * in, xmlSecSize inSize,
+xmlSecGCryptKWAesBlockEncrypt(const xmlSecByte * in, xmlSecSize inSize,
                                xmlSecByte * out, xmlSecSize outSize,
                                void * context) {
-    xmlSecGnuTLSKWAesCtxPtr ctx = (xmlSecGnuTLSKWAesCtxPtr)context;
+    xmlSecGCryptKWAesCtxPtr ctx = (xmlSecGCryptKWAesCtxPtr)context;
     gcry_cipher_hd_t cipherCtx;
     gpg_err_code_t ret;
 
@@ -530,10 +529,10 @@ xmlSecGnuTLSKWAesBlockEncrypt(const xmlSecByte * in, xmlSecSize inSize,
 }
 
 static int
-xmlSecGnuTLSKWAesBlockDecrypt(const xmlSecByte * in, xmlSecSize inSize,
+xmlSecGCryptKWAesBlockDecrypt(const xmlSecByte * in, xmlSecSize inSize,
                                xmlSecByte * out, xmlSecSize outSize,
                                void * context) {
-    xmlSecGnuTLSKWAesCtxPtr ctx = (xmlSecGnuTLSKWAesCtxPtr)context;
+    xmlSecGCryptKWAesCtxPtr ctx = (xmlSecGCryptKWAesCtxPtr)context;
     gcry_cipher_hd_t cipherCtx;
     gpg_err_code_t ret;
 
diff --git a/src/gcrypt/kw_des.c b/src/gcrypt/kw_des.c
index d6af1ef..ae541b2 100644
--- a/src/gcrypt/kw_des.c
+++ b/src/gcrypt/kw_des.c
@@ -16,7 +16,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <gnutls/gnutls.h>
 #include <gcrypt.h>
 
 
@@ -26,7 +25,7 @@
 #include <xmlsec/transforms.h>
 #include <xmlsec/errors.h>
 
-#include <xmlsec/gnutls/crypto.h>
+#include <xmlsec/gcrypt/crypto.h>
 
 #include "../kw_aes_des.h"
 
@@ -35,22 +34,22 @@
  * DES KW implementation
  *
  *********************************************************************/
-static int       xmlSecGnuTLSKWDes3GenerateRandom               (void * context,
+static int       xmlSecGCryptKWDes3GenerateRandom               (void * context,
                                                                  xmlSecByte * out, 
                                                                  xmlSecSize outSize);
-static int       xmlSecGnuTLSKWDes3Sha1                         (void * context,
+static int       xmlSecGCryptKWDes3Sha1                         (void * context,
                                                                  const xmlSecByte * in, 
                                                                  xmlSecSize inSize, 
                                                                  xmlSecByte * out, 
                                                                  xmlSecSize outSize);
-static int      xmlSecGnuTLSKWDes3BlockEncrypt                  (void * context,
+static int      xmlSecGCryptKWDes3BlockEncrypt                  (void * context,
                                                                  const xmlSecByte * iv, 
                                                                  xmlSecSize ivSize,
                                                                  const xmlSecByte * in, 
                                                                  xmlSecSize inSize,
                                                                  xmlSecByte * out, 
                                                                  xmlSecSize outSize);
-static int      xmlSecGnuTLSKWDes3BlockDecrypt                  (void * context,
+static int      xmlSecGCryptKWDes3BlockDecrypt                  (void * context,
                                                                  const xmlSecByte * iv, 
                                                                  xmlSecSize ivSize,
                                                                  const xmlSecByte * in, 
@@ -58,19 +57,19 @@ static int      xmlSecGnuTLSKWDes3BlockDecrypt                  (void * context,
                                                                  xmlSecByte * out, 
                                                                  xmlSecSize outSize);
 
-static xmlSecKWDes3Klass xmlSecGnuTLSKWDes3ImplKlass = {
+static xmlSecKWDes3Klass xmlSecGCryptKWDes3ImplKlass = {
     /* callbacks */
-    xmlSecGnuTLSKWDes3GenerateRandom,       /* xmlSecKWDes3GenerateRandomMethod     generateRandom; */
-    xmlSecGnuTLSKWDes3Sha1,                 /* xmlSecKWDes3Sha1Method               sha1; */
-    xmlSecGnuTLSKWDes3BlockEncrypt,         /* xmlSecKWDes3BlockEncryptMethod       encrypt; */
-    xmlSecGnuTLSKWDes3BlockDecrypt,         /* xmlSecKWDes3BlockDecryptMethod       decrypt; */
+    xmlSecGCryptKWDes3GenerateRandom,       /* xmlSecKWDes3GenerateRandomMethod     generateRandom; */
+    xmlSecGCryptKWDes3Sha1,                 /* xmlSecKWDes3Sha1Method               sha1; */
+    xmlSecGCryptKWDes3BlockEncrypt,         /* xmlSecKWDes3BlockEncryptMethod       encrypt; */
+    xmlSecGCryptKWDes3BlockDecrypt,         /* xmlSecKWDes3BlockDecryptMethod       decrypt; */
 
     /* for the future */
     NULL,                                   /* void*                               reserved0; */
     NULL,                                   /* void*                               reserved1; */
 };
 
-static int      xmlSecGnuTLSKWDes3Encrypt                       (const xmlSecByte *key, 
+static int      xmlSecGCryptKWDes3Encrypt                       (const xmlSecByte *key, 
                                                                  xmlSecSize keySize,
                                                                  const xmlSecByte *iv, 
                                                                  xmlSecSize ivSize,
@@ -88,73 +87,73 @@ static int      xmlSecGnuTLSKWDes3Encrypt                       (const xmlSecByt
  * key (xmlSecBuffer) is located after xmlSecTransform structure
  *
  ********************************************************************/
-typedef struct _xmlSecGnuTLSKWDes3Ctx              xmlSecGnuTLSKWDes3Ctx,
-                                                  *xmlSecGnuTLSKWDes3CtxPtr;
-struct _xmlSecGnuTLSKWDes3Ctx {
+typedef struct _xmlSecGCryptKWDes3Ctx              xmlSecGCryptKWDes3Ctx,
+                                                  *xmlSecGCryptKWDes3CtxPtr;
+struct _xmlSecGCryptKWDes3Ctx {
     xmlSecBuffer        keyBuffer;
 };
-#define xmlSecGnuTLSKWDes3Size     \
-    (sizeof(xmlSecTransform) + sizeof(xmlSecGnuTLSKWDes3Ctx))
-#define xmlSecGnuTLSKWDes3GetCtx(transform) \
-    ((xmlSecGnuTLSKWDes3CtxPtr)(((xmlSecByte*)(transform)) + sizeof(xmlSecTransform)))
-
-static int      xmlSecGnuTLSKWDes3Initialize                    (xmlSecTransformPtr transform);
-static void     xmlSecGnuTLSKWDes3Finalize                      (xmlSecTransformPtr transform);
-static int      xmlSecGnuTLSKWDes3SetKeyReq                     (xmlSecTransformPtr transform,
+#define xmlSecGCryptKWDes3Size     \
+    (sizeof(xmlSecTransform) + sizeof(xmlSecGCryptKWDes3Ctx))
+#define xmlSecGCryptKWDes3GetCtx(transform) \
+    ((xmlSecGCryptKWDes3CtxPtr)(((xmlSecByte*)(transform)) + sizeof(xmlSecTransform)))
+
+static int      xmlSecGCryptKWDes3Initialize                    (xmlSecTransformPtr transform);
+static void     xmlSecGCryptKWDes3Finalize                      (xmlSecTransformPtr transform);
+static int      xmlSecGCryptKWDes3SetKeyReq                     (xmlSecTransformPtr transform,
                                                                  xmlSecKeyReqPtr keyReq);
-static int      xmlSecGnuTLSKWDes3SetKey                        (xmlSecTransformPtr transform,
+static int      xmlSecGCryptKWDes3SetKey                        (xmlSecTransformPtr transform,
                                                                  xmlSecKeyPtr key);
-static int      xmlSecGnuTLSKWDes3Execute                       (xmlSecTransformPtr transform,
+static int      xmlSecGCryptKWDes3Execute                       (xmlSecTransformPtr transform,
                                                                  int last,
                                                                  xmlSecTransformCtxPtr transformCtx);
-static xmlSecTransformKlass xmlSecGnuTLSKWDes3Klass = {
+static xmlSecTransformKlass xmlSecGCryptKWDes3Klass = {
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),               /* xmlSecSize klassSize */
-    xmlSecGnuTLSKWDes3Size,                     /* xmlSecSize objSize */
+    xmlSecGCryptKWDes3Size,                     /* xmlSecSize objSize */
 
     xmlSecNameKWDes3,                           /* const xmlChar* name; */
     xmlSecHrefKWDes3,                           /* const xmlChar* href; */
     xmlSecTransformUsageEncryptionMethod,       /* xmlSecAlgorithmUsage usage; */
 
-    xmlSecGnuTLSKWDes3Initialize,               /* xmlSecTransformInitializeMethod initialize; */
-    xmlSecGnuTLSKWDes3Finalize,                 /* xmlSecTransformFinalizeMethod finalize; */
+    xmlSecGCryptKWDes3Initialize,               /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecGCryptKWDes3Finalize,                 /* xmlSecTransformFinalizeMethod finalize; */
     NULL,                                       /* xmlSecTransformNodeReadMethod readNode; */
     NULL,                                       /* xmlSecTransformNodeWriteMethod writeNode; */
-    xmlSecGnuTLSKWDes3SetKeyReq,                /* xmlSecTransformSetKeyMethod setKeyReq; */
-    xmlSecGnuTLSKWDes3SetKey,                   /* xmlSecTransformSetKeyMethod setKey; */
+    xmlSecGCryptKWDes3SetKeyReq,                /* xmlSecTransformSetKeyMethod setKeyReq; */
+    xmlSecGCryptKWDes3SetKey,                   /* xmlSecTransformSetKeyMethod setKey; */
     NULL,                                       /* xmlSecTransformValidateMethod validate; */
     xmlSecTransformDefaultGetDataType,          /* xmlSecTransformGetDataTypeMethod getDataType; */
     xmlSecTransformDefaultPushBin,              /* xmlSecTransformPushBinMethod pushBin; */
     xmlSecTransformDefaultPopBin,               /* xmlSecTransformPopBinMethod popBin; */
     NULL,                                       /* xmlSecTransformPushXmlMethod pushXml; */
     NULL,                                       /* xmlSecTransformPopXmlMethod popXml; */
-    xmlSecGnuTLSKWDes3Execute,                  /* xmlSecTransformExecuteMethod execute; */
+    xmlSecGCryptKWDes3Execute,                  /* xmlSecTransformExecuteMethod execute; */
 
     NULL,                                       /* void* reserved0; */
     NULL,                                       /* void* reserved1; */
 };
 
 /**
- * xmlSecGnuTLSTransformKWDes3GetKlass:
+ * xmlSecGCryptTransformKWDes3GetKlass:
  *
  * The Triple DES key wrapper transform klass.
  *
  * Returns: Triple DES key wrapper transform klass.
  */
 xmlSecTransformId
-xmlSecGnuTLSTransformKWDes3GetKlass(void) {
-    return(&xmlSecGnuTLSKWDes3Klass);
+xmlSecGCryptTransformKWDes3GetKlass(void) {
+    return(&xmlSecGCryptKWDes3Klass);
 }
 
 static int
-xmlSecGnuTLSKWDes3Initialize(xmlSecTransformPtr transform) {
-    xmlSecGnuTLSKWDes3CtxPtr ctx;
+xmlSecGCryptKWDes3Initialize(xmlSecTransformPtr transform) {
+    xmlSecGCryptKWDes3CtxPtr ctx;
     int ret;
 
-    xmlSecAssert2(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformKWDes3Id), -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSKWDes3Size), -1);
+    xmlSecAssert2(xmlSecTransformCheckId(transform, xmlSecGCryptTransformKWDes3Id), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptKWDes3Size), -1);
 
-    ctx = xmlSecGnuTLSKWDes3GetCtx(transform);
+    ctx = xmlSecGCryptKWDes3GetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
 
     ret = xmlSecBufferInitialize(&(ctx->keyBuffer), 0);
@@ -171,31 +170,31 @@ xmlSecGnuTLSKWDes3Initialize(xmlSecTransformPtr transform) {
 }
 
 static void
-xmlSecGnuTLSKWDes3Finalize(xmlSecTransformPtr transform) {
-    xmlSecGnuTLSKWDes3CtxPtr ctx;
+xmlSecGCryptKWDes3Finalize(xmlSecTransformPtr transform) {
+    xmlSecGCryptKWDes3CtxPtr ctx;
 
-    xmlSecAssert(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformKWDes3Id));
-    xmlSecAssert(xmlSecTransformCheckSize(transform, xmlSecGnuTLSKWDes3Size));
+    xmlSecAssert(xmlSecTransformCheckId(transform, xmlSecGCryptTransformKWDes3Id));
+    xmlSecAssert(xmlSecTransformCheckSize(transform, xmlSecGCryptKWDes3Size));
 
-    ctx = xmlSecGnuTLSKWDes3GetCtx(transform);
+    ctx = xmlSecGCryptKWDes3GetCtx(transform);
     xmlSecAssert(ctx != NULL);
 
     xmlSecBufferFinalize(&(ctx->keyBuffer));
 }
 
 static int
-xmlSecGnuTLSKWDes3SetKeyReq(xmlSecTransformPtr transform,  xmlSecKeyReqPtr keyReq) {
-    xmlSecGnuTLSKWDes3CtxPtr ctx;
+xmlSecGCryptKWDes3SetKeyReq(xmlSecTransformPtr transform,  xmlSecKeyReqPtr keyReq) {
+    xmlSecGCryptKWDes3CtxPtr ctx;
 
-    xmlSecAssert2(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformKWDes3Id), -1);
+    xmlSecAssert2(xmlSecTransformCheckId(transform, xmlSecGCryptTransformKWDes3Id), -1);
     xmlSecAssert2((transform->operation == xmlSecTransformOperationEncrypt) || (transform->operation == xmlSecTransformOperationDecrypt), -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSKWDes3Size), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptKWDes3Size), -1);
     xmlSecAssert2(keyReq != NULL, -1);
 
-    ctx = xmlSecGnuTLSKWDes3GetCtx(transform);
+    ctx = xmlSecGCryptKWDes3GetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
 
-    keyReq->keyId       = xmlSecGnuTLSKeyDataDesId;
+    keyReq->keyId       = xmlSecGCryptKeyDataDesId;
     keyReq->keyType     = xmlSecKeyDataTypeSymmetric;
     if(transform->operation == xmlSecTransformOperationEncrypt) {
         keyReq->keyUsage= xmlSecKeyUsageEncrypt;
@@ -207,19 +206,19 @@ xmlSecGnuTLSKWDes3SetKeyReq(xmlSecTransformPtr transform,  xmlSecKeyReqPtr keyRe
 }
 
 static int
-xmlSecGnuTLSKWDes3SetKey(xmlSecTransformPtr transform, xmlSecKeyPtr key) {
-    xmlSecGnuTLSKWDes3CtxPtr ctx;
+xmlSecGCryptKWDes3SetKey(xmlSecTransformPtr transform, xmlSecKeyPtr key) {
+    xmlSecGCryptKWDes3CtxPtr ctx;
     xmlSecBufferPtr buffer;
     xmlSecSize keySize;
     int ret;
 
-    xmlSecAssert2(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformKWDes3Id), -1);
+    xmlSecAssert2(xmlSecTransformCheckId(transform, xmlSecGCryptTransformKWDes3Id), -1);
     xmlSecAssert2((transform->operation == xmlSecTransformOperationEncrypt) || (transform->operation == xmlSecTransformOperationDecrypt), -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSKWDes3Size), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptKWDes3Size), -1);
     xmlSecAssert2(key != NULL, -1);
-    xmlSecAssert2(xmlSecKeyDataCheckId(xmlSecKeyGetValue(key), xmlSecGnuTLSKeyDataDesId), -1);
+    xmlSecAssert2(xmlSecKeyDataCheckId(xmlSecKeyGetValue(key), xmlSecGCryptKeyDataDesId), -1);
 
-    ctx = xmlSecGnuTLSKWDes3GetCtx(transform);
+    ctx = xmlSecGCryptKWDes3GetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
 
     buffer = xmlSecKeyDataBinaryValueGetBuffer(xmlSecKeyGetValue(key));
@@ -250,18 +249,18 @@ xmlSecGnuTLSKWDes3SetKey(xmlSecTransformPtr transform, xmlSecKeyPtr key) {
 }
 
 static int
-xmlSecGnuTLSKWDes3Execute(xmlSecTransformPtr transform, int last, xmlSecTransformCtxPtr transformCtx) {
-    xmlSecGnuTLSKWDes3CtxPtr ctx;
+xmlSecGCryptKWDes3Execute(xmlSecTransformPtr transform, int last, xmlSecTransformCtxPtr transformCtx) {
+    xmlSecGCryptKWDes3CtxPtr ctx;
     xmlSecBufferPtr in, out;
     xmlSecSize inSize, outSize, keySize;
     int ret;
 
-    xmlSecAssert2(xmlSecTransformCheckId(transform, xmlSecGnuTLSTransformKWDes3Id), -1);
+    xmlSecAssert2(xmlSecTransformCheckId(transform, xmlSecGCryptTransformKWDes3Id), -1);
     xmlSecAssert2((transform->operation == xmlSecTransformOperationEncrypt) || (transform->operation == xmlSecTransformOperationDecrypt), -1);
-    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGnuTLSKWDes3Size), -1);
+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecGCryptKWDes3Size), -1);
     xmlSecAssert2(transformCtx != NULL, -1);
 
-    ctx = xmlSecGnuTLSKWDes3GetCtx(transform);
+    ctx = xmlSecGCryptKWDes3GetCtx(transform);
     xmlSecAssert2(ctx != NULL, -1);
 
     keySize = xmlSecBufferGetSize(&(ctx->keyBuffer));
@@ -311,7 +310,7 @@ xmlSecGnuTLSKWDes3Execute(xmlSecTransformPtr transform, int last, xmlSecTransfor
         }
 
         if(transform->operation == xmlSecTransformOperationEncrypt) {
-            ret = xmlSecKWDes3Encode(&xmlSecGnuTLSKWDes3ImplKlass, ctx,
+            ret = xmlSecKWDes3Encode(&xmlSecGCryptKWDes3ImplKlass, ctx,
                                     xmlSecBufferGetData(in), inSize,
                                     xmlSecBufferGetData(out), outSize);
             if(ret < 0) {
@@ -325,7 +324,7 @@ xmlSecGnuTLSKWDes3Execute(xmlSecTransformPtr transform, int last, xmlSecTransfor
             }
             outSize = ret;
         } else {
-            ret = xmlSecKWDes3Decode(&xmlSecGnuTLSKWDes3ImplKlass, ctx,
+            ret = xmlSecKWDes3Decode(&xmlSecGCryptKWDes3ImplKlass, ctx,
                                     xmlSecBufferGetData(in), inSize,
                                     xmlSecBufferGetData(out), outSize);
             if(ret < 0) {
@@ -381,10 +380,10 @@ xmlSecGnuTLSKWDes3Execute(xmlSecTransformPtr transform, int last, xmlSecTransfor
  *
  *********************************************************************/
 static int
-xmlSecGnuTLSKWDes3Sha1(void * context,
+xmlSecGCryptKWDes3Sha1(void * context,
                        const xmlSecByte * in, xmlSecSize inSize,
                        xmlSecByte * out, xmlSecSize outSize) {
-    xmlSecGnuTLSKWDes3CtxPtr ctx = (xmlSecGnuTLSKWDes3CtxPtr)context;
+    xmlSecGCryptKWDes3CtxPtr ctx = (xmlSecGCryptKWDes3CtxPtr)context;
     gcry_md_hd_t digestCtx;
     unsigned char * res;
     unsigned int len;
@@ -441,9 +440,9 @@ xmlSecGnuTLSKWDes3Sha1(void * context,
 }
 
 static int
-xmlSecGnuTLSKWDes3GenerateRandom(void * context,
+xmlSecGCryptKWDes3GenerateRandom(void * context,
                                  xmlSecByte * out, xmlSecSize outSize) {
-    xmlSecGnuTLSKWDes3CtxPtr ctx = (xmlSecGnuTLSKWDes3CtxPtr)context;
+    xmlSecGCryptKWDes3CtxPtr ctx = (xmlSecGCryptKWDes3CtxPtr)context;
 
     xmlSecAssert2(ctx != NULL, -1);
     xmlSecAssert2(out != NULL, -1);
@@ -454,11 +453,11 @@ xmlSecGnuTLSKWDes3GenerateRandom(void * context,
 }
 
 static int
-xmlSecGnuTLSKWDes3BlockEncrypt(void * context,
+xmlSecGCryptKWDes3BlockEncrypt(void * context,
                                const xmlSecByte * iv, xmlSecSize ivSize,
                                const xmlSecByte * in, xmlSecSize inSize,
                                xmlSecByte * out, xmlSecSize outSize) {
-    xmlSecGnuTLSKWDes3CtxPtr ctx = (xmlSecGnuTLSKWDes3CtxPtr)context;
+    xmlSecGCryptKWDes3CtxPtr ctx = (xmlSecGCryptKWDes3CtxPtr)context;
     int ret;
 
     xmlSecAssert2(ctx != NULL, -1);
@@ -471,7 +470,7 @@ xmlSecGnuTLSKWDes3BlockEncrypt(void * context,
     xmlSecAssert2(out != NULL, -1);
     xmlSecAssert2(outSize >= inSize, -1);
 
-    ret = xmlSecGnuTLSKWDes3Encrypt(xmlSecBufferGetData(&(ctx->keyBuffer)),
+    ret = xmlSecGCryptKWDes3Encrypt(xmlSecBufferGetData(&(ctx->keyBuffer)),
                                     XMLSEC_KW_DES3_KEY_LENGTH,
                                     iv, XMLSEC_KW_DES3_IV_LENGTH,
                                     in, inSize,
@@ -480,7 +479,7 @@ xmlSecGnuTLSKWDes3BlockEncrypt(void * context,
     if(ret < 0) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     NULL,
-                    "xmlSecGnuTLSKWDes3Encrypt",
+                    "xmlSecGCryptKWDes3Encrypt",
                     XMLSEC_ERRORS_R_XMLSEC_FAILED,
                     XMLSEC_ERRORS_NO_MESSAGE);
         return(-1);
@@ -490,11 +489,11 @@ xmlSecGnuTLSKWDes3BlockEncrypt(void * context,
 }
 
 static int
-xmlSecGnuTLSKWDes3BlockDecrypt(void * context,
+xmlSecGCryptKWDes3BlockDecrypt(void * context,
                                const xmlSecByte * iv, xmlSecSize ivSize,
                                const xmlSecByte * in, xmlSecSize inSize,
                                xmlSecByte * out, xmlSecSize outSize) {
-    xmlSecGnuTLSKWDes3CtxPtr ctx = (xmlSecGnuTLSKWDes3CtxPtr)context;
+    xmlSecGCryptKWDes3CtxPtr ctx = (xmlSecGCryptKWDes3CtxPtr)context;
     int ret;
 
     xmlSecAssert2(ctx != NULL, -1);
@@ -507,7 +506,7 @@ xmlSecGnuTLSKWDes3BlockDecrypt(void * context,
     xmlSecAssert2(out != NULL, -1);
     xmlSecAssert2(outSize >= inSize, -1);
 
-    ret = xmlSecGnuTLSKWDes3Encrypt(xmlSecBufferGetData(&(ctx->keyBuffer)),
+    ret = xmlSecGCryptKWDes3Encrypt(xmlSecBufferGetData(&(ctx->keyBuffer)),
                                     XMLSEC_KW_DES3_KEY_LENGTH,
                                     iv, XMLSEC_KW_DES3_IV_LENGTH,
                                     in, inSize,
@@ -516,7 +515,7 @@ xmlSecGnuTLSKWDes3BlockDecrypt(void * context,
     if(ret < 0) {
         xmlSecError(XMLSEC_ERRORS_HERE,
                     NULL,
-                    "xmlSecGnuTLSKWDes3Encrypt",
+                    "xmlSecGCryptKWDes3Encrypt",
                     XMLSEC_ERRORS_R_XMLSEC_FAILED,
                     XMLSEC_ERRORS_NO_MESSAGE);
         return(-1);
@@ -525,7 +524,7 @@ xmlSecGnuTLSKWDes3BlockDecrypt(void * context,
 }
 
 static int
-xmlSecGnuTLSKWDes3Encrypt(const xmlSecByte *key, xmlSecSize keySize,
+xmlSecGCryptKWDes3Encrypt(const xmlSecByte *key, xmlSecSize keySize,
                            const xmlSecByte *iv, xmlSecSize ivSize,
                            const xmlSecByte *in, xmlSecSize inSize,
                            xmlSecByte *out, xmlSecSize outSize,
diff --git a/src/gcrypt/symkeys.c b/src/gcrypt/symkeys.c
index d2ea284..8ef48e6 100644
--- a/src/gcrypt/symkeys.c
+++ b/src/gcrypt/symkeys.c
@@ -22,126 +22,126 @@
 #include <xmlsec/transforms.h>
 #include <xmlsec/errors.h>
 
-#include <xmlsec/gnutls/crypto.h>
+#include <xmlsec/gcrypt/crypto.h>
 
 /*****************************************************************************
  *
  * Symmetic (binary) keys - just a wrapper for xmlSecKeyDataBinary
  *
  ****************************************************************************/
-static int      xmlSecGnuTLSSymKeyDataInitialize        (xmlSecKeyDataPtr data);
-static int      xmlSecGnuTLSSymKeyDataDuplicate         (xmlSecKeyDataPtr dst,
+static int      xmlSecGCryptSymKeyDataInitialize        (xmlSecKeyDataPtr data);
+static int      xmlSecGCryptSymKeyDataDuplicate         (xmlSecKeyDataPtr dst,
                                                          xmlSecKeyDataPtr src);
-static void     xmlSecGnuTLSSymKeyDataFinalize          (xmlSecKeyDataPtr data);
-static int      xmlSecGnuTLSSymKeyDataXmlRead           (xmlSecKeyDataId id,
+static void     xmlSecGCryptSymKeyDataFinalize          (xmlSecKeyDataPtr data);
+static int      xmlSecGCryptSymKeyDataXmlRead           (xmlSecKeyDataId id,
                                                          xmlSecKeyPtr key,
                                                          xmlNodePtr node,
                                                          xmlSecKeyInfoCtxPtr keyInfoCtx);
-static int      xmlSecGnuTLSSymKeyDataXmlWrite          (xmlSecKeyDataId id,
+static int      xmlSecGCryptSymKeyDataXmlWrite          (xmlSecKeyDataId id,
                                                          xmlSecKeyPtr key,
                                                          xmlNodePtr node,
                                                          xmlSecKeyInfoCtxPtr keyInfoCtx);
-static int      xmlSecGnuTLSSymKeyDataBinRead           (xmlSecKeyDataId id,
+static int      xmlSecGCryptSymKeyDataBinRead           (xmlSecKeyDataId id,
                                                          xmlSecKeyPtr key,
                                                          const xmlSecByte* buf,
                                                          xmlSecSize bufSize,
                                                          xmlSecKeyInfoCtxPtr keyInfoCtx);
-static int      xmlSecGnuTLSSymKeyDataBinWrite          (xmlSecKeyDataId id,
+static int      xmlSecGCryptSymKeyDataBinWrite          (xmlSecKeyDataId id,
                                                          xmlSecKeyPtr key,
                                                          xmlSecByte** buf,
                                                          xmlSecSize* bufSize,
                                                          xmlSecKeyInfoCtxPtr keyInfoCtx);
-static int      xmlSecGnuTLSSymKeyDataGenerate          (xmlSecKeyDataPtr data,
+static int      xmlSecGCryptSymKeyDataGenerate          (xmlSecKeyDataPtr data,
                                                          xmlSecSize sizeBits,
                                                          xmlSecKeyDataType type);
 
-static xmlSecKeyDataType xmlSecGnuTLSSymKeyDataGetType  (xmlSecKeyDataPtr data);
-static xmlSecSize        xmlSecGnuTLSSymKeyDataGetSize  (xmlSecKeyDataPtr data);
-static void     xmlSecGnuTLSSymKeyDataDebugDump         (xmlSecKeyDataPtr data,
+static xmlSecKeyDataType xmlSecGCryptSymKeyDataGetType  (xmlSecKeyDataPtr data);
+static xmlSecSize        xmlSecGCryptSymKeyDataGetSize  (xmlSecKeyDataPtr data);
+static void     xmlSecGCryptSymKeyDataDebugDump         (xmlSecKeyDataPtr data,
                                                          FILE* output);
-static void     xmlSecGnuTLSSymKeyDataDebugXmlDump      (xmlSecKeyDataPtr data,
+static void     xmlSecGCryptSymKeyDataDebugXmlDump      (xmlSecKeyDataPtr data,
                                                          FILE* output);
-static int      xmlSecGnuTLSSymKeyDataKlassCheck        (xmlSecKeyDataKlass* klass);
+static int      xmlSecGCryptSymKeyDataKlassCheck        (xmlSecKeyDataKlass* klass);
 
-#define xmlSecGnuTLSSymKeyDataCheckId(data) \
+#define xmlSecGCryptSymKeyDataCheckId(data) \
     (xmlSecKeyDataIsValid((data)) && \
-     xmlSecGnuTLSSymKeyDataKlassCheck((data)->id))
+     xmlSecGCryptSymKeyDataKlassCheck((data)->id))
 
 static int
-xmlSecGnuTLSSymKeyDataInitialize(xmlSecKeyDataPtr data) {
-    xmlSecAssert2(xmlSecGnuTLSSymKeyDataCheckId(data), -1);
+xmlSecGCryptSymKeyDataInitialize(xmlSecKeyDataPtr data) {
+    xmlSecAssert2(xmlSecGCryptSymKeyDataCheckId(data), -1);
 
     return(xmlSecKeyDataBinaryValueInitialize(data));
 }
 
 static int
-xmlSecGnuTLSSymKeyDataDuplicate(xmlSecKeyDataPtr dst, xmlSecKeyDataPtr src) {
-    xmlSecAssert2(xmlSecGnuTLSSymKeyDataCheckId(dst), -1);
-    xmlSecAssert2(xmlSecGnuTLSSymKeyDataCheckId(src), -1);
+xmlSecGCryptSymKeyDataDuplicate(xmlSecKeyDataPtr dst, xmlSecKeyDataPtr src) {
+    xmlSecAssert2(xmlSecGCryptSymKeyDataCheckId(dst), -1);
+    xmlSecAssert2(xmlSecGCryptSymKeyDataCheckId(src), -1);
     xmlSecAssert2(dst->id == src->id, -1);
 
     return(xmlSecKeyDataBinaryValueDuplicate(dst, src));
 }
 
 static void
-xmlSecGnuTLSSymKeyDataFinalize(xmlSecKeyDataPtr data) {
-    xmlSecAssert(xmlSecGnuTLSSymKeyDataCheckId(data));
+xmlSecGCryptSymKeyDataFinalize(xmlSecKeyDataPtr data) {
+    xmlSecAssert(xmlSecGCryptSymKeyDataCheckId(data));
 
     xmlSecKeyDataBinaryValueFinalize(data);
 }
 
 static int
-xmlSecGnuTLSSymKeyDataXmlRead(xmlSecKeyDataId id, xmlSecKeyPtr key,
+xmlSecGCryptSymKeyDataXmlRead(xmlSecKeyDataId id, xmlSecKeyPtr key,
                                xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) {
-    xmlSecAssert2(xmlSecGnuTLSSymKeyDataKlassCheck(id), -1);
+    xmlSecAssert2(xmlSecGCryptSymKeyDataKlassCheck(id), -1);
 
     return(xmlSecKeyDataBinaryValueXmlRead(id, key, node, keyInfoCtx));
 }
 
 static int
-xmlSecGnuTLSSymKeyDataXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
+xmlSecGCryptSymKeyDataXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
                                     xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) {
-    xmlSecAssert2(xmlSecGnuTLSSymKeyDataKlassCheck(id), -1);
+    xmlSecAssert2(xmlSecGCryptSymKeyDataKlassCheck(id), -1);
 
     return(xmlSecKeyDataBinaryValueXmlWrite(id, key, node, keyInfoCtx));
 }
 
 static int
-xmlSecGnuTLSSymKeyDataBinRead(xmlSecKeyDataId id, xmlSecKeyPtr key,
+xmlSecGCryptSymKeyDataBinRead(xmlSecKeyDataId id, xmlSecKeyPtr key,
                                     const xmlSecByte* buf, xmlSecSize bufSize,
                                     xmlSecKeyInfoCtxPtr keyInfoCtx) {
-    xmlSecAssert2(xmlSecGnuTLSSymKeyDataKlassCheck(id), -1);
+    xmlSecAssert2(xmlSecGCryptSymKeyDataKlassCheck(id), -1);
 
     return(xmlSecKeyDataBinaryValueBinRead(id, key, buf, bufSize, keyInfoCtx));
 }
 
 static int
-xmlSecGnuTLSSymKeyDataBinWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
+xmlSecGCryptSymKeyDataBinWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
                                     xmlSecByte** buf, xmlSecSize* bufSize,
                                     xmlSecKeyInfoCtxPtr keyInfoCtx) {
-    xmlSecAssert2(xmlSecGnuTLSSymKeyDataKlassCheck(id), -1);
+    xmlSecAssert2(xmlSecGCryptSymKeyDataKlassCheck(id), -1);
 
     return(xmlSecKeyDataBinaryValueBinWrite(id, key, buf, bufSize, keyInfoCtx));
 }
 
 static int
-xmlSecGnuTLSSymKeyDataGenerate(xmlSecKeyDataPtr data, xmlSecSize sizeBits, xmlSecKeyDataType type ATTRIBUTE_UNUSED) {
+xmlSecGCryptSymKeyDataGenerate(xmlSecKeyDataPtr data, xmlSecSize sizeBits, xmlSecKeyDataType type ATTRIBUTE_UNUSED) {
     xmlSecBufferPtr buffer;
 
-    xmlSecAssert2(xmlSecGnuTLSSymKeyDataCheckId(data), -1);
+    xmlSecAssert2(xmlSecGCryptSymKeyDataCheckId(data), -1);
     xmlSecAssert2(sizeBits > 0, -1);
 
     buffer = xmlSecKeyDataBinaryValueGetBuffer(data);
     xmlSecAssert2(buffer != NULL, -1);
 
-    return(xmlSecGnuTLSGenerateRandom(buffer, (sizeBits + 7) / 8));
+    return(xmlSecGCryptGenerateRandom(buffer, (sizeBits + 7) / 8));
 }
 
 static xmlSecKeyDataType
-xmlSecGnuTLSSymKeyDataGetType(xmlSecKeyDataPtr data) {
+xmlSecGCryptSymKeyDataGetType(xmlSecKeyDataPtr data) {
     xmlSecBufferPtr buffer;
 
-    xmlSecAssert2(xmlSecGnuTLSSymKeyDataCheckId(data), xmlSecKeyDataTypeUnknown);
+    xmlSecAssert2(xmlSecGCryptSymKeyDataCheckId(data), xmlSecKeyDataTypeUnknown);
 
     buffer = xmlSecKeyDataBinaryValueGetBuffer(data);
     xmlSecAssert2(buffer != NULL, xmlSecKeyDataTypeUnknown);
@@ -150,42 +150,42 @@ xmlSecGnuTLSSymKeyDataGetType(xmlSecKeyDataPtr data) {
 }
 
 static xmlSecSize
-xmlSecGnuTLSSymKeyDataGetSize(xmlSecKeyDataPtr data) {
-    xmlSecAssert2(xmlSecGnuTLSSymKeyDataCheckId(data), 0);
+xmlSecGCryptSymKeyDataGetSize(xmlSecKeyDataPtr data) {
+    xmlSecAssert2(xmlSecGCryptSymKeyDataCheckId(data), 0);
 
     return(xmlSecKeyDataBinaryValueGetSize(data));
 }
 
 static void
-xmlSecGnuTLSSymKeyDataDebugDump(xmlSecKeyDataPtr data, FILE* output) {
-    xmlSecAssert(xmlSecGnuTLSSymKeyDataCheckId(data));
+xmlSecGCryptSymKeyDataDebugDump(xmlSecKeyDataPtr data, FILE* output) {
+    xmlSecAssert(xmlSecGCryptSymKeyDataCheckId(data));
 
     xmlSecKeyDataBinaryValueDebugDump(data, output);
 }
 
 static void
-xmlSecGnuTLSSymKeyDataDebugXmlDump(xmlSecKeyDataPtr data, FILE* output) {
-    xmlSecAssert(xmlSecGnuTLSSymKeyDataCheckId(data));
+xmlSecGCryptSymKeyDataDebugXmlDump(xmlSecKeyDataPtr data, FILE* output) {
+    xmlSecAssert(xmlSecGCryptSymKeyDataCheckId(data));
 
     xmlSecKeyDataBinaryValueDebugXmlDump(data, output);
 }
 
 static int
-xmlSecGnuTLSSymKeyDataKlassCheck(xmlSecKeyDataKlass* klass) {
+xmlSecGCryptSymKeyDataKlassCheck(xmlSecKeyDataKlass* klass) {
 #ifndef XMLSEC_NO_DES
-    if(klass == xmlSecGnuTLSKeyDataDesId) {
+    if(klass == xmlSecGCryptKeyDataDesId) {
         return(1);
     }
 #endif /* XMLSEC_NO_DES */
 
 #ifndef XMLSEC_NO_AES
-    if(klass == xmlSecGnuTLSKeyDataAesId) {
+    if(klass == xmlSecGCryptKeyDataAesId) {
         return(1);
     }
 #endif /* XMLSEC_NO_AES */
 
 #ifndef XMLSEC_NO_HMAC
-    if(klass == xmlSecGnuTLSKeyDataHmacId) {
+    if(klass == xmlSecGCryptKeyDataHmacId) {
         return(1);
     }
 #endif /* XMLSEC_NO_HMAC */
@@ -199,7 +199,7 @@ xmlSecGnuTLSSymKeyDataKlassCheck(xmlSecKeyDataKlass* klass) {
  * <xmlsec:AESKeyValue> processing
  *
  *************************************************************************/
-static xmlSecKeyDataKlass xmlSecGnuTLSKeyDataAesKlass = {
+static xmlSecKeyDataKlass xmlSecGCryptKeyDataAesKlass = {
     sizeof(xmlSecKeyDataKlass),
     xmlSecKeyDataBinarySize,
 
@@ -212,25 +212,25 @@ static xmlSecKeyDataKlass xmlSecGnuTLSKeyDataAesKlass = {
     xmlSecNs,                                   /* const xmlChar* dataNodeNs; */
 
     /* constructors/destructor */
-    xmlSecGnuTLSSymKeyDataInitialize,           /* xmlSecKeyDataInitializeMethod initialize; */
-    xmlSecGnuTLSSymKeyDataDuplicate,            /* xmlSecKeyDataDuplicateMethod duplicate; */
-    xmlSecGnuTLSSymKeyDataFinalize,             /* xmlSecKeyDataFinalizeMethod finalize; */
-    xmlSecGnuTLSSymKeyDataGenerate,             /* xmlSecKeyDataGenerateMethod generate; */
+    xmlSecGCryptSymKeyDataInitialize,           /* xmlSecKeyDataInitializeMethod initialize; */
+    xmlSecGCryptSymKeyDataDuplicate,            /* xmlSecKeyDataDuplicateMethod duplicate; */
+    xmlSecGCryptSymKeyDataFinalize,             /* xmlSecKeyDataFinalizeMethod finalize; */
+    xmlSecGCryptSymKeyDataGenerate,             /* xmlSecKeyDataGenerateMethod generate; */
 
     /* get info */
-    xmlSecGnuTLSSymKeyDataGetType,              /* xmlSecKeyDataGetTypeMethod getType; */
-    xmlSecGnuTLSSymKeyDataGetSize,              /* xmlSecKeyDataGetSizeMethod getSize; */
+    xmlSecGCryptSymKeyDataGetType,              /* xmlSecKeyDataGetTypeMethod getType; */
+    xmlSecGCryptSymKeyDataGetSize,              /* xmlSecKeyDataGetSizeMethod getSize; */
     NULL,                                       /* xmlSecKeyDataGetIdentifier getIdentifier; */
 
     /* read/write */
-    xmlSecGnuTLSSymKeyDataXmlRead,              /* xmlSecKeyDataXmlReadMethod xmlRead; */
-    xmlSecGnuTLSSymKeyDataXmlWrite,             /* xmlSecKeyDataXmlWriteMethod xmlWrite; */
-    xmlSecGnuTLSSymKeyDataBinRead,              /* xmlSecKeyDataBinReadMethod binRead; */
-    xmlSecGnuTLSSymKeyDataBinWrite,             /* xmlSecKeyDataBinWriteMethod binWrite; */
+    xmlSecGCryptSymKeyDataXmlRead,              /* xmlSecKeyDataXmlReadMethod xmlRead; */
+    xmlSecGCryptSymKeyDataXmlWrite,             /* xmlSecKeyDataXmlWriteMethod xmlWrite; */
+    xmlSecGCryptSymKeyDataBinRead,              /* xmlSecKeyDataBinReadMethod binRead; */
+    xmlSecGCryptSymKeyDataBinWrite,             /* xmlSecKeyDataBinWriteMethod binWrite; */
 
     /* debug */
-    xmlSecGnuTLSSymKeyDataDebugDump,            /* xmlSecKeyDataDebugDumpMethod debugDump; */
-    xmlSecGnuTLSSymKeyDataDebugXmlDump,         /* xmlSecKeyDataDebugDumpMethod debugXmlDump; */
+    xmlSecGCryptSymKeyDataDebugDump,            /* xmlSecKeyDataDebugDumpMethod debugDump; */
+    xmlSecGCryptSymKeyDataDebugXmlDump,         /* xmlSecKeyDataDebugDumpMethod debugXmlDump; */
 
     /* reserved for the future */
     NULL,                                       /* void* reserved0; */
@@ -238,19 +238,19 @@ static xmlSecKeyDataKlass xmlSecGnuTLSKeyDataAesKlass = {
 };
 
 /**
- * xmlSecGnuTLSKeyDataAesGetKlass:
+ * xmlSecGCryptKeyDataAesGetKlass:
  *
  * The AES key data klass.
  *
  * Returns: AES key data klass.
  */
 xmlSecKeyDataId
-xmlSecGnuTLSKeyDataAesGetKlass(void) {
-    return(&xmlSecGnuTLSKeyDataAesKlass);
+xmlSecGCryptKeyDataAesGetKlass(void) {
+    return(&xmlSecGCryptKeyDataAesKlass);
 }
 
 /**
- * xmlSecGnuTLSKeyDataAesSet:
+ * xmlSecGCryptKeyDataAesSet:
  * @data:               the pointer to AES key data.
  * @buf:                the pointer to key value.
  * @bufSize:            the key value size (in bytes).
@@ -260,10 +260,10 @@ xmlSecGnuTLSKeyDataAesGetKlass(void) {
  * Returns: 0 on success or a negative value if an error occurs.
  */
 int
-xmlSecGnuTLSKeyDataAesSet(xmlSecKeyDataPtr data, const xmlSecByte* buf, xmlSecSize bufSize) {
+xmlSecGCryptKeyDataAesSet(xmlSecKeyDataPtr data, const xmlSecByte* buf, xmlSecSize bufSize) {
     xmlSecBufferPtr buffer;
 
-    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataAesId), -1);
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataAesId), -1);
     xmlSecAssert2(buf != NULL, -1);
     xmlSecAssert2(bufSize > 0, -1);
 
@@ -280,7 +280,7 @@ xmlSecGnuTLSKeyDataAesSet(xmlSecKeyDataPtr data, const xmlSecByte* buf, xmlSecSi
  * <xmlsec:DESKeyValue> processing
  *
  *************************************************************************/
-static xmlSecKeyDataKlass xmlSecGnuTLSKeyDataDesKlass = {
+static xmlSecKeyDataKlass xmlSecGCryptKeyDataDesKlass = {
     sizeof(xmlSecKeyDataKlass),
     xmlSecKeyDataBinarySize,
 
@@ -293,25 +293,25 @@ static xmlSecKeyDataKlass xmlSecGnuTLSKeyDataDesKlass = {
     xmlSecNs,                                   /* const xmlChar* dataNodeNs; */
 
     /* constructors/destructor */
-    xmlSecGnuTLSSymKeyDataInitialize,           /* xmlSecKeyDataInitializeMethod initialize; */
-    xmlSecGnuTLSSymKeyDataDuplicate,            /* xmlSecKeyDataDuplicateMethod duplicate; */
-    xmlSecGnuTLSSymKeyDataFinalize,             /* xmlSecKeyDataFinalizeMethod finalize; */
-    xmlSecGnuTLSSymKeyDataGenerate,             /* xmlSecKeyDataGenerateMethod generate; */
+    xmlSecGCryptSymKeyDataInitialize,           /* xmlSecKeyDataInitializeMethod initialize; */
+    xmlSecGCryptSymKeyDataDuplicate,            /* xmlSecKeyDataDuplicateMethod duplicate; */
+    xmlSecGCryptSymKeyDataFinalize,             /* xmlSecKeyDataFinalizeMethod finalize; */
+    xmlSecGCryptSymKeyDataGenerate,             /* xmlSecKeyDataGenerateMethod generate; */
 
     /* get info */
-    xmlSecGnuTLSSymKeyDataGetType,              /* xmlSecKeyDataGetTypeMethod getType; */
-    xmlSecGnuTLSSymKeyDataGetSize,              /* xmlSecKeyDataGetSizeMethod getSize; */
+    xmlSecGCryptSymKeyDataGetType,              /* xmlSecKeyDataGetTypeMethod getType; */
+    xmlSecGCryptSymKeyDataGetSize,              /* xmlSecKeyDataGetSizeMethod getSize; */
     NULL,                                       /* xmlSecKeyDataGetIdentifier getIdentifier; */
 
     /* read/write */
-    xmlSecGnuTLSSymKeyDataXmlRead,              /* xmlSecKeyDataXmlReadMethod xmlRead; */
-    xmlSecGnuTLSSymKeyDataXmlWrite,             /* xmlSecKeyDataXmlWriteMethod xmlWrite; */
-    xmlSecGnuTLSSymKeyDataBinRead,              /* xmlSecKeyDataBinReadMethod binRead; */
-    xmlSecGnuTLSSymKeyDataBinWrite,             /* xmlSecKeyDataBinWriteMethod binWrite; */
+    xmlSecGCryptSymKeyDataXmlRead,              /* xmlSecKeyDataXmlReadMethod xmlRead; */
+    xmlSecGCryptSymKeyDataXmlWrite,             /* xmlSecKeyDataXmlWriteMethod xmlWrite; */
+    xmlSecGCryptSymKeyDataBinRead,              /* xmlSecKeyDataBinReadMethod binRead; */
+    xmlSecGCryptSymKeyDataBinWrite,             /* xmlSecKeyDataBinWriteMethod binWrite; */
 
     /* debug */
-    xmlSecGnuTLSSymKeyDataDebugDump,            /* xmlSecKeyDataDebugDumpMethod debugDump; */
-    xmlSecGnuTLSSymKeyDataDebugXmlDump,         /* xmlSecKeyDataDebugDumpMethod debugXmlDump; */
+    xmlSecGCryptSymKeyDataDebugDump,            /* xmlSecKeyDataDebugDumpMethod debugDump; */
+    xmlSecGCryptSymKeyDataDebugXmlDump,         /* xmlSecKeyDataDebugDumpMethod debugXmlDump; */
 
     /* reserved for the future */
     NULL,                                       /* void* reserved0; */
@@ -319,19 +319,19 @@ static xmlSecKeyDataKlass xmlSecGnuTLSKeyDataDesKlass = {
 };
 
 /**
- * xmlSecGnuTLSKeyDataDesGetKlass:
+ * xmlSecGCryptKeyDataDesGetKlass:
  *
  * The DES key data klass.
  *
  * Returns: DES key data klass.
  */
 xmlSecKeyDataId
-xmlSecGnuTLSKeyDataDesGetKlass(void) {
-    return(&xmlSecGnuTLSKeyDataDesKlass);
+xmlSecGCryptKeyDataDesGetKlass(void) {
+    return(&xmlSecGCryptKeyDataDesKlass);
 }
 
 /**
- * xmlSecGnuTLSKeyDataDesSet:
+ * xmlSecGCryptKeyDataDesSet:
  * @data:               the pointer to DES key data.
  * @buf:                the pointer to key value.
  * @bufSize:            the key value size (in bytes).
@@ -341,10 +341,10 @@ xmlSecGnuTLSKeyDataDesGetKlass(void) {
  * Returns: 0 on success or a negative value if an error occurs.
  */
 int
-xmlSecGnuTLSKeyDataDesSet(xmlSecKeyDataPtr data, const xmlSecByte* buf, xmlSecSize bufSize) {
+xmlSecGCryptKeyDataDesSet(xmlSecKeyDataPtr data, const xmlSecByte* buf, xmlSecSize bufSize) {
     xmlSecBufferPtr buffer;
 
-    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataDesId), -1);
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataDesId), -1);
     xmlSecAssert2(buf != NULL, -1);
     xmlSecAssert2(bufSize > 0, -1);
 
@@ -362,7 +362,7 @@ xmlSecGnuTLSKeyDataDesSet(xmlSecKeyDataPtr data, const xmlSecByte* buf, xmlSecSi
  * <xmlsec:HMACKeyValue> processing
  *
  *************************************************************************/
-static xmlSecKeyDataKlass xmlSecGnuTLSKeyDataHmacKlass = {
+static xmlSecKeyDataKlass xmlSecGCryptKeyDataHmacKlass = {
     sizeof(xmlSecKeyDataKlass),
     xmlSecKeyDataBinarySize,
 
@@ -375,25 +375,25 @@ static xmlSecKeyDataKlass xmlSecGnuTLSKeyDataHmacKlass = {
     xmlSecNs,                                   /* const xmlChar* dataNodeNs; */
 
     /* constructors/destructor */
-    xmlSecGnuTLSSymKeyDataInitialize,           /* xmlSecKeyDataInitializeMethod initialize; */
-    xmlSecGnuTLSSymKeyDataDuplicate,            /* xmlSecKeyDataDuplicateMethod duplicate; */
-    xmlSecGnuTLSSymKeyDataFinalize,             /* xmlSecKeyDataFinalizeMethod finalize; */
-    xmlSecGnuTLSSymKeyDataGenerate,             /* xmlSecKeyDataGenerateMethod generate; */
+    xmlSecGCryptSymKeyDataInitialize,           /* xmlSecKeyDataInitializeMethod initialize; */
+    xmlSecGCryptSymKeyDataDuplicate,            /* xmlSecKeyDataDuplicateMethod duplicate; */
+    xmlSecGCryptSymKeyDataFinalize,             /* xmlSecKeyDataFinalizeMethod finalize; */
+    xmlSecGCryptSymKeyDataGenerate,             /* xmlSecKeyDataGenerateMethod generate; */
 
     /* get info */
-    xmlSecGnuTLSSymKeyDataGetType,              /* xmlSecKeyDataGetTypeMethod getType; */
-    xmlSecGnuTLSSymKeyDataGetSize,              /* xmlSecKeyDataGetSizeMethod getSize; */
+    xmlSecGCryptSymKeyDataGetType,              /* xmlSecKeyDataGetTypeMethod getType; */
+    xmlSecGCryptSymKeyDataGetSize,              /* xmlSecKeyDataGetSizeMethod getSize; */
     NULL,                                       /* xmlSecKeyDataGetIdentifier getIdentifier; */
 
     /* read/write */
-    xmlSecGnuTLSSymKeyDataXmlRead,              /* xmlSecKeyDataXmlReadMethod xmlRead; */
-    xmlSecGnuTLSSymKeyDataXmlWrite,             /* xmlSecKeyDataXmlWriteMethod xmlWrite; */
-    xmlSecGnuTLSSymKeyDataBinRead,              /* xmlSecKeyDataBinReadMethod binRead; */
-    xmlSecGnuTLSSymKeyDataBinWrite,             /* xmlSecKeyDataBinWriteMethod binWrite; */
+    xmlSecGCryptSymKeyDataXmlRead,              /* xmlSecKeyDataXmlReadMethod xmlRead; */
+    xmlSecGCryptSymKeyDataXmlWrite,             /* xmlSecKeyDataXmlWriteMethod xmlWrite; */
+    xmlSecGCryptSymKeyDataBinRead,              /* xmlSecKeyDataBinReadMethod binRead; */
+    xmlSecGCryptSymKeyDataBinWrite,             /* xmlSecKeyDataBinWriteMethod binWrite; */
 
     /* debug */
-    xmlSecGnuTLSSymKeyDataDebugDump,            /* xmlSecKeyDataDebugDumpMethod debugDump; */
-    xmlSecGnuTLSSymKeyDataDebugXmlDump,         /* xmlSecKeyDataDebugDumpMethod debugXmlDump; */
+    xmlSecGCryptSymKeyDataDebugDump,            /* xmlSecKeyDataDebugDumpMethod debugDump; */
+    xmlSecGCryptSymKeyDataDebugXmlDump,         /* xmlSecKeyDataDebugDumpMethod debugXmlDump; */
 
     /* reserved for the future */
     NULL,                                       /* void* reserved0; */
@@ -401,19 +401,19 @@ static xmlSecKeyDataKlass xmlSecGnuTLSKeyDataHmacKlass = {
 };
 
 /**
- * xmlSecGnuTLSKeyDataHmacGetKlass:
+ * xmlSecGCryptKeyDataHmacGetKlass:
  *
  * The HMAC key data klass.
  *
  * Returns: HMAC key data klass.
  */
 xmlSecKeyDataId
-xmlSecGnuTLSKeyDataHmacGetKlass(void) {
-    return(&xmlSecGnuTLSKeyDataHmacKlass);
+xmlSecGCryptKeyDataHmacGetKlass(void) {
+    return(&xmlSecGCryptKeyDataHmacKlass);
 }
 
 /**
- * xmlSecGnuTLSKeyDataHmacSet:
+ * xmlSecGCryptKeyDataHmacSet:
  * @data:               the pointer to HMAC key data.
  * @buf:                the pointer to key value.
  * @bufSize:            the key value size (in bytes).
@@ -423,10 +423,10 @@ xmlSecGnuTLSKeyDataHmacGetKlass(void) {
  * Returns: 0 on success or a negative value if an error occurs.
  */
 int
-xmlSecGnuTLSKeyDataHmacSet(xmlSecKeyDataPtr data, const xmlSecByte* buf, xmlSecSize bufSize) {
+xmlSecGCryptKeyDataHmacSet(xmlSecKeyDataPtr data, const xmlSecByte* buf, xmlSecSize bufSize) {
     xmlSecBufferPtr buffer;
 
-    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGnuTLSKeyDataHmacId), -1);
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecGCryptKeyDataHmacId), -1);
     xmlSecAssert2(buf != NULL, -1);
     xmlSecAssert2(bufSize > 0, -1);
 
diff --git a/xmlsec-config.in b/xmlsec-config.in
index 646109c..cb46909 100644
--- a/xmlsec-config.in
+++ b/xmlsec-config.in
@@ -21,7 +21,7 @@ Known values for OPTION are:
   --help		display this help and exit
   --version		output version information
   --crypto=LIB		configure with XMLSEC crypto library (one of the
-			following: none default openssl gnutls nss) 
+			following: none default openssl nss gnutls gcrypt)
 EOF
 
     exit $1
@@ -167,6 +167,17 @@ gnutls)
     fi
     ;;
 
+gcrypt)
+    if test "@XMLSEC_NO_GCRYPT@" = "0"; then
+        the_crypto_flags="@GCRYPT_CFLAGS@ -DXMLSEC_CRYPTO=\\\"gcrypt\\\""
+	the_crypto_libs="@GCRYPT_LIBS@"
+        the_xmlsec_crypto_lib="-l GCRYPT_CRYPTO_LIB@"
+    else
+        echo "Error: the \"$crypto\" cryptographic library is not supported"
+	usage 1
+    fi
+    ;;
+
 nss)
     if test "@XMLSEC_NO_NSS@" = "0"; then
         the_crypto_flags="@NSS_CFLAGS@ -DXMLSEC_CRYPTO=\\\"nss\\\""
diff --git a/xmlsec-gcrypt.pc.in b/xmlsec-gcrypt.pc.in
index e2c50a0..cff1655 100644
--- a/xmlsec-gcrypt.pc.in
+++ b/xmlsec-gcrypt.pc.in
@@ -3,9 +3,9 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
 
-Name: xmlsec1-gnutls
+Name: xmlsec1-gcrypt
 Version: @VERSION@
 Description: XML Security Library implements XML Signature and XML Encryption standards
-Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@ 
-Cflags: -DXMLSEC_CRYPTO=\\\"gnutls\\\" @XMLSEC_GNUTLS_CFLAGS@
-Libs: @XMLSEC_GNUTLS_LIBS@ 
+Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@
+Cflags: -DXMLSEC_CRYPTO=\\\"gcrypt\\\" @XMLSEC_GCRYPT_CFLAGS@
+Libs: @XMLSEC_GCRYPT_LIBS@



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