[xml/sgml-commit] [xmlsec1] 10/32: Imported Upstream version 1.2.12

Rene Engelhard rene at moszumanska.debian.org
Sun Jun 25 17:46:22 UTC 2017


This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch experimental
in repository xmlsec1.

commit 3118210271faa14068a9417cb76e7cc4a457fe68
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Fri Jun 23 12:56:30 2017 +0200

    Imported Upstream version 1.2.12
---
 AUTHORS                                            |   10 +-
 ChangeLog                                          |  161 +
 INSTALL                                            |    2 +-
 Makefile.am                                        |    9 +-
 Makefile.in                                        |   80 +-
 apps/Makefile.am                                   |    1 +
 apps/Makefile.in                                   |   16 +
 apps/cmdline.c                                     |   12 +
 apps/xmlsec.c                                      |   72 +-
 compile                                            |  140 +
 configure                                          | 8972 +++-----------------
 configure.in                                       |  440 +-
 docs/Makefile.in                                   |   15 +
 docs/api/Makefile.in                               |   15 +
 docs/api/chapters/new-crypto.sgml                  |    2 +-
 docs/api/index.html                                |   89 +-
 docs/api/xmlsec-app.html                           |   62 +-
 docs/api/xmlsec-base64.html                        |   52 +-
 docs/api/xmlsec-bn.html                            |  112 +-
 docs/api/xmlsec-buffer.html                        |   82 +-
 docs/api/xmlsec-custom-keys-manager.html           |    9 +-
 docs/api/xmlsec-decrypt-with-keys-mngr.html        |    9 +-
 docs/api/xmlsec-decrypt-with-signle-key.html       |    9 +-
 docs/api/xmlsec-dl.html                            |   20 +-
 docs/api/xmlsec-encrypt-dynamic-template.html      |    9 +-
 docs/api/xmlsec-encrypt-template-file.html         |    9 +-
 docs/api/xmlsec-encrypt-with-session-key.html      |    9 +-
 docs/api/xmlsec-encryption-klasses.html            |    6 +-
 docs/api/xmlsec-errors.html                        |   70 +-
 .../xmlsec-examples-sign-dynamimc-template.html    |    9 +-
 docs/api/xmlsec-examples-sign-template-file.html   |   12 +-
 docs/api/xmlsec-examples-sign-x509.html            |    9 +-
 docs/api/xmlsec-examples.html                      |    6 +-
 docs/api/xmlsec-gnutls-app.html                    |   60 +-
 docs/api/xmlsec-gnutls-crypto.html                 |   34 +-
 docs/api/xmlsec-gnutls-ref.html                    |   10 +-
 docs/api/xmlsec-index.html                         |    4 +-
 docs/api/xmlsec-index.sgml                         | 1299 ---
 docs/api/xmlsec-io.html                            |   22 +-
 docs/api/xmlsec-keyinfo.html                       |   48 +-
 docs/api/xmlsec-keys.html                          |  150 +-
 docs/api/xmlsec-keysdata.html                      |  268 +-
 docs/api/xmlsec-keysmngr.html                      |   90 +-
 docs/api/xmlsec-list.html                          |   78 +-
 docs/api/xmlsec-membuf.html                        |   12 +-
 docs/api/xmlsec-mscrypto-app.html                  |  100 +-
 docs/api/xmlsec-mscrypto-certkeys.html             |   22 +-
 docs/api/xmlsec-mscrypto-crypto.html               |   44 +-
 docs/api/xmlsec-mscrypto-keysstore.html            |   26 +-
 docs/api/xmlsec-mscrypto-ref.html                  |   16 +-
 docs/api/xmlsec-mscrypto-x509.html                 |   60 +-
 docs/api/xmlsec-nodeset.html                       |   68 +-
 docs/api/xmlsec-notes-compiling-others.html        |    6 +-
 docs/api/xmlsec-notes-compiling-unix.html          |    6 +-
 docs/api/xmlsec-notes-compiling-windows.html       |    6 +-
 docs/api/xmlsec-notes-compiling.html               |    6 +-
 docs/api/xmlsec-notes-contexts.html                |    6 +-
 docs/api/xmlsec-notes-custom-keys-store.html       |    6 +-
 docs/api/xmlsec-notes-decrypt.html                 |    6 +-
 .../xmlsec-notes-dynamic-encryption-templates.html |    6 +-
 .../xmlsec-notes-dynamic-signature-templates.html  |    6 +-
 docs/api/xmlsec-notes-encrypt.html                 |    6 +-
 docs/api/xmlsec-notes-include-files.html           |    6 +-
 docs/api/xmlsec-notes-init-shutdown.html           |    6 +-
 docs/api/xmlsec-notes-keys-manager-sign-enc.html   |    6 +-
 .../api/xmlsec-notes-keys-mngr-verify-decrypt.html |    6 +-
 docs/api/xmlsec-notes-keys.html                    |    6 +-
 docs/api/xmlsec-notes-keysmngr.html                |    6 +-
 docs/api/xmlsec-notes-new-crypto-functions.html    |    6 +-
 docs/api/xmlsec-notes-new-crypto-key-stores.html   |    2 +-
 docs/api/xmlsec-notes-new-crypto-keys.html         |    6 +-
 docs/api/xmlsec-notes-new-crypto-klasses.html      |    8 +-
 .../xmlsec-notes-new-crypto-sharing-results.html   |    6 +-
 .../xmlsec-notes-new-crypto-simple-keys-mngr.html  |    6 +-
 docs/api/xmlsec-notes-new-crypto-skeleton.html     |    6 +-
 docs/api/xmlsec-notes-new-crypto-transforms.html   |    6 +-
 docs/api/xmlsec-notes-new-crypto.html              |    6 +-
 docs/api/xmlsec-notes-overview.html                |    6 +-
 docs/api/xmlsec-notes-sign-encrypt.html            |    6 +-
 docs/api/xmlsec-notes-sign-x509.html               |    6 +-
 docs/api/xmlsec-notes-sign.html                    |    6 +-
 docs/api/xmlsec-notes-simple-keys-store.html       |    6 +-
 docs/api/xmlsec-notes-structure.html               |    6 +-
 docs/api/xmlsec-notes-templates.html               |    6 +-
 docs/api/xmlsec-notes-transforms.html              |    6 +-
 docs/api/xmlsec-notes-verify-decrypt.html          |    6 +-
 docs/api/xmlsec-notes-verify-x509.html             |    6 +-
 docs/api/xmlsec-notes-verify.html                  |    6 +-
 docs/api/xmlsec-notes-x509.html                    |    6 +-
 docs/api/xmlsec-notes.html                         |    6 +-
 docs/api/xmlsec-nss-app.html                       |  136 +-
 docs/api/xmlsec-nss-bignum.html                    |   22 +-
 docs/api/xmlsec-nss-crypto.html                    |   48 +-
 docs/api/xmlsec-nss-keysstore.html                 |   26 +-
 docs/api/xmlsec-nss-pkikeys.html                   |   24 +-
 docs/api/xmlsec-nss-ref.html                       |   18 +-
 docs/api/xmlsec-nss-x509.html                      |   62 +-
 docs/api/xmlsec-openssl-app.html                   |  140 +-
 docs/api/xmlsec-openssl-bn.html                    |   20 +-
 docs/api/xmlsec-openssl-crypto.html                |   74 +-
 docs/api/xmlsec-openssl-evp.html                   |   20 +-
 docs/api/xmlsec-openssl-ref.html                   |   16 +-
 docs/api/xmlsec-openssl-x509.html                  |   68 +-
 docs/api/xmlsec-parser.html                        |   30 +-
 docs/api/xmlsec-ref.html                           |   52 +-
 docs/api/xmlsec-reference.html                     |    6 +-
 docs/api/xmlsec-signature-klasses.html             |    6 +-
 docs/api/xmlsec-templates.html                     |  180 +-
 docs/api/xmlsec-transforms.html                    |  372 +-
 docs/api/xmlsec-verify-with-key.html               |    9 +-
 docs/api/xmlsec-verify-with-keys-mngr.html         |    9 +-
 docs/api/xmlsec-verify-with-restrictions.html      |    9 +-
 docs/api/xmlsec-verify-with-x509.html              |    9 +-
 docs/api/xmlsec-version.html                       |   10 +-
 docs/api/xmlsec-x509.html                          |   16 +-
 docs/api/xmlsec-xmldsig.html                       |   74 +-
 docs/api/xmlsec-xmlenc.html                        |   62 +-
 docs/api/xmlsec-xmlsec.html                        |   18 +-
 docs/api/xmlsec-xmltree.html                       |  256 +-
 docs/authors.html                                  |    9 +-
 docs/bugs.html                                     |    2 +-
 docs/c14n.html                                     |    2 +-
 docs/documentation.html                            |   28 +-
 docs/download.html                                 |   26 +-
 docs/faq.html                                      |  556 +-
 docs/index.html                                    |   65 +-
 docs/news.html                                     |   49 +-
 docs/related.html                                  |  162 +-
 docs/xmldsig-verifier.html                         |   13 +-
 docs/xmldsig.html                                  |   47 +-
 docs/xmlenc.html                                   |    4 +-
 docs/xmlsec-man.html                               |   18 +-
 examples/Makefile.w32                              |   10 +-
 include/Makefile.in                                |   15 +
 include/xmlsec/Makefile.in                         |   15 +
 include/xmlsec/app.h                               |   22 +
 include/xmlsec/base64.h                            |    4 +
 include/xmlsec/exports.h                           |   15 +-
 include/xmlsec/gnutls/Makefile.in                  |   15 +
 include/xmlsec/gnutls/crypto.h                     |    4 +
 include/xmlsec/{gnutls => mscrypto}/.cvsignore     |    0
 include/xmlsec/mscrypto/Makefile.am                |   16 +
 include/xmlsec/{nss => mscrypto}/Makefile.in       |   68 +-
 include/xmlsec/mscrypto/certkeys.h                 |    1 +
 include/xmlsec/mscrypto/crypto.h                   |   44 +
 include/xmlsec/mscrypto/symbols.h                  |    5 +-
 include/xmlsec/mscrypto/x509.h                     |    4 +
 include/xmlsec/nss/Makefile.in                     |   15 +
 include/xmlsec/nss/crypto.h                        |    4 +
 include/xmlsec/openssl/Makefile.in                 |   15 +
 include/xmlsec/openssl/app.h                       |    3 +
 include/xmlsec/openssl/crypto.h                    |    4 +
 include/xmlsec/openssl/x509.h                      |    5 +
 include/xmlsec/private.h                           |    3 +
 include/xmlsec/private/Makefile.in                 |   15 +
 include/xmlsec/strings.h                           |   20 +
 include/xmlsec/templates.h                         |    7 +
 include/xmlsec/version.h                           |    6 +-
 include/xmlsec/xmlenc.h                            |   19 +-
 include/xmlsec/xmltree.h                           |   17 +-
 man/Makefile.in                                    |   15 +
 mkinstalldirs                                      |    2 +-
 scripts/build_release.sh                           |   18 +-
 scripts/push_release.sh                            |   39 +-
 src/Makefile.am                                    |    5 +-
 src/Makefile.in                                    |   18 +-
 src/app.c                                          |   70 +
 src/base64.c                                       |   27 +-
 src/bn.c                                           |    2 +-
 src/dl.c                                           |   26 +
 src/gnutls/Makefile.am                             |   24 +-
 src/gnutls/Makefile.in                             |  121 +-
 src/gnutls/hmac.c                                  |   45 +-
 src/keyinfo.c                                      |    5 +-
 src/{gnutls => mscrypto}/.cvsignore                |    4 +-
 src/mscrypto/Makefile.am                           |   58 +
 src/{nss => mscrypto}/Makefile.in                  |  219 +-
 src/mscrypto/app.c                                 |  248 +-
 src/mscrypto/certkeys.c                            |  234 +-
 src/mscrypto/ciphers.c                             |   43 +-
 src/mscrypto/crypto.c                              |   21 +-
 src/mscrypto/csp_calg.h                            |   92 +
 src/mscrypto/csp_oid.h                             |  114 +
 src/mscrypto/digests.c                             |   79 +-
 src/mscrypto/keysstore.c                           |   70 +-
 src/mscrypto/kt_rsa.c                              |    3 +-
 src/mscrypto/mingw-crypt32.def                     |   32 +
 src/mscrypto/signatures.c                          |   95 +-
 src/mscrypto/x509.c                                |  169 +-
 src/mscrypto/x509vfy.c                             | 1066 ++-
 src/mscrypto/xmlsec-mingw.h                        |  165 +
 src/nss/Makefile.am                                |   25 +-
 src/nss/Makefile.in                                |  221 +-
 src/nss/app.c                                      |    4 -
 src/nss/bignum.c                                   |    2 +-
 src/nss/hmac.c                                     |   45 +-
 src/nss/keysstore.c                                |   20 -
 src/nss/pkikeys.c                                  |    2 +-
 src/nss/x509.c                                     |   18 +-
 src/openssl/Makefile.am                            |   24 +-
 src/openssl/Makefile.in                            |  210 +-
 src/openssl/app.c                                  |   43 +
 src/openssl/bn.c                                   |    2 +-
 src/openssl/hmac.c                                 |   45 +-
 src/openssl/x509.c                                 |   19 +-
 src/openssl/x509vfy.c                              |  120 +-
 src/skeleton/Makefile.am                           |   24 +-
 src/skeleton/crypto.c                              |   12 +
 src/strings.c                                      |   20 +
 src/templates.c                                    |  126 +-
 src/transforms.c                                   |    3 +-
 src/xmldsig.c                                      |   21 +-
 src/xmlenc.c                                       |  208 +-
 src/xmlsec-ltdl.c                                  |    7 +-
 src/xmlsec-ltdl.patch                              |   16 +
 src/xmltree.c                                      |  142 +-
 src/xpath.c                                        |    2 +-
 tests/aleksey-xmldsig-01/enveloped-gost.tmpl       |   31 +
 tests/aleksey-xmldsig-01/enveloped-gost.xml        |   42 +
 tests/keys/gost2001ca.der                          |  Bin 0 -> 527 bytes
 tests/keys/gost2001ca.pem                          |   13 +
 tests/testDSig.sh                                  |  124 +-
 tests/testEnc.sh                                   |  100 +-
 tests/testKeys.sh                                  |   53 +-
 win32/Makefile.msvc                                |    2 +-
 win32/mycfg.bat                                    |    5 +-
 xmlsec-config.in                                   |    3 +-
 xmlsec-nss.pc.in                                   |    2 +-
 xmlsec.spec.in                                     |    4 +
 xmlsec1-config                                     |   17 +-
 xmlsec1-gnutls.pc                                  |   11 +
 xmlsec1-nss.pc                                     |    6 +-
 xmlsec1-openssl.pc                                 |    4 +-
 xmlsec1.m4                                         |  172 +
 xmlsec1.pc                                         |    4 +-
 xmlsec1.spec                                       |    6 +-
 xmlsec1Conf.sh                                     |    4 +-
 237 files changed, 8748 insertions(+), 12676 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 8c5f95a..3003d13 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,8 @@
 Aleksey Sanin  <aleksey at aleksey.com>
-Windows port: Igor Zlatkovic <igor at stud.fh-frankfurt.de>
-Debian port: John Belmonte  <jvb at prairienet.org> 
-NSS port: Tej Arora <tej at netscape.com>
-mscrypto port: Wouter Ketting <wsh at xs4all.nl>
+
+Windows port:     Igor Zlatkovic <igor at stud.fh-frankfurt.de>
+Debian port:      John Belmonte  <jvb at prairienet.org> 
+xmlsec-nss:       Tej Arora <tej at netscape.com>, AOL Inc.
+xmlsec-mscrypto:  Wouter Ketting <wsh at xs4all.nl>, Cordys R&D BV
+GOST support:     Dmitry Belyavsky <beldmit at cryptocom.ru>, Cryptocom LTD (http://www.cryptocom.ru)
 
diff --git a/ChangeLog b/ChangeLog
index 19ddbf0..97c4a17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,164 @@
+2009-06-15  Aleksey Sanin  <aleksey at aleksey.com>
+	* configure.in docs/download.html docs/index.html docs/news.html 
+	include/xmlsec/version.h: preparation for new 1.2.12 release
+
+2009-06-15  Aleksey Sanin  <aleksey at aleksey.com>
+	* added support for the GOST implemented by Russian Crypto Pro CSP 
+	(patch from Dennis Prochko)
+
+2009-06-15  Aleksey Sanin  <aleksey at aleksey.com>
+	* fixed HMAC vuln with small values of HMAC length 
+
+2009-06-13  Aleksey Sanin  <aleksey at aleksey.com>
+        * fixing gnutls detection (bug #585629)
+
+2009-06-09  Aleksey Sanin  <aleksey at aleksey.com>
+        * update SVN to GIT references in docs
+
+2009-06-09  Aleksey Sanin  <aleksey at aleksey.com>
+        * adding configurable Base64 line length
+
+2008-09-10  Aleksey Sanin  <aleksey at aleksey.com>
+	* fixing bug #501315 (patch from Antony Dovgal)
+
+2008-08-26  Aleksey Sanin  <aleksey at aleksey.com>
+	* apps/xmlsec.c: fix integer division (patch from Mikhail)
+
+2008-06-10  Aleksey Sanin  <aleksey at aleksey.com>
+	* src/mscrypto/x509.c src/openssl/x509.c src/nss/x509.c: fix crash
+	in the error reporting (based on patch from Frank Gross)
+
+2008-06-04  Aleksey Sanin  <aleksey at aleksey.com>
+	* src/templates.c src/keyinfo.c src/xmltree.c src/mscrypto/x509.c 
+        src/openssl/x509.c src/nss/x509.c include/xmlsec/xmltree.h:
+	added new function xmlSecNodeEncodeAndSetContent for encoding
+	special chars in the node content (bug reported by Cliff Hones)
+
+2008-06-04  Aleksey Sanin  <aleksey at aleksey.com>
+	* src/xmltree.c, src/xmlenc.c, include/xmlsec/xmltree.h, include/xmlsec/xmlenc.h: 
+	add an option to return the replaced (encrypted) node(s) to the caller
+	(based on the patch from Frank Gross)
+
+2008-05-23  Aleksey Sanin  <aleksey at aleksey.com>
+	
+	* src/mscrypto/app.c: fix MS certificates ref counting
+
+2007-11-06  Aleksey Sanin  <aleksey at aleksey.com>
+	
+	* configure.in docs/download.html docs/index.html docs/news.html 
+	include/xmlsec/version.h: preparation for new 1.2.11 release
+
+2007-07-19  Aleksey Sanin  <aleksey at aleksey.com>
+
+	* bug #454397 - mingw build: added missing files
+
+2007-07-19  Aleksey Sanin  <aleksey at aleksey.com>
+
+        * bug #454397 - mingw build: normal way to pass def file to linker
+        (patch from Roumen Petrov)
+
+2007-07-17  Aleksey Sanin  <aleksey at aleksey.com>
+
+        * bug #454397 - mingw build: (cross-compilation) and several 
+        minor cleanups (patch from Roumen Petrov)
+
+2007-06-16  Aleksey Sanin  <aleksey at aleksey.com>
+
+	* configure.in: configure fixes (patch from Roumen Petrov)
+
+2007-06-06  Aleksey Sanin  <aleksey at aleksey.com>
+
+	* src/mscrypto/*: better support for non micorsoft CSP's (patch from 
+	Wouter and Ed Shallow)
+
+2007-02-12  Aleksey Sanin  <aleksey at aleksey.com>
+
+	* Makefile.am xmlsec1.m4: automake macro for xmlsec1 (from Heiko Ronsdorf)
+
+2006-09-04  Aleksey Sanin  <aleksey at aleksey.com>
+
+	* include/xmlsec/openssl/app.h src/openssl/app.c src/openssl/x509vfy.c:
+	added xmlSecOpenSSLAppKeysMngrAddCertsFile() function 
+	(David Norrel)
+
+2006-08-15  Aleksey Sanin  <aleksey at aleksey.com>
+
+	* src/openssl/x509vfy.c: fixed loading certs from a directory
+	during openssl x509 store init (based on idea from David Norrel)
+
+2006-06-12  Aleksey Sanin  <aleksey at aleksey.com>
+
+	* include/xmlsec/templates.h, src/templates.c, src/xmltree.c:
+	support for custom namespaces prefixes for xmldisg namespace
+	(based on patch from Barry Ferg)
+
+2006-06-12  Aleksey Sanin  <aleksey at aleksey.com>
+
+	* configure.in docs/download.html docs/index.html docs/news.html 
+	include/xmlsec/version.h: preparation for new 1.2.10 release
+
+2006-06-12  Aleksey Sanin  <aleksey at aleksey.com>
+	
+	* xmlsec-config.in: lib64/ folder patch from Daniel
+
+2006-06-08  Aleksey Sanin  <aleksey at aleksey.com>
+
+	* config.h.in configure.in xmlsec-nss.pc.in: support different
+	packages for NSPR/NSS 
+
+2006-05-20  Aleksey Sanin  <aleksey at aleksey.com>
+	Added xmlSecOpenSSLX509StoreAdoptCrl() function
+
+2006-03-10  Aleksey Sanin  <aleksey at aleksey.com>
+
+	* src/nss/app.c, src/openssl/x509vfy.c, src/xmldsig.c,
+	src/xmlsec-ltdl.c, src/xmlsec-ltdl.patch: cleanup Coverity
+	complaints
+
+2006-02-26  Aleksey Sanin  <aleksey at aleksey.com>
+	* apps/xmlsec.c tests/testDSig.sh: added an ability to skip
+	tests for transforms not available in given built
+	* tests/: added GOST test from Dmitry Belyavsky
+
+2006-02-16  Aleksey Sanin  <aleksey at aleksey.com>
+	* src/mscrypto/certkeys.c: fixed memleak in msrypto
+
+2006-02-14  Aleksey Sanin  <aleksey at aleksey.com>
+	* include/xmlsec/mscrypto/x509.h src/mscrypto/x509vfy.h:
+	added an option for disabling system trusted certs
+	for mscrypto store (based on patch from Dmitry Belyavsky)
+
+2006-02-10  Aleksey Sanin  <aleksey at aleksey.com>
+	* authors docs/authors.html
+	include/xmlsec/app.h include/xmlsec/private.h 
+	include/xmlsec/strings.h include/xmlsec/mscrypto/crypto.h
+	include/xmlsec/mscrypto/symbols.h src/app.c src/dl.c
+	src/strings.c src/transforms.c src/mscrypto/certkeys.c
+	src/mscrypto/crypto.c src/mscrypto/digests.c
+	src/mscrypto/signatures.c src/skeleton/crypto.c:
+	added support for GOST94 for digests and 
+	GOST 2001 keys/signatures: mscrypto only (patch from 
+	Dmitry Belyavsky)
+
+2005-12-20  Aleksey Sanin  <aleksey at aleksey.com>
+
+	* src/mscrypto/x509vfy.c: check MSCrypto store for certs
+	(patch from Dmitry Belyavsky); replace tabs with spaces
+
+2005-12-15  Aleksey Sanin  <aleksey at aleksey.com>
+
+	* include/xmlsec/templates.h src/templates.c: functions
+	for adding X509IssuerName and X509SerialNumber nodes
+	to the template (patch from Dmitry Belyavsky)
+
+2005-11-14  Aleksey Sanin  <aleksey at aleksey.com>
+
+	* configure.in: fixing shrext vs. shrext_cmds conflict
+
+2005-09-25  Aleksey Sanin  <aleksey at aleksey.com>
+	* src/nss/pkikeys.c: fixing xmlsec-nss crash
+	* configure.in: change crypto libs order to be openssl/nss/gnutls
+
 2005-07-12  Aleksey Sanin  <aleksey at aleksey.com>
 
 	* configure.in docs/download.html docs/index.html docs/news.html:
diff --git a/INSTALL b/INSTALL
index 2365ae7..baa984f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -35,4 +35,4 @@ normal C ANSI API (please report any violation to this rule you may find).
 
 Aleksey Sanin <aleksey at aleksey.com>
 
-$Id: INSTALL,v 1.5 2003/02/14 01:40:46 aleksey Exp $
+$Id$
diff --git a/Makefile.am b/Makefile.am
index 000efe2..78ace1c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,8 @@ pkgconfig_DATA 	= xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@
 pkgconfigdir 	= $(libdir)/pkgconfig
 confexecdir	= $(libdir)
 confexec_DATA 	= xmlsec1Conf.sh
+m4datadir	= $(datadir)/aclocal
+m4data_DATA	= xmlsec1.m4
 
 DISTCLEANFILES = \
 	xmlsec1Conf.sh \
@@ -39,6 +41,7 @@ EXTRA_DIST = \
 	xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@ \
 	xmlsec1-config \
 	xmlsec1.spec \
+	xmlsec1.m4 \
 	$(NULL)
 
 EXTRA_CLEAN = \
@@ -125,7 +128,6 @@ perfcheck: $(TEST_APP)
 	@(export PERF_TEST=10 && $(MAKE) check)
 
 dist-hook:
-	@($(RM) -rf `find $(distdir) -name CVS`)
 
 cleantar:
 	@($(RM) -f xmlsec*.tar.gz COPYING.LIB)
@@ -133,9 +135,6 @@ cleantar:
 rpm: cleantar
 	@(unset CDPATH && $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz)
 
-tag-release:
-	@cvs tag -F xmlsec-$(SAFE_VERSION) > /dev/null
-
-rpm-release: clean cleantar rpm tag-release
+rpm-release: clean cleantar rpm 
 	
 
diff --git a/Makefile.in b/Makefile.in
index 5415115..b14f69e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,8 +43,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/xmlsec-nss.pc.in $(srcdir)/xmlsec-openssl.pc.in \
 	$(srcdir)/xmlsec.pc.in $(srcdir)/xmlsec.spec.in \
 	$(srcdir)/xmlsecConf.sh.in $(top_srcdir)/configure AUTHORS \
-	COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \
-	depcomp install-sh ltmain.sh missing mkinstalldirs
+	COPYING ChangeLog INSTALL NEWS TODO compile config.guess \
+	config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -54,10 +54,11 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno configure.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = xmlsec1Conf.sh xmlsec1-config xmlsec1-openssl.pc \
-	xmlsec1-gnutls.pc xmlsec1-nss.pc xmlsec1.spec xmlsec1.pc
+CONFIG_CLEAN_FILES = xmlsec1.pc xmlsec1Conf.sh xmlsec1-config \
+	xmlsec1-openssl.pc xmlsec1-gnutls.pc xmlsec1-nss.pc \
+	xmlsec1.spec
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(confexecdir)" \
-	"$(DESTDIR)$(pkgconfigdir)"
+	"$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgconfigdir)"
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(bin_SCRIPTS)
 SOURCES =
@@ -75,8 +76,9 @@ am__vpath_adj = case $$p in \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 confexecDATA_INSTALL = $(INSTALL_DATA)
+m4dataDATA_INSTALL = $(INSTALL_DATA)
 pkgconfigDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(confexec_DATA) $(pkgconfig_DATA)
+DATA = $(confexec_DATA) $(m4data_DATA) $(pkgconfig_DATA)
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -155,12 +157,17 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAN2HTML = @MAN2HTML@
 MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
+MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
+MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
 MV = @MV@
 NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
+NSPR_PACKAGE = @NSPR_PACKAGE@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_CRYPTO_LIB = @NSS_CRYPTO_LIB@
 NSS_LIBS = @NSS_LIBS@
 NSS_MIN_VERSION = @NSS_MIN_VERSION@
+NSS_PACKAGE = @NSS_PACKAGE@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_CRYPTO_LIB = @OPENSSL_CRYPTO_LIB@
@@ -178,6 +185,8 @@ PKG_CONFIG_ENABLED = @PKG_CONFIG_ENABLED@
 RANLIB = @RANLIB@
 RM = @RM@
 SET_MAKE = @SET_MAKE@
+SHAREDLIB_HACK_FALSE = @SHAREDLIB_HACK_FALSE@
+SHAREDLIB_HACK_TRUE = @SHAREDLIB_HACK_TRUE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TAR = @TAR@
@@ -190,6 +199,7 @@ XMLSEC_CORE_LIBS = @XMLSEC_CORE_LIBS@
 XMLSEC_CRYPTO = @XMLSEC_CRYPTO@
 XMLSEC_CRYPTO_CFLAGS = @XMLSEC_CRYPTO_CFLAGS@
 XMLSEC_CRYPTO_DISABLED_LIST = @XMLSEC_CRYPTO_DISABLED_LIST@
+XMLSEC_CRYPTO_EXTRA_LDFLAGS = @XMLSEC_CRYPTO_EXTRA_LDFLAGS@
 XMLSEC_CRYPTO_LIB = @XMLSEC_CRYPTO_LIB@
 XMLSEC_CRYPTO_LIBS = @XMLSEC_CRYPTO_LIBS@
 XMLSEC_CRYPTO_LIST = @XMLSEC_CRYPTO_LIST@
@@ -198,6 +208,7 @@ XMLSEC_DEFINES = @XMLSEC_DEFINES@
 XMLSEC_DL_INCLUDES = @XMLSEC_DL_INCLUDES@
 XMLSEC_DL_LIBS = @XMLSEC_DL_LIBS@
 XMLSEC_DOCDIR = @XMLSEC_DOCDIR@
+XMLSEC_EXTRA_LDFLAGS = @XMLSEC_EXTRA_LDFLAGS@
 XMLSEC_GNUTLS_CFLAGS = @XMLSEC_GNUTLS_CFLAGS@
 XMLSEC_GNUTLS_LIBS = @XMLSEC_GNUTLS_LIBS@
 XMLSEC_LIBDIR = @XMLSEC_LIBDIR@
@@ -220,6 +231,9 @@ XMLSEC_NO_DSA_TRUE = @XMLSEC_NO_DSA_TRUE@
 XMLSEC_NO_GNUTLS = @XMLSEC_NO_GNUTLS@
 XMLSEC_NO_GNUTLS_FALSE = @XMLSEC_NO_GNUTLS_FALSE@
 XMLSEC_NO_GNUTLS_TRUE = @XMLSEC_NO_GNUTLS_TRUE@
+XMLSEC_NO_GOST = @XMLSEC_NO_GOST@
+XMLSEC_NO_GOST_FALSE = @XMLSEC_NO_GOST_FALSE@
+XMLSEC_NO_GOST_TRUE = @XMLSEC_NO_GOST_TRUE@
 XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
 XMLSEC_NO_HMAC_FALSE = @XMLSEC_NO_HMAC_FALSE@
 XMLSEC_NO_HMAC_TRUE = @XMLSEC_NO_HMAC_TRUE@
@@ -227,6 +241,9 @@ XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
 XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
 XMLSEC_NO_MD5_FALSE = @XMLSEC_NO_MD5_FALSE@
 XMLSEC_NO_MD5_TRUE = @XMLSEC_NO_MD5_TRUE@
+XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
+XMLSEC_NO_MSCRYPTO_FALSE = @XMLSEC_NO_MSCRYPTO_FALSE@
+XMLSEC_NO_MSCRYPTO_TRUE = @XMLSEC_NO_MSCRYPTO_TRUE@
 XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
 XMLSEC_NO_NSS_FALSE = @XMLSEC_NO_NSS_FALSE@
 XMLSEC_NO_NSS_TRUE = @XMLSEC_NO_NSS_TRUE@
@@ -331,6 +348,8 @@ pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@
 pkgconfigdir = $(libdir)/pkgconfig
 confexecdir = $(libdir)
 confexec_DATA = xmlsec1Conf.sh
+m4datadir = $(datadir)/aclocal
+m4data_DATA = xmlsec1.m4
 DISTCLEANFILES = \
 	xmlsec1Conf.sh \
 	xmlsec1.pc xmlsec1-openssl.pc xmlsec1-gnutls.pc xmlsec1-nss.pc \
@@ -359,6 +378,7 @@ EXTRA_DIST = \
 	xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@ \
 	xmlsec1-config \
 	xmlsec1.spec \
+	xmlsec1.m4 \
 	$(NULL)
 
 EXTRA_CLEAN = \
@@ -441,6 +461,8 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
+xmlsec1.pc: $(top_builddir)/config.status $(srcdir)/xmlsec.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 xmlsec1Conf.sh: $(top_builddir)/config.status $(srcdir)/xmlsecConf.sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 xmlsec1-config: $(top_builddir)/config.status $(srcdir)/xmlsec-config.in
@@ -453,8 +475,6 @@ xmlsec1-nss.pc: $(top_builddir)/config.status $(srcdir)/xmlsec-nss.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 xmlsec1.spec: $(top_builddir)/config.status $(srcdir)/xmlsec.spec.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-xmlsec1.pc: $(top_builddir)/config.status $(srcdir)/xmlsec.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@@ -501,6 +521,23 @@ uninstall-confexecDATA:
 	  echo " rm -f '$(DESTDIR)$(confexecdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(confexecdir)/$$f"; \
 	done
+install-m4dataDATA: $(m4data_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(m4datadir)" || $(mkdir_p) "$(DESTDIR)$(m4datadir)"
+	@list='$(m4data_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(m4dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(m4datadir)/$$f'"; \
+	  $(m4dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(m4datadir)/$$f"; \
+	done
+
+uninstall-m4dataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(m4data_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(m4datadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(m4datadir)/$$f"; \
+	done
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
@@ -789,7 +826,7 @@ check: check-recursive
 all-am: Makefile $(SCRIPTS) $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(confexecdir)" "$(DESTDIR)$(pkgconfigdir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(confexecdir)" "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgconfigdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-recursive
@@ -837,7 +874,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-pkgconfigDATA
+install-data-am: install-m4dataDATA install-pkgconfigDATA
 
 install-exec-am: install-binSCRIPTS install-confexecDATA
 
@@ -866,7 +903,7 @@ ps: ps-recursive
 ps-am:
 
 uninstall-am: uninstall-binSCRIPTS uninstall-confexecDATA \
-	uninstall-info-am uninstall-pkgconfigDATA
+	uninstall-info-am uninstall-m4dataDATA uninstall-pkgconfigDATA
 
 uninstall-info: uninstall-info-recursive
 
@@ -879,13 +916,14 @@ uninstall-info: uninstall-info-recursive
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-binSCRIPTS install-confexecDATA \
 	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-pkgconfigDATA \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-binSCRIPTS uninstall-confexecDATA uninstall-info-am \
+	install-info install-info-am install-m4dataDATA install-man \
+	install-pkgconfigDATA install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive \
+	mostlyclean mostlyclean-generic mostlyclean-libtool \
+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-binSCRIPTS \
+	uninstall-confexecDATA uninstall-info-am uninstall-m4dataDATA \
 	uninstall-pkgconfigDATA
 
 
@@ -947,7 +985,6 @@ perfcheck: $(TEST_APP)
 	@(export PERF_TEST=10 && $(MAKE) check)
 
 dist-hook:
-	@($(RM) -rf `find $(distdir) -name CVS`)
 
 cleantar:
 	@($(RM) -f xmlsec*.tar.gz COPYING.LIB)
@@ -955,10 +992,7 @@ cleantar:
 rpm: cleantar
 	@(unset CDPATH && $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz)
 
-tag-release:
-	@cvs tag -F xmlsec-$(SAFE_VERSION) > /dev/null
-
-rpm-release: clean cleantar rpm tag-release
+rpm-release: clean cleantar rpm 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/apps/Makefile.am b/apps/Makefile.am
index f1e2a1c..eebbcca 100644
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -45,6 +45,7 @@ endif
 INCLUDES = \
 	-DXMLSEC_CRYPTO=\"@XMLSEC_CRYPTO@\" \
 	-DPACKAGE=\"@PACKAGE@\" \
+	-I../include \
 	-I$(top_srcdir)/include \
 	$(XMLSEC_DEFINES) \
 	$(XMLSEC_APP_DEFINES) \
diff --git a/apps/Makefile.in b/apps/Makefile.in
index 66f34a6..19c87ca 100644
--- a/apps/Makefile.in
+++ b/apps/Makefile.in
@@ -146,12 +146,17 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAN2HTML = @MAN2HTML@
 MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
+MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
+MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
 MV = @MV@
 NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
+NSPR_PACKAGE = @NSPR_PACKAGE@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_CRYPTO_LIB = @NSS_CRYPTO_LIB@
 NSS_LIBS = @NSS_LIBS@
 NSS_MIN_VERSION = @NSS_MIN_VERSION@
+NSS_PACKAGE = @NSS_PACKAGE@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_CRYPTO_LIB = @OPENSSL_CRYPTO_LIB@
@@ -169,6 +174,8 @@ PKG_CONFIG_ENABLED = @PKG_CONFIG_ENABLED@
 RANLIB = @RANLIB@
 RM = @RM@
 SET_MAKE = @SET_MAKE@
+SHAREDLIB_HACK_FALSE = @SHAREDLIB_HACK_FALSE@
+SHAREDLIB_HACK_TRUE = @SHAREDLIB_HACK_TRUE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TAR = @TAR@
@@ -181,6 +188,7 @@ XMLSEC_CORE_LIBS = @XMLSEC_CORE_LIBS@
 XMLSEC_CRYPTO = @XMLSEC_CRYPTO@
 XMLSEC_CRYPTO_CFLAGS = @XMLSEC_CRYPTO_CFLAGS@
 XMLSEC_CRYPTO_DISABLED_LIST = @XMLSEC_CRYPTO_DISABLED_LIST@
+XMLSEC_CRYPTO_EXTRA_LDFLAGS = @XMLSEC_CRYPTO_EXTRA_LDFLAGS@
 XMLSEC_CRYPTO_LIB = @XMLSEC_CRYPTO_LIB@
 XMLSEC_CRYPTO_LIBS = @XMLSEC_CRYPTO_LIBS@
 XMLSEC_CRYPTO_LIST = @XMLSEC_CRYPTO_LIST@
@@ -189,6 +197,7 @@ XMLSEC_DEFINES = @XMLSEC_DEFINES@
 XMLSEC_DL_INCLUDES = @XMLSEC_DL_INCLUDES@
 XMLSEC_DL_LIBS = @XMLSEC_DL_LIBS@
 XMLSEC_DOCDIR = @XMLSEC_DOCDIR@
+XMLSEC_EXTRA_LDFLAGS = @XMLSEC_EXTRA_LDFLAGS@
 XMLSEC_GNUTLS_CFLAGS = @XMLSEC_GNUTLS_CFLAGS@
 XMLSEC_GNUTLS_LIBS = @XMLSEC_GNUTLS_LIBS@
 XMLSEC_LIBDIR = @XMLSEC_LIBDIR@
@@ -211,6 +220,9 @@ XMLSEC_NO_DSA_TRUE = @XMLSEC_NO_DSA_TRUE@
 XMLSEC_NO_GNUTLS = @XMLSEC_NO_GNUTLS@
 XMLSEC_NO_GNUTLS_FALSE = @XMLSEC_NO_GNUTLS_FALSE@
 XMLSEC_NO_GNUTLS_TRUE = @XMLSEC_NO_GNUTLS_TRUE@
+XMLSEC_NO_GOST = @XMLSEC_NO_GOST@
+XMLSEC_NO_GOST_FALSE = @XMLSEC_NO_GOST_FALSE@
+XMLSEC_NO_GOST_TRUE = @XMLSEC_NO_GOST_TRUE@
 XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
 XMLSEC_NO_HMAC_FALSE = @XMLSEC_NO_HMAC_FALSE@
 XMLSEC_NO_HMAC_TRUE = @XMLSEC_NO_HMAC_TRUE@
@@ -218,6 +230,9 @@ XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
 XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
 XMLSEC_NO_MD5_FALSE = @XMLSEC_NO_MD5_FALSE@
 XMLSEC_NO_MD5_TRUE = @XMLSEC_NO_MD5_TRUE@
+XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
+XMLSEC_NO_MSCRYPTO_FALSE = @XMLSEC_NO_MSCRYPTO_FALSE@
+XMLSEC_NO_MSCRYPTO_TRUE = @XMLSEC_NO_MSCRYPTO_TRUE@
 XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
 XMLSEC_NO_NSS_FALSE = @XMLSEC_NO_NSS_FALSE@
 XMLSEC_NO_NSS_TRUE = @XMLSEC_NO_NSS_TRUE@
@@ -349,6 +364,7 @@ NULL =
 INCLUDES = \
 	-DXMLSEC_CRYPTO=\"@XMLSEC_CRYPTO@\" \
 	-DPACKAGE=\"@PACKAGE@\" \
+	-I../include \
 	-I$(top_srcdir)/include \
 	$(XMLSEC_DEFINES) \
 	$(XMLSEC_APP_DEFINES) \
diff --git a/apps/cmdline.c b/apps/cmdline.c
index e34e5b0..fe09b7b 100644
--- a/apps/cmdline.c
+++ b/apps/cmdline.c
@@ -78,6 +78,7 @@ xmlSecAppCmdLineParamsListParse(xmlSecAppCmdLineParamPtr* params,
 				xmlSecAppCmdLineParamTopic topics,
 				const char** argv, int argc, int pos) {
     xmlSecAppCmdLineParamPtr param;
+    int ii;
     int ret;
     
     assert(params != NULL);
@@ -98,6 +99,17 @@ xmlSecAppCmdLineParamsListParse(xmlSecAppCmdLineParamPtr* params,
 	pos = ret + 1;
     }
     
+    /* check that all parameters at the end are filenames */
+    for(ii = pos; (ii < argc); ++ii) {
+	if(argv[ii][0] == '-') {
+	    fprintf(stderr, "Error: filename is expected instead of parameter \"%s\".\n", argv[ii]);
+	    return(-1);
+	    
+	}
+    }
+    
+    
+    
     return(pos);
 }
 
diff --git a/apps/xmlsec.c b/apps/xmlsec.c
index dd0f4d4..f2fa9f6 100644
--- a/apps/xmlsec.c
+++ b/apps/xmlsec.c
@@ -52,7 +52,7 @@ static const char bugs[] =
     "Report bugs to http://www.aleksey.com/xmlsec/bugs.html\n";
 
 static const char helpCommands1[] =     
-    "Usage: xmlsec <command> [<options>] [<file>]\n"
+    "Usage: xmlsec <command> [<options>] [<files>]\n"
     "\n"
     "xmlsec is a command line tool for signing, verifying, encrypting and\n"
     "decrypting XML documents. The allowed <command> values are:\n"
@@ -120,10 +120,18 @@ static const char helpListKeyData[] =
     "Usage: xmlsec list-key-data\n"
     "Prints the list of known key data klasses\n";
 
+static const char helpCheckKeyData[] =     
+    "Usage: xmlsec check-key-data <key-data-name> [<key-data-name> ... ]\n"
+    "Checks the given key-data against the list of known key-data klasses\n";
+
 static const char helpListTransforms[] =     
     "Usage: xmlsec list-transforms\n"
     "Prints the list of known transform klasses\n";
 
+static const char helpCheckTransforms[] =     
+    "Usage: xmlsec check-transforms <transform-name> [<transform-name> ... ]\n"
+    "Checks the given transforms against the list of known transform klasses\n";
+
 #define xmlSecAppCmdLineTopicGeneral		0x0001
 #define xmlSecAppCmdLineTopicDSigCommon		0x0002
 #define xmlSecAppCmdLineTopicDSigSign		0x0004
@@ -272,7 +280,7 @@ static xmlSecAppCmdLineParam pkcs8PemParam = {
     xmlSecAppCmdLineTopicKeysMngr,
     "--pkcs8-pem",
     "--privkey-p8-pem",
-    "--pkcs-pem[:<name>] <file>[,<cafile>[,<cafile>[...]]]"
+    "--pkcs8-pem[:<name>] <file>[,<cafile>[,<cafile>[...]]]"
     "\n\tload private key from PKCS8 PEM file and PEM certificates"
     "\n\tthat verify this key",
     xmlSecAppCmdLineParamTypeStringList,
@@ -907,7 +915,9 @@ typedef enum {
     xmlSecAppCommandUnknown = 0,
     xmlSecAppCommandHelp,
     xmlSecAppCommandListKeyData,
+    xmlSecAppCommandCheckKeyData,
     xmlSecAppCommandListTransforms,    
+    xmlSecAppCommandCheckTransforms,    
     xmlSecAppCommandVersion,
     xmlSecAppCommandKeys,
     xmlSecAppCommandSign,
@@ -971,7 +981,9 @@ static void			xmlSecAppPrintXkmsServerCtx	(xmlSecXkmsServerCtxPtr xkmsServerCtx)
 #endif /* XMLSEC_NO_XKMS */
 
 static void			xmlSecAppListKeyData		(void);
+static int			xmlSecAppCheckKeyData	    (const char * name);
 static void			xmlSecAppListTransforms		(void);
+static int			xmlSecAppCheckTransform	    (const char * name);
 
 static xmlSecTransformUriType	xmlSecAppGetUriType		(const char* string);
 static FILE* 			xmlSecAppOpenFile		(const char* filename);
@@ -1083,9 +1095,29 @@ int main(int argc, const char **argv) {
 	case xmlSecAppCommandListKeyData:
 	    xmlSecAppListKeyData();
 	    break;
+	case xmlSecAppCommandCheckKeyData:
+	    for(i = pos; i < argc; ++i) {
+            if(xmlSecAppCheckKeyData(argv[i]) < 0) {
+                fprintf(stderr, "Error: key data \"%s\" not found\n", argv[i]);
+                goto fail;
+            } else {
+                fprintf(stdout, "Key data \"%s\" found\n", argv[i]);
+            }
+	    }
+	    break;
 	case xmlSecAppCommandListTransforms:
 	    xmlSecAppListTransforms();
 	    break;	    
+	case xmlSecAppCommandCheckTransforms:
+	    for(i = pos; i < argc; ++i) {
+            if(xmlSecAppCheckTransform(argv[i]) < 0) {
+                fprintf(stderr, "Error: transform \"%s\" not found\n", argv[i]);
+                goto fail;
+            } else {
+                fprintf(stdout, "Transforms \"%s\" found\n", argv[i]);
+            }
+	    }
+	    break;	    
 	case xmlSecAppCommandKeys:
 	    for(i = pos; i < argc; ++i) {
     	    	if(xmlSecAppCryptoSimpleKeysMngrSave(gKeysMngr, argv[i], xmlSecKeyDataTypeAny) < 0) {
@@ -1170,7 +1202,7 @@ int main(int argc, const char **argv) {
        (xmlSecAppCmdLineParamGetInt(&repeatParam, 1) > 0)) {
        
 	repeats = xmlSecAppCmdLineParamGetInt(&repeatParam, 1);
-        fprintf(stderr, "Executed %d tests in %ld msec\n", repeats, total_time / (CLOCKS_PER_SEC / 1000));    
+        fprintf(stderr, "Executed %d tests in %ld msec\n", repeats, (1000 * total_time) / CLOCKS_PER_SEC);    
     }
 
     goto success;
@@ -1988,6 +2020,14 @@ xmlSecAppListKeyData(void) {
     xmlSecKeyDataIdListDebugDump(xmlSecKeyDataIdsGet(), stdout);
 }
 
+static int 
+xmlSecAppCheckKeyData(const char * name) {
+    if(xmlSecKeyDataIdListFindByName(xmlSecKeyDataIdsGet(), BAD_CAST name, xmlSecKeyDataUsageAny) == xmlSecKeyDataIdUnknown) {
+        return -1;
+    }
+    return 0;
+}
+
 static void 
 xmlSecAppListTransforms(void) {
     fprintf(stdout, "Registered transform klasses:\n");
@@ -1995,6 +2035,14 @@ xmlSecAppListTransforms(void) {
 }
 
 static int 
+xmlSecAppCheckTransform(const char * name) {
+    if(xmlSecTransformIdListFindByName(xmlSecTransformIdsGet(), BAD_CAST name, xmlSecTransformUsageAny) == xmlSecTransformIdUnknown) {
+        return -1;
+    }
+    return 0;
+}
+
+static int 
 xmlSecAppPrepareKeyInfoReadCtx(xmlSecKeyInfoCtxPtr keyInfoCtx) {
     xmlSecAppCmdLineValuePtr value;
     int ret;
@@ -2684,10 +2732,20 @@ xmlSecAppParseCommand(const char* cmd, xmlSecAppCmdLineParamTopic* cmdLineTopics
 	return(xmlSecAppCommandListKeyData);
     } else 
 
+    if((strcmp(cmd, "check-key-data") == 0) || (strcmp(cmd, "--check-key-data") == 0)) {
+	(*cmdLineTopics) = 0;
+	return(xmlSecAppCommandCheckKeyData);
+    } else 
+
     if((strcmp(cmd, "list-transforms") == 0) || (strcmp(cmd, "--list-transforms") == 0)) {
 	(*cmdLineTopics) = 0;
 	return(xmlSecAppCommandListTransforms);
     } else 
+
+    if((strcmp(cmd, "check-transforms") == 0) || (strcmp(cmd, "--check-transforms") == 0)) {
+	(*cmdLineTopics) = 0;
+	return(xmlSecAppCommandCheckTransforms);
+    } else 
     
     if((strcmp(cmd, "keys") == 0) || (strcmp(cmd, "--keys") == 0)) {
 	(*cmdLineTopics) = xmlSecAppCmdLineTopicGeneral | 
@@ -2787,9 +2845,15 @@ xmlSecAppPrintHelp(xmlSecAppCommand command, xmlSecAppCmdLineParamTopic topics)
     case xmlSecAppCommandListKeyData:
 	fprintf(stdout, "%s\n", helpListKeyData);
         break;
+    case xmlSecAppCommandCheckKeyData:
+	fprintf(stdout, "%s\n", helpCheckKeyData);
+        break;
     case xmlSecAppCommandListTransforms:
 	fprintf(stdout, "%s\n", helpListTransforms);
         break;
+    case xmlSecAppCommandCheckTransforms:
+	fprintf(stdout, "%s\n", helpCheckTransforms);
+        break;
     case xmlSecAppCommandKeys:
 	fprintf(stdout, "%s\n", helpKeys);
         break;
@@ -2853,7 +2917,7 @@ xmlSecAppOpenFile(const char* filename) {
     if((filename == NULL) || (strcmp(filename, "-") == 0)) {
 	return(stdout);
     }
-    file = fopen(filename, "w");
+    file = fopen(filename, "wb");
     if(file == NULL) {
 	fprintf(stderr, "Error: failed to open file \"%s\"\n", filename);
 	return(NULL);
diff --git a/compile b/compile
new file mode 100755
index 0000000..80b645b
--- /dev/null
+++ b/compile
@@ -0,0 +1,140 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
+
+scriptversion=2004-09-10.20
+
+# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey at cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake at gnu.org> or send patches to
+# <automake-patches at gnu.org>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to <bug-automake at gnu.org>.
+EOF
+    exit 0
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit 0
+    ;;
+esac
+
+ofile=
+cfile=
+eat=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as `compile cc -o foo foo.c'.
+	# So we strip `-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no `-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # `.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  mv "$cofile" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/configure b/configure
index 7cb2f8b..fe624b8 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for xmlsec1 1.2.9.
+# Generated by GNU Autoconf 2.59 for xmlsec1 1.2.12.
 #
 # Report bugs to <http://www.aleksey.com/xmlsec>.
 #
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xmlsec1'
 PACKAGE_TARNAME='xmlsec1'
-PACKAGE_VERSION='1.2.9'
-PACKAGE_STRING='xmlsec1 1.2.9'
+PACKAGE_VERSION='1.2.12'
+PACKAGE_STRING='xmlsec1 1.2.12'
 PACKAGE_BUGREPORT='http://www.aleksey.com/xmlsec'
 
 # Factoring default headers for most tests.
@@ -464,7 +464,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os XMLSEC_VERSION XMLSEC_PACKAGE XMLSEC_VERSION_SAFE XMLSEC_VERSION_MAJOR XMLSE [...]
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os XMLSEC_VERSION XMLSEC_PACKAGE XMLSEC_VERSION_SAFE XMLSEC_VERSION_MAJOR XMLSE [...]
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -953,7 +953,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xmlsec1 1.2.9 to adapt to many kinds of systems.
+\`configure' configures xmlsec1 1.2.12 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1019,7 +1019,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xmlsec1 1.2.9:";;
+     short | recursive ) echo "Configuration of xmlsec1 1.2.12:";;
    esac
   cat <<\_ACEOF
 
@@ -1040,6 +1040,7 @@ Optional Features:
   --enable-ltdl-install   install libltdl
   --enable-development    enable development environment (no)
   --enable-pkgconfig      enable pkgconfig for configuration (yes)
+  --enable-mscrypto       enable mscrypto (no)
   --enable-md5            enable MD5 support (yes)
   --enable-ripemd160      enable RIPEMD-160 support (yes)
   --enable-sha1           enable SHA1 support (yes)
@@ -1053,6 +1054,7 @@ Optional Features:
   --enable-x509           enable x509 support (yes)
   --enable-des            enable DES support (yes)
   --enable-aes            enable AES support (OpenSSL >= 0.9.7 is required)
+  --enable-gost           enable GOST support (no)
   --enable-xmldsig        enable XMLDSig support (yes)
   --enable-xmlenc         enable XMLEnc support (yes)
   --enable-xkms           enable XKMS support - under development (no)
@@ -1076,10 +1078,11 @@ Optional Packages:
   --with-libxml=PFX       libxml2 location
   --with-libxslt=PFX      libxslt location
   --with-openssl=PFX      openssl location
-  --with-gnutls=PFX       gnutls location
   --with-nss=PFX          nss location
   --with-nspr=PFX         nspr location (needed for NSS)
+  --with-seamonkey-ver=VER  mozilla version (alt to --with-nss, --with-nspr)
   --with-mozilla-ver=VER  mozilla version (alt to --with-nss, --with-nspr)
+  --with-gnutls=PFX       gnutls location
   --with-html-dir=PATH    path to installed docs
 
 Some influential environment variables:
@@ -1195,7 +1198,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-xmlsec1 configure 1.2.9
+xmlsec1 configure 1.2.12
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1209,7 +1212,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xmlsec1 $as_me 1.2.9, which was
+It was created by xmlsec1 $as_me 1.2.12, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1549,7 +1552,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 XMLSEC_PACKAGE=xmlsec1
 XMLSEC_VERSION_MAJOR=1
 XMLSEC_VERSION_MINOR=2
-XMLSEC_VERSION_SUBMINOR=9
+XMLSEC_VERSION_SUBMINOR=12
 XMLSEC_VERSION="$XMLSEC_VERSION_MAJOR.$XMLSEC_VERSION_MINOR.$XMLSEC_VERSION_SUBMINOR"
 XMLSEC_VERSION_INFO=`echo $XMLSEC_VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'`
 XMLSEC_VERSION_SAFE=`echo $XMLSEC_VERSION | sed 's/\./_/g'`
@@ -1927,7 +1930,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xmlsec1'
- VERSION='1.2.9'
+ VERSION='1.2.12'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3267,6 +3270,8 @@ else
 fi
 
 
+
+
 # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
@@ -3821,7 +3826,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3824 "configure"' > conftest.$ac_ext
+  echo '#line 3829 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5393,7 +5398,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:5396:" \
+echo "$as_me:5401:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6291,7 +6296,7 @@ fi
   ;;
 esac
 
-enable_dlopen=no
+enable_dlopen=yes
 enable_win32_dll=no
 
 # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
@@ -6427,11 +6432,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6430: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6435: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6434: \$? = $ac_status" >&5
+   echo "$as_me:6439: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6660,11 +6665,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6663: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6668: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6667: \$? = $ac_status" >&5
+   echo "$as_me:6672: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6720,11 +6725,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6723: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6728: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6727: \$? = $ac_status" >&5
+   echo "$as_me:6732: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8054,7 +8059,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 8057 "configure"' > conftest.$ac_ext
+    echo '#line 8062 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8925,7 +8930,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8928 "configure"
+#line 8933 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9023,7 +9028,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9026 "configure"
+#line 9031 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11202,11 +11207,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11205: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11210: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11209: \$? = $ac_status" >&5
+   echo "$as_me:11214: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -11262,11 +11267,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11265: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11270: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11269: \$? = $ac_status" >&5
+   echo "$as_me:11274: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11773,7 +11778,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 11776 "configure"' > conftest.$ac_ext
+    echo '#line 11781 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -12644,7 +12649,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12647 "configure"
+#line 12652 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12742,7 +12747,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12745 "configure"
+#line 12750 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13569,11 +13574,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13572: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13577: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13576: \$? = $ac_status" >&5
+   echo "$as_me:13581: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -13629,11 +13634,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13632: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13637: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13636: \$? = $ac_status" >&5
+   echo "$as_me:13641: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14943,7 +14948,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 14946 "configure"' > conftest.$ac_ext
+    echo '#line 14951 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -15684,11 +15689,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15687: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15692: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15691: \$? = $ac_status" >&5
+   echo "$as_me:15696: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15917,11 +15922,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15920: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15925: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15924: \$? = $ac_status" >&5
+   echo "$as_me:15929: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15977,11 +15982,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15980: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15985: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15984: \$? = $ac_status" >&5
+   echo "$as_me:15989: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17311,7 +17316,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 17314 "configure"' > conftest.$ac_ext
+    echo '#line 17319 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -18182,7 +18187,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18185 "configure"
+#line 18190 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18280,7 +18285,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18283 "configure"
+#line 18288 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -22609,7 +22614,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 22612 "configure"
+#line 22617 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -24146,12 +24151,46 @@ echo "${ECHO_T}no" >&6
 fi
 
 
+XMLSEC_EXTRA_LDFLAGS=
+XMLSEC_CRYPTO_EXTRA_LDFLAGS=
+
+xmlsec_sharedlib_hack="no"
+XMLSEC_SHLIBSFX="$shrext"
 case "${host}" in
     *aix* )
 	CFLAGS="${CFLAGS} -D_ALL_SOURCE"
 	;;
+ *-*-mingw*)
+				XMLSEC_EXTRA_LDFLAGS="-no-undefined -avoid-version"
+	XMLSEC_CRYPTO_EXTRA_LDFLAGS="-no-undefined -avoid-version"
+	XMLSEC_SHLIBSFX=".dll.a"
+	xmlsec_sharedlib_hack="yes"
+	;;
+ *-*-cygwin*)
+	XMLSEC_EXTRA_LDFLAGS="-no-undefined"
+	XMLSEC_CRYPTO_EXTRA_LDFLAGS="-no-undefined"
+	;;
 esac
 
+# To avoid problem with loading of a shared library (dlopen or equivalent)
+# at run time on some platforms we need to link crypto modules with extra
+# source. It's work without hack on 9x and under emulation.
+# On nt 5.x (w2k,xp) the error is 998("Invalid access to memory location").
+
+
+if test "z$xmlsec_sharedlib_hack" = "zyes"; then
+  SHAREDLIB_HACK_TRUE=
+  SHAREDLIB_HACK_FALSE='#'
+else
+  SHAREDLIB_HACK_TRUE='#'
+  SHAREDLIB_HACK_FALSE=
+fi
+
+
+if test "z$shrext" == "z" ; then
+    shrext=$shrext_cmds
+fi
+
 echo "$as_me:$LINENO: checking for __FUNCTION__ or __func__" >&5
 echo $ECHO_N "checking for __FUNCTION__ or __func__... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
@@ -24676,6 +24715,8 @@ if test "$ac_cv_sizeof_size_t" -ne "4" ; then
 fi
 
 
+
+
 # Check whether --enable-sha1 or --disable-sha1 was given.
 if test "${enable_sha1+set}" = set; then
   enableval="$enable_sha1"
@@ -24842,22 +24883,57 @@ echo "${ECHO_T}$LIBXML_LIBS" >&6
   fi
 
 fi
-echo "$as_me:$LINENO: checking libxml2 $with_libxml  $LIBXML_FOUND  " >&5
-echo $ECHO_N "checking libxml2 $with_libxml  $LIBXML_FOUND  ... $ECHO_C" >&6
 if test "z$LIBXML_FOUND" = "zno" ; then
-    echo "$as_me:$LINENO: checking for libxml2 libraries >= $LIBXML_MIN_VERSION" >&5
-echo $ECHO_N "checking for libxml2 libraries >= $LIBXML_MIN_VERSION... $ECHO_C" >&6
-    if test "z$with_libxml" != "z" ; then
-	LIBXML_CONFIG=$with_libxml/bin/$LIBXML_CONFIG
+    if test "z$with_libxml" != "zyes" ; then
+	# Extract the first word of "$LIBXML_CONFIG", so it can be a program name with args.
+set dummy $LIBXML_CONFIG; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_LIBXML_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $LIBXML_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_LIBXML_CONFIG="$LIBXML_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$with_libxml/bin:$PATH"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_LIBXML_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+LIBXML_CONFIG=$ac_cv_path_LIBXML_CONFIG
+
+if test -n "$LIBXML_CONFIG"; then
+  echo "$as_me:$LINENO: result: $LIBXML_CONFIG" >&5
+echo "${ECHO_T}$LIBXML_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
     fi
-    echo "$as_me:$LINENO: checking libxml2 $with_libxml  $LIBXML_CONFIG  " >&5
-echo $ECHO_N "checking libxml2 $with_libxml  $LIBXML_CONFIG  ... $ECHO_C" >&6
-    if ! $LIBXML_CONFIG --version > /dev/null 2>&1 ; then
-	{ { echo "$as_me:$LINENO: error: Could not find libxml2 anywhere (see config.log for details)." >&5
-echo "$as_me: error: Could not find libxml2 anywhere (see config.log for details)." >&2;}
+    echo "$as_me:$LINENO: checking libxml2 $LIBXML_CONFIG " >&5
+echo $ECHO_N "checking libxml2 $LIBXML_CONFIG ... $ECHO_C" >&6
+    if ! LIBXML_VERSION=`$LIBXML_CONFIG --version 2>/dev/null`; then
+	{ { echo "$as_me:$LINENO: error: Could not find libxml2 anywhere." >&5
+echo "$as_me: error: Could not find libxml2 anywhere." >&2;}
    { (exit 1); exit 1; }; }
     fi
-    vers=`$LIBXML_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+    vers=`echo $LIBXML_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
     minvers=`echo $LIBXML_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
     if test "$vers" -ge "$minvers" ; then
         LIBXML_LIBS="`$LIBXML_CONFIG --libs`"
@@ -24995,13 +25071,52 @@ echo "${ECHO_T}$LIBXSLT_LIBS" >&6
 fi
 
 if test "z$LIBXSLT_FOUND" = "zno" ; then
+    if test "z$with_libxslt" != "zyes" ; then
+	# Extract the first word of "$LIBXSLT_CONFIG", so it can be a program name with args.
+set dummy $LIBXSLT_CONFIG; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_LIBXSLT_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $LIBXSLT_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_LIBXSLT_CONFIG="$LIBXSLT_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$with_libxslt/bin:$PATH"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_LIBXSLT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+LIBXSLT_CONFIG=$ac_cv_path_LIBXSLT_CONFIG
+
+if test -n "$LIBXSLT_CONFIG"; then
+  echo "$as_me:$LINENO: result: $LIBXSLT_CONFIG" >&5
+echo "${ECHO_T}$LIBXSLT_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+    fi
     echo "$as_me:$LINENO: checking for libxslt libraries >= $LIBXSLT_MIN_VERSION" >&5
 echo $ECHO_N "checking for libxslt libraries >= $LIBXSLT_MIN_VERSION... $ECHO_C" >&6
-    if test "z$LIBXSLT_CONFIG" != "z" ; then
-	LIBXSLT_CONFIG=$with_libxslt/bin/$LIBXSLT_CONFIG
-    fi
-    if ! $LIBXSLT_CONFIG --version > /dev/null 2>&1 ; then
-	if test "z$with_libxslt" != "z" ; then
+    if ! LIBXSLT_VERSION=`$LIBXSLT_CONFIG --version 2>/dev/null`; then
+	if test "z$with_libxslt" != "zyes" ; then
 	    { { echo "$as_me:$LINENO: error: Unable to find libxslt at '$with_libxslt'" >&5
 echo "$as_me: error: Unable to find libxslt at '$with_libxslt'" >&2;}
    { (exit 1); exit 1; }; }
@@ -25010,14 +25125,14 @@ echo "$as_me: error: Unable to find libxslt at '$with_libxslt'" >&2;}
 echo "${ECHO_T}no" >&6
 	fi
     else
-        vers=`$LIBXSLT_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+        vers=`echo $LIBXSLT_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
 	minvers=`echo $LIBXSLT_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
 	if test "$vers" -ge "$minvers" ; then
     	    LIBXSLT_LIBS="`$LIBXSLT_CONFIG --libs`"
 	    LIBXSLT_CFLAGS="`$LIBXSLT_CONFIG --cflags`"
 	    LIBXSLT_FOUND="yes"
-    	    echo "$as_me:$LINENO: result: \"yes ('$LIBXSLT_VERSION')\"" >&5
-echo "${ECHO_T}\"yes ('$LIBXSLT_VERSION')\"" >&6
+    	    echo "$as_me:$LINENO: result: yes ('$LIBXSLT_VERSION')" >&5
+echo "${ECHO_T}yes ('$LIBXSLT_VERSION')" >&6
 	else
     	    { { echo "$as_me:$LINENO: error: You need at least libxslt $LIBXSLT_MIN_VERSION for this version of $XMLSEC_PACKAGE" >&5
 echo "$as_me: error: You need at least libxslt $LIBXSLT_MIN_VERSION for this version of $XMLSEC_PACKAGE" >&2;}
@@ -25069,11 +25184,17 @@ echo $ECHO_N "checking for openssl libraries >= $OPENSSL_MIN_VERSION... $ECHO_C"
     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 elif test "z$with_openssl" != "z" ; then
+    case $host in
+	*-*-mingw*) openssl_exlibs=;;
+	*-*-osf5*) openssl_exlibs=;;
+	#FIXME: check if lib "dl" is required
+	*)          openssl_exlibs=-ldl;;
+    esac
     OPENSSL_CFLAGS="$OPENSSL_CFLAGS -I$with_openssl/include"
-    if test -f "$with_openssl/lib/libcrypto$shrext" ; then
-	OPENSSL_LIBS="-L$with_openssl/lib -lcrypto -ldl"
+    if test -f "$with_openssl/lib/libcrypto${XMLSEC_SHLIBSFX}" ; then
+	OPENSSL_LIBS="-L$with_openssl/lib -lcrypto $openssl_exlibs"
     else
-	OPENSSL_LIBS="$with_openssl/lib/libcrypto.a -ldl"
+	OPENSSL_LIBS="$with_openssl/lib/libcrypto.a $openssl_exlibs"
     fi
     OPENSSL_FOUND="yes"
 elif test "z$PKG_CONFIG_ENABLED" = "zyes" ; then
@@ -25497,13 +25618,19 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 
 else
 
-	    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+	    OPENSSL_VERSION=""
 
 fi
 rm -f conftest*
 
     fi
+    if test "z$OPENSSL_VERSION" = "z" ; then
+        echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    else
+        echo "$as_me:$LINENO: result: yes ('$OPENSSL_VERSION')" >&5
+echo "${ECHO_T}yes ('$OPENSSL_VERSION')" >&6
+    fi
 
     CPPFLAGS=$OLD_CPPFLAGS
 fi
@@ -25548,28 +25675,53 @@ fi
 
 
 
-GNUTLS_CONFIG="libgnutls-config"
-XMLSEC_NO_GNUTLS="1"
-GNUTLS_MIN_VERSION="0.8.1"
-GNUTLS_NEW_MIN_VERSION="1.0.0"
-GNUTLS_VERSION=""
-GNUTLS_CFLAGS=""
-GNUTLS_LIBS=""
-GNUTLS_CRYPTO_LIB="$XMLSEC_PACKAGE-gnutls"
-GNUTLS_FOUND="no"
 
-# Check whether --with-gnutls or --without-gnutls was given.
-if test "${with_gnutls+set}" = set; then
-  withval="$with_gnutls"
+XMLSEC_NO_NSS="1"
+MOZILLA_MIN_VERSION="1.4"
+NSS_MIN_VERSION="3.2"
+NSPR_MIN_VERSION="4.0"
+NSS_CFLAGS=""
+NSS_LIBS=""
+NSS_LIBS_LIST="-lnss3 -lsmime3"
+NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
+NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
+NSS_FOUND="no"
+NSPR_PACKAGE=mozilla-nspr
+NSS_PACKAGE=mozilla-nss
+
+
+
+# Check whether --with-nss or --without-nss was given.
+if test "${with_nss+set}" = set; then
+  withval="$with_nss"
 
 fi;
-if test "z$with_gnutls" = "zno" ; then
-    echo "$as_me:$LINENO: checking for gnutls libraries >= $GNUTLS_MIN_VERSION" >&5
-echo $ECHO_N "checking for gnutls libraries >= $GNUTLS_MIN_VERSION... $ECHO_C" >&6
+
+# Check whether --with-nspr or --without-nspr was given.
+if test "${with_nspr+set}" = set; then
+  withval="$with_nspr"
+
+fi;
+
+# Check whether --with-seamonkey_ver or --without-seamonkey_ver was given.
+if test "${with_seamonkey_ver+set}" = set; then
+  withval="$with_seamonkey_ver"
+
+fi;
+
+# Check whether --with-mozilla_ver or --without-mozilla_ver was given.
+if test "${with_mozilla_ver+set}" = set; then
+  withval="$with_mozilla_ver"
+
+fi;
+if test "z$with_nss" = "zno" -o "z$with_nspr" = "zno" ; then
+    echo "$as_me:$LINENO: checking for NSS libraries" >&5
+echo $ECHO_N "checking for NSS libraries... $ECHO_C" >&6
     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
-    GNUTLS_FOUND="without"
-elif test "z$with_gnutls" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then
+    NSS_FOUND="without"
+elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then
+                                    if test "z$NSS_FOUND" = "zno" ; then
 
   succeeded=no
 
@@ -25624,31 +25776,31 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for libgnutls >= $GNUTLS_NEW_MIN_VERSION" >&5
-echo $ECHO_N "checking for libgnutls >= $GNUTLS_NEW_MIN_VERSION... $ECHO_C" >&6
+        echo "$as_me:$LINENO: checking for mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" >&5
+echo $ECHO_N "checking for mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
 
-        if $PKG_CONFIG --exists "libgnutls >= $GNUTLS_NEW_MIN_VERSION" ; then
+        if $PKG_CONFIG --exists "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" ; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking GNUTLS_CFLAGS" >&5
-echo $ECHO_N "checking GNUTLS_CFLAGS... $ECHO_C" >&6
-            GNUTLS_CFLAGS=`$PKG_CONFIG --cflags "libgnutls >= $GNUTLS_NEW_MIN_VERSION"`
-            echo "$as_me:$LINENO: result: $GNUTLS_CFLAGS" >&5
-echo "${ECHO_T}$GNUTLS_CFLAGS" >&6
+            echo "$as_me:$LINENO: checking NSS_CFLAGS" >&5
+echo $ECHO_N "checking NSS_CFLAGS... $ECHO_C" >&6
+            NSS_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
+            echo "$as_me:$LINENO: result: $NSS_CFLAGS" >&5
+echo "${ECHO_T}$NSS_CFLAGS" >&6
 
-            echo "$as_me:$LINENO: checking GNUTLS_LIBS" >&5
-echo $ECHO_N "checking GNUTLS_LIBS... $ECHO_C" >&6
-            GNUTLS_LIBS=`$PKG_CONFIG --libs "libgnutls >= $GNUTLS_NEW_MIN_VERSION"`
-            echo "$as_me:$LINENO: result: $GNUTLS_LIBS" >&5
-echo "${ECHO_T}$GNUTLS_LIBS" >&6
+            echo "$as_me:$LINENO: checking NSS_LIBS" >&5
+echo $ECHO_N "checking NSS_LIBS... $ECHO_C" >&6
+            NSS_LIBS=`$PKG_CONFIG --libs "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
+            echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
+echo "${ECHO_T}$NSS_LIBS" >&6
         else
-            GNUTLS_CFLAGS=""
-            GNUTLS_LIBS=""
+            NSS_CFLAGS=""
+            NSS_LIBS=""
             ## If we have a custom action on failure, don't print errors, but
             ## do set a variable so people can do so.
-            GNUTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnutls >= $GNUTLS_NEW_MIN_VERSION"`
+            NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
 
         fi
 
@@ -25661,13 +25813,13 @@ echo "${ECHO_T}$GNUTLS_LIBS" >&6
   fi
 
   if test $succeeded = yes; then
-     GNUTLS_FOUND=yes
+     NSS_FOUND=yes NSPR_PACKAGE=mozilla-nspr NSS_PACKAGE=mozilla-nss
   else
-     GNUTLS_FOUND=no
+     NSS_FOUND=no
   fi
 
-
-    if test "z$GNUTLS_FOUND" = "zno" ; then
+    fi
+    if test "z$NSS_FOUND" = "zno" ; then
 
   succeeded=no
 
@@ -25722,31 +25874,31 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for libgnutls >= $GNUTLS_MIN_VERSION" >&5
-echo $ECHO_N "checking for libgnutls >= $GNUTLS_MIN_VERSION... $ECHO_C" >&6
+        echo "$as_me:$LINENO: checking for xulrunner-nspr >= $MOZILLA_MIN_VERSION xulrunner-nss >= $MOZILLA_MIN_VERSION" >&5
+echo $ECHO_N "checking for xulrunner-nspr >= $MOZILLA_MIN_VERSION xulrunner-nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
 
-        if $PKG_CONFIG --exists "libgnutls >= $GNUTLS_MIN_VERSION" ; then
+        if $PKG_CONFIG --exists "xulrunner-nspr >= $MOZILLA_MIN_VERSION xulrunner-nss >= $MOZILLA_MIN_VERSION" ; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             succeeded=yes
 
-            echo "$as_me:$LINENO: checking GNUTLS_CFLAGS" >&5
-echo $ECHO_N "checking GNUTLS_CFLAGS... $ECHO_C" >&6
-            GNUTLS_CFLAGS=`$PKG_CONFIG --cflags "libgnutls >= $GNUTLS_MIN_VERSION"`
-            echo "$as_me:$LINENO: result: $GNUTLS_CFLAGS" >&5
-echo "${ECHO_T}$GNUTLS_CFLAGS" >&6
+            echo "$as_me:$LINENO: checking NSS_CFLAGS" >&5
+echo $ECHO_N "checking NSS_CFLAGS... $ECHO_C" >&6
+            NSS_CFLAGS=`$PKG_CONFIG --cflags "xulrunner-nspr >= $MOZILLA_MIN_VERSION xulrunner-nss >= $MOZILLA_MIN_VERSION"`
+            echo "$as_me:$LINENO: result: $NSS_CFLAGS" >&5
+echo "${ECHO_T}$NSS_CFLAGS" >&6
 
-            echo "$as_me:$LINENO: checking GNUTLS_LIBS" >&5
-echo $ECHO_N "checking GNUTLS_LIBS... $ECHO_C" >&6
-            GNUTLS_LIBS=`$PKG_CONFIG --libs "libgnutls >= $GNUTLS_MIN_VERSION"`
-            echo "$as_me:$LINENO: result: $GNUTLS_LIBS" >&5
-echo "${ECHO_T}$GNUTLS_LIBS" >&6
+            echo "$as_me:$LINENO: checking NSS_LIBS" >&5
+echo $ECHO_N "checking NSS_LIBS... $ECHO_C" >&6
+            NSS_LIBS=`$PKG_CONFIG --libs "xulrunner-nspr >= $MOZILLA_MIN_VERSION xulrunner-nss >= $MOZILLA_MIN_VERSION"`
+            echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
+echo "${ECHO_T}$NSS_LIBS" >&6
         else
-            GNUTLS_CFLAGS=""
-            GNUTLS_LIBS=""
+            NSS_CFLAGS=""
+            NSS_LIBS=""
             ## If we have a custom action on failure, don't print errors, but
             ## do set a variable so people can do so.
-            GNUTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnutls >= $GNUTLS_MIN_VERSION"`
+            NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xulrunner-nspr >= $MOZILLA_MIN_VERSION xulrunner-nss >= $MOZILLA_MIN_VERSION"`
 
         fi
 
@@ -25759,124 +25911,15 @@ echo "${ECHO_T}$GNUTLS_LIBS" >&6
   fi
 
   if test $succeeded = yes; then
-     GNUTLS_FOUND=yes
+     NSS_FOUND=yes NSPR_PACKAGE=xulrunner-nspr NSS_PACKAGE=xulrunner-nss
   else
-     GNUTLS_FOUND=no
+     NSS_FOUND=no
   fi
 
-	if test "z$GNUTLS_FOUND" = "zyes" ; then
-	    GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DXMLSEC_GNUTLS_OLD=1"
-	fi
-    fi
-fi
-
-if test "z$GNUTLS_FOUND" = "zno" ; then
-    echo "$as_me:$LINENO: checking for gnutls libraries >= $GNUTLS_MIN_VERSION" >&5
-echo $ECHO_N "checking for gnutls libraries >= $GNUTLS_MIN_VERSION... $ECHO_C" >&6
-    if test "z$with_gnutls" != "z" ; then
-	GNUTLS_CONFIG=$with_gnutls/bin/$GNUTLS_CONFIG
-    fi
-    if ! $GNUTLS_CONFIG --version > /dev/null 2>&1 ; then
-	if test "z$with_gnutls" != "z" ; then
-	    { { echo "$as_me:$LINENO: error: Unable to find gnutls at '$with_gnutls'" >&5
-echo "$as_me: error: Unable to find gnutls at '$with_gnutls'" >&2;}
-   { (exit 1); exit 1; }; }
-	else
-	    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-	fi
-    else
-        vers=`$GNUTLS_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-	minvers=`echo $GNUTLS_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-	if test "$vers" -ge "$minvers" ; then
-	    GNUTLS_CFLAGS="$GNUTLS_CFLAGS `$GNUTLS_CONFIG --cflags`"
-    	    GNUTLS_LIBS="$GNUTLS_LIBS `$GNUTLS_CONFIG --libs`"
-	    GNUTLS_FOUND=yes
-
-	    new_minvers=`echo $GNUTLS_NEW_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-	    if test "$vers" -lt "$new_minvers" ; then
-		GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DXMLSEC_GNUTLS_OLD=1"
-	    fi
-	    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-	else
-    	    { { echo "$as_me:$LINENO: error: You need at least gnutls $GNUTLS_MIN_VERSION for this version of $XMLSEC_PACKAGE" >&5
-echo "$as_me: error: You need at least gnutls $GNUTLS_MIN_VERSION for this version of $XMLSEC_PACKAGE" >&2;}
-   { (exit 1); exit 1; }; }
-	fi
     fi
-fi
+    if test "z$NSS_FOUND" = "zno" ; then
 
-if test "z$GNUTLS_FOUND" = "zyes" ; then
-    XMLSEC_NO_GNUTLS="0"
-    GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DXMLSEC_CRYPTO_GNUTLS=1"
-
-        if test "z$XMLSEC_CRYPTO" = "z" ; then
-	XMLSEC_CRYPTO="gnutls"
-    	XMLSEC_CRYPTO_LIB="$GNUTLS_CRYPTO_LIB"
-	XMLSEC_CRYPTO_CFLAGS="$GNUTLS_CFLAGS"
-	XMLSEC_CRYPTO_LIBS="$GNUTLS_LIBS"
-    fi
-    XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST gnutls"
-else
-    XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST gnutls"
-fi
-
-
-
-if test "z$XMLSEC_NO_GNUTLS" = "z1"; then
-  XMLSEC_NO_GNUTLS_TRUE=
-  XMLSEC_NO_GNUTLS_FALSE='#'
-else
-  XMLSEC_NO_GNUTLS_TRUE='#'
-  XMLSEC_NO_GNUTLS_FALSE=
-fi
-
-
-
-
-
-
-
-
-XMLSEC_NO_NSS="1"
-MOZILLA_MIN_VERSION="1.4"
-NSS_MIN_VERSION="3.2"
-NSPR_MIN_VERSION="4.0"
-NSS_CFLAGS=""
-NSS_LIBS=""
-NSS_LIBS_LIST="-lnss3 -lsmime3"
-NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
-NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
-NSS_FOUND="no"
-
-
-# Check whether --with-nss or --without-nss was given.
-if test "${with_nss+set}" = set; then
-  withval="$with_nss"
-
-fi;
-
-# Check whether --with-nspr or --without-nspr was given.
-if test "${with_nspr+set}" = set; then
-  withval="$with_nspr"
-
-fi;
-
-# Check whether --with-mozilla_ver or --without-mozilla_ver was given.
-if test "${with_mozilla_ver+set}" = set; then
-  withval="$with_mozilla_ver"
-
-fi;
-if test "z$with_nss" = "zno" -o "z$with_nspr" = "zno" ; then
-    echo "$as_me:$LINENO: checking for NSS libraries" >&5
-echo $ECHO_N "checking for NSS libraries... $ECHO_C" >&6
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    NSS_FOUND="without"
-elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then
-
-  succeeded=no
+  succeeded=no
 
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
@@ -25929,23 +25972,23 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" >&5
-echo $ECHO_N "checking for mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
+        echo "$as_me:$LINENO: checking for nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION" >&5
+echo $ECHO_N "checking for nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
 
-        if $PKG_CONFIG --exists "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" ; then
+        if $PKG_CONFIG --exists "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION" ; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             succeeded=yes
 
             echo "$as_me:$LINENO: checking NSS_CFLAGS" >&5
 echo $ECHO_N "checking NSS_CFLAGS... $ECHO_C" >&6
-            NSS_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
+            NSS_CFLAGS=`$PKG_CONFIG --cflags "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
             echo "$as_me:$LINENO: result: $NSS_CFLAGS" >&5
 echo "${ECHO_T}$NSS_CFLAGS" >&6
 
             echo "$as_me:$LINENO: checking NSS_LIBS" >&5
 echo $ECHO_N "checking NSS_LIBS... $ECHO_C" >&6
-            NSS_LIBS=`$PKG_CONFIG --libs "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
+            NSS_LIBS=`$PKG_CONFIG --libs "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
             echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
 echo "${ECHO_T}$NSS_LIBS" >&6
         else
@@ -25953,7 +25996,7 @@ echo "${ECHO_T}$NSS_LIBS" >&6
             NSS_LIBS=""
             ## If we have a custom action on failure, don't print errors, but
             ## do set a variable so people can do so.
-            NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
+            NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
 
         fi
 
@@ -25966,15 +26009,18 @@ echo "${ECHO_T}$NSS_LIBS" >&6
   fi
 
   if test $succeeded = yes; then
-     NSS_FOUND=yes
+     NSS_FOUND=yes NSPR_PACKAGE=nspr NSS_PACKAGE=nss
   else
      NSS_FOUND=no
   fi
 
+    fi
 fi
 
 if test "z$NSS_FOUND" = "zno" ; then
-        if test "z$with_mozilla_ver" != "z" ; then
+        if test "z$with_seamonkey_ver" != "z" ; then
+        ac_mozilla_name=seamonkey-$with_seamonkey_ver
+    elif test "z$with_mozilla_ver" != "z" ; then
         ac_mozilla_name=mozilla-$with_mozilla_ver
     else
         ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
@@ -25992,7 +26038,7 @@ echo $ECHO_N "checking for nspr libraries >= $NSPR_MIN_VERSION... $ECHO_C" >&6
 
     if test "z$with_nspr" != "z" ; then
 	NSPR_PREFIX="$with_nspr"
-	NSPR_CFLAGS="-I$with_nspr/include"
+	NSPR_CFLAGS="-I$with_nspr/include -I$with_nspr/include/nspr"
 	if test "z$with_gnu_ld" = "zyes" ; then
 	    NSPR_LIBS="-Wl,-rpath-link -Wl,$with_nspr/lib -L$with_nspr/lib $NSPR_LIBS_LIST"
 	else
@@ -26078,7 +26124,7 @@ echo $ECHO_N "checking for nss libraries >= $NSS_MIN_VERSION... $ECHO_C" >&6
     NSS_NSS_H=""
 
     if test "z$with_nss" != "z" ; then
-	NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include"
+	NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss"
 	if test "z$with_gnu_ld" = "zyes" ; then
 	    NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST"
         else
@@ -26200,7727 +26246,1269 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking for crypto library" >&5
-echo $ECHO_N "checking for crypto library... $ECHO_C" >&6
-if test "z$XMLSEC_CRYPTO" = "z" ;  then
-    { { echo "$as_me:$LINENO: error: At least one crypto library should exist for $XMLSEC_PACKAGE" >&5
-echo "$as_me: error: At least one crypto library should exist for $XMLSEC_PACKAGE" >&2;}
-   { (exit 1); exit 1; }; }
-else
-    echo "$as_me:$LINENO: result: yes ('$XMLSEC_CRYPTO')" >&5
-echo "${ECHO_T}yes ('$XMLSEC_CRYPTO')" >&6
-fi
-
-echo "$as_me:$LINENO: checking for MD5 support" >&5
-echo $ECHO_N "checking for MD5 support... $ECHO_C" >&6
-# Check whether --enable-md5 or --disable-md5 was given.
-if test "${enable_md5+set}" = set; then
-  enableval="$enable_md5"
-
-fi;
-if test "z$enable_md5" = "zno" ; then
-    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_MD5=1"
-    XMLSEC_NO_MD5="1"
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-else
-    XMLSEC_NO_MD5="0"
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-fi
-
-
-if test "z$XMLSEC_NO_MD5" = "z1"; then
-  XMLSEC_NO_MD5_TRUE=
-  XMLSEC_NO_MD5_FALSE='#'
-else
-  XMLSEC_NO_MD5_TRUE='#'
-  XMLSEC_NO_MD5_FALSE=
-fi
 
 
+GNUTLS_CONFIG="libgnutls-config"
+XMLSEC_NO_GNUTLS="1"
+GNUTLS_MIN_VERSION="0.8.1"
+GNUTLS_NEW_MIN_VERSION="1.0.0"
+GNUTLS_VERSION=""
+GNUTLS_CFLAGS=""
+GNUTLS_LIBS=""
+GNUTLS_CRYPTO_LIB="$XMLSEC_PACKAGE-gnutls"
+GNUTLS_FOUND="no"
 
-echo "$as_me:$LINENO: checking for RIPEMD-160 support" >&5
-echo $ECHO_N "checking for RIPEMD-160 support... $ECHO_C" >&6
-# Check whether --enable-ripemd160 or --disable-ripemd160 was given.
-if test "${enable_ripemd160+set}" = set; then
-  enableval="$enable_ripemd160"
+# Check whether --with-gnutls or --without-gnutls was given.
+if test "${with_gnutls+set}" = set; then
+  withval="$with_gnutls"
 
 fi;
-if test "z$enable_ripemd160" = "zno" ; then
-    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_RIPEMD160=1"
-    XMLSEC_NO_RIPEMD160="1"
+if test "z$with_gnutls" = "zno" ; then
+    echo "$as_me:$LINENO: checking for gnutls libraries >= $GNUTLS_MIN_VERSION" >&5
+echo $ECHO_N "checking for gnutls libraries >= $GNUTLS_MIN_VERSION... $ECHO_C" >&6
     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
-else
-    XMLSEC_NO_RIPEMD160="0"
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-fi
+    GNUTLS_FOUND="without"
+elif test "z$with_gnutls" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then
 
+  succeeded=no
 
-if test "z$XMLSEC_NO_RIPEMD160" = "z1"; then
-  XMLSEC_NO_RIPEMD160_TRUE=
-  XMLSEC_NO_RIPEMD160_FALSE='#'
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  XMLSEC_NO_RIPEMD160_TRUE='#'
-  XMLSEC_NO_RIPEMD160_FALSE=
-fi
-
-
-
-echo "$as_me:$LINENO: checking for SHA1 support" >&5
-echo $ECHO_N "checking for SHA1 support... $ECHO_C" >&6
-# Check whether --enable-sha1 or --disable-sha1 was given.
-if test "${enable_sha1+set}" = set; then
-  enableval="$enable_sha1"
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
 
-fi;
-if test "z$enable_sha1" = "zno" ; then
-    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA1=1"
-    XMLSEC_NO_SHA1="1"
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-else
-    XMLSEC_NO_SHA1="0"
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
 fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
-
-if test "z$XMLSEC_NO_SHA1" = "z1"; then
-  XMLSEC_NO_SHA1_TRUE=
-  XMLSEC_NO_SHA1_FALSE='#'
+if test -n "$PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  XMLSEC_NO_SHA1_TRUE='#'
-  XMLSEC_NO_SHA1_FALSE=
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
+  fi
 
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        echo "$as_me:$LINENO: checking for gnutls >= $GNUTLS_NEW_MIN_VERSION" >&5
+echo $ECHO_N "checking for gnutls >= $GNUTLS_NEW_MIN_VERSION... $ECHO_C" >&6
 
-echo "$as_me:$LINENO: checking for SHA224 support" >&5
-echo $ECHO_N "checking for SHA224 support... $ECHO_C" >&6
-# Check whether --enable-sha224 or --disable-sha224 was given.
-if test "${enable_sha224+set}" = set; then
-  enableval="$enable_sha224"
-
-fi;
-if test "z$enable_sha224" = "zno" ; then
-    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA224=1"
-    XMLSEC_NO_SHA224="1"
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-else
-    XMLSEC_NO_SHA224="0"
-    echo "$as_me:$LINENO: result: yes" >&5
+        if $PKG_CONFIG --exists "gnutls >= $GNUTLS_NEW_MIN_VERSION" ; then
+            echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-fi
+            succeeded=yes
 
+            echo "$as_me:$LINENO: checking GNUTLS_CFLAGS" >&5
+echo $ECHO_N "checking GNUTLS_CFLAGS... $ECHO_C" >&6
+            GNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= $GNUTLS_NEW_MIN_VERSION"`
+            echo "$as_me:$LINENO: result: $GNUTLS_CFLAGS" >&5
+echo "${ECHO_T}$GNUTLS_CFLAGS" >&6
 
-if test "z$XMLSEC_NO_SHA224" = "z1"; then
-  XMLSEC_NO_SHA224_TRUE=
-  XMLSEC_NO_SHA224_FALSE='#'
-else
-  XMLSEC_NO_SHA224_TRUE='#'
-  XMLSEC_NO_SHA224_FALSE=
-fi
+            echo "$as_me:$LINENO: checking GNUTLS_LIBS" >&5
+echo $ECHO_N "checking GNUTLS_LIBS... $ECHO_C" >&6
+            GNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= $GNUTLS_NEW_MIN_VERSION"`
+            echo "$as_me:$LINENO: result: $GNUTLS_LIBS" >&5
+echo "${ECHO_T}$GNUTLS_LIBS" >&6
+        else
+            GNUTLS_CFLAGS=""
+            GNUTLS_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            GNUTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnutls >= $GNUTLS_NEW_MIN_VERSION"`
 
+        fi
 
 
-echo "$as_me:$LINENO: checking for SHA256 support" >&5
-echo $ECHO_N "checking for SHA256 support... $ECHO_C" >&6
-# Check whether --enable-sha256 or --disable-sha256 was given.
-if test "${enable_sha256+set}" = set; then
-  enableval="$enable_sha256"
 
-fi;
-if test "z$enable_sha256" = "zno" ; then
-    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA256=1"
-    XMLSEC_NO_SHA256="1"
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-else
-    XMLSEC_NO_SHA256="0"
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-fi
-
-
-if test "z$XMLSEC_NO_SHA256" = "z1"; then
-  XMLSEC_NO_SHA256_TRUE=
-  XMLSEC_NO_SHA256_FALSE='#'
-else
-  XMLSEC_NO_SHA256_TRUE='#'
-  XMLSEC_NO_SHA256_FALSE=
-fi
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
 
+  if test $succeeded = yes; then
+     GNUTLS_FOUND=yes
+  else
+     GNUTLS_FOUND=no
+  fi
 
+    if test "z$GNUTLS_FOUND" = "zno" ; then
 
-echo "$as_me:$LINENO: checking for SHA384 support" >&5
-echo $ECHO_N "checking for SHA384 support... $ECHO_C" >&6
-# Check whether --enable-sha384 or --disable-sha384 was given.
-if test "${enable_sha384+set}" = set; then
-  enableval="$enable_sha384"
+  succeeded=no
 
-fi;
-if test "z$enable_sha384" = "zno" ; then
-    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA384=1"
-    XMLSEC_NO_SHA384="1"
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-    XMLSEC_NO_SHA384="0"
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-fi
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
 
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
-if test "z$XMLSEC_NO_SHA384" = "z1"; then
-  XMLSEC_NO_SHA384_TRUE=
-  XMLSEC_NO_SHA384_FALSE='#'
+if test -n "$PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  XMLSEC_NO_SHA384_TRUE='#'
-  XMLSEC_NO_SHA384_FALSE=
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
+  fi
 
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        echo "$as_me:$LINENO: checking for libgnutls >= $GNUTLS_NEW_MIN_VERSION" >&5
+echo $ECHO_N "checking for libgnutls >= $GNUTLS_NEW_MIN_VERSION... $ECHO_C" >&6
 
-echo "$as_me:$LINENO: checking for SHA512 support" >&5
-echo $ECHO_N "checking for SHA512 support... $ECHO_C" >&6
-# Check whether --enable-sha512 or --disable-sha512 was given.
-if test "${enable_sha512+set}" = set; then
-  enableval="$enable_sha512"
-
-fi;
-if test "z$enable_sha512" = "zno" ; then
-    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA512=1"
-    XMLSEC_NO_SHA512="1"
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-else
-    XMLSEC_NO_SHA512="0"
-    echo "$as_me:$LINENO: result: yes" >&5
+        if $PKG_CONFIG --exists "libgnutls >= $GNUTLS_NEW_MIN_VERSION" ; then
+            echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-fi
-
-
-if test "z$XMLSEC_NO_SHA512" = "z1"; then
-  XMLSEC_NO_SHA512_TRUE=
-  XMLSEC_NO_SHA512_FALSE='#'
-else
-  XMLSEC_NO_SHA512_TRUE='#'
-  XMLSEC_NO_SHA512_FALSE=
-fi
+            succeeded=yes
 
+            echo "$as_me:$LINENO: checking GNUTLS_CFLAGS" >&5
+echo $ECHO_N "checking GNUTLS_CFLAGS... $ECHO_C" >&6
+            GNUTLS_CFLAGS=`$PKG_CONFIG --cflags "libgnutls >= $GNUTLS_NEW_MIN_VERSION"`
+            echo "$as_me:$LINENO: result: $GNUTLS_CFLAGS" >&5
+echo "${ECHO_T}$GNUTLS_CFLAGS" >&6
 
+            echo "$as_me:$LINENO: checking GNUTLS_LIBS" >&5
+echo $ECHO_N "checking GNUTLS_LIBS... $ECHO_C" >&6
+            GNUTLS_LIBS=`$PKG_CONFIG --libs "libgnutls >= $GNUTLS_NEW_MIN_VERSION"`
+            echo "$as_me:$LINENO: result: $GNUTLS_LIBS" >&5
+echo "${ECHO_T}$GNUTLS_LIBS" >&6
+        else
+            GNUTLS_CFLAGS=""
+            GNUTLS_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            GNUTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnutls >= $GNUTLS_NEW_MIN_VERSION"`
 
+        fi
 
-echo "$as_me:$LINENO: checking for HMAC support" >&5
-echo $ECHO_N "checking for HMAC support... $ECHO_C" >&6
-# Check whether --enable-hmac or --disable-hmac was given.
-if test "${enable_hmac+set}" = set; then
-  enableval="$enable_hmac"
 
-fi;
-if test "z$enable_hmac" = "zno" ; then
-    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_HMAC=1"
-    XMLSEC_NO_HMAC="1"
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-else
-    XMLSEC_NO_HMAC="0"
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-fi
 
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
 
-if test "z$XMLSEC_NO_HMAC" = "z1"; then
-  XMLSEC_NO_HMAC_TRUE=
-  XMLSEC_NO_HMAC_FALSE='#'
-else
-  XMLSEC_NO_HMAC_TRUE='#'
-  XMLSEC_NO_HMAC_FALSE=
-fi
+  if test $succeeded = yes; then
+     GNUTLS_FOUND=yes
+  else
+     GNUTLS_FOUND=no
+  fi
 
+    fi
 
+    if test "z$GNUTLS_FOUND" = "zno" ; then
 
-echo "$as_me:$LINENO: checking for DSA support" >&5
-echo $ECHO_N "checking for DSA support... $ECHO_C" >&6
-# Check whether --enable-dsa or --disable-dsa was given.
-if test "${enable_dsa+set}" = set; then
-  enableval="$enable_dsa"
+  succeeded=no
 
-fi;
-if test "z$enable_dsa" = "zno" ; then
-    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_DSA=1"
-    XMLSEC_NO_DSA="1"
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-    XMLSEC_NO_DSA="0"
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-fi
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
 
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
-if test "z$XMLSEC_NO_DSA" = "z1"; then
-  XMLSEC_NO_DSA_TRUE=
-  XMLSEC_NO_DSA_FALSE='#'
+if test -n "$PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  XMLSEC_NO_DSA_TRUE='#'
-  XMLSEC_NO_DSA_FALSE=
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
+  fi
 
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        echo "$as_me:$LINENO: checking for libgnutls >= $GNUTLS_MIN_VERSION" >&5
+echo $ECHO_N "checking for libgnutls >= $GNUTLS_MIN_VERSION... $ECHO_C" >&6
 
-echo "$as_me:$LINENO: checking for RSA support" >&5
-echo $ECHO_N "checking for RSA support... $ECHO_C" >&6
-# Check whether --enable-rsa or --disable-rsa was given.
-if test "${enable_rsa+set}" = set; then
-  enableval="$enable_rsa"
+        if $PKG_CONFIG --exists "libgnutls >= $GNUTLS_MIN_VERSION" ; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+            succeeded=yes
 
-fi;
-if test "z$enable_rsa" = "zno" ; then
-    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_RSA=1"
-    XMLSEC_NO_RSA="1"
-    echo "$as_me:$LINENO: result: no" >&5
+            echo "$as_me:$LINENO: checking GNUTLS_CFLAGS" >&5
+echo $ECHO_N "checking GNUTLS_CFLAGS... $ECHO_C" >&6
+            GNUTLS_CFLAGS=`$PKG_CONFIG --cflags "libgnutls >= $GNUTLS_MIN_VERSION"`
+            echo "$as_me:$LINENO: result: $GNUTLS_CFLAGS" >&5
+echo "${ECHO_T}$GNUTLS_CFLAGS" >&6
+
+            echo "$as_me:$LINENO: checking GNUTLS_LIBS" >&5
+echo $ECHO_N "checking GNUTLS_LIBS... $ECHO_C" >&6
+            GNUTLS_LIBS=`$PKG_CONFIG --libs "libgnutls >= $GNUTLS_MIN_VERSION"`
+            echo "$as_me:$LINENO: result: $GNUTLS_LIBS" >&5
+echo "${ECHO_T}$GNUTLS_LIBS" >&6
+        else
+            GNUTLS_CFLAGS=""
+            GNUTLS_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            GNUTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnutls >= $GNUTLS_MIN_VERSION"`
+
+        fi
+
+
+
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     GNUTLS_FOUND=yes
+  else
+     GNUTLS_FOUND=no
+  fi
+
+	if test "z$GNUTLS_FOUND" = "zyes" ; then
+	    GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DXMLSEC_GNUTLS_OLD=1"
+	fi
+    fi
+fi
+
+if test "z$GNUTLS_FOUND" = "zno" ; then
+    echo "$as_me:$LINENO: checking for gnutls libraries >= $GNUTLS_MIN_VERSION" >&5
+echo $ECHO_N "checking for gnutls libraries >= $GNUTLS_MIN_VERSION... $ECHO_C" >&6
+    if test "z$with_gnutls" != "z" ; then
+	GNUTLS_CONFIG=$with_gnutls/bin/$GNUTLS_CONFIG
+    fi
+    if ! $GNUTLS_CONFIG --version > /dev/null 2>&1 ; then
+	if test "z$with_gnutls" != "z" ; then
+	    { { echo "$as_me:$LINENO: error: Unable to find gnutls at '$with_gnutls'" >&5
+echo "$as_me: error: Unable to find gnutls at '$with_gnutls'" >&2;}
+   { (exit 1); exit 1; }; }
+	else
+	    echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
-else
-    XMLSEC_NO_RSA="0"
-    echo "$as_me:$LINENO: result: yes" >&5
+	fi
+    else
+        vers=`$GNUTLS_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+	minvers=`echo $GNUTLS_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+	if test "$vers" -ge "$minvers" ; then
+	    GNUTLS_CFLAGS="$GNUTLS_CFLAGS `$GNUTLS_CONFIG --cflags`"
+    	    GNUTLS_LIBS="$GNUTLS_LIBS `$GNUTLS_CONFIG --libs`"
+	    GNUTLS_FOUND=yes
+
+	    new_minvers=`echo $GNUTLS_NEW_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+	    if test "$vers" -lt "$new_minvers" ; then
+		GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DXMLSEC_GNUTLS_OLD=1"
+	    fi
+	    echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
+	else
+    	    { { echo "$as_me:$LINENO: error: You need at least gnutls $GNUTLS_MIN_VERSION for this version of $XMLSEC_PACKAGE" >&5
+echo "$as_me: error: You need at least gnutls $GNUTLS_MIN_VERSION for this version of $XMLSEC_PACKAGE" >&2;}
+   { (exit 1); exit 1; }; }
+	fi
+    fi
 fi
 
+if test "z$GNUTLS_FOUND" = "zyes" ; then
+    XMLSEC_NO_GNUTLS="0"
+    GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DXMLSEC_CRYPTO_GNUTLS=1"
 
-if test "z$XMLSEC_NO_RSA" = "z1"; then
-  XMLSEC_NO_RSA_TRUE=
-  XMLSEC_NO_RSA_FALSE='#'
+        if test "z$XMLSEC_CRYPTO" = "z" ; then
+	XMLSEC_CRYPTO="gnutls"
+    	XMLSEC_CRYPTO_LIB="$GNUTLS_CRYPTO_LIB"
+	XMLSEC_CRYPTO_CFLAGS="$GNUTLS_CFLAGS"
+	XMLSEC_CRYPTO_LIBS="$GNUTLS_LIBS"
+    fi
+    XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST gnutls"
 else
-  XMLSEC_NO_RSA_TRUE='#'
-  XMLSEC_NO_RSA_FALSE=
+    XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST gnutls"
 fi
 
 
 
-echo "$as_me:$LINENO: checking for x509 support" >&5
-echo $ECHO_N "checking for x509 support... $ECHO_C" >&6
-# Check whether --enable-x509 or --disable-x509 was given.
-if test "${enable_x509+set}" = set; then
-  enableval="$enable_x509"
+if test "z$XMLSEC_NO_GNUTLS" = "z1"; then
+  XMLSEC_NO_GNUTLS_TRUE=
+  XMLSEC_NO_GNUTLS_FALSE='#'
+else
+  XMLSEC_NO_GNUTLS_TRUE='#'
+  XMLSEC_NO_GNUTLS_FALSE=
+fi
 
+
+
+
+
+
+
+XMLSEC_NO_MSCRYPTO="1"
+MSCRYPTO_CFLAGS=""
+MSCRYPTO_LIBS=""
+MSCRYPTO_CRYPTO_LIB="$XMLSEC_PACKAGE-mscrypto"
+MSCRYPTO_ENABLE='none'
+# Check whether --enable-mscrypto or --disable-mscrypto was given.
+if test "${enable_mscrypto+set}" = set; then
+  enableval="$enable_mscrypto"
+  MSCRYPTO_ENABLE=$enableval
 fi;
-if test "z$enable_x509" = "zno" ; then
-    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_X509=1"
-    XMLSEC_NO_X509="1"
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+if test "z$MSCRYPTO_ENABLE" != "zyes" ; then
+    echo "$as_me:$LINENO: checking for mscrypto libraries" >&5
+echo $ECHO_N "checking for mscrypto libraries... $ECHO_C" >&6
+    echo "$as_me:$LINENO: result: $MSCRYPTO_ENABLE" >&5
+echo "${ECHO_T}$MSCRYPTO_ENABLE" >&6
+else
+    LIBS_SAVE="$LIBS"
+    LIBS="$LIBS -lcrypt32"
+    echo "$as_me:$LINENO: checking for mscrypto libraries" >&5
+echo $ECHO_N "checking for mscrypto libraries... $ECHO_C" >&6
+    cat >conftest.$ac_ext <<_ACEOF
+
+	#include <windows.h>
+	#include <wincrypt.h>
+	int main () { CertOpenStore(0,0,0,0,0);; return(0); }
+
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
 else
-    XMLSEC_NO_X509="0"
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+MSCRYPTO_ENABLE="no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+    echo "$as_me:$LINENO: result: $MSCRYPTO_ENABLE" >&5
+echo "${ECHO_T}$MSCRYPTO_ENABLE" >&6
+    LIBS="$LIBS_SAVE"
 fi
 
+if test "z$MSCRYPTO_ENABLE" = "zyes" ; then
+    XMLSEC_NO_MSCRYPTO="0"
 
-if test "z$XMLSEC_NO_X509" = "z1"; then
-  XMLSEC_NO_X509_TRUE=
-  XMLSEC_NO_X509_FALSE='#'
+    MSCRYPTO_CFLAGS="$MSCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MSCRYPTO=1"
+    case $host in
+	*-*-mingw*)
+						MSCRYPTO_LIBS='-Wl,$(srcdir)/mingw-crypt32.def';;
+	*)
+		MSCRYPTO_LIBS="-lcrypt32";;
+    esac
+
+        if test "z$XMLSEC_CRYPTO" = "z" ; then
+	XMLSEC_CRYPTO="mscrypto"
+    	XMLSEC_CRYPTO_LIB="$MSCRYPTO_CRYPTO_LIB"
+	XMLSEC_CRYPTO_CFLAGS="$MSCRYPTO_CFLAGS"
+	XMLSEC_CRYPTO_LIBS="$MSCRYPTO_LIBS"
+    fi
+    XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST mscrypto"
 else
-  XMLSEC_NO_X509_TRUE='#'
-  XMLSEC_NO_X509_FALSE=
+    XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST mscrypto"
 fi
 
 
 
-echo "$as_me:$LINENO: checking for DES support" >&5
-echo $ECHO_N "checking for DES support... $ECHO_C" >&6
-# Check whether --enable-des or --disable-des was given.
-if test "${enable_des+set}" = set; then
-  enableval="$enable_des"
+if test "z$XMLSEC_NO_MSCRYPTO" = "z1"; then
+  XMLSEC_NO_MSCRYPTO_TRUE=
+  XMLSEC_NO_MSCRYPTO_FALSE='#'
+else
+  XMLSEC_NO_MSCRYPTO_TRUE='#'
+  XMLSEC_NO_MSCRYPTO_FALSE=
+fi
+
+
+
+
+
+
+echo "$as_me:$LINENO: checking for crypto library" >&5
+echo $ECHO_N "checking for crypto library... $ECHO_C" >&6
+if test "z$XMLSEC_CRYPTO" = "z" ;  then
+    { { echo "$as_me:$LINENO: error: At least one crypto library should exist for $XMLSEC_PACKAGE" >&5
+echo "$as_me: error: At least one crypto library should exist for $XMLSEC_PACKAGE" >&2;}
+   { (exit 1); exit 1; }; }
+else
+    echo "$as_me:$LINENO: result: yes ('$XMLSEC_CRYPTO')" >&5
+echo "${ECHO_T}yes ('$XMLSEC_CRYPTO')" >&6
+fi
+
+echo "$as_me:$LINENO: checking for MD5 support" >&5
+echo $ECHO_N "checking for MD5 support... $ECHO_C" >&6
+# Check whether --enable-md5 or --disable-md5 was given.
+if test "${enable_md5+set}" = set; then
+  enableval="$enable_md5"
 
 fi;
-if test "z$enable_des" = "zno" ; then
-    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_DES=1"
-    XMLSEC_NO_DES="1"
+if test "z$enable_md5" = "zno" ; then
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_MD5=1"
+    XMLSEC_NO_MD5="1"
     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
-    XMLSEC_NO_DES="0"
+    XMLSEC_NO_MD5="0"
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
 
-if test "z$XMLSEC_NO_DES" = "z1"; then
-  XMLSEC_NO_DES_TRUE=
-  XMLSEC_NO_DES_FALSE='#'
+if test "z$XMLSEC_NO_MD5" = "z1"; then
+  XMLSEC_NO_MD5_TRUE=
+  XMLSEC_NO_MD5_FALSE='#'
 else
-  XMLSEC_NO_DES_TRUE='#'
-  XMLSEC_NO_DES_FALSE=
+  XMLSEC_NO_MD5_TRUE='#'
+  XMLSEC_NO_MD5_FALSE=
 fi
 
 
 
-echo "$as_me:$LINENO: checking for AES support" >&5
-echo $ECHO_N "checking for AES support... $ECHO_C" >&6
-# Check whether --enable-aes or --disable-aes was given.
-if test "${enable_aes+set}" = set; then
-  enableval="$enable_aes"
+echo "$as_me:$LINENO: checking for RIPEMD-160 support" >&5
+echo $ECHO_N "checking for RIPEMD-160 support... $ECHO_C" >&6
+# Check whether --enable-ripemd160 or --disable-ripemd160 was given.
+if test "${enable_ripemd160+set}" = set; then
+  enableval="$enable_ripemd160"
 
 fi;
-if test "z$enable_aes" = "zno" ; then
-    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_AES=1"
-    XMLSEC_NO_AES="1"
+if test "z$enable_ripemd160" = "zno" ; then
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_RIPEMD160=1"
+    XMLSEC_NO_RIPEMD160="1"
     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
-    XMLSEC_NO_AES="0"
+    XMLSEC_NO_RIPEMD160="0"
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
 
-if test "z$XMLSEC_NO_AES" = "z1"; then
-  XMLSEC_NO_AES_TRUE=
-  XMLSEC_NO_AES_FALSE='#'
+if test "z$XMLSEC_NO_RIPEMD160" = "z1"; then
+  XMLSEC_NO_RIPEMD160_TRUE=
+  XMLSEC_NO_RIPEMD160_FALSE='#'
 else
-  XMLSEC_NO_AES_TRUE='#'
-  XMLSEC_NO_AES_FALSE=
+  XMLSEC_NO_RIPEMD160_TRUE='#'
+  XMLSEC_NO_RIPEMD160_FALSE=
 fi
 
 
 
-echo "$as_me:$LINENO: checking for XMLDSig support" >&5
-echo $ECHO_N "checking for XMLDSig support... $ECHO_C" >&6
-# Check whether --enable-xmldsig or --disable-xmldsig was given.
-if test "${enable_xmldsig+set}" = set; then
-  enableval="$enable_xmldsig"
+echo "$as_me:$LINENO: checking for SHA1 support" >&5
+echo $ECHO_N "checking for SHA1 support... $ECHO_C" >&6
+# Check whether --enable-sha1 or --disable-sha1 was given.
+if test "${enable_sha1+set}" = set; then
+  enableval="$enable_sha1"
 
 fi;
-if test "z$enable_xmldsig" = "zno" ; then
-    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_XMLDSIG=1"
-    XMLSEC_NO_XMLDSIG="1"
+if test "z$enable_sha1" = "zno" ; then
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA1=1"
+    XMLSEC_NO_SHA1="1"
     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
-    XMLSEC_NO_XMLDSIG="0"
+    XMLSEC_NO_SHA1="0"
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
 
-if test "z$XMLSEC_NO_XMLDSIG" = "z1"; then
-  XMLSEC_NO_XMLDSIG_TRUE=
-  XMLSEC_NO_XMLDSIG_FALSE='#'
+if test "z$XMLSEC_NO_SHA1" = "z1"; then
+  XMLSEC_NO_SHA1_TRUE=
+  XMLSEC_NO_SHA1_FALSE='#'
 else
-  XMLSEC_NO_XMLDSIG_TRUE='#'
-  XMLSEC_NO_XMLDSIG_FALSE=
+  XMLSEC_NO_SHA1_TRUE='#'
+  XMLSEC_NO_SHA1_FALSE=
 fi
 
 
 
-echo "$as_me:$LINENO: checking for XMLEnc support" >&5
-echo $ECHO_N "checking for XMLEnc support... $ECHO_C" >&6
-# Check whether --enable-xmlenc or --disable-xmlenc was given.
-if test "${enable_xmlenc+set}" = set; then
-  enableval="$enable_xmlenc"
+echo "$as_me:$LINENO: checking for SHA224 support" >&5
+echo $ECHO_N "checking for SHA224 support... $ECHO_C" >&6
+# Check whether --enable-sha224 or --disable-sha224 was given.
+if test "${enable_sha224+set}" = set; then
+  enableval="$enable_sha224"
 
 fi;
-if test "z$enable_xmlenc" = "zno" ; then
-    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_XMLENC=1"
-    XMLSEC_NO_XMLENC="1"
+if test "z$enable_sha224" = "zno" ; then
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA224=1"
+    XMLSEC_NO_SHA224="1"
     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
-    XMLSEC_NO_XMLENC="0"
+    XMLSEC_NO_SHA224="0"
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
 
-if test "z$XMLSEC_NO_XMLENC" = "z1"; then
-  XMLSEC_NO_XMLENC_TRUE=
-  XMLSEC_NO_XMLENC_FALSE='#'
+if test "z$XMLSEC_NO_SHA224" = "z1"; then
+  XMLSEC_NO_SHA224_TRUE=
+  XMLSEC_NO_SHA224_FALSE='#'
 else
-  XMLSEC_NO_XMLENC_TRUE='#'
-  XMLSEC_NO_XMLENC_FALSE=
+  XMLSEC_NO_SHA224_TRUE='#'
+  XMLSEC_NO_SHA224_FALSE=
 fi
 
 
 
-echo "$as_me:$LINENO: checking for XMKMS support - under development" >&5
-echo $ECHO_N "checking for XMKMS support - under development... $ECHO_C" >&6
-# Check whether --enable-xkms or --disable-xkms was given.
-if test "${enable_xkms+set}" = set; then
-  enableval="$enable_xkms"
+echo "$as_me:$LINENO: checking for SHA256 support" >&5
+echo $ECHO_N "checking for SHA256 support... $ECHO_C" >&6
+# Check whether --enable-sha256 or --disable-sha256 was given.
+if test "${enable_sha256+set}" = set; then
+  enableval="$enable_sha256"
 
 fi;
-if test "z$enable_xkms" = "zyes" ; then
-    XMLSEC_NO_XKMS="0"
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_XKMS=1"
-    XMLSEC_NO_XKMS="1"
+if test "z$enable_sha256" = "zno" ; then
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA256=1"
+    XMLSEC_NO_SHA256="1"
     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
+else
+    XMLSEC_NO_SHA256="0"
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 fi
 
 
-if test "z$XMLSEC_NO_XKMS" = "z1"; then
-  XMLSEC_NO_XKMS_TRUE=
-  XMLSEC_NO_XKMS_FALSE='#'
+if test "z$XMLSEC_NO_SHA256" = "z1"; then
+  XMLSEC_NO_SHA256_TRUE=
+  XMLSEC_NO_SHA256_FALSE='#'
 else
-  XMLSEC_NO_XKMS_TRUE='#'
-  XMLSEC_NO_XKMS_FALSE=
+  XMLSEC_NO_SHA256_TRUE='#'
+  XMLSEC_NO_SHA256_FALSE=
 fi
 
 
 
-XMLSEC_DL_INCLUDES=""
-XMLSEC_DL_LIBS=""
-echo "$as_me:$LINENO: checking for xmlsec-crypto dynamic loading support" >&5
-echo $ECHO_N "checking for xmlsec-crypto dynamic loading support... $ECHO_C" >&6
-# Check whether --enable-crypto_dl or --disable-crypto_dl was given.
-if test "${enable_crypto_dl+set}" = set; then
-  enableval="$enable_crypto_dl"
+echo "$as_me:$LINENO: checking for SHA384 support" >&5
+echo $ECHO_N "checking for SHA384 support... $ECHO_C" >&6
+# Check whether --enable-sha384 or --disable-sha384 was given.
+if test "${enable_sha384+set}" = set; then
+  enableval="$enable_sha384"
 
 fi;
-if test "z$enable_crypto_dl" = "zno" ; then
-    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_CRYPTO_DYNAMIC_LOADING=1"
-    XMLSEC_NO_CRYPTO_DYNAMIC_LOADING="1"
+if test "z$enable_sha384" = "zno" ; then
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA384=1"
+    XMLSEC_NO_SHA384="1"
     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
-    XMLSEC_DL_INCLUDES="$INCLTDL"
-    XMLSEC_DL_LIBS="$LIBLTDL $LIBADD_DL"
-    XMLSEC_NO_CRYPTO_DYNAMIC_LOADING="0"
+    XMLSEC_NO_SHA384="0"
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
 
-if test "z$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING" = "z1"; then
-  XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE=
-  XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE='#'
+if test "z$XMLSEC_NO_SHA384" = "z1"; then
+  XMLSEC_NO_SHA384_TRUE=
+  XMLSEC_NO_SHA384_FALSE='#'
 else
-  XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE='#'
-  XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE=
+  XMLSEC_NO_SHA384_TRUE='#'
+  XMLSEC_NO_SHA384_FALSE=
 fi
 
 
 
-
-
-echo "$as_me:$LINENO: checking for xmlsec-crypto dynamic loading support in command line tool" >&5
-echo $ECHO_N "checking for xmlsec-crypto dynamic loading support in command line tool... $ECHO_C" >&6
-# Check whether --enable-apps_crypto_dl or --disable-apps_crypto_dl was given.
-if test "${enable_apps_crypto_dl+set}" = set; then
-  enableval="$enable_apps_crypto_dl"
+echo "$as_me:$LINENO: checking for SHA512 support" >&5
+echo $ECHO_N "checking for SHA512 support... $ECHO_C" >&6
+# Check whether --enable-sha512 or --disable-sha512 was given.
+if test "${enable_sha512+set}" = set; then
+  enableval="$enable_sha512"
 
 fi;
-if test "z$enable_apps_crypto_dl" = "z" ; then
-    enable_apps_crypto_dl="$enable_crypto_dl"
-fi
-if test "z$enable_apps_crypto_dl" = "zno" ; then
-    XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING="1"
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-elif test "z$enable_crypto_dl" = "zno" ; then
+if test "z$enable_sha512" = "zno" ; then
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA512=1"
+    XMLSEC_NO_SHA512="1"
     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
-    { { echo "$as_me:$LINENO: error: xmlsec-crypto libraries dynamic loading support in xmlsec command line tool is requested but no dynamic loading in xmlsec itself is disabled" >&5
-echo "$as_me: error: xmlsec-crypto libraries dynamic loading support in xmlsec command line tool is requested but no dynamic loading in xmlsec itself is disabled" >&2;}
-   { (exit 1); exit 1; }; }
 else
-    XMLSEC_APP_DEFINES="$XMLSEC_APP_DEFINES -DXMLSEC_CRYPTO_DYNAMIC_LOADING=1"
-    XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING="0"
+    XMLSEC_NO_SHA512="0"
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
 
-if test "z$XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING" = "z1"; then
-  XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE=
-  XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE='#'
+if test "z$XMLSEC_NO_SHA512" = "z1"; then
+  XMLSEC_NO_SHA512_TRUE=
+  XMLSEC_NO_SHA512_FALSE='#'
 else
-  XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE='#'
-  XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE=
+  XMLSEC_NO_SHA512_TRUE='#'
+  XMLSEC_NO_SHA512_FALSE=
 fi
 
 
 
-echo "$as_me:$LINENO: checking for docs folder" >&5
-echo $ECHO_N "checking for docs folder... $ECHO_C" >&6
 
-# Check whether --with-html-dir or --without-html-dir was given.
-if test "${with_html_dir+set}" = set; then
-  withval="$with_html_dir"
+echo "$as_me:$LINENO: checking for HMAC support" >&5
+echo $ECHO_N "checking for HMAC support... $ECHO_C" >&6
+# Check whether --enable-hmac or --disable-hmac was given.
+if test "${enable_hmac+set}" = set; then
+  enableval="$enable_hmac"
 
 fi;
-if test "z$with_html_dir" != "z" ; then
-    XMLSEC_DOCDIR=$with_html_dir
+if test "z$enable_hmac" = "zno" ; then
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_HMAC=1"
+    XMLSEC_NO_HMAC="1"
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 else
-    XMLSEC_DOCDIR='$(datadir)/doc/xmlsec1'
+    XMLSEC_NO_HMAC="0"
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:$LINENO: result: $XMLSEC_DOCDIR" >&5
-echo "${ECHO_T}$XMLSEC_DOCDIR" >&6
 
+if test "z$XMLSEC_NO_HMAC" = "z1"; then
+  XMLSEC_NO_HMAC_TRUE=
+  XMLSEC_NO_HMAC_FALSE='#'
+else
+  XMLSEC_NO_HMAC_TRUE='#'
+  XMLSEC_NO_HMAC_FALSE=
+fi
 
-echo "$as_me:$LINENO: checking for Simple Keys Manager testing" >&5
-echo $ECHO_N "checking for Simple Keys Manager testing... $ECHO_C" >&6
-# Check whether --enable-skm or --disable-skm was given.
-if test "${enable_skm+set}" = set; then
-  enableval="$enable_skm"
+
+
+echo "$as_me:$LINENO: checking for DSA support" >&5
+echo $ECHO_N "checking for DSA support... $ECHO_C" >&6
+# Check whether --enable-dsa or --disable-dsa was given.
+if test "${enable_dsa+set}" = set; then
+  enableval="$enable_dsa"
 
 fi;
-if test "z$enable_skm" = "zno" ; then
-    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SKM_TEST=1"
+if test "z$enable_dsa" = "zno" ; then
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_DSA=1"
+    XMLSEC_NO_DSA="1"
     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
+    XMLSEC_NO_DSA="0"
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:$LINENO: checking for templates testing" >&5
-echo $ECHO_N "checking for templates testing... $ECHO_C" >&6
-# Check whether --enable-skm or --disable-skm was given.
-if test "${enable_skm+set}" = set; then
-  enableval="$enable_skm"
+
+if test "z$XMLSEC_NO_DSA" = "z1"; then
+  XMLSEC_NO_DSA_TRUE=
+  XMLSEC_NO_DSA_FALSE='#'
+else
+  XMLSEC_NO_DSA_TRUE='#'
+  XMLSEC_NO_DSA_FALSE=
+fi
+
+
+
+echo "$as_me:$LINENO: checking for RSA support" >&5
+echo $ECHO_N "checking for RSA support... $ECHO_C" >&6
+# Check whether --enable-rsa or --disable-rsa was given.
+if test "${enable_rsa+set}" = set; then
+  enableval="$enable_rsa"
 
 fi;
-if test "z$enable_tmpl_tests" = "zyes" ; then
-    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_TMPL_TEST=1"
+if test "z$enable_rsa" = "zno" ; then
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_RSA=1"
+    XMLSEC_NO_RSA="1"
     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
+    XMLSEC_NO_RSA="0"
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
 
-echo "$as_me:$LINENO: checking for debuging" >&5
-echo $ECHO_N "checking for debuging... $ECHO_C" >&6
-# Check whether --enable-debuging or --disable-debuging was given.
-if test "${enable_debuging+set}" = set; then
-  enableval="$enable_debuging"
 
-fi;
-if test "z$enable_debuging" = "zyes" ; then
-    CFLAGS="$CFLAGS -g"
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if test "z$XMLSEC_NO_RSA" = "z1"; then
+  XMLSEC_NO_RSA_TRUE=
+  XMLSEC_NO_RSA_FALSE='#'
 else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  XMLSEC_NO_RSA_TRUE='#'
+  XMLSEC_NO_RSA_FALSE=
 fi
 
-echo "$as_me:$LINENO: checking for profiling" >&5
-echo $ECHO_N "checking for profiling... $ECHO_C" >&6
-# Check whether --enable-profiling or --disable-profiling was given.
-if test "${enable_profiling+set}" = set; then
-  enableval="$enable_profiling"
+
+
+echo "$as_me:$LINENO: checking for x509 support" >&5
+echo $ECHO_N "checking for x509 support... $ECHO_C" >&6
+# Check whether --enable-x509 or --disable-x509 was given.
+if test "${enable_x509+set}" = set; then
+  enableval="$enable_x509"
 
 fi;
-if test "z$enable_profiling" = "zyes" ; then
-    CFLAGS="$CFLAGS -pg"
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
+if test "z$enable_x509" = "zno" ; then
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_X509=1"
+    XMLSEC_NO_X509="1"
     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
-fi
-
-echo "$as_me:$LINENO: checking for pedantic" >&5
-echo $ECHO_N "checking for pedantic... $ECHO_C" >&6
-# Check whether --enable-pedantic or --disable-pedantic was given.
-if test "${enable_pedantic+set}" = set; then
-  enableval="$enable_pedantic"
-
-fi;
-if test "z$enable_pedantic" = "zyes" ; then
-        CFLAGS="$CFLAGS -O -pedantic -Wall -ansi -fno-inline -W -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls"
+else
+    XMLSEC_NO_X509="0"
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
+fi
+
+
+if test "z$XMLSEC_NO_X509" = "z1"; then
+  XMLSEC_NO_X509_TRUE=
+  XMLSEC_NO_X509_FALSE='#'
 else
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  XMLSEC_NO_X509_TRUE='#'
+  XMLSEC_NO_X509_FALSE=
 fi
 
-XMLSEC_STATIC_BINARIES=""
-echo "$as_me:$LINENO: checking for static linking" >&5
-echo $ECHO_N "checking for static linking... $ECHO_C" >&6
-# Check whether --enable-static_linking or --disable-static_linking was given.
-if test "${enable_static_linking+set}" = set; then
-  enableval="$enable_static_linking"
+
+
+echo "$as_me:$LINENO: checking for DES support" >&5
+echo $ECHO_N "checking for DES support... $ECHO_C" >&6
+# Check whether --enable-des or --disable-des was given.
+if test "${enable_des+set}" = set; then
+  enableval="$enable_des"
 
 fi;
-if test "z$enable_static_linking" = "zyes" ; then
-    XMLSEC_STATIC_BINARIES="-static"
+if test "z$enable_des" = "zno" ; then
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_DES=1"
+    XMLSEC_NO_DES="1"
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+else
+    XMLSEC_NO_DES="0"
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
+fi
+
+
+if test "z$XMLSEC_NO_DES" = "z1"; then
+  XMLSEC_NO_DES_TRUE=
+  XMLSEC_NO_DES_FALSE='#'
 else
+  XMLSEC_NO_DES_TRUE='#'
+  XMLSEC_NO_DES_FALSE=
+fi
+
+
+
+echo "$as_me:$LINENO: checking for AES support" >&5
+echo $ECHO_N "checking for AES support... $ECHO_C" >&6
+# Check whether --enable-aes or --disable-aes was given.
+if test "${enable_aes+set}" = set; then
+  enableval="$enable_aes"
+
+fi;
+if test "z$enable_aes" = "zno" ; then
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_AES=1"
+    XMLSEC_NO_AES="1"
     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
+else
+    XMLSEC_NO_AES="0"
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 fi
 
 
-XMLSEC_CORE_CFLAGS="$XMLSEC_DEFINES -I${includedir}/xmlsec1  $XMLSEC_DL_INCLUDES"
-XMLSEC_CORE_LIBS="-lxmlsec1 $XMLSEC_DL_LIBS "
+if test "z$XMLSEC_NO_AES" = "z1"; then
+  XMLSEC_NO_AES_TRUE=
+  XMLSEC_NO_AES_FALSE='#'
+else
+  XMLSEC_NO_AES_TRUE='#'
+  XMLSEC_NO_AES_FALSE=
+fi
 
 
 
-XMLSEC_LIBDIR="${libdir}"
+echo "$as_me:$LINENO: checking for GOST support" >&5
+echo $ECHO_N "checking for GOST support... $ECHO_C" >&6
+# Check whether --enable-gost or --disable-gost was given.
+if test "${enable_gost+set}" = set; then
+  enableval="$enable_gost"
 
+fi;
+if test "z$enable_gost" != "zyes" ; then
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_GOST=1"
+    XMLSEC_NO_GOST="1"
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+else
+    XMLSEC_NO_GOST="0"
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+fi
 
-XMLSEC_OPENSSL_CFLAGS="$XMLSEC_CORE_CFLAGS $OPENSSL_CFLAGS"
-XMLSEC_OPENSSL_LIBS="-L${libdir} -l$OPENSSL_CRYPTO_LIB $XMLSEC_CORE_LIBS $OPENSSL_LIBS"
 
+if test "z$XMLSEC_NO_GOST" = "z1"; then
+  XMLSEC_NO_GOST_TRUE=
+  XMLSEC_NO_GOST_FALSE='#'
+else
+  XMLSEC_NO_GOST_TRUE='#'
+  XMLSEC_NO_GOST_FALSE=
+fi
 
 
-XMLSEC_GNUTLS_CFLAGS="$XMLSEC_CORE_CFLAGS $GNUTLS_CFLAGS"
-XMLSEC_GNUTLS_LIBS="-L${libdir} -l$GNUTLS_CRYPTO_LIB $XMLSEC_CORE_LIBS $GNUTLS_LIBS"
 
+echo "$as_me:$LINENO: checking for XMLDSig support" >&5
+echo $ECHO_N "checking for XMLDSig support... $ECHO_C" >&6
+# Check whether --enable-xmldsig or --disable-xmldsig was given.
+if test "${enable_xmldsig+set}" = set; then
+  enableval="$enable_xmldsig"
 
+fi;
+if test "z$enable_xmldsig" = "zno" ; then
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_XMLDSIG=1"
+    XMLSEC_NO_XMLDSIG="1"
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+else
+    XMLSEC_NO_XMLDSIG="0"
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+fi
 
-XMLSEC_NSS_CFLAGS="$XMLSEC_CORE_CFLAGS $NSS_CFLAGS"
-XMLSEC_NSS_LIBS="-L${libdir} -l$NSS_CRYPTO_LIB $XMLSEC_CORE_LIBS $NSS_LIBS"
 
+if test "z$XMLSEC_NO_XMLDSIG" = "z1"; then
+  XMLSEC_NO_XMLDSIG_TRUE=
+  XMLSEC_NO_XMLDSIG_FALSE='#'
+else
+  XMLSEC_NO_XMLDSIG_TRUE='#'
+  XMLSEC_NO_XMLDSIG_FALSE=
+fi
 
 
-XMLSEC_CFLAGS="$XMLSEC_CORE_CFLAGS $LIBXML_CFLAGS $LIBXSLT_CFLAGS $XMLSEC_CRYPTO_CFLAGS"
-XMLSEC_LIBS="-L${libdir} -l$XMLSEC_CRYPTO_LIB $XMLSEC_CORE_LIBS $LIBXML_LIBS $LIBXSLT_LIBS $XMLSEC_CRYPTO_LIBS"
 
+echo "$as_me:$LINENO: checking for XMLEnc support" >&5
+echo $ECHO_N "checking for XMLEnc support... $ECHO_C" >&6
+# Check whether --enable-xmlenc or --disable-xmlenc was given.
+if test "${enable_xmlenc+set}" = set; then
+  enableval="$enable_xmlenc"
 
+fi;
+if test "z$enable_xmlenc" = "zno" ; then
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_XMLENC=1"
+    XMLSEC_NO_XMLENC="1"
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+else
+    XMLSEC_NO_XMLENC="0"
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+fi
 
 
+if test "z$XMLSEC_NO_XMLENC" = "z1"; then
+  XMLSEC_NO_XMLENC_TRUE=
+  XMLSEC_NO_XMLENC_FALSE='#'
+else
+  XMLSEC_NO_XMLENC_TRUE='#'
+  XMLSEC_NO_XMLENC_FALSE=
+fi
 
 
 
+echo "$as_me:$LINENO: checking for XMKMS support - under development" >&5
+echo $ECHO_N "checking for XMKMS support - under development... $ECHO_C" >&6
+# Check whether --enable-xkms or --disable-xkms was given.
+if test "${enable_xkms+set}" = set; then
+  enableval="$enable_xkms"
 
+fi;
+if test "z$enable_xkms" = "zyes" ; then
+    XMLSEC_NO_XKMS="0"
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_XKMS=1"
+    XMLSEC_NO_XKMS="1"
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
 
 
+if test "z$XMLSEC_NO_XKMS" = "z1"; then
+  XMLSEC_NO_XKMS_TRUE=
+  XMLSEC_NO_XKMS_FALSE='#'
+else
+  XMLSEC_NO_XKMS_TRUE='#'
+  XMLSEC_NO_XKMS_FALSE=
+fi
 
 
 
+XMLSEC_DL_INCLUDES=""
+XMLSEC_DL_LIBS=""
+echo "$as_me:$LINENO: checking for xmlsec-crypto dynamic loading support" >&5
+echo $ECHO_N "checking for xmlsec-crypto dynamic loading support... $ECHO_C" >&6
+# Check whether --enable-crypto_dl or --disable-crypto_dl was given.
+if test "${enable_crypto_dl+set}" = set; then
+  enableval="$enable_crypto_dl"
 
+fi;
+if test "z$enable_crypto_dl" = "zno" ; then
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_CRYPTO_DYNAMIC_LOADING=1"
+    XMLSEC_NO_CRYPTO_DYNAMIC_LOADING="1"
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+else
+    XMLSEC_DL_INCLUDES="$INCLTDL"
+    XMLSEC_DL_LIBS="$LIBLTDL $LIBADD_DL"
+    XMLSEC_NO_CRYPTO_DYNAMIC_LOADING="0"
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+fi
 
 
-XMLSEC_CRYPTO_PC_FILES_LIST=""
-for i in $XMLSEC_CRYPTO_LIST ; do
-    XMLSEC_CRYPTO_PC_FILES_LIST="$XMLSEC_CRYPTO_PC_FILES_LIST $XMLSEC_PACKAGE-$i.pc"
-done
+if test "z$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING" = "z1"; then
+  XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE=
+  XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE='#'
+else
+  XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE='#'
+  XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE=
+fi
 
 
-                                                                                                                                                                ac_config_files="$ac_config_files include/xmlsec/version.h Makefile include/Makefile include/xmlsec/Makefile include/xmlsec/private/Makefile src/Makefile apps/Makefile docs/Makefile docs/api/Makefile man/Makefile xmlsec1Conf.sh:xmlsecConf.sh.in xmlsec1-config:xmlsec-config.in xmlsec1-openssl.pc:xmlsec-openssl.pc.in xmlsec1-gnutls. [...]
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
 
-_ACEOF
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
 
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+echo "$as_me:$LINENO: checking for xmlsec-crypto dynamic loading support in command line tool" >&5
+echo $ECHO_N "checking for xmlsec-crypto dynamic loading support in command line tool... $ECHO_C" >&6
+# Check whether --enable-apps_crypto_dl or --disable-apps_crypto_dl was given.
+if test "${enable_apps_crypto_dl+set}" = set; then
+  enableval="$enable_apps_crypto_dl"
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
+fi;
+if test "z$enable_apps_crypto_dl" = "z" ; then
+    enable_apps_crypto_dl="$enable_crypto_dl"
+fi
+if test "z$enable_apps_crypto_dl" = "zno" ; then
+    XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING="1"
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+elif test "z$enable_crypto_dl" = "zno" ; then
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    { { echo "$as_me:$LINENO: error: xmlsec-crypto libraries dynamic loading support in xmlsec command line tool is requested but no dynamic loading in xmlsec itself is disabled" >&5
+echo "$as_me: error: xmlsec-crypto libraries dynamic loading support in xmlsec command line tool is requested but no dynamic loading in xmlsec itself is disabled" >&2;}
+   { (exit 1); exit 1; }; }
+else
+    XMLSEC_APP_DEFINES="$XMLSEC_APP_DEFINES -DXMLSEC_CRYPTO_DYNAMIC_LOADING=1"
+    XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING="0"
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 fi
 
-DEFS=-DHAVE_CONFIG_H
 
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
+if test "z$XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING" = "z1"; then
+  XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE=
+  XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE='#'
+else
+  XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE='#'
+  XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE=
+fi
 
-LTLIBOBJS=$ac_ltlibobjs
 
 
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${INSTALL_LTDL_TRUE}" && test -z "${INSTALL_LTDL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"INSTALL_LTDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"INSTALL_LTDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${CONVENIENCE_LTDL_TRUE}" && test -z "${CONVENIENCE_LTDL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"CONVENIENCE_LTDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CONVENIENCE_LTDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_OPENSSL_TRUE}" && test -z "${XMLSEC_NO_OPENSSL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_OPENSSL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_OPENSSL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_GNUTLS_TRUE}" && test -z "${XMLSEC_NO_GNUTLS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_GNUTLS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_GNUTLS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+echo "$as_me:$LINENO: checking for docs folder" >&5
+echo $ECHO_N "checking for docs folder... $ECHO_C" >&6
+
+# Check whether --with-html-dir or --without-html-dir was given.
+if test "${with_html_dir+set}" = set; then
+  withval="$with_html_dir"
+
+fi;
+if test "z$with_html_dir" != "z" ; then
+    XMLSEC_DOCDIR=$with_html_dir
+else
+    XMLSEC_DOCDIR='$(datadir)/doc/xmlsec1'
 fi
-if test -z "${XMLSEC_NO_NSS_TRUE}" && test -z "${XMLSEC_NO_NSS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_NSS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_NSS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+
+echo "$as_me:$LINENO: result: $XMLSEC_DOCDIR" >&5
+echo "${ECHO_T}$XMLSEC_DOCDIR" >&6
+
+
+echo "$as_me:$LINENO: checking for Simple Keys Manager testing" >&5
+echo $ECHO_N "checking for Simple Keys Manager testing... $ECHO_C" >&6
+# Check whether --enable-skm or --disable-skm was given.
+if test "${enable_skm+set}" = set; then
+  enableval="$enable_skm"
+
+fi;
+if test "z$enable_skm" = "zno" ; then
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SKM_TEST=1"
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+else
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 fi
-if test -z "${XMLSEC_NO_MD5_TRUE}" && test -z "${XMLSEC_NO_MD5_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_MD5\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_MD5\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+
+echo "$as_me:$LINENO: checking for templates testing" >&5
+echo $ECHO_N "checking for templates testing... $ECHO_C" >&6
+# Check whether --enable-skm or --disable-skm was given.
+if test "${enable_skm+set}" = set; then
+  enableval="$enable_skm"
+
+fi;
+if test "z$enable_tmpl_tests" = "zyes" ; then
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_TMPL_TEST=1"
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+else
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 fi
-if test -z "${XMLSEC_NO_RIPEMD160_TRUE}" && test -z "${XMLSEC_NO_RIPEMD160_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_RIPEMD160\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_RIPEMD160\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+
+echo "$as_me:$LINENO: checking for debuging" >&5
+echo $ECHO_N "checking for debuging... $ECHO_C" >&6
+# Check whether --enable-debuging or --disable-debuging was given.
+if test "${enable_debuging+set}" = set; then
+  enableval="$enable_debuging"
+
+fi;
+if test "z$enable_debuging" = "zyes" ; then
+    CFLAGS="$CFLAGS -g"
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-if test -z "${XMLSEC_NO_SHA1_TRUE}" && test -z "${XMLSEC_NO_SHA1_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA1\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_SHA1\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+
+echo "$as_me:$LINENO: checking for profiling" >&5
+echo $ECHO_N "checking for profiling... $ECHO_C" >&6
+# Check whether --enable-profiling or --disable-profiling was given.
+if test "${enable_profiling+set}" = set; then
+  enableval="$enable_profiling"
+
+fi;
+if test "z$enable_profiling" = "zyes" ; then
+    CFLAGS="$CFLAGS -pg"
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-if test -z "${XMLSEC_NO_SHA224_TRUE}" && test -z "${XMLSEC_NO_SHA224_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA224\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_SHA224\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+
+echo "$as_me:$LINENO: checking for pedantic" >&5
+echo $ECHO_N "checking for pedantic... $ECHO_C" >&6
+# Check whether --enable-pedantic or --disable-pedantic was given.
+if test "${enable_pedantic+set}" = set; then
+  enableval="$enable_pedantic"
+
+fi;
+if test "z$enable_pedantic" = "zyes" ; then
+        CFLAGS="$CFLAGS -O -pedantic -Wall -ansi -fno-inline -W -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls"
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-if test -z "${XMLSEC_NO_SHA256_TRUE}" && test -z "${XMLSEC_NO_SHA256_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA256\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_SHA256\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+
+XMLSEC_STATIC_BINARIES=""
+echo "$as_me:$LINENO: checking for static linking" >&5
+echo $ECHO_N "checking for static linking... $ECHO_C" >&6
+# Check whether --enable-static_linking or --disable-static_linking was given.
+if test "${enable_static_linking+set}" = set; then
+  enableval="$enable_static_linking"
+
+fi;
+if test "z$enable_static_linking" = "zyes" ; then
+    XMLSEC_STATIC_BINARIES="-static"
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-if test -z "${XMLSEC_NO_SHA384_TRUE}" && test -z "${XMLSEC_NO_SHA384_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA384\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_SHA384\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_SHA512_TRUE}" && test -z "${XMLSEC_NO_SHA512_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA512\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_SHA512\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_HMAC_TRUE}" && test -z "${XMLSEC_NO_HMAC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_HMAC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_HMAC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_DSA_TRUE}" && test -z "${XMLSEC_NO_DSA_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_DSA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_DSA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_RSA_TRUE}" && test -z "${XMLSEC_NO_RSA_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_RSA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_RSA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_X509_TRUE}" && test -z "${XMLSEC_NO_X509_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_X509\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_X509\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_DES_TRUE}" && test -z "${XMLSEC_NO_DES_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_DES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_DES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_AES_TRUE}" && test -z "${XMLSEC_NO_AES_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_AES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_AES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_XMLDSIG_TRUE}" && test -z "${XMLSEC_NO_XMLDSIG_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_XMLDSIG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_XMLDSIG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_XMLENC_TRUE}" && test -z "${XMLSEC_NO_XMLENC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_XMLENC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_XMLENC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_XKMS_TRUE}" && test -z "${XMLSEC_NO_XKMS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_XKMS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_XKMS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE}" && test -z "${XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_CRYPTO_DYNAMIC_LOADING\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_CRYPTO_DYNAMIC_LOADING\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE}" && test -z "${XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
 
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
+XMLSEC_CORE_CFLAGS="$XMLSEC_DEFINES -I${includedir}/xmlsec1  $XMLSEC_DL_INCLUDES"
+XMLSEC_CORE_LIBS="-lxmlsec1 $XMLSEC_DL_LIBS "
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
 
 
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
+XMLSEC_LIBDIR="${libdir}"
 
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
 
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
+XMLSEC_OPENSSL_CFLAGS="$XMLSEC_CORE_CFLAGS $OPENSSL_CFLAGS"
+XMLSEC_OPENSSL_LIBS="-L${libdir} -l$OPENSSL_CRYPTO_LIB $XMLSEC_CORE_LIBS $OPENSSL_LIBS"
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
 
 
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+XMLSEC_GNUTLS_CFLAGS="$XMLSEC_CORE_CFLAGS $GNUTLS_CFLAGS"
+XMLSEC_GNUTLS_LIBS="-L${libdir} -l$GNUTLS_CRYPTO_LIB $XMLSEC_CORE_LIBS $GNUTLS_LIBS"
 
 
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
+XMLSEC_NSS_CFLAGS="$XMLSEC_CORE_CFLAGS $NSS_CFLAGS"
+XMLSEC_NSS_LIBS="-L${libdir} -l$NSS_CRYPTO_LIB $XMLSEC_CORE_LIBS $NSS_LIBS"
 
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
 
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
 
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by xmlsec1 $as_me 1.2.9, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf at gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-xmlsec1 config.status 1.2.9
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS section.
-#
-
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "include/xmlsec/version.h" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/version.h" ;;
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-  "include/xmlsec/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/Makefile" ;;
-  "include/xmlsec/private/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/private/Makefile" ;;
-  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-  "apps/Makefile" ) CONFIG_FILES="$CONFIG_FILES apps/Makefile" ;;
-  "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
-  "docs/api/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/api/Makefile" ;;
-  "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
-  "xmlsec1Conf.sh" ) CONFIG_FILES="$CONFIG_FILES xmlsec1Conf.sh:xmlsecConf.sh.in" ;;
-  "xmlsec1-config" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-config:xmlsec-config.in" ;;
-  "xmlsec1-openssl.pc" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-openssl.pc:xmlsec-openssl.pc.in" ;;
-  "xmlsec1-gnutls.pc" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-gnutls.pc:xmlsec-gnutls.pc.in" ;;
-  "xmlsec1-nss.pc" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-nss.pc:xmlsec-nss.pc.in" ;;
-  "xmlsec1.spec" ) CONFIG_FILES="$CONFIG_FILES xmlsec1.spec:xmlsec.spec.in" ;;
-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s, at SHELL@,$SHELL,;t t
-s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s, at exec_prefix@,$exec_prefix,;t t
-s, at prefix@,$prefix,;t t
-s, at program_transform_name@,$program_transform_name,;t t
-s, at bindir@,$bindir,;t t
-s, at sbindir@,$sbindir,;t t
-s, at libexecdir@,$libexecdir,;t t
-s, at datadir@,$datadir,;t t
-s, at sysconfdir@,$sysconfdir,;t t
-s, at sharedstatedir@,$sharedstatedir,;t t
-s, at localstatedir@,$localstatedir,;t t
-s, at libdir@,$libdir,;t t
-s, at includedir@,$includedir,;t t
-s, at oldincludedir@,$oldincludedir,;t t
-s, at infodir@,$infodir,;t t
-s, at mandir@,$mandir,;t t
-s, at build_alias@,$build_alias,;t t
-s, at host_alias@,$host_alias,;t t
-s, at target_alias@,$target_alias,;t t
-s, at DEFS@,$DEFS,;t t
-s, at ECHO_C@,$ECHO_C,;t t
-s, at ECHO_N@,$ECHO_N,;t t
-s, at ECHO_T@,$ECHO_T,;t t
-s, at LIBS@,$LIBS,;t t
-s, at build@,$build,;t t
-s, at build_cpu@,$build_cpu,;t t
-s, at build_vendor@,$build_vendor,;t t
-s, at build_os@,$build_os,;t t
-s, at host@,$host,;t t
-s, at host_cpu@,$host_cpu,;t t
-s, at host_vendor@,$host_vendor,;t t
-s, at host_os@,$host_os,;t t
-s, at XMLSEC_VERSION@,$XMLSEC_VERSION,;t t
-s, at XMLSEC_PACKAGE@,$XMLSEC_PACKAGE,;t t
-s, at XMLSEC_VERSION_SAFE@,$XMLSEC_VERSION_SAFE,;t t
-s, at XMLSEC_VERSION_MAJOR@,$XMLSEC_VERSION_MAJOR,;t t
-s, at XMLSEC_VERSION_MINOR@,$XMLSEC_VERSION_MINOR,;t t
-s, at XMLSEC_VERSION_SUBMINOR@,$XMLSEC_VERSION_SUBMINOR,;t t
-s, at XMLSEC_VERSION_INFO@,$XMLSEC_VERSION_INFO,;t t
-s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s, at INSTALL_DATA@,$INSTALL_DATA,;t t
-s, at CYGPATH_W@,$CYGPATH_W,;t t
-s, at PACKAGE@,$PACKAGE,;t t
-s, at VERSION@,$VERSION,;t t
-s, at ACLOCAL@,$ACLOCAL,;t t
-s, at AUTOCONF@,$AUTOCONF,;t t
-s, at AUTOMAKE@,$AUTOMAKE,;t t
-s, at AUTOHEADER@,$AUTOHEADER,;t t
-s, at MAKEINFO@,$MAKEINFO,;t t
-s, at install_sh@,$install_sh,;t t
-s, at STRIP@,$STRIP,;t t
-s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
-s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-s, at mkdir_p@,$mkdir_p,;t t
-s, at AWK@,$AWK,;t t
-s, at SET_MAKE@,$SET_MAKE,;t t
-s, at am__leading_dot@,$am__leading_dot,;t t
-s, at AMTAR@,$AMTAR,;t t
-s, at am__tar@,$am__tar,;t t
-s, at am__untar@,$am__untar,;t t
-s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-s, at MAINT@,$MAINT,;t t
-s, at CC@,$CC,;t t
-s, at CFLAGS@,$CFLAGS,;t t
-s, at LDFLAGS@,$LDFLAGS,;t t
-s, at CPPFLAGS@,$CPPFLAGS,;t t
-s, at ac_ct_CC@,$ac_ct_CC,;t t
-s, at EXEEXT@,$EXEEXT,;t t
-s, at OBJEXT@,$OBJEXT,;t t
-s, at DEPDIR@,$DEPDIR,;t t
-s, at am__include@,$am__include,;t t
-s, at am__quote@,$am__quote,;t t
-s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
-s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
-s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-s, at CCDEPMODE@,$CCDEPMODE,;t t
-s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s, at EGREP@,$EGREP,;t t
-s, at LN_S@,$LN_S,;t t
-s, at ECHO@,$ECHO,;t t
-s, at AR@,$AR,;t t
-s, at ac_ct_AR@,$ac_ct_AR,;t t
-s, at RANLIB@,$RANLIB,;t t
-s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s, at CPP@,$CPP,;t t
-s, at CXX@,$CXX,;t t
-s, at CXXFLAGS@,$CXXFLAGS,;t t
-s, at ac_ct_CXX@,$ac_ct_CXX,;t t
-s, at CXXDEPMODE@,$CXXDEPMODE,;t t
-s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
-s, at CXXCPP@,$CXXCPP,;t t
-s, at F77@,$F77,;t t
-s, at FFLAGS@,$FFLAGS,;t t
-s, at ac_ct_F77@,$ac_ct_F77,;t t
-s, at LIBTOOL@,$LIBTOOL,;t t
-s, at RM@,$RM,;t t
-s, at CP@,$CP,;t t
-s, at MV@,$MV,;t t
-s, at TAR@,$TAR,;t t
-s, at HELP2MAN@,$HELP2MAN,;t t
-s, at MAN2HTML@,$MAN2HTML,;t t
-s, at U@,$U,;t t
-s, at ANSI2KNR@,$ANSI2KNR,;t t
-s, at INSTALL_LTDL_TRUE@,$INSTALL_LTDL_TRUE,;t t
-s, at INSTALL_LTDL_FALSE@,$INSTALL_LTDL_FALSE,;t t
-s, at CONVENIENCE_LTDL_TRUE@,$CONVENIENCE_LTDL_TRUE,;t t
-s, at CONVENIENCE_LTDL_FALSE@,$CONVENIENCE_LTDL_FALSE,;t t
-s, at LIBADD_DL@,$LIBADD_DL,;t t
-s, at PKG_CONFIG_ENABLED@,$PKG_CONFIG_ENABLED,;t t
-s, at PKG_CONFIG@,$PKG_CONFIG,;t t
-s, at LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t
-s, at LIBXML_LIBS@,$LIBXML_LIBS,;t t
-s, at LIBXML_CONFIG@,$LIBXML_CONFIG,;t t
-s, at LIBXML_MIN_VERSION@,$LIBXML_MIN_VERSION,;t t
-s, at LIBXSLT_CFLAGS@,$LIBXSLT_CFLAGS,;t t
-s, at LIBXSLT_LIBS@,$LIBXSLT_LIBS,;t t
-s, at XMLSEC_NO_LIBXSLT@,$XMLSEC_NO_LIBXSLT,;t t
-s, at LIBXSLT_CONFIG@,$LIBXSLT_CONFIG,;t t
-s, at LIBXSLT_MIN_VERSION@,$LIBXSLT_MIN_VERSION,;t t
-s, at OPENSSL_CFLAGS@,$OPENSSL_CFLAGS,;t t
-s, at OPENSSL_LIBS@,$OPENSSL_LIBS,;t t
-s, at XMLSEC_NO_OPENSSL_TRUE@,$XMLSEC_NO_OPENSSL_TRUE,;t t
-s, at XMLSEC_NO_OPENSSL_FALSE@,$XMLSEC_NO_OPENSSL_FALSE,;t t
-s, at XMLSEC_NO_OPENSSL@,$XMLSEC_NO_OPENSSL,;t t
-s, at OPENSSL_CRYPTO_LIB@,$OPENSSL_CRYPTO_LIB,;t t
-s, at OPENSSL_MIN_VERSION@,$OPENSSL_MIN_VERSION,;t t
-s, at GNUTLS_CFLAGS@,$GNUTLS_CFLAGS,;t t
-s, at GNUTLS_LIBS@,$GNUTLS_LIBS,;t t
-s, at XMLSEC_NO_GNUTLS_TRUE@,$XMLSEC_NO_GNUTLS_TRUE,;t t
-s, at XMLSEC_NO_GNUTLS_FALSE@,$XMLSEC_NO_GNUTLS_FALSE,;t t
-s, at XMLSEC_NO_GNUTLS@,$XMLSEC_NO_GNUTLS,;t t
-s, at GNUTLS_CRYPTO_LIB@,$GNUTLS_CRYPTO_LIB,;t t
-s, at GNUTLS_MIN_VERSION@,$GNUTLS_MIN_VERSION,;t t
-s, at NSS_CFLAGS@,$NSS_CFLAGS,;t t
-s, at NSS_LIBS@,$NSS_LIBS,;t t
-s, at XMLSEC_NO_NSS_TRUE@,$XMLSEC_NO_NSS_TRUE,;t t
-s, at XMLSEC_NO_NSS_FALSE@,$XMLSEC_NO_NSS_FALSE,;t t
-s, at XMLSEC_NO_NSS@,$XMLSEC_NO_NSS,;t t
-s, at NSS_CRYPTO_LIB@,$NSS_CRYPTO_LIB,;t t
-s, at NSS_MIN_VERSION@,$NSS_MIN_VERSION,;t t
-s, at NSPR_MIN_VERSION@,$NSPR_MIN_VERSION,;t t
-s, at MOZILLA_MIN_VERSION@,$MOZILLA_MIN_VERSION,;t t
-s, at XMLSEC_NO_MD5_TRUE@,$XMLSEC_NO_MD5_TRUE,;t t
-s, at XMLSEC_NO_MD5_FALSE@,$XMLSEC_NO_MD5_FALSE,;t t
-s, at XMLSEC_NO_MD5@,$XMLSEC_NO_MD5,;t t
-s, at XMLSEC_NO_RIPEMD160_TRUE@,$XMLSEC_NO_RIPEMD160_TRUE,;t t
-s, at XMLSEC_NO_RIPEMD160_FALSE@,$XMLSEC_NO_RIPEMD160_FALSE,;t t
-s, at XMLSEC_NO_RIPEMD160@,$XMLSEC_NO_RIPEMD160,;t t
-s, at XMLSEC_NO_SHA1_TRUE@,$XMLSEC_NO_SHA1_TRUE,;t t
-s, at XMLSEC_NO_SHA1_FALSE@,$XMLSEC_NO_SHA1_FALSE,;t t
-s, at XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t
-s, at XMLSEC_NO_SHA224_TRUE@,$XMLSEC_NO_SHA224_TRUE,;t t
-s, at XMLSEC_NO_SHA224_FALSE@,$XMLSEC_NO_SHA224_FALSE,;t t
-s, at XMLSEC_NO_SHA224@,$XMLSEC_NO_SHA224,;t t
-s, at XMLSEC_NO_SHA256_TRUE@,$XMLSEC_NO_SHA256_TRUE,;t t
-s, at XMLSEC_NO_SHA256_FALSE@,$XMLSEC_NO_SHA256_FALSE,;t t
-s, at XMLSEC_NO_SHA256@,$XMLSEC_NO_SHA256,;t t
-s, at XMLSEC_NO_SHA384_TRUE@,$XMLSEC_NO_SHA384_TRUE,;t t
-s, at XMLSEC_NO_SHA384_FALSE@,$XMLSEC_NO_SHA384_FALSE,;t t
-s, at XMLSEC_NO_SHA384@,$XMLSEC_NO_SHA384,;t t
-s, at XMLSEC_NO_SHA512_TRUE@,$XMLSEC_NO_SHA512_TRUE,;t t
-s, at XMLSEC_NO_SHA512_FALSE@,$XMLSEC_NO_SHA512_FALSE,;t t
-s, at XMLSEC_NO_SHA512@,$XMLSEC_NO_SHA512,;t t
-s, at XMLSEC_NO_HMAC_TRUE@,$XMLSEC_NO_HMAC_TRUE,;t t
-s, at XMLSEC_NO_HMAC_FALSE@,$XMLSEC_NO_HMAC_FALSE,;t t
-s, at XMLSEC_NO_HMAC@,$XMLSEC_NO_HMAC,;t t
-s, at XMLSEC_NO_DSA_TRUE@,$XMLSEC_NO_DSA_TRUE,;t t
-s, at XMLSEC_NO_DSA_FALSE@,$XMLSEC_NO_DSA_FALSE,;t t
-s, at XMLSEC_NO_DSA@,$XMLSEC_NO_DSA,;t t
-s, at XMLSEC_NO_RSA_TRUE@,$XMLSEC_NO_RSA_TRUE,;t t
-s, at XMLSEC_NO_RSA_FALSE@,$XMLSEC_NO_RSA_FALSE,;t t
-s, at XMLSEC_NO_RSA@,$XMLSEC_NO_RSA,;t t
-s, at XMLSEC_NO_X509_TRUE@,$XMLSEC_NO_X509_TRUE,;t t
-s, at XMLSEC_NO_X509_FALSE@,$XMLSEC_NO_X509_FALSE,;t t
-s, at XMLSEC_NO_X509@,$XMLSEC_NO_X509,;t t
-s, at XMLSEC_NO_DES_TRUE@,$XMLSEC_NO_DES_TRUE,;t t
-s, at XMLSEC_NO_DES_FALSE@,$XMLSEC_NO_DES_FALSE,;t t
-s, at XMLSEC_NO_DES@,$XMLSEC_NO_DES,;t t
-s, at XMLSEC_NO_AES_TRUE@,$XMLSEC_NO_AES_TRUE,;t t
-s, at XMLSEC_NO_AES_FALSE@,$XMLSEC_NO_AES_FALSE,;t t
-s, at XMLSEC_NO_AES@,$XMLSEC_NO_AES,;t t
-s, at XMLSEC_NO_XMLDSIG_TRUE@,$XMLSEC_NO_XMLDSIG_TRUE,;t t
-s, at XMLSEC_NO_XMLDSIG_FALSE@,$XMLSEC_NO_XMLDSIG_FALSE,;t t
-s, at XMLSEC_NO_XMLDSIG@,$XMLSEC_NO_XMLDSIG,;t t
-s, at XMLSEC_NO_XMLENC_TRUE@,$XMLSEC_NO_XMLENC_TRUE,;t t
-s, at XMLSEC_NO_XMLENC_FALSE@,$XMLSEC_NO_XMLENC_FALSE,;t t
-s, at XMLSEC_NO_XMLENC@,$XMLSEC_NO_XMLENC,;t t
-s, at XMLSEC_NO_XKMS_TRUE@,$XMLSEC_NO_XKMS_TRUE,;t t
-s, at XMLSEC_NO_XKMS_FALSE@,$XMLSEC_NO_XKMS_FALSE,;t t
-s, at XMLSEC_NO_XKMS@,$XMLSEC_NO_XKMS,;t t
-s, at XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE@,$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE,;t t
-s, at XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE@,$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE,;t t
-s, at XMLSEC_NO_CRYPTO_DYNAMIC_LOADING@,$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING,;t t
-s, at XMLSEC_DL_INCLUDES@,$XMLSEC_DL_INCLUDES,;t t
-s, at XMLSEC_DL_LIBS@,$XMLSEC_DL_LIBS,;t t
-s, at XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE@,$XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE,;t t
-s, at XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE@,$XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE,;t t
-s, at XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING@,$XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING,;t t
-s, at XMLSEC_DOCDIR@,$XMLSEC_DOCDIR,;t t
-s, at XMLSEC_STATIC_BINARIES@,$XMLSEC_STATIC_BINARIES,;t t
-s, at XMLSEC_CORE_CFLAGS@,$XMLSEC_CORE_CFLAGS,;t t
-s, at XMLSEC_CORE_LIBS@,$XMLSEC_CORE_LIBS,;t t
-s, at XMLSEC_LIBDIR@,$XMLSEC_LIBDIR,;t t
-s, at XMLSEC_OPENSSL_CFLAGS@,$XMLSEC_OPENSSL_CFLAGS,;t t
-s, at XMLSEC_OPENSSL_LIBS@,$XMLSEC_OPENSSL_LIBS,;t t
-s, at XMLSEC_GNUTLS_CFLAGS@,$XMLSEC_GNUTLS_CFLAGS,;t t
-s, at XMLSEC_GNUTLS_LIBS@,$XMLSEC_GNUTLS_LIBS,;t t
-s, at XMLSEC_NSS_CFLAGS@,$XMLSEC_NSS_CFLAGS,;t t
-s, at XMLSEC_NSS_LIBS@,$XMLSEC_NSS_LIBS,;t t
-s, at XMLSEC_CFLAGS@,$XMLSEC_CFLAGS,;t t
-s, at XMLSEC_LIBS@,$XMLSEC_LIBS,;t t
-s, at XMLSEC_DEFINES@,$XMLSEC_DEFINES,;t t
-s, at XMLSEC_APP_DEFINES@,$XMLSEC_APP_DEFINES,;t t
-s, at XMLSEC_CRYPTO@,$XMLSEC_CRYPTO,;t t
-s, at XMLSEC_CRYPTO_LIST@,$XMLSEC_CRYPTO_LIST,;t t
-s, at XMLSEC_CRYPTO_DISABLED_LIST@,$XMLSEC_CRYPTO_DISABLED_LIST,;t t
-s, at XMLSEC_CRYPTO_LIB@,$XMLSEC_CRYPTO_LIB,;t t
-s, at XMLSEC_CRYPTO_CFLAGS@,$XMLSEC_CRYPTO_CFLAGS,;t t
-s, at XMLSEC_CRYPTO_LIBS@,$XMLSEC_CRYPTO_LIBS,;t t
-s, at XMLSEC_CRYPTO_PC_FILES_LIST@,$XMLSEC_CRYPTO_PC_FILES_LIST,;t t
-s, at LIBOBJS@,$LIBOBJS,;t t
-s, at LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-  esac
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s, at configure_input@,$configure_input,;t t
-s, at srcdir@,$ac_srcdir,;t t
-s, at abs_srcdir@,$ac_abs_srcdir,;t t
-s, at top_srcdir@,$ac_top_srcdir,;t t
-s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s, at builddir@,$ac_builddir,;t t
-s, at abs_builddir@,$ac_abs_builddir,;t t
-s, at top_builddir@,$ac_top_builddir,;t t
-s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
-s, at INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-ac_dB='[	 ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-
-_ACEOF
-
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h.  The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status.  Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless.  Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >>conftest.undefs <<\_ACEOF
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo '  :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
-do
-  # Write a limited-size here document to $tmp/defines.sed.
-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#define' lines.
-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines
-echo '  fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
-  # Write a limited-size here document to $tmp/undefs.sed.
-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#undef'
-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-  rm -f conftest.undefs
-  mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
-  if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
-    fi
-  else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
-  fi
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`(dirname "$mf") 2>/dev/null ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`(dirname "$file") 2>/dev/null ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    { if $as_mkdir_p; then
-    mkdir -p $dirpart/$fdir
-  else
-    as_dir=$dirpart/$fdir
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-  esac
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
-
-
-(cd $srcdir && rm -f COPYING.LIB COPYING && $LN_S Copyright COPYING)
-
-if test "z$XMLSEC_NO_OPENSSL" != "z1" ; then
-                    ac_config_files="$ac_config_files include/xmlsec/openssl/Makefile src/openssl/Makefile"
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${INSTALL_LTDL_TRUE}" && test -z "${INSTALL_LTDL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"INSTALL_LTDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"INSTALL_LTDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${CONVENIENCE_LTDL_TRUE}" && test -z "${CONVENIENCE_LTDL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"CONVENIENCE_LTDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CONVENIENCE_LTDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_OPENSSL_TRUE}" && test -z "${XMLSEC_NO_OPENSSL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_OPENSSL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_OPENSSL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_GNUTLS_TRUE}" && test -z "${XMLSEC_NO_GNUTLS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_GNUTLS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_GNUTLS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_NSS_TRUE}" && test -z "${XMLSEC_NO_NSS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_NSS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_NSS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_MD5_TRUE}" && test -z "${XMLSEC_NO_MD5_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_MD5\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_MD5\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_RIPEMD160_TRUE}" && test -z "${XMLSEC_NO_RIPEMD160_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_RIPEMD160\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_RIPEMD160\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_SHA1_TRUE}" && test -z "${XMLSEC_NO_SHA1_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA1\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_SHA1\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_SHA224_TRUE}" && test -z "${XMLSEC_NO_SHA224_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA224\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_SHA224\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_SHA256_TRUE}" && test -z "${XMLSEC_NO_SHA256_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA256\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_SHA256\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_SHA384_TRUE}" && test -z "${XMLSEC_NO_SHA384_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA384\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_SHA384\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_SHA512_TRUE}" && test -z "${XMLSEC_NO_SHA512_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA512\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_SHA512\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_HMAC_TRUE}" && test -z "${XMLSEC_NO_HMAC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_HMAC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_HMAC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_DSA_TRUE}" && test -z "${XMLSEC_NO_DSA_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_DSA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_DSA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_RSA_TRUE}" && test -z "${XMLSEC_NO_RSA_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_RSA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_RSA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_X509_TRUE}" && test -z "${XMLSEC_NO_X509_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_X509\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_X509\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_DES_TRUE}" && test -z "${XMLSEC_NO_DES_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_DES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_DES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_AES_TRUE}" && test -z "${XMLSEC_NO_AES_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_AES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_AES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_XMLDSIG_TRUE}" && test -z "${XMLSEC_NO_XMLDSIG_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_XMLDSIG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_XMLDSIG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_XMLENC_TRUE}" && test -z "${XMLSEC_NO_XMLENC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_XMLENC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_XMLENC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_XKMS_TRUE}" && test -z "${XMLSEC_NO_XKMS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_XKMS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_XKMS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE}" && test -z "${XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_CRYPTO_DYNAMIC_LOADING\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_CRYPTO_DYNAMIC_LOADING\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE}" && test -z "${XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by xmlsec1 $as_me 1.2.9, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf at gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-xmlsec1 config.status 1.2.9
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS section.
-#
-
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "include/xmlsec/version.h" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/version.h" ;;
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-  "include/xmlsec/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/Makefile" ;;
-  "include/xmlsec/private/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/private/Makefile" ;;
-  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-  "apps/Makefile" ) CONFIG_FILES="$CONFIG_FILES apps/Makefile" ;;
-  "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
-  "docs/api/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/api/Makefile" ;;
-  "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
-  "xmlsec1Conf.sh" ) CONFIG_FILES="$CONFIG_FILES xmlsec1Conf.sh:xmlsecConf.sh.in" ;;
-  "xmlsec1-config" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-config:xmlsec-config.in" ;;
-  "xmlsec1-openssl.pc" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-openssl.pc:xmlsec-openssl.pc.in" ;;
-  "xmlsec1-gnutls.pc" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-gnutls.pc:xmlsec-gnutls.pc.in" ;;
-  "xmlsec1-nss.pc" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-nss.pc:xmlsec-nss.pc.in" ;;
-  "xmlsec1.spec" ) CONFIG_FILES="$CONFIG_FILES xmlsec1.spec:xmlsec.spec.in" ;;
-  "include/xmlsec/openssl/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/openssl/Makefile" ;;
-  "src/openssl/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/openssl/Makefile" ;;
-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s, at SHELL@,$SHELL,;t t
-s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s, at exec_prefix@,$exec_prefix,;t t
-s, at prefix@,$prefix,;t t
-s, at program_transform_name@,$program_transform_name,;t t
-s, at bindir@,$bindir,;t t
-s, at sbindir@,$sbindir,;t t
-s, at libexecdir@,$libexecdir,;t t
-s, at datadir@,$datadir,;t t
-s, at sysconfdir@,$sysconfdir,;t t
-s, at sharedstatedir@,$sharedstatedir,;t t
-s, at localstatedir@,$localstatedir,;t t
-s, at libdir@,$libdir,;t t
-s, at includedir@,$includedir,;t t
-s, at oldincludedir@,$oldincludedir,;t t
-s, at infodir@,$infodir,;t t
-s, at mandir@,$mandir,;t t
-s, at build_alias@,$build_alias,;t t
-s, at host_alias@,$host_alias,;t t
-s, at target_alias@,$target_alias,;t t
-s, at DEFS@,$DEFS,;t t
-s, at ECHO_C@,$ECHO_C,;t t
-s, at ECHO_N@,$ECHO_N,;t t
-s, at ECHO_T@,$ECHO_T,;t t
-s, at LIBS@,$LIBS,;t t
-s, at build@,$build,;t t
-s, at build_cpu@,$build_cpu,;t t
-s, at build_vendor@,$build_vendor,;t t
-s, at build_os@,$build_os,;t t
-s, at host@,$host,;t t
-s, at host_cpu@,$host_cpu,;t t
-s, at host_vendor@,$host_vendor,;t t
-s, at host_os@,$host_os,;t t
-s, at XMLSEC_VERSION@,$XMLSEC_VERSION,;t t
-s, at XMLSEC_PACKAGE@,$XMLSEC_PACKAGE,;t t
-s, at XMLSEC_VERSION_SAFE@,$XMLSEC_VERSION_SAFE,;t t
-s, at XMLSEC_VERSION_MAJOR@,$XMLSEC_VERSION_MAJOR,;t t
-s, at XMLSEC_VERSION_MINOR@,$XMLSEC_VERSION_MINOR,;t t
-s, at XMLSEC_VERSION_SUBMINOR@,$XMLSEC_VERSION_SUBMINOR,;t t
-s, at XMLSEC_VERSION_INFO@,$XMLSEC_VERSION_INFO,;t t
-s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s, at INSTALL_DATA@,$INSTALL_DATA,;t t
-s, at CYGPATH_W@,$CYGPATH_W,;t t
-s, at PACKAGE@,$PACKAGE,;t t
-s, at VERSION@,$VERSION,;t t
-s, at ACLOCAL@,$ACLOCAL,;t t
-s, at AUTOCONF@,$AUTOCONF,;t t
-s, at AUTOMAKE@,$AUTOMAKE,;t t
-s, at AUTOHEADER@,$AUTOHEADER,;t t
-s, at MAKEINFO@,$MAKEINFO,;t t
-s, at install_sh@,$install_sh,;t t
-s, at STRIP@,$STRIP,;t t
-s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
-s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-s, at mkdir_p@,$mkdir_p,;t t
-s, at AWK@,$AWK,;t t
-s, at SET_MAKE@,$SET_MAKE,;t t
-s, at am__leading_dot@,$am__leading_dot,;t t
-s, at AMTAR@,$AMTAR,;t t
-s, at am__tar@,$am__tar,;t t
-s, at am__untar@,$am__untar,;t t
-s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-s, at MAINT@,$MAINT,;t t
-s, at CC@,$CC,;t t
-s, at CFLAGS@,$CFLAGS,;t t
-s, at LDFLAGS@,$LDFLAGS,;t t
-s, at CPPFLAGS@,$CPPFLAGS,;t t
-s, at ac_ct_CC@,$ac_ct_CC,;t t
-s, at EXEEXT@,$EXEEXT,;t t
-s, at OBJEXT@,$OBJEXT,;t t
-s, at DEPDIR@,$DEPDIR,;t t
-s, at am__include@,$am__include,;t t
-s, at am__quote@,$am__quote,;t t
-s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
-s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
-s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-s, at CCDEPMODE@,$CCDEPMODE,;t t
-s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s, at EGREP@,$EGREP,;t t
-s, at LN_S@,$LN_S,;t t
-s, at ECHO@,$ECHO,;t t
-s, at AR@,$AR,;t t
-s, at ac_ct_AR@,$ac_ct_AR,;t t
-s, at RANLIB@,$RANLIB,;t t
-s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s, at CPP@,$CPP,;t t
-s, at CXX@,$CXX,;t t
-s, at CXXFLAGS@,$CXXFLAGS,;t t
-s, at ac_ct_CXX@,$ac_ct_CXX,;t t
-s, at CXXDEPMODE@,$CXXDEPMODE,;t t
-s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
-s, at CXXCPP@,$CXXCPP,;t t
-s, at F77@,$F77,;t t
-s, at FFLAGS@,$FFLAGS,;t t
-s, at ac_ct_F77@,$ac_ct_F77,;t t
-s, at LIBTOOL@,$LIBTOOL,;t t
-s, at RM@,$RM,;t t
-s, at CP@,$CP,;t t
-s, at MV@,$MV,;t t
-s, at TAR@,$TAR,;t t
-s, at HELP2MAN@,$HELP2MAN,;t t
-s, at MAN2HTML@,$MAN2HTML,;t t
-s, at U@,$U,;t t
-s, at ANSI2KNR@,$ANSI2KNR,;t t
-s, at INSTALL_LTDL_TRUE@,$INSTALL_LTDL_TRUE,;t t
-s, at INSTALL_LTDL_FALSE@,$INSTALL_LTDL_FALSE,;t t
-s, at CONVENIENCE_LTDL_TRUE@,$CONVENIENCE_LTDL_TRUE,;t t
-s, at CONVENIENCE_LTDL_FALSE@,$CONVENIENCE_LTDL_FALSE,;t t
-s, at LIBADD_DL@,$LIBADD_DL,;t t
-s, at PKG_CONFIG_ENABLED@,$PKG_CONFIG_ENABLED,;t t
-s, at PKG_CONFIG@,$PKG_CONFIG,;t t
-s, at LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t
-s, at LIBXML_LIBS@,$LIBXML_LIBS,;t t
-s, at LIBXML_CONFIG@,$LIBXML_CONFIG,;t t
-s, at LIBXML_MIN_VERSION@,$LIBXML_MIN_VERSION,;t t
-s, at LIBXSLT_CFLAGS@,$LIBXSLT_CFLAGS,;t t
-s, at LIBXSLT_LIBS@,$LIBXSLT_LIBS,;t t
-s, at XMLSEC_NO_LIBXSLT@,$XMLSEC_NO_LIBXSLT,;t t
-s, at LIBXSLT_CONFIG@,$LIBXSLT_CONFIG,;t t
-s, at LIBXSLT_MIN_VERSION@,$LIBXSLT_MIN_VERSION,;t t
-s, at OPENSSL_CFLAGS@,$OPENSSL_CFLAGS,;t t
-s, at OPENSSL_LIBS@,$OPENSSL_LIBS,;t t
-s, at XMLSEC_NO_OPENSSL_TRUE@,$XMLSEC_NO_OPENSSL_TRUE,;t t
-s, at XMLSEC_NO_OPENSSL_FALSE@,$XMLSEC_NO_OPENSSL_FALSE,;t t
-s, at XMLSEC_NO_OPENSSL@,$XMLSEC_NO_OPENSSL,;t t
-s, at OPENSSL_CRYPTO_LIB@,$OPENSSL_CRYPTO_LIB,;t t
-s, at OPENSSL_MIN_VERSION@,$OPENSSL_MIN_VERSION,;t t
-s, at GNUTLS_CFLAGS@,$GNUTLS_CFLAGS,;t t
-s, at GNUTLS_LIBS@,$GNUTLS_LIBS,;t t
-s, at XMLSEC_NO_GNUTLS_TRUE@,$XMLSEC_NO_GNUTLS_TRUE,;t t
-s, at XMLSEC_NO_GNUTLS_FALSE@,$XMLSEC_NO_GNUTLS_FALSE,;t t
-s, at XMLSEC_NO_GNUTLS@,$XMLSEC_NO_GNUTLS,;t t
-s, at GNUTLS_CRYPTO_LIB@,$GNUTLS_CRYPTO_LIB,;t t
-s, at GNUTLS_MIN_VERSION@,$GNUTLS_MIN_VERSION,;t t
-s, at NSS_CFLAGS@,$NSS_CFLAGS,;t t
-s, at NSS_LIBS@,$NSS_LIBS,;t t
-s, at XMLSEC_NO_NSS_TRUE@,$XMLSEC_NO_NSS_TRUE,;t t
-s, at XMLSEC_NO_NSS_FALSE@,$XMLSEC_NO_NSS_FALSE,;t t
-s, at XMLSEC_NO_NSS@,$XMLSEC_NO_NSS,;t t
-s, at NSS_CRYPTO_LIB@,$NSS_CRYPTO_LIB,;t t
-s, at NSS_MIN_VERSION@,$NSS_MIN_VERSION,;t t
-s, at NSPR_MIN_VERSION@,$NSPR_MIN_VERSION,;t t
-s, at MOZILLA_MIN_VERSION@,$MOZILLA_MIN_VERSION,;t t
-s, at XMLSEC_NO_MD5_TRUE@,$XMLSEC_NO_MD5_TRUE,;t t
-s, at XMLSEC_NO_MD5_FALSE@,$XMLSEC_NO_MD5_FALSE,;t t
-s, at XMLSEC_NO_MD5@,$XMLSEC_NO_MD5,;t t
-s, at XMLSEC_NO_RIPEMD160_TRUE@,$XMLSEC_NO_RIPEMD160_TRUE,;t t
-s, at XMLSEC_NO_RIPEMD160_FALSE@,$XMLSEC_NO_RIPEMD160_FALSE,;t t
-s, at XMLSEC_NO_RIPEMD160@,$XMLSEC_NO_RIPEMD160,;t t
-s, at XMLSEC_NO_SHA1_TRUE@,$XMLSEC_NO_SHA1_TRUE,;t t
-s, at XMLSEC_NO_SHA1_FALSE@,$XMLSEC_NO_SHA1_FALSE,;t t
-s, at XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t
-s, at XMLSEC_NO_SHA224_TRUE@,$XMLSEC_NO_SHA224_TRUE,;t t
-s, at XMLSEC_NO_SHA224_FALSE@,$XMLSEC_NO_SHA224_FALSE,;t t
-s, at XMLSEC_NO_SHA224@,$XMLSEC_NO_SHA224,;t t
-s, at XMLSEC_NO_SHA256_TRUE@,$XMLSEC_NO_SHA256_TRUE,;t t
-s, at XMLSEC_NO_SHA256_FALSE@,$XMLSEC_NO_SHA256_FALSE,;t t
-s, at XMLSEC_NO_SHA256@,$XMLSEC_NO_SHA256,;t t
-s, at XMLSEC_NO_SHA384_TRUE@,$XMLSEC_NO_SHA384_TRUE,;t t
-s, at XMLSEC_NO_SHA384_FALSE@,$XMLSEC_NO_SHA384_FALSE,;t t
-s, at XMLSEC_NO_SHA384@,$XMLSEC_NO_SHA384,;t t
-s, at XMLSEC_NO_SHA512_TRUE@,$XMLSEC_NO_SHA512_TRUE,;t t
-s, at XMLSEC_NO_SHA512_FALSE@,$XMLSEC_NO_SHA512_FALSE,;t t
-s, at XMLSEC_NO_SHA512@,$XMLSEC_NO_SHA512,;t t
-s, at XMLSEC_NO_HMAC_TRUE@,$XMLSEC_NO_HMAC_TRUE,;t t
-s, at XMLSEC_NO_HMAC_FALSE@,$XMLSEC_NO_HMAC_FALSE,;t t
-s, at XMLSEC_NO_HMAC@,$XMLSEC_NO_HMAC,;t t
-s, at XMLSEC_NO_DSA_TRUE@,$XMLSEC_NO_DSA_TRUE,;t t
-s, at XMLSEC_NO_DSA_FALSE@,$XMLSEC_NO_DSA_FALSE,;t t
-s, at XMLSEC_NO_DSA@,$XMLSEC_NO_DSA,;t t
-s, at XMLSEC_NO_RSA_TRUE@,$XMLSEC_NO_RSA_TRUE,;t t
-s, at XMLSEC_NO_RSA_FALSE@,$XMLSEC_NO_RSA_FALSE,;t t
-s, at XMLSEC_NO_RSA@,$XMLSEC_NO_RSA,;t t
-s, at XMLSEC_NO_X509_TRUE@,$XMLSEC_NO_X509_TRUE,;t t
-s, at XMLSEC_NO_X509_FALSE@,$XMLSEC_NO_X509_FALSE,;t t
-s, at XMLSEC_NO_X509@,$XMLSEC_NO_X509,;t t
-s, at XMLSEC_NO_DES_TRUE@,$XMLSEC_NO_DES_TRUE,;t t
-s, at XMLSEC_NO_DES_FALSE@,$XMLSEC_NO_DES_FALSE,;t t
-s, at XMLSEC_NO_DES@,$XMLSEC_NO_DES,;t t
-s, at XMLSEC_NO_AES_TRUE@,$XMLSEC_NO_AES_TRUE,;t t
-s, at XMLSEC_NO_AES_FALSE@,$XMLSEC_NO_AES_FALSE,;t t
-s, at XMLSEC_NO_AES@,$XMLSEC_NO_AES,;t t
-s, at XMLSEC_NO_XMLDSIG_TRUE@,$XMLSEC_NO_XMLDSIG_TRUE,;t t
-s, at XMLSEC_NO_XMLDSIG_FALSE@,$XMLSEC_NO_XMLDSIG_FALSE,;t t
-s, at XMLSEC_NO_XMLDSIG@,$XMLSEC_NO_XMLDSIG,;t t
-s, at XMLSEC_NO_XMLENC_TRUE@,$XMLSEC_NO_XMLENC_TRUE,;t t
-s, at XMLSEC_NO_XMLENC_FALSE@,$XMLSEC_NO_XMLENC_FALSE,;t t
-s, at XMLSEC_NO_XMLENC@,$XMLSEC_NO_XMLENC,;t t
-s, at XMLSEC_NO_XKMS_TRUE@,$XMLSEC_NO_XKMS_TRUE,;t t
-s, at XMLSEC_NO_XKMS_FALSE@,$XMLSEC_NO_XKMS_FALSE,;t t
-s, at XMLSEC_NO_XKMS@,$XMLSEC_NO_XKMS,;t t
-s, at XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE@,$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE,;t t
-s, at XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE@,$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE,;t t
-s, at XMLSEC_NO_CRYPTO_DYNAMIC_LOADING@,$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING,;t t
-s, at XMLSEC_DL_INCLUDES@,$XMLSEC_DL_INCLUDES,;t t
-s, at XMLSEC_DL_LIBS@,$XMLSEC_DL_LIBS,;t t
-s, at XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE@,$XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE,;t t
-s, at XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE@,$XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE,;t t
-s, at XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING@,$XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING,;t t
-s, at XMLSEC_DOCDIR@,$XMLSEC_DOCDIR,;t t
-s, at XMLSEC_STATIC_BINARIES@,$XMLSEC_STATIC_BINARIES,;t t
-s, at XMLSEC_CORE_CFLAGS@,$XMLSEC_CORE_CFLAGS,;t t
-s, at XMLSEC_CORE_LIBS@,$XMLSEC_CORE_LIBS,;t t
-s, at XMLSEC_LIBDIR@,$XMLSEC_LIBDIR,;t t
-s, at XMLSEC_OPENSSL_CFLAGS@,$XMLSEC_OPENSSL_CFLAGS,;t t
-s, at XMLSEC_OPENSSL_LIBS@,$XMLSEC_OPENSSL_LIBS,;t t
-s, at XMLSEC_GNUTLS_CFLAGS@,$XMLSEC_GNUTLS_CFLAGS,;t t
-s, at XMLSEC_GNUTLS_LIBS@,$XMLSEC_GNUTLS_LIBS,;t t
-s, at XMLSEC_NSS_CFLAGS@,$XMLSEC_NSS_CFLAGS,;t t
-s, at XMLSEC_NSS_LIBS@,$XMLSEC_NSS_LIBS,;t t
-s, at XMLSEC_CFLAGS@,$XMLSEC_CFLAGS,;t t
-s, at XMLSEC_LIBS@,$XMLSEC_LIBS,;t t
-s, at XMLSEC_DEFINES@,$XMLSEC_DEFINES,;t t
-s, at XMLSEC_APP_DEFINES@,$XMLSEC_APP_DEFINES,;t t
-s, at XMLSEC_CRYPTO@,$XMLSEC_CRYPTO,;t t
-s, at XMLSEC_CRYPTO_LIST@,$XMLSEC_CRYPTO_LIST,;t t
-s, at XMLSEC_CRYPTO_DISABLED_LIST@,$XMLSEC_CRYPTO_DISABLED_LIST,;t t
-s, at XMLSEC_CRYPTO_LIB@,$XMLSEC_CRYPTO_LIB,;t t
-s, at XMLSEC_CRYPTO_CFLAGS@,$XMLSEC_CRYPTO_CFLAGS,;t t
-s, at XMLSEC_CRYPTO_LIBS@,$XMLSEC_CRYPTO_LIBS,;t t
-s, at XMLSEC_CRYPTO_PC_FILES_LIST@,$XMLSEC_CRYPTO_PC_FILES_LIST,;t t
-s, at LIBOBJS@,$LIBOBJS,;t t
-s, at LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-  esac
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s, at configure_input@,$configure_input,;t t
-s, at srcdir@,$ac_srcdir,;t t
-s, at abs_srcdir@,$ac_abs_srcdir,;t t
-s, at top_srcdir@,$ac_top_srcdir,;t t
-s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s, at builddir@,$ac_builddir,;t t
-s, at abs_builddir@,$ac_abs_builddir,;t t
-s, at top_builddir@,$ac_top_builddir,;t t
-s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
-s, at INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-ac_dB='[	 ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-
-_ACEOF
-
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h.  The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status.  Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless.  Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >>conftest.undefs <<\_ACEOF
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo '  :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
-do
-  # Write a limited-size here document to $tmp/defines.sed.
-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#define' lines.
-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines
-echo '  fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
-  # Write a limited-size here document to $tmp/undefs.sed.
-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#undef'
-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-  rm -f conftest.undefs
-  mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
-  if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
-    fi
-  else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
-  fi
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`(dirname "$mf") 2>/dev/null ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`(dirname "$file") 2>/dev/null ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    { if $as_mkdir_p; then
-    mkdir -p $dirpart/$fdir
-  else
-    as_dir=$dirpart/$fdir
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-  esac
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
-fi
-
-if test "z$XMLSEC_NO_GNUTLS" != "z1" ; then
-                    ac_config_files="$ac_config_files include/xmlsec/gnutls/Makefile src/gnutls/Makefile"
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${INSTALL_LTDL_TRUE}" && test -z "${INSTALL_LTDL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"INSTALL_LTDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"INSTALL_LTDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${CONVENIENCE_LTDL_TRUE}" && test -z "${CONVENIENCE_LTDL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"CONVENIENCE_LTDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CONVENIENCE_LTDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_OPENSSL_TRUE}" && test -z "${XMLSEC_NO_OPENSSL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_OPENSSL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_OPENSSL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_GNUTLS_TRUE}" && test -z "${XMLSEC_NO_GNUTLS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_GNUTLS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_GNUTLS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_NSS_TRUE}" && test -z "${XMLSEC_NO_NSS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_NSS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_NSS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_MD5_TRUE}" && test -z "${XMLSEC_NO_MD5_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_MD5\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_MD5\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_RIPEMD160_TRUE}" && test -z "${XMLSEC_NO_RIPEMD160_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_RIPEMD160\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_RIPEMD160\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_SHA1_TRUE}" && test -z "${XMLSEC_NO_SHA1_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA1\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_SHA1\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_SHA224_TRUE}" && test -z "${XMLSEC_NO_SHA224_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA224\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_SHA224\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_SHA256_TRUE}" && test -z "${XMLSEC_NO_SHA256_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA256\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_SHA256\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_SHA384_TRUE}" && test -z "${XMLSEC_NO_SHA384_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA384\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_SHA384\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_SHA512_TRUE}" && test -z "${XMLSEC_NO_SHA512_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA512\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_SHA512\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_HMAC_TRUE}" && test -z "${XMLSEC_NO_HMAC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_HMAC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_HMAC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_DSA_TRUE}" && test -z "${XMLSEC_NO_DSA_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_DSA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_DSA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_RSA_TRUE}" && test -z "${XMLSEC_NO_RSA_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_RSA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_RSA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_X509_TRUE}" && test -z "${XMLSEC_NO_X509_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_X509\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_X509\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_DES_TRUE}" && test -z "${XMLSEC_NO_DES_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_DES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_DES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_AES_TRUE}" && test -z "${XMLSEC_NO_AES_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_AES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_AES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_XMLDSIG_TRUE}" && test -z "${XMLSEC_NO_XMLDSIG_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_XMLDSIG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_XMLDSIG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_XMLENC_TRUE}" && test -z "${XMLSEC_NO_XMLENC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_XMLENC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_XMLENC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_XKMS_TRUE}" && test -z "${XMLSEC_NO_XKMS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_XKMS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_XKMS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE}" && test -z "${XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_CRYPTO_DYNAMIC_LOADING\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_CRYPTO_DYNAMIC_LOADING\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE}" && test -z "${XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by xmlsec1 $as_me 1.2.9, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf at gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-xmlsec1 config.status 1.2.9
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS section.
-#
-
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "include/xmlsec/version.h" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/version.h" ;;
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-  "include/xmlsec/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/Makefile" ;;
-  "include/xmlsec/private/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/private/Makefile" ;;
-  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-  "apps/Makefile" ) CONFIG_FILES="$CONFIG_FILES apps/Makefile" ;;
-  "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
-  "docs/api/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/api/Makefile" ;;
-  "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
-  "xmlsec1Conf.sh" ) CONFIG_FILES="$CONFIG_FILES xmlsec1Conf.sh:xmlsecConf.sh.in" ;;
-  "xmlsec1-config" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-config:xmlsec-config.in" ;;
-  "xmlsec1-openssl.pc" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-openssl.pc:xmlsec-openssl.pc.in" ;;
-  "xmlsec1-gnutls.pc" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-gnutls.pc:xmlsec-gnutls.pc.in" ;;
-  "xmlsec1-nss.pc" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-nss.pc:xmlsec-nss.pc.in" ;;
-  "xmlsec1.spec" ) CONFIG_FILES="$CONFIG_FILES xmlsec1.spec:xmlsec.spec.in" ;;
-  "include/xmlsec/openssl/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/openssl/Makefile" ;;
-  "src/openssl/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/openssl/Makefile" ;;
-  "include/xmlsec/gnutls/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/gnutls/Makefile" ;;
-  "src/gnutls/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gnutls/Makefile" ;;
-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s, at SHELL@,$SHELL,;t t
-s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s, at exec_prefix@,$exec_prefix,;t t
-s, at prefix@,$prefix,;t t
-s, at program_transform_name@,$program_transform_name,;t t
-s, at bindir@,$bindir,;t t
-s, at sbindir@,$sbindir,;t t
-s, at libexecdir@,$libexecdir,;t t
-s, at datadir@,$datadir,;t t
-s, at sysconfdir@,$sysconfdir,;t t
-s, at sharedstatedir@,$sharedstatedir,;t t
-s, at localstatedir@,$localstatedir,;t t
-s, at libdir@,$libdir,;t t
-s, at includedir@,$includedir,;t t
-s, at oldincludedir@,$oldincludedir,;t t
-s, at infodir@,$infodir,;t t
-s, at mandir@,$mandir,;t t
-s, at build_alias@,$build_alias,;t t
-s, at host_alias@,$host_alias,;t t
-s, at target_alias@,$target_alias,;t t
-s, at DEFS@,$DEFS,;t t
-s, at ECHO_C@,$ECHO_C,;t t
-s, at ECHO_N@,$ECHO_N,;t t
-s, at ECHO_T@,$ECHO_T,;t t
-s, at LIBS@,$LIBS,;t t
-s, at build@,$build,;t t
-s, at build_cpu@,$build_cpu,;t t
-s, at build_vendor@,$build_vendor,;t t
-s, at build_os@,$build_os,;t t
-s, at host@,$host,;t t
-s, at host_cpu@,$host_cpu,;t t
-s, at host_vendor@,$host_vendor,;t t
-s, at host_os@,$host_os,;t t
-s, at XMLSEC_VERSION@,$XMLSEC_VERSION,;t t
-s, at XMLSEC_PACKAGE@,$XMLSEC_PACKAGE,;t t
-s, at XMLSEC_VERSION_SAFE@,$XMLSEC_VERSION_SAFE,;t t
-s, at XMLSEC_VERSION_MAJOR@,$XMLSEC_VERSION_MAJOR,;t t
-s, at XMLSEC_VERSION_MINOR@,$XMLSEC_VERSION_MINOR,;t t
-s, at XMLSEC_VERSION_SUBMINOR@,$XMLSEC_VERSION_SUBMINOR,;t t
-s, at XMLSEC_VERSION_INFO@,$XMLSEC_VERSION_INFO,;t t
-s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s, at INSTALL_DATA@,$INSTALL_DATA,;t t
-s, at CYGPATH_W@,$CYGPATH_W,;t t
-s, at PACKAGE@,$PACKAGE,;t t
-s, at VERSION@,$VERSION,;t t
-s, at ACLOCAL@,$ACLOCAL,;t t
-s, at AUTOCONF@,$AUTOCONF,;t t
-s, at AUTOMAKE@,$AUTOMAKE,;t t
-s, at AUTOHEADER@,$AUTOHEADER,;t t
-s, at MAKEINFO@,$MAKEINFO,;t t
-s, at install_sh@,$install_sh,;t t
-s, at STRIP@,$STRIP,;t t
-s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
-s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-s, at mkdir_p@,$mkdir_p,;t t
-s, at AWK@,$AWK,;t t
-s, at SET_MAKE@,$SET_MAKE,;t t
-s, at am__leading_dot@,$am__leading_dot,;t t
-s, at AMTAR@,$AMTAR,;t t
-s, at am__tar@,$am__tar,;t t
-s, at am__untar@,$am__untar,;t t
-s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-s, at MAINT@,$MAINT,;t t
-s, at CC@,$CC,;t t
-s, at CFLAGS@,$CFLAGS,;t t
-s, at LDFLAGS@,$LDFLAGS,;t t
-s, at CPPFLAGS@,$CPPFLAGS,;t t
-s, at ac_ct_CC@,$ac_ct_CC,;t t
-s, at EXEEXT@,$EXEEXT,;t t
-s, at OBJEXT@,$OBJEXT,;t t
-s, at DEPDIR@,$DEPDIR,;t t
-s, at am__include@,$am__include,;t t
-s, at am__quote@,$am__quote,;t t
-s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
-s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
-s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-s, at CCDEPMODE@,$CCDEPMODE,;t t
-s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s, at EGREP@,$EGREP,;t t
-s, at LN_S@,$LN_S,;t t
-s, at ECHO@,$ECHO,;t t
-s, at AR@,$AR,;t t
-s, at ac_ct_AR@,$ac_ct_AR,;t t
-s, at RANLIB@,$RANLIB,;t t
-s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s, at CPP@,$CPP,;t t
-s, at CXX@,$CXX,;t t
-s, at CXXFLAGS@,$CXXFLAGS,;t t
-s, at ac_ct_CXX@,$ac_ct_CXX,;t t
-s, at CXXDEPMODE@,$CXXDEPMODE,;t t
-s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
-s, at CXXCPP@,$CXXCPP,;t t
-s, at F77@,$F77,;t t
-s, at FFLAGS@,$FFLAGS,;t t
-s, at ac_ct_F77@,$ac_ct_F77,;t t
-s, at LIBTOOL@,$LIBTOOL,;t t
-s, at RM@,$RM,;t t
-s, at CP@,$CP,;t t
-s, at MV@,$MV,;t t
-s, at TAR@,$TAR,;t t
-s, at HELP2MAN@,$HELP2MAN,;t t
-s, at MAN2HTML@,$MAN2HTML,;t t
-s, at U@,$U,;t t
-s, at ANSI2KNR@,$ANSI2KNR,;t t
-s, at INSTALL_LTDL_TRUE@,$INSTALL_LTDL_TRUE,;t t
-s, at INSTALL_LTDL_FALSE@,$INSTALL_LTDL_FALSE,;t t
-s, at CONVENIENCE_LTDL_TRUE@,$CONVENIENCE_LTDL_TRUE,;t t
-s, at CONVENIENCE_LTDL_FALSE@,$CONVENIENCE_LTDL_FALSE,;t t
-s, at LIBADD_DL@,$LIBADD_DL,;t t
-s, at PKG_CONFIG_ENABLED@,$PKG_CONFIG_ENABLED,;t t
-s, at PKG_CONFIG@,$PKG_CONFIG,;t t
-s, at LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t
-s, at LIBXML_LIBS@,$LIBXML_LIBS,;t t
-s, at LIBXML_CONFIG@,$LIBXML_CONFIG,;t t
-s, at LIBXML_MIN_VERSION@,$LIBXML_MIN_VERSION,;t t
-s, at LIBXSLT_CFLAGS@,$LIBXSLT_CFLAGS,;t t
-s, at LIBXSLT_LIBS@,$LIBXSLT_LIBS,;t t
-s, at XMLSEC_NO_LIBXSLT@,$XMLSEC_NO_LIBXSLT,;t t
-s, at LIBXSLT_CONFIG@,$LIBXSLT_CONFIG,;t t
-s, at LIBXSLT_MIN_VERSION@,$LIBXSLT_MIN_VERSION,;t t
-s, at OPENSSL_CFLAGS@,$OPENSSL_CFLAGS,;t t
-s, at OPENSSL_LIBS@,$OPENSSL_LIBS,;t t
-s, at XMLSEC_NO_OPENSSL_TRUE@,$XMLSEC_NO_OPENSSL_TRUE,;t t
-s, at XMLSEC_NO_OPENSSL_FALSE@,$XMLSEC_NO_OPENSSL_FALSE,;t t
-s, at XMLSEC_NO_OPENSSL@,$XMLSEC_NO_OPENSSL,;t t
-s, at OPENSSL_CRYPTO_LIB@,$OPENSSL_CRYPTO_LIB,;t t
-s, at OPENSSL_MIN_VERSION@,$OPENSSL_MIN_VERSION,;t t
-s, at GNUTLS_CFLAGS@,$GNUTLS_CFLAGS,;t t
-s, at GNUTLS_LIBS@,$GNUTLS_LIBS,;t t
-s, at XMLSEC_NO_GNUTLS_TRUE@,$XMLSEC_NO_GNUTLS_TRUE,;t t
-s, at XMLSEC_NO_GNUTLS_FALSE@,$XMLSEC_NO_GNUTLS_FALSE,;t t
-s, at XMLSEC_NO_GNUTLS@,$XMLSEC_NO_GNUTLS,;t t
-s, at GNUTLS_CRYPTO_LIB@,$GNUTLS_CRYPTO_LIB,;t t
-s, at GNUTLS_MIN_VERSION@,$GNUTLS_MIN_VERSION,;t t
-s, at NSS_CFLAGS@,$NSS_CFLAGS,;t t
-s, at NSS_LIBS@,$NSS_LIBS,;t t
-s, at XMLSEC_NO_NSS_TRUE@,$XMLSEC_NO_NSS_TRUE,;t t
-s, at XMLSEC_NO_NSS_FALSE@,$XMLSEC_NO_NSS_FALSE,;t t
-s, at XMLSEC_NO_NSS@,$XMLSEC_NO_NSS,;t t
-s, at NSS_CRYPTO_LIB@,$NSS_CRYPTO_LIB,;t t
-s, at NSS_MIN_VERSION@,$NSS_MIN_VERSION,;t t
-s, at NSPR_MIN_VERSION@,$NSPR_MIN_VERSION,;t t
-s, at MOZILLA_MIN_VERSION@,$MOZILLA_MIN_VERSION,;t t
-s, at XMLSEC_NO_MD5_TRUE@,$XMLSEC_NO_MD5_TRUE,;t t
-s, at XMLSEC_NO_MD5_FALSE@,$XMLSEC_NO_MD5_FALSE,;t t
-s, at XMLSEC_NO_MD5@,$XMLSEC_NO_MD5,;t t
-s, at XMLSEC_NO_RIPEMD160_TRUE@,$XMLSEC_NO_RIPEMD160_TRUE,;t t
-s, at XMLSEC_NO_RIPEMD160_FALSE@,$XMLSEC_NO_RIPEMD160_FALSE,;t t
-s, at XMLSEC_NO_RIPEMD160@,$XMLSEC_NO_RIPEMD160,;t t
-s, at XMLSEC_NO_SHA1_TRUE@,$XMLSEC_NO_SHA1_TRUE,;t t
-s, at XMLSEC_NO_SHA1_FALSE@,$XMLSEC_NO_SHA1_FALSE,;t t
-s, at XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t
-s, at XMLSEC_NO_SHA224_TRUE@,$XMLSEC_NO_SHA224_TRUE,;t t
-s, at XMLSEC_NO_SHA224_FALSE@,$XMLSEC_NO_SHA224_FALSE,;t t
-s, at XMLSEC_NO_SHA224@,$XMLSEC_NO_SHA224,;t t
-s, at XMLSEC_NO_SHA256_TRUE@,$XMLSEC_NO_SHA256_TRUE,;t t
-s, at XMLSEC_NO_SHA256_FALSE@,$XMLSEC_NO_SHA256_FALSE,;t t
-s, at XMLSEC_NO_SHA256@,$XMLSEC_NO_SHA256,;t t
-s, at XMLSEC_NO_SHA384_TRUE@,$XMLSEC_NO_SHA384_TRUE,;t t
-s, at XMLSEC_NO_SHA384_FALSE@,$XMLSEC_NO_SHA384_FALSE,;t t
-s, at XMLSEC_NO_SHA384@,$XMLSEC_NO_SHA384,;t t
-s, at XMLSEC_NO_SHA512_TRUE@,$XMLSEC_NO_SHA512_TRUE,;t t
-s, at XMLSEC_NO_SHA512_FALSE@,$XMLSEC_NO_SHA512_FALSE,;t t
-s, at XMLSEC_NO_SHA512@,$XMLSEC_NO_SHA512,;t t
-s, at XMLSEC_NO_HMAC_TRUE@,$XMLSEC_NO_HMAC_TRUE,;t t
-s, at XMLSEC_NO_HMAC_FALSE@,$XMLSEC_NO_HMAC_FALSE,;t t
-s, at XMLSEC_NO_HMAC@,$XMLSEC_NO_HMAC,;t t
-s, at XMLSEC_NO_DSA_TRUE@,$XMLSEC_NO_DSA_TRUE,;t t
-s, at XMLSEC_NO_DSA_FALSE@,$XMLSEC_NO_DSA_FALSE,;t t
-s, at XMLSEC_NO_DSA@,$XMLSEC_NO_DSA,;t t
-s, at XMLSEC_NO_RSA_TRUE@,$XMLSEC_NO_RSA_TRUE,;t t
-s, at XMLSEC_NO_RSA_FALSE@,$XMLSEC_NO_RSA_FALSE,;t t
-s, at XMLSEC_NO_RSA@,$XMLSEC_NO_RSA,;t t
-s, at XMLSEC_NO_X509_TRUE@,$XMLSEC_NO_X509_TRUE,;t t
-s, at XMLSEC_NO_X509_FALSE@,$XMLSEC_NO_X509_FALSE,;t t
-s, at XMLSEC_NO_X509@,$XMLSEC_NO_X509,;t t
-s, at XMLSEC_NO_DES_TRUE@,$XMLSEC_NO_DES_TRUE,;t t
-s, at XMLSEC_NO_DES_FALSE@,$XMLSEC_NO_DES_FALSE,;t t
-s, at XMLSEC_NO_DES@,$XMLSEC_NO_DES,;t t
-s, at XMLSEC_NO_AES_TRUE@,$XMLSEC_NO_AES_TRUE,;t t
-s, at XMLSEC_NO_AES_FALSE@,$XMLSEC_NO_AES_FALSE,;t t
-s, at XMLSEC_NO_AES@,$XMLSEC_NO_AES,;t t
-s, at XMLSEC_NO_XMLDSIG_TRUE@,$XMLSEC_NO_XMLDSIG_TRUE,;t t
-s, at XMLSEC_NO_XMLDSIG_FALSE@,$XMLSEC_NO_XMLDSIG_FALSE,;t t
-s, at XMLSEC_NO_XMLDSIG@,$XMLSEC_NO_XMLDSIG,;t t
-s, at XMLSEC_NO_XMLENC_TRUE@,$XMLSEC_NO_XMLENC_TRUE,;t t
-s, at XMLSEC_NO_XMLENC_FALSE@,$XMLSEC_NO_XMLENC_FALSE,;t t
-s, at XMLSEC_NO_XMLENC@,$XMLSEC_NO_XMLENC,;t t
-s, at XMLSEC_NO_XKMS_TRUE@,$XMLSEC_NO_XKMS_TRUE,;t t
-s, at XMLSEC_NO_XKMS_FALSE@,$XMLSEC_NO_XKMS_FALSE,;t t
-s, at XMLSEC_NO_XKMS@,$XMLSEC_NO_XKMS,;t t
-s, at XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE@,$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE,;t t
-s, at XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE@,$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE,;t t
-s, at XMLSEC_NO_CRYPTO_DYNAMIC_LOADING@,$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING,;t t
-s, at XMLSEC_DL_INCLUDES@,$XMLSEC_DL_INCLUDES,;t t
-s, at XMLSEC_DL_LIBS@,$XMLSEC_DL_LIBS,;t t
-s, at XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE@,$XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE,;t t
-s, at XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE@,$XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE,;t t
-s, at XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING@,$XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING,;t t
-s, at XMLSEC_DOCDIR@,$XMLSEC_DOCDIR,;t t
-s, at XMLSEC_STATIC_BINARIES@,$XMLSEC_STATIC_BINARIES,;t t
-s, at XMLSEC_CORE_CFLAGS@,$XMLSEC_CORE_CFLAGS,;t t
-s, at XMLSEC_CORE_LIBS@,$XMLSEC_CORE_LIBS,;t t
-s, at XMLSEC_LIBDIR@,$XMLSEC_LIBDIR,;t t
-s, at XMLSEC_OPENSSL_CFLAGS@,$XMLSEC_OPENSSL_CFLAGS,;t t
-s, at XMLSEC_OPENSSL_LIBS@,$XMLSEC_OPENSSL_LIBS,;t t
-s, at XMLSEC_GNUTLS_CFLAGS@,$XMLSEC_GNUTLS_CFLAGS,;t t
-s, at XMLSEC_GNUTLS_LIBS@,$XMLSEC_GNUTLS_LIBS,;t t
-s, at XMLSEC_NSS_CFLAGS@,$XMLSEC_NSS_CFLAGS,;t t
-s, at XMLSEC_NSS_LIBS@,$XMLSEC_NSS_LIBS,;t t
-s, at XMLSEC_CFLAGS@,$XMLSEC_CFLAGS,;t t
-s, at XMLSEC_LIBS@,$XMLSEC_LIBS,;t t
-s, at XMLSEC_DEFINES@,$XMLSEC_DEFINES,;t t
-s, at XMLSEC_APP_DEFINES@,$XMLSEC_APP_DEFINES,;t t
-s, at XMLSEC_CRYPTO@,$XMLSEC_CRYPTO,;t t
-s, at XMLSEC_CRYPTO_LIST@,$XMLSEC_CRYPTO_LIST,;t t
-s, at XMLSEC_CRYPTO_DISABLED_LIST@,$XMLSEC_CRYPTO_DISABLED_LIST,;t t
-s, at XMLSEC_CRYPTO_LIB@,$XMLSEC_CRYPTO_LIB,;t t
-s, at XMLSEC_CRYPTO_CFLAGS@,$XMLSEC_CRYPTO_CFLAGS,;t t
-s, at XMLSEC_CRYPTO_LIBS@,$XMLSEC_CRYPTO_LIBS,;t t
-s, at XMLSEC_CRYPTO_PC_FILES_LIST@,$XMLSEC_CRYPTO_PC_FILES_LIST,;t t
-s, at LIBOBJS@,$LIBOBJS,;t t
-s, at LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-  esac
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s, at configure_input@,$configure_input,;t t
-s, at srcdir@,$ac_srcdir,;t t
-s, at abs_srcdir@,$ac_abs_srcdir,;t t
-s, at top_srcdir@,$ac_top_srcdir,;t t
-s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s, at builddir@,$ac_builddir,;t t
-s, at abs_builddir@,$ac_abs_builddir,;t t
-s, at top_builddir@,$ac_top_builddir,;t t
-s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
-s, at INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-ac_dB='[	 ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-
-_ACEOF
-
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h.  The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status.  Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless.  Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >>conftest.undefs <<\_ACEOF
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo '  :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
-do
-  # Write a limited-size here document to $tmp/defines.sed.
-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#define' lines.
-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines
-echo '  fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
-  # Write a limited-size here document to $tmp/undefs.sed.
-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#undef'
-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-  rm -f conftest.undefs
-  mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
-  if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
-    fi
-  else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
-  fi
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`(dirname "$mf") 2>/dev/null ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`(dirname "$file") 2>/dev/null ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    { if $as_mkdir_p; then
-    mkdir -p $dirpart/$fdir
-  else
-    as_dir=$dirpart/$fdir
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-  esac
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
-fi
-
-if test "z$XMLSEC_NO_NSS" != "z1" ; then
-                    ac_config_files="$ac_config_files include/xmlsec/nss/Makefile src/nss/Makefile"
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${INSTALL_LTDL_TRUE}" && test -z "${INSTALL_LTDL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"INSTALL_LTDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"INSTALL_LTDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${CONVENIENCE_LTDL_TRUE}" && test -z "${CONVENIENCE_LTDL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"CONVENIENCE_LTDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CONVENIENCE_LTDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_OPENSSL_TRUE}" && test -z "${XMLSEC_NO_OPENSSL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_OPENSSL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_OPENSSL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_GNUTLS_TRUE}" && test -z "${XMLSEC_NO_GNUTLS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_GNUTLS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_GNUTLS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_NSS_TRUE}" && test -z "${XMLSEC_NO_NSS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_NSS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_NSS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_MD5_TRUE}" && test -z "${XMLSEC_NO_MD5_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_MD5\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_MD5\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_RIPEMD160_TRUE}" && test -z "${XMLSEC_NO_RIPEMD160_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_RIPEMD160\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_RIPEMD160\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_SHA1_TRUE}" && test -z "${XMLSEC_NO_SHA1_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA1\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_SHA1\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_SHA224_TRUE}" && test -z "${XMLSEC_NO_SHA224_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA224\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_SHA224\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_SHA256_TRUE}" && test -z "${XMLSEC_NO_SHA256_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA256\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_SHA256\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_SHA384_TRUE}" && test -z "${XMLSEC_NO_SHA384_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA384\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_SHA384\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_SHA512_TRUE}" && test -z "${XMLSEC_NO_SHA512_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA512\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_SHA512\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_HMAC_TRUE}" && test -z "${XMLSEC_NO_HMAC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_HMAC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_HMAC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_DSA_TRUE}" && test -z "${XMLSEC_NO_DSA_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_DSA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_DSA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_RSA_TRUE}" && test -z "${XMLSEC_NO_RSA_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_RSA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_RSA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_X509_TRUE}" && test -z "${XMLSEC_NO_X509_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_X509\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_X509\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_DES_TRUE}" && test -z "${XMLSEC_NO_DES_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_DES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_DES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_AES_TRUE}" && test -z "${XMLSEC_NO_AES_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_AES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_AES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_XMLDSIG_TRUE}" && test -z "${XMLSEC_NO_XMLDSIG_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_XMLDSIG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_XMLDSIG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_XMLENC_TRUE}" && test -z "${XMLSEC_NO_XMLENC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_XMLENC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_XMLENC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_XKMS_TRUE}" && test -z "${XMLSEC_NO_XKMS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_XKMS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_XKMS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE}" && test -z "${XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_CRYPTO_DYNAMIC_LOADING\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_CRYPTO_DYNAMIC_LOADING\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE}" && test -z "${XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by xmlsec1 $as_me 1.2.9, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf at gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-xmlsec1 config.status 1.2.9
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS section.
-#
-
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "include/xmlsec/version.h" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/version.h" ;;
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-  "include/xmlsec/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/Makefile" ;;
-  "include/xmlsec/private/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/private/Makefile" ;;
-  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-  "apps/Makefile" ) CONFIG_FILES="$CONFIG_FILES apps/Makefile" ;;
-  "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
-  "docs/api/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/api/Makefile" ;;
-  "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
-  "xmlsec1Conf.sh" ) CONFIG_FILES="$CONFIG_FILES xmlsec1Conf.sh:xmlsecConf.sh.in" ;;
-  "xmlsec1-config" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-config:xmlsec-config.in" ;;
-  "xmlsec1-openssl.pc" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-openssl.pc:xmlsec-openssl.pc.in" ;;
-  "xmlsec1-gnutls.pc" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-gnutls.pc:xmlsec-gnutls.pc.in" ;;
-  "xmlsec1-nss.pc" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-nss.pc:xmlsec-nss.pc.in" ;;
-  "xmlsec1.spec" ) CONFIG_FILES="$CONFIG_FILES xmlsec1.spec:xmlsec.spec.in" ;;
-  "include/xmlsec/openssl/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/openssl/Makefile" ;;
-  "src/openssl/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/openssl/Makefile" ;;
-  "include/xmlsec/gnutls/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/gnutls/Makefile" ;;
-  "src/gnutls/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gnutls/Makefile" ;;
-  "include/xmlsec/nss/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/nss/Makefile" ;;
-  "src/nss/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/nss/Makefile" ;;
-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s, at SHELL@,$SHELL,;t t
-s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s, at exec_prefix@,$exec_prefix,;t t
-s, at prefix@,$prefix,;t t
-s, at program_transform_name@,$program_transform_name,;t t
-s, at bindir@,$bindir,;t t
-s, at sbindir@,$sbindir,;t t
-s, at libexecdir@,$libexecdir,;t t
-s, at datadir@,$datadir,;t t
-s, at sysconfdir@,$sysconfdir,;t t
-s, at sharedstatedir@,$sharedstatedir,;t t
-s, at localstatedir@,$localstatedir,;t t
-s, at libdir@,$libdir,;t t
-s, at includedir@,$includedir,;t t
-s, at oldincludedir@,$oldincludedir,;t t
-s, at infodir@,$infodir,;t t
-s, at mandir@,$mandir,;t t
-s, at build_alias@,$build_alias,;t t
-s, at host_alias@,$host_alias,;t t
-s, at target_alias@,$target_alias,;t t
-s, at DEFS@,$DEFS,;t t
-s, at ECHO_C@,$ECHO_C,;t t
-s, at ECHO_N@,$ECHO_N,;t t
-s, at ECHO_T@,$ECHO_T,;t t
-s, at LIBS@,$LIBS,;t t
-s, at build@,$build,;t t
-s, at build_cpu@,$build_cpu,;t t
-s, at build_vendor@,$build_vendor,;t t
-s, at build_os@,$build_os,;t t
-s, at host@,$host,;t t
-s, at host_cpu@,$host_cpu,;t t
-s, at host_vendor@,$host_vendor,;t t
-s, at host_os@,$host_os,;t t
-s, at XMLSEC_VERSION@,$XMLSEC_VERSION,;t t
-s, at XMLSEC_PACKAGE@,$XMLSEC_PACKAGE,;t t
-s, at XMLSEC_VERSION_SAFE@,$XMLSEC_VERSION_SAFE,;t t
-s, at XMLSEC_VERSION_MAJOR@,$XMLSEC_VERSION_MAJOR,;t t
-s, at XMLSEC_VERSION_MINOR@,$XMLSEC_VERSION_MINOR,;t t
-s, at XMLSEC_VERSION_SUBMINOR@,$XMLSEC_VERSION_SUBMINOR,;t t
-s, at XMLSEC_VERSION_INFO@,$XMLSEC_VERSION_INFO,;t t
-s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s, at INSTALL_DATA@,$INSTALL_DATA,;t t
-s, at CYGPATH_W@,$CYGPATH_W,;t t
-s, at PACKAGE@,$PACKAGE,;t t
-s, at VERSION@,$VERSION,;t t
-s, at ACLOCAL@,$ACLOCAL,;t t
-s, at AUTOCONF@,$AUTOCONF,;t t
-s, at AUTOMAKE@,$AUTOMAKE,;t t
-s, at AUTOHEADER@,$AUTOHEADER,;t t
-s, at MAKEINFO@,$MAKEINFO,;t t
-s, at install_sh@,$install_sh,;t t
-s, at STRIP@,$STRIP,;t t
-s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
-s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-s, at mkdir_p@,$mkdir_p,;t t
-s, at AWK@,$AWK,;t t
-s, at SET_MAKE@,$SET_MAKE,;t t
-s, at am__leading_dot@,$am__leading_dot,;t t
-s, at AMTAR@,$AMTAR,;t t
-s, at am__tar@,$am__tar,;t t
-s, at am__untar@,$am__untar,;t t
-s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-s, at MAINT@,$MAINT,;t t
-s, at CC@,$CC,;t t
-s, at CFLAGS@,$CFLAGS,;t t
-s, at LDFLAGS@,$LDFLAGS,;t t
-s, at CPPFLAGS@,$CPPFLAGS,;t t
-s, at ac_ct_CC@,$ac_ct_CC,;t t
-s, at EXEEXT@,$EXEEXT,;t t
-s, at OBJEXT@,$OBJEXT,;t t
-s, at DEPDIR@,$DEPDIR,;t t
-s, at am__include@,$am__include,;t t
-s, at am__quote@,$am__quote,;t t
-s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
-s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
-s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-s, at CCDEPMODE@,$CCDEPMODE,;t t
-s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s, at EGREP@,$EGREP,;t t
-s, at LN_S@,$LN_S,;t t
-s, at ECHO@,$ECHO,;t t
-s, at AR@,$AR,;t t
-s, at ac_ct_AR@,$ac_ct_AR,;t t
-s, at RANLIB@,$RANLIB,;t t
-s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s, at CPP@,$CPP,;t t
-s, at CXX@,$CXX,;t t
-s, at CXXFLAGS@,$CXXFLAGS,;t t
-s, at ac_ct_CXX@,$ac_ct_CXX,;t t
-s, at CXXDEPMODE@,$CXXDEPMODE,;t t
-s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
-s, at CXXCPP@,$CXXCPP,;t t
-s, at F77@,$F77,;t t
-s, at FFLAGS@,$FFLAGS,;t t
-s, at ac_ct_F77@,$ac_ct_F77,;t t
-s, at LIBTOOL@,$LIBTOOL,;t t
-s, at RM@,$RM,;t t
-s, at CP@,$CP,;t t
-s, at MV@,$MV,;t t
-s, at TAR@,$TAR,;t t
-s, at HELP2MAN@,$HELP2MAN,;t t
-s, at MAN2HTML@,$MAN2HTML,;t t
-s, at U@,$U,;t t
-s, at ANSI2KNR@,$ANSI2KNR,;t t
-s, at INSTALL_LTDL_TRUE@,$INSTALL_LTDL_TRUE,;t t
-s, at INSTALL_LTDL_FALSE@,$INSTALL_LTDL_FALSE,;t t
-s, at CONVENIENCE_LTDL_TRUE@,$CONVENIENCE_LTDL_TRUE,;t t
-s, at CONVENIENCE_LTDL_FALSE@,$CONVENIENCE_LTDL_FALSE,;t t
-s, at LIBADD_DL@,$LIBADD_DL,;t t
-s, at PKG_CONFIG_ENABLED@,$PKG_CONFIG_ENABLED,;t t
-s, at PKG_CONFIG@,$PKG_CONFIG,;t t
-s, at LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t
-s, at LIBXML_LIBS@,$LIBXML_LIBS,;t t
-s, at LIBXML_CONFIG@,$LIBXML_CONFIG,;t t
-s, at LIBXML_MIN_VERSION@,$LIBXML_MIN_VERSION,;t t
-s, at LIBXSLT_CFLAGS@,$LIBXSLT_CFLAGS,;t t
-s, at LIBXSLT_LIBS@,$LIBXSLT_LIBS,;t t
-s, at XMLSEC_NO_LIBXSLT@,$XMLSEC_NO_LIBXSLT,;t t
-s, at LIBXSLT_CONFIG@,$LIBXSLT_CONFIG,;t t
-s, at LIBXSLT_MIN_VERSION@,$LIBXSLT_MIN_VERSION,;t t
-s, at OPENSSL_CFLAGS@,$OPENSSL_CFLAGS,;t t
-s, at OPENSSL_LIBS@,$OPENSSL_LIBS,;t t
-s, at XMLSEC_NO_OPENSSL_TRUE@,$XMLSEC_NO_OPENSSL_TRUE,;t t
-s, at XMLSEC_NO_OPENSSL_FALSE@,$XMLSEC_NO_OPENSSL_FALSE,;t t
-s, at XMLSEC_NO_OPENSSL@,$XMLSEC_NO_OPENSSL,;t t
-s, at OPENSSL_CRYPTO_LIB@,$OPENSSL_CRYPTO_LIB,;t t
-s, at OPENSSL_MIN_VERSION@,$OPENSSL_MIN_VERSION,;t t
-s, at GNUTLS_CFLAGS@,$GNUTLS_CFLAGS,;t t
-s, at GNUTLS_LIBS@,$GNUTLS_LIBS,;t t
-s, at XMLSEC_NO_GNUTLS_TRUE@,$XMLSEC_NO_GNUTLS_TRUE,;t t
-s, at XMLSEC_NO_GNUTLS_FALSE@,$XMLSEC_NO_GNUTLS_FALSE,;t t
-s, at XMLSEC_NO_GNUTLS@,$XMLSEC_NO_GNUTLS,;t t
-s, at GNUTLS_CRYPTO_LIB@,$GNUTLS_CRYPTO_LIB,;t t
-s, at GNUTLS_MIN_VERSION@,$GNUTLS_MIN_VERSION,;t t
-s, at NSS_CFLAGS@,$NSS_CFLAGS,;t t
-s, at NSS_LIBS@,$NSS_LIBS,;t t
-s, at XMLSEC_NO_NSS_TRUE@,$XMLSEC_NO_NSS_TRUE,;t t
-s, at XMLSEC_NO_NSS_FALSE@,$XMLSEC_NO_NSS_FALSE,;t t
-s, at XMLSEC_NO_NSS@,$XMLSEC_NO_NSS,;t t
-s, at NSS_CRYPTO_LIB@,$NSS_CRYPTO_LIB,;t t
-s, at NSS_MIN_VERSION@,$NSS_MIN_VERSION,;t t
-s, at NSPR_MIN_VERSION@,$NSPR_MIN_VERSION,;t t
-s, at MOZILLA_MIN_VERSION@,$MOZILLA_MIN_VERSION,;t t
-s, at XMLSEC_NO_MD5_TRUE@,$XMLSEC_NO_MD5_TRUE,;t t
-s, at XMLSEC_NO_MD5_FALSE@,$XMLSEC_NO_MD5_FALSE,;t t
-s, at XMLSEC_NO_MD5@,$XMLSEC_NO_MD5,;t t
-s, at XMLSEC_NO_RIPEMD160_TRUE@,$XMLSEC_NO_RIPEMD160_TRUE,;t t
-s, at XMLSEC_NO_RIPEMD160_FALSE@,$XMLSEC_NO_RIPEMD160_FALSE,;t t
-s, at XMLSEC_NO_RIPEMD160@,$XMLSEC_NO_RIPEMD160,;t t
-s, at XMLSEC_NO_SHA1_TRUE@,$XMLSEC_NO_SHA1_TRUE,;t t
-s, at XMLSEC_NO_SHA1_FALSE@,$XMLSEC_NO_SHA1_FALSE,;t t
-s, at XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t
-s, at XMLSEC_NO_SHA224_TRUE@,$XMLSEC_NO_SHA224_TRUE,;t t
-s, at XMLSEC_NO_SHA224_FALSE@,$XMLSEC_NO_SHA224_FALSE,;t t
-s, at XMLSEC_NO_SHA224@,$XMLSEC_NO_SHA224,;t t
-s, at XMLSEC_NO_SHA256_TRUE@,$XMLSEC_NO_SHA256_TRUE,;t t
-s, at XMLSEC_NO_SHA256_FALSE@,$XMLSEC_NO_SHA256_FALSE,;t t
-s, at XMLSEC_NO_SHA256@,$XMLSEC_NO_SHA256,;t t
-s, at XMLSEC_NO_SHA384_TRUE@,$XMLSEC_NO_SHA384_TRUE,;t t
-s, at XMLSEC_NO_SHA384_FALSE@,$XMLSEC_NO_SHA384_FALSE,;t t
-s, at XMLSEC_NO_SHA384@,$XMLSEC_NO_SHA384,;t t
-s, at XMLSEC_NO_SHA512_TRUE@,$XMLSEC_NO_SHA512_TRUE,;t t
-s, at XMLSEC_NO_SHA512_FALSE@,$XMLSEC_NO_SHA512_FALSE,;t t
-s, at XMLSEC_NO_SHA512@,$XMLSEC_NO_SHA512,;t t
-s, at XMLSEC_NO_HMAC_TRUE@,$XMLSEC_NO_HMAC_TRUE,;t t
-s, at XMLSEC_NO_HMAC_FALSE@,$XMLSEC_NO_HMAC_FALSE,;t t
-s, at XMLSEC_NO_HMAC@,$XMLSEC_NO_HMAC,;t t
-s, at XMLSEC_NO_DSA_TRUE@,$XMLSEC_NO_DSA_TRUE,;t t
-s, at XMLSEC_NO_DSA_FALSE@,$XMLSEC_NO_DSA_FALSE,;t t
-s, at XMLSEC_NO_DSA@,$XMLSEC_NO_DSA,;t t
-s, at XMLSEC_NO_RSA_TRUE@,$XMLSEC_NO_RSA_TRUE,;t t
-s, at XMLSEC_NO_RSA_FALSE@,$XMLSEC_NO_RSA_FALSE,;t t
-s, at XMLSEC_NO_RSA@,$XMLSEC_NO_RSA,;t t
-s, at XMLSEC_NO_X509_TRUE@,$XMLSEC_NO_X509_TRUE,;t t
-s, at XMLSEC_NO_X509_FALSE@,$XMLSEC_NO_X509_FALSE,;t t
-s, at XMLSEC_NO_X509@,$XMLSEC_NO_X509,;t t
-s, at XMLSEC_NO_DES_TRUE@,$XMLSEC_NO_DES_TRUE,;t t
-s, at XMLSEC_NO_DES_FALSE@,$XMLSEC_NO_DES_FALSE,;t t
-s, at XMLSEC_NO_DES@,$XMLSEC_NO_DES,;t t
-s, at XMLSEC_NO_AES_TRUE@,$XMLSEC_NO_AES_TRUE,;t t
-s, at XMLSEC_NO_AES_FALSE@,$XMLSEC_NO_AES_FALSE,;t t
-s, at XMLSEC_NO_AES@,$XMLSEC_NO_AES,;t t
-s, at XMLSEC_NO_XMLDSIG_TRUE@,$XMLSEC_NO_XMLDSIG_TRUE,;t t
-s, at XMLSEC_NO_XMLDSIG_FALSE@,$XMLSEC_NO_XMLDSIG_FALSE,;t t
-s, at XMLSEC_NO_XMLDSIG@,$XMLSEC_NO_XMLDSIG,;t t
-s, at XMLSEC_NO_XMLENC_TRUE@,$XMLSEC_NO_XMLENC_TRUE,;t t
-s, at XMLSEC_NO_XMLENC_FALSE@,$XMLSEC_NO_XMLENC_FALSE,;t t
-s, at XMLSEC_NO_XMLENC@,$XMLSEC_NO_XMLENC,;t t
-s, at XMLSEC_NO_XKMS_TRUE@,$XMLSEC_NO_XKMS_TRUE,;t t
-s, at XMLSEC_NO_XKMS_FALSE@,$XMLSEC_NO_XKMS_FALSE,;t t
-s, at XMLSEC_NO_XKMS@,$XMLSEC_NO_XKMS,;t t
-s, at XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE@,$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE,;t t
-s, at XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE@,$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE,;t t
-s, at XMLSEC_NO_CRYPTO_DYNAMIC_LOADING@,$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING,;t t
-s, at XMLSEC_DL_INCLUDES@,$XMLSEC_DL_INCLUDES,;t t
-s, at XMLSEC_DL_LIBS@,$XMLSEC_DL_LIBS,;t t
-s, at XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE@,$XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE,;t t
-s, at XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE@,$XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE,;t t
-s, at XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING@,$XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING,;t t
-s, at XMLSEC_DOCDIR@,$XMLSEC_DOCDIR,;t t
-s, at XMLSEC_STATIC_BINARIES@,$XMLSEC_STATIC_BINARIES,;t t
-s, at XMLSEC_CORE_CFLAGS@,$XMLSEC_CORE_CFLAGS,;t t
-s, at XMLSEC_CORE_LIBS@,$XMLSEC_CORE_LIBS,;t t
-s, at XMLSEC_LIBDIR@,$XMLSEC_LIBDIR,;t t
-s, at XMLSEC_OPENSSL_CFLAGS@,$XMLSEC_OPENSSL_CFLAGS,;t t
-s, at XMLSEC_OPENSSL_LIBS@,$XMLSEC_OPENSSL_LIBS,;t t
-s, at XMLSEC_GNUTLS_CFLAGS@,$XMLSEC_GNUTLS_CFLAGS,;t t
-s, at XMLSEC_GNUTLS_LIBS@,$XMLSEC_GNUTLS_LIBS,;t t
-s, at XMLSEC_NSS_CFLAGS@,$XMLSEC_NSS_CFLAGS,;t t
-s, at XMLSEC_NSS_LIBS@,$XMLSEC_NSS_LIBS,;t t
-s, at XMLSEC_CFLAGS@,$XMLSEC_CFLAGS,;t t
-s, at XMLSEC_LIBS@,$XMLSEC_LIBS,;t t
-s, at XMLSEC_DEFINES@,$XMLSEC_DEFINES,;t t
-s, at XMLSEC_APP_DEFINES@,$XMLSEC_APP_DEFINES,;t t
-s, at XMLSEC_CRYPTO@,$XMLSEC_CRYPTO,;t t
-s, at XMLSEC_CRYPTO_LIST@,$XMLSEC_CRYPTO_LIST,;t t
-s, at XMLSEC_CRYPTO_DISABLED_LIST@,$XMLSEC_CRYPTO_DISABLED_LIST,;t t
-s, at XMLSEC_CRYPTO_LIB@,$XMLSEC_CRYPTO_LIB,;t t
-s, at XMLSEC_CRYPTO_CFLAGS@,$XMLSEC_CRYPTO_CFLAGS,;t t
-s, at XMLSEC_CRYPTO_LIBS@,$XMLSEC_CRYPTO_LIBS,;t t
-s, at XMLSEC_CRYPTO_PC_FILES_LIST@,$XMLSEC_CRYPTO_PC_FILES_LIST,;t t
-s, at LIBOBJS@,$LIBOBJS,;t t
-s, at LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-  esac
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s, at configure_input@,$configure_input,;t t
-s, at srcdir@,$ac_srcdir,;t t
-s, at abs_srcdir@,$ac_abs_srcdir,;t t
-s, at top_srcdir@,$ac_top_srcdir,;t t
-s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s, at builddir@,$ac_builddir,;t t
-s, at abs_builddir@,$ac_abs_builddir,;t t
-s, at top_builddir@,$ac_top_builddir,;t t
-s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
-s, at INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-ac_dB='[	 ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-
-_ACEOF
-
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h.  The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status.  Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless.  Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >>conftest.undefs <<\_ACEOF
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo '  :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
-do
-  # Write a limited-size here document to $tmp/defines.sed.
-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#define' lines.
-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines
-echo '  fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
-  # Write a limited-size here document to $tmp/undefs.sed.
-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#undef'
-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-  rm -f conftest.undefs
-  mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
-  if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
-    fi
-  else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
-  fi
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
+XMLSEC_CFLAGS="$XMLSEC_CORE_CFLAGS $LIBXML_CFLAGS $LIBXSLT_CFLAGS $XMLSEC_CRYPTO_CFLAGS"
+XMLSEC_LIBS="-L${libdir} -l$XMLSEC_CRYPTO_LIB $XMLSEC_CORE_LIBS $LIBXML_LIBS $LIBXSLT_LIBS $XMLSEC_CRYPTO_LIBS"
 
-  ac_builddir=.
 
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
 
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
 
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
 
 
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`(dirname "$mf") 2>/dev/null ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`(dirname "$file") 2>/dev/null ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    { if $as_mkdir_p; then
-    mkdir -p $dirpart/$fdir
-  else
-    as_dir=$dirpart/$fdir
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-   { (exit 1); exit 1; }; }; }
 
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-  esac
+
+
+
+
+
+
+
+
+
+
+
+XMLSEC_CRYPTO_PC_FILES_LIST=""
+for i in $XMLSEC_CRYPTO_LIST ; do
+        test x$i = xmscrypto && continue
+    XMLSEC_CRYPTO_PC_FILES_LIST="$XMLSEC_CRYPTO_PC_FILES_LIST $XMLSEC_PACKAGE-$i.pc"
 done
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
 
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
+if test "z$XMLSEC_NO_OPENSSL" != "z1" ; then
+                    ac_config_files="$ac_config_files include/xmlsec/openssl/Makefile src/openssl/Makefile"
 
+fi
+
+if test "z$XMLSEC_NO_GNUTLS" != "z1" ; then
+                    ac_config_files="$ac_config_files include/xmlsec/gnutls/Makefile src/gnutls/Makefile"
+
+fi
+
+if test "z$XMLSEC_NO_NSS" != "z1" ; then
+                    ac_config_files="$ac_config_files include/xmlsec/nss/Makefile src/nss/Makefile"
 
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
 fi
 
+if test "z$XMLSEC_NO_MSCRYPTO" != "z1" ; then
+                    ac_config_files="$ac_config_files include/xmlsec/mscrypto/Makefile src/mscrypto/Makefile"
+
 fi
 
 if test "z$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING" = "z1" ; then
 (rm -f xmlsec1.pc && $LN_S xmlsec1-$XMLSEC_CRYPTO.pc xmlsec1.pc)
 else
           ac_config_files="$ac_config_files xmlsec1.pc:xmlsec.pc.in"
+
+fi
+
+                                                                                                                                                                ac_config_files="$ac_config_files include/xmlsec/version.h Makefile include/Makefile include/xmlsec/Makefile include/xmlsec/private/Makefile src/Makefile apps/Makefile docs/Makefile docs/api/Makefile man/Makefile xmlsec1Conf.sh:xmlsecConf.sh.in xmlsec1-config:xmlsec-config.in xmlsec1-openssl.pc:xmlsec-openssl.pc.in xmlsec1-gnutls. [...]
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -34054,6 +27642,13 @@ echo "$as_me: error: conditional \"CONVENIENCE_LTDL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${SHAREDLIB_HACK_TRUE}" && test -z "${SHAREDLIB_HACK_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"SHAREDLIB_HACK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"SHAREDLIB_HACK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${XMLSEC_NO_OPENSSL_TRUE}" && test -z "${XMLSEC_NO_OPENSSL_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_OPENSSL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -34061,6 +27656,13 @@ echo "$as_me: error: conditional \"XMLSEC_NO_OPENSSL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${XMLSEC_NO_NSS_TRUE}" && test -z "${XMLSEC_NO_NSS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_NSS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"XMLSEC_NO_NSS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${XMLSEC_NO_GNUTLS_TRUE}" && test -z "${XMLSEC_NO_GNUTLS_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_GNUTLS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -34068,10 +27670,10 @@ echo "$as_me: error: conditional \"XMLSEC_NO_GNUTLS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${XMLSEC_NO_NSS_TRUE}" && test -z "${XMLSEC_NO_NSS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_NSS\" was never defined.
+if test -z "${XMLSEC_NO_MSCRYPTO_TRUE}" && test -z "${XMLSEC_NO_MSCRYPTO_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_MSCRYPTO\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"XMLSEC_NO_NSS\" was never defined.
+echo "$as_me: error: conditional \"XMLSEC_NO_MSCRYPTO\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -34166,6 +27768,13 @@ echo "$as_me: error: conditional \"XMLSEC_NO_AES\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${XMLSEC_NO_GOST_TRUE}" && test -z "${XMLSEC_NO_GOST_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_GOST\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"XMLSEC_NO_GOST\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${XMLSEC_NO_XMLDSIG_TRUE}" && test -z "${XMLSEC_NO_XMLDSIG_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_XMLDSIG\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -34472,7 +28081,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by xmlsec1 $as_me 1.2.9, which was
+This file was extended by xmlsec1 $as_me 1.2.12, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -34535,7 +28144,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-xmlsec1 config.status 1.2.9
+xmlsec1 config.status 1.2.12
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -34645,6 +28254,15 @@ for ac_config_target in $ac_config_targets
 do
   case "$ac_config_target" in
   # Handling of arguments.
+  "include/xmlsec/openssl/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/openssl/Makefile" ;;
+  "src/openssl/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/openssl/Makefile" ;;
+  "include/xmlsec/gnutls/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/gnutls/Makefile" ;;
+  "src/gnutls/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gnutls/Makefile" ;;
+  "include/xmlsec/nss/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/nss/Makefile" ;;
+  "src/nss/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/nss/Makefile" ;;
+  "include/xmlsec/mscrypto/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/mscrypto/Makefile" ;;
+  "src/mscrypto/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/mscrypto/Makefile" ;;
+  "xmlsec1.pc" ) CONFIG_FILES="$CONFIG_FILES xmlsec1.pc:xmlsec.pc.in" ;;
   "include/xmlsec/version.h" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/version.h" ;;
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
@@ -34661,13 +28279,6 @@ do
   "xmlsec1-gnutls.pc" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-gnutls.pc:xmlsec-gnutls.pc.in" ;;
   "xmlsec1-nss.pc" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-nss.pc:xmlsec-nss.pc.in" ;;
   "xmlsec1.spec" ) CONFIG_FILES="$CONFIG_FILES xmlsec1.spec:xmlsec.spec.in" ;;
-  "include/xmlsec/openssl/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/openssl/Makefile" ;;
-  "src/openssl/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/openssl/Makefile" ;;
-  "include/xmlsec/gnutls/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/gnutls/Makefile" ;;
-  "src/gnutls/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gnutls/Makefile" ;;
-  "include/xmlsec/nss/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/nss/Makefile" ;;
-  "src/nss/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/nss/Makefile" ;;
-  "xmlsec1.pc" ) CONFIG_FILES="$CONFIG_FILES xmlsec1.pc:xmlsec.pc.in" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@@ -34843,6 +28454,8 @@ s, at INSTALL_LTDL_FALSE@,$INSTALL_LTDL_FALSE,;t t
 s, at CONVENIENCE_LTDL_TRUE@,$CONVENIENCE_LTDL_TRUE,;t t
 s, at CONVENIENCE_LTDL_FALSE@,$CONVENIENCE_LTDL_FALSE,;t t
 s, at LIBADD_DL@,$LIBADD_DL,;t t
+s, at SHAREDLIB_HACK_TRUE@,$SHAREDLIB_HACK_TRUE,;t t
+s, at SHAREDLIB_HACK_FALSE@,$SHAREDLIB_HACK_FALSE,;t t
 s, at PKG_CONFIG_ENABLED@,$PKG_CONFIG_ENABLED,;t t
 s, at PKG_CONFIG@,$PKG_CONFIG,;t t
 s, at LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t
@@ -34851,8 +28464,8 @@ s, at LIBXML_CONFIG@,$LIBXML_CONFIG,;t t
 s, at LIBXML_MIN_VERSION@,$LIBXML_MIN_VERSION,;t t
 s, at LIBXSLT_CFLAGS@,$LIBXSLT_CFLAGS,;t t
 s, at LIBXSLT_LIBS@,$LIBXSLT_LIBS,;t t
-s, at XMLSEC_NO_LIBXSLT@,$XMLSEC_NO_LIBXSLT,;t t
 s, at LIBXSLT_CONFIG@,$LIBXSLT_CONFIG,;t t
+s, at XMLSEC_NO_LIBXSLT@,$XMLSEC_NO_LIBXSLT,;t t
 s, at LIBXSLT_MIN_VERSION@,$LIBXSLT_MIN_VERSION,;t t
 s, at OPENSSL_CFLAGS@,$OPENSSL_CFLAGS,;t t
 s, at OPENSSL_LIBS@,$OPENSSL_LIBS,;t t
@@ -34861,22 +28474,30 @@ s, at XMLSEC_NO_OPENSSL_FALSE@,$XMLSEC_NO_OPENSSL_FALSE,;t t
 s, at XMLSEC_NO_OPENSSL@,$XMLSEC_NO_OPENSSL,;t t
 s, at OPENSSL_CRYPTO_LIB@,$OPENSSL_CRYPTO_LIB,;t t
 s, at OPENSSL_MIN_VERSION@,$OPENSSL_MIN_VERSION,;t t
-s, at GNUTLS_CFLAGS@,$GNUTLS_CFLAGS,;t t
-s, at GNUTLS_LIBS@,$GNUTLS_LIBS,;t t
-s, at XMLSEC_NO_GNUTLS_TRUE@,$XMLSEC_NO_GNUTLS_TRUE,;t t
-s, at XMLSEC_NO_GNUTLS_FALSE@,$XMLSEC_NO_GNUTLS_FALSE,;t t
-s, at XMLSEC_NO_GNUTLS@,$XMLSEC_NO_GNUTLS,;t t
-s, at GNUTLS_CRYPTO_LIB@,$GNUTLS_CRYPTO_LIB,;t t
-s, at GNUTLS_MIN_VERSION@,$GNUTLS_MIN_VERSION,;t t
 s, at NSS_CFLAGS@,$NSS_CFLAGS,;t t
 s, at NSS_LIBS@,$NSS_LIBS,;t t
 s, at XMLSEC_NO_NSS_TRUE@,$XMLSEC_NO_NSS_TRUE,;t t
 s, at XMLSEC_NO_NSS_FALSE@,$XMLSEC_NO_NSS_FALSE,;t t
 s, at XMLSEC_NO_NSS@,$XMLSEC_NO_NSS,;t t
+s, at NSPR_PACKAGE@,$NSPR_PACKAGE,;t t
+s, at NSS_PACKAGE@,$NSS_PACKAGE,;t t
 s, at NSS_CRYPTO_LIB@,$NSS_CRYPTO_LIB,;t t
 s, at NSS_MIN_VERSION@,$NSS_MIN_VERSION,;t t
 s, at NSPR_MIN_VERSION@,$NSPR_MIN_VERSION,;t t
 s, at MOZILLA_MIN_VERSION@,$MOZILLA_MIN_VERSION,;t t
+s, at GNUTLS_CFLAGS@,$GNUTLS_CFLAGS,;t t
+s, at GNUTLS_LIBS@,$GNUTLS_LIBS,;t t
+s, at XMLSEC_NO_GNUTLS_TRUE@,$XMLSEC_NO_GNUTLS_TRUE,;t t
+s, at XMLSEC_NO_GNUTLS_FALSE@,$XMLSEC_NO_GNUTLS_FALSE,;t t
+s, at XMLSEC_NO_GNUTLS@,$XMLSEC_NO_GNUTLS,;t t
+s, at GNUTLS_CRYPTO_LIB@,$GNUTLS_CRYPTO_LIB,;t t
+s, at GNUTLS_MIN_VERSION@,$GNUTLS_MIN_VERSION,;t t
+s, at XMLSEC_NO_MSCRYPTO_TRUE@,$XMLSEC_NO_MSCRYPTO_TRUE,;t t
+s, at XMLSEC_NO_MSCRYPTO_FALSE@,$XMLSEC_NO_MSCRYPTO_FALSE,;t t
+s, at XMLSEC_NO_MSCRYPTO@,$XMLSEC_NO_MSCRYPTO,;t t
+s, at MSCRYPTO_CFLAGS@,$MSCRYPTO_CFLAGS,;t t
+s, at MSCRYPTO_LIBS@,$MSCRYPTO_LIBS,;t t
+s, at MSCRYPTO_CRYPTO_LIB@,$MSCRYPTO_CRYPTO_LIB,;t t
 s, at XMLSEC_NO_MD5_TRUE@,$XMLSEC_NO_MD5_TRUE,;t t
 s, at XMLSEC_NO_MD5_FALSE@,$XMLSEC_NO_MD5_FALSE,;t t
 s, at XMLSEC_NO_MD5@,$XMLSEC_NO_MD5,;t t
@@ -34916,6 +28537,9 @@ s, at XMLSEC_NO_DES@,$XMLSEC_NO_DES,;t t
 s, at XMLSEC_NO_AES_TRUE@,$XMLSEC_NO_AES_TRUE,;t t
 s, at XMLSEC_NO_AES_FALSE@,$XMLSEC_NO_AES_FALSE,;t t
 s, at XMLSEC_NO_AES@,$XMLSEC_NO_AES,;t t
+s, at XMLSEC_NO_GOST_TRUE@,$XMLSEC_NO_GOST_TRUE,;t t
+s, at XMLSEC_NO_GOST_FALSE@,$XMLSEC_NO_GOST_FALSE,;t t
+s, at XMLSEC_NO_GOST@,$XMLSEC_NO_GOST,;t t
 s, at XMLSEC_NO_XMLDSIG_TRUE@,$XMLSEC_NO_XMLDSIG_TRUE,;t t
 s, at XMLSEC_NO_XMLDSIG_FALSE@,$XMLSEC_NO_XMLDSIG_FALSE,;t t
 s, at XMLSEC_NO_XMLDSIG@,$XMLSEC_NO_XMLDSIG,;t t
@@ -34948,6 +28572,8 @@ s, at XMLSEC_CFLAGS@,$XMLSEC_CFLAGS,;t t
 s, at XMLSEC_LIBS@,$XMLSEC_LIBS,;t t
 s, at XMLSEC_DEFINES@,$XMLSEC_DEFINES,;t t
 s, at XMLSEC_APP_DEFINES@,$XMLSEC_APP_DEFINES,;t t
+s, at XMLSEC_EXTRA_LDFLAGS@,$XMLSEC_EXTRA_LDFLAGS,;t t
+s, at XMLSEC_CRYPTO_EXTRA_LDFLAGS@,$XMLSEC_CRYPTO_EXTRA_LDFLAGS,;t t
 s, at XMLSEC_CRYPTO@,$XMLSEC_CRYPTO,;t t
 s, at XMLSEC_CRYPTO_LIST@,$XMLSEC_CRYPTO_LIST,;t t
 s, at XMLSEC_CRYPTO_DISABLED_LIST@,$XMLSEC_CRYPTO_DISABLED_LIST,;t t
@@ -35672,4 +29298,6 @@ if test "$no_create" != yes; then
   $ac_cs_success || { (exit 1); exit 1; }
 fi
 
-fi
+
+
+(cd $srcdir && rm -f COPYING.LIB COPYING && $LN_S Copyright COPYING)
diff --git a/configure.in b/configure.in
index 80d6a01..cc167b1 100644
--- a/configure.in
+++ b/configure.in
@@ -1,10 +1,10 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([xmlsec1], 1.2.9, [http://www.aleksey.com/xmlsec])
+AC_INIT([xmlsec1], 1.2.12, [http://www.aleksey.com/xmlsec])
 
 XMLSEC_PACKAGE=xmlsec1
 XMLSEC_VERSION_MAJOR=1
 XMLSEC_VERSION_MINOR=2
-XMLSEC_VERSION_SUBMINOR=9
+XMLSEC_VERSION_SUBMINOR=12
 XMLSEC_VERSION="$XMLSEC_VERSION_MAJOR.$XMLSEC_VERSION_MINOR.$XMLSEC_VERSION_SUBMINOR"
 XMLSEC_VERSION_INFO=`echo $XMLSEC_VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'`
 XMLSEC_VERSION_SAFE=`echo $XMLSEC_VERSION | sed 's/\./_/g'`
@@ -28,6 +28,7 @@ dnl
 dnl Check the environment
 dnl
 AC_PROG_CC
+AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_STDC_HEADERS
@@ -83,12 +84,45 @@ fi
 dnl ==========================================================================
 dnl Perform host specific configuration
 dnl ==========================================================================
+XMLSEC_EXTRA_LDFLAGS=
+XMLSEC_CRYPTO_EXTRA_LDFLAGS=
+dnl should separate extra LDFLAGS for xmlsec and crypto libs ?
+dnl should --enable-runtime-pseudo-reloc for mingw and cygwin ?
+
+xmlsec_sharedlib_hack="no"
+XMLSEC_SHLIBSFX="$shrext"
 case "${host}" in
     *aix* )
 	CFLAGS="${CFLAGS} -D_ALL_SOURCE"
 	;;
+ *-*-mingw*)
+	dnl use libtool flags "-avoid-version" to create shared
+	dnl libraries without version suffix, i.e. libxmlsec1.dll
+	dnl instead libxmlsec1-NN.dll, where NN is a number.
+	XMLSEC_EXTRA_LDFLAGS="-no-undefined -avoid-version"
+	XMLSEC_CRYPTO_EXTRA_LDFLAGS="-no-undefined -avoid-version"
+	XMLSEC_SHLIBSFX=".dll.a"
+	xmlsec_sharedlib_hack="yes"
+	;;
+ *-*-cygwin*)
+	XMLSEC_EXTRA_LDFLAGS="-no-undefined"
+	XMLSEC_CRYPTO_EXTRA_LDFLAGS="-no-undefined"
+	;;
 esac
 
+# To avoid problem with loading of a shared library (dlopen or equivalent)
+# at run time on some platforms we need to link crypto modules with extra
+# source. It's work without hack on 9x and under emulation.
+# On nt 5.x (w2k,xp) the error is 998("Invalid access to memory location").
+AM_CONDITIONAL(SHAREDLIB_HACK, [test "z$xmlsec_sharedlib_hack" = "zyes"])
+
+dnl ==========================================================================
+dnl Hack for autoconf version mismatch
+dnl ==========================================================================
+if test "z$shrext" == "z" ; then 
+    shrext=$shrext_cmds
+fi
+
 dnl ==========================================================================
 dnl Check for __FUNCTION__ or __FUNCTION__
 dnl ==========================================================================
@@ -122,6 +156,14 @@ if test "$ac_cv_sizeof_size_t" -ne "4" ; then
 fi
 
 
+dnl autoconf 2.59 fail
+dnl configure.in:137: error: possibly undefined macro: PKG_CONFIG_ENABLED
+dnl       If this token and others are legitimate, please use m4_pattern_allow.
+dnl       See the Autoconf documentation.
+dnl Also note that pkg.m4 (pkgconfig>=0.16 ?)
+dnl allow [^PKG_CONFIG(_PATH)?$] !
+m4_pattern_allow([PKG_CONFIG_ENABLED])
+
 dnl ==========================================================================
 dnl Check if pkg-config enabled and installed
 dnl ==========================================================================
@@ -154,23 +196,22 @@ elif test "z$with_libxml" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then
 	[LIBXML_FOUND=yes],
 	[LIBXML_FOUND=no])
 fi
-AC_MSG_CHECKING(libxml2 $with_libxml  $LIBXML_FOUND  )
 if test "z$LIBXML_FOUND" = "zno" ; then
-    AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_MIN_VERSION) 
-    if test "z$with_libxml" != "z" ; then 
-	LIBXML_CONFIG=$with_libxml/bin/$LIBXML_CONFIG
+    if test "z$with_libxml" != "zyes" ; then
+	AC_PATH_PROG([LIBXML_CONFIG], [$LIBXML_CONFIG], [],
+		     [$with_libxml/bin:$PATH])
     fi
-    AC_MSG_CHECKING(libxml2 $with_libxml  $LIBXML_CONFIG  )
-    if ! $LIBXML_CONFIG --version > /dev/null 2>&1 ; then
-	AC_MSG_ERROR(Could not find libxml2 anywhere (see config.log for details).)
+    AC_MSG_CHECKING([libxml2 $LIBXML_CONFIG ])
+    if ! LIBXML_VERSION=`$LIBXML_CONFIG --version 2>/dev/null`; then
+	AC_MSG_ERROR(Could not find libxml2 anywhere.)
     fi
-    vers=`$LIBXML_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+    vers=`echo $LIBXML_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
     minvers=`echo $LIBXML_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
     if test "$vers" -ge "$minvers" ; then
         LIBXML_LIBS="`$LIBXML_CONFIG --libs`"
         LIBXML_CFLAGS="`$LIBXML_CONFIG --cflags`"
 	LIBXML_FOUND="yes"
-        AC_MSG_RESULT(yes ('$LIBXML_VERSION'))
+        AC_MSG_RESULT([yes ('$LIBXML_VERSION')])
     else
         AC_MSG_ERROR(You need at least libxml2 $LIBXML_MIN_VERSION for this version of $XMLSEC_PACKAGE)
     fi
@@ -202,24 +243,25 @@ elif test "z$with_libxslt" = "z" -a  "z$PKG_CONFIG_ENABLED" = "zyes" ; then
 fi
 
 if test "z$LIBXSLT_FOUND" = "zno" ; then
-    AC_MSG_CHECKING(for libxslt libraries >= $LIBXSLT_MIN_VERSION) 
-    if test "z$LIBXSLT_CONFIG" != "z" ; then 
-	LIBXSLT_CONFIG=$with_libxslt/bin/$LIBXSLT_CONFIG
+    if test "z$with_libxslt" != "zyes" ; then
+	AC_PATH_PROG([LIBXSLT_CONFIG], [$LIBXSLT_CONFIG], [],
+		     [$with_libxslt/bin:$PATH])
     fi
-    if ! $LIBXSLT_CONFIG --version > /dev/null 2>&1 ; then
-	if test "z$with_libxslt" != "z" ; then
+    AC_MSG_CHECKING(for libxslt libraries >= $LIBXSLT_MIN_VERSION) 
+    if ! LIBXSLT_VERSION=`$LIBXSLT_CONFIG --version 2>/dev/null`; then
+	if test "z$with_libxslt" != "zyes" ; then
 	    AC_MSG_ERROR(Unable to find libxslt at '$with_libxslt')
 	else 
 	    AC_MSG_RESULT(no)
 	fi
     else
-        vers=`$LIBXSLT_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+        vers=`echo $LIBXSLT_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
 	minvers=`echo $LIBXSLT_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
 	if test "$vers" -ge "$minvers" ; then
     	    LIBXSLT_LIBS="`$LIBXSLT_CONFIG --libs`"
 	    LIBXSLT_CFLAGS="`$LIBXSLT_CONFIG --cflags`"
 	    LIBXSLT_FOUND="yes"
-    	    AC_MSG_RESULT("yes ('$LIBXSLT_VERSION')")
+    	    AC_MSG_RESULT([yes ('$LIBXSLT_VERSION')])
 	else
     	    AC_MSG_ERROR(You need at least libxslt $LIBXSLT_MIN_VERSION for this version of $XMLSEC_PACKAGE)
 	fi	
@@ -268,11 +310,17 @@ if test "z$with_openssl" = "zno" ; then
     AC_MSG_CHECKING(for openssl libraries >= $OPENSSL_MIN_VERSION) 
     AC_MSG_RESULT(no)
 elif test "z$with_openssl" != "z" ; then
+    case $host in
+	*-*-mingw*) openssl_exlibs=;;
+	*-*-osf5*) openssl_exlibs=;;
+	#FIXME: check if lib "dl" is required
+	*)          openssl_exlibs=-ldl;;
+    esac
     OPENSSL_CFLAGS="$OPENSSL_CFLAGS -I$with_openssl/include"
-    if test -f "$with_openssl/lib/libcrypto$shrext" ; then
-	OPENSSL_LIBS="-L$with_openssl/lib -lcrypto -ldl"
+    if test -f "$with_openssl/lib/libcrypto${XMLSEC_SHLIBSFX}" ; then
+	OPENSSL_LIBS="-L$with_openssl/lib -lcrypto $openssl_exlibs"
     else
-	OPENSSL_LIBS="$with_openssl/lib/libcrypto.a -ldl"
+	OPENSSL_LIBS="$with_openssl/lib/libcrypto.a $openssl_exlibs"
     fi
     OPENSSL_FOUND="yes"
 elif test "z$PKG_CONFIG_ENABLED" = "zyes" ; then
@@ -377,9 +425,14 @@ if test "z$OPENSSL_FOUND" = "zyes" -a "z$OPENSSL_VERSION" = "z" ; then
 	],[
 	    OPENSSL_VERSION="0.9.6"
 	],[
-	    AC_MSG_RESULT(no)
+	    OPENSSL_VERSION=""
 	]) 
     fi
+    if test "z$OPENSSL_VERSION" = "z" ; then
+        AC_MSG_RESULT(no)
+    else
+        AC_MSG_RESULT([yes ('$OPENSSL_VERSION')])
+    fi
     
     CPPFLAGS=$OLD_CPPFLAGS
 fi    
@@ -417,91 +470,6 @@ AC_SUBST(OPENSSL_CRYPTO_LIB)
 AC_SUBST(OPENSSL_MIN_VERSION)
 
 dnl ==========================================================================
-dnl See if we can find GnuTLS
-dnl ==========================================================================
-GNUTLS_CONFIG="libgnutls-config"
-XMLSEC_NO_GNUTLS="1"
-GNUTLS_MIN_VERSION="0.8.1"
-GNUTLS_NEW_MIN_VERSION="1.0.0"
-GNUTLS_VERSION=""
-GNUTLS_CFLAGS=""
-GNUTLS_LIBS=""
-GNUTLS_CRYPTO_LIB="$XMLSEC_PACKAGE-gnutls"
-GNUTLS_FOUND="no"
-AC_ARG_WITH(gnutls, [  --with-gnutls=[PFX]       gnutls location])
-if test "z$with_gnutls" = "zno" ; then
-    AC_MSG_CHECKING(for gnutls libraries >= $GNUTLS_MIN_VERSION) 
-    AC_MSG_RESULT(no)
-    GNUTLS_FOUND="without"
-elif test "z$with_gnutls" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then
-    PKG_CHECK_MODULES(GNUTLS, libgnutls >= $GNUTLS_NEW_MIN_VERSION,
-	[GNUTLS_FOUND=yes],
-	[GNUTLS_FOUND=no])
-
-    if test "z$GNUTLS_FOUND" = "zno" ; then 
-	PKG_CHECK_MODULES(GNUTLS, libgnutls >= $GNUTLS_MIN_VERSION,
-	    [GNUTLS_FOUND=yes],
-	    [GNUTLS_FOUND=no])
-	if test "z$GNUTLS_FOUND" = "zyes" ; then 
-	    GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DXMLSEC_GNUTLS_OLD=1"
-	fi
-    fi
-fi
-
-if test "z$GNUTLS_FOUND" = "zno" ; then 
-    AC_MSG_CHECKING(for gnutls libraries >= $GNUTLS_MIN_VERSION) 
-    if test "z$with_gnutls" != "z" ; then
-	GNUTLS_CONFIG=$with_gnutls/bin/$GNUTLS_CONFIG
-    fi
-    if ! $GNUTLS_CONFIG --version > /dev/null 2>&1 ; then
-	if test "z$with_gnutls" != "z" ; then
-	    AC_MSG_ERROR(Unable to find gnutls at '$with_gnutls')
-	else 
-	    AC_MSG_RESULT(no)
-	fi
-    else
-        vers=`$GNUTLS_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-	minvers=`echo $GNUTLS_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-	if test "$vers" -ge "$minvers" ; then
-	    GNUTLS_CFLAGS="$GNUTLS_CFLAGS `$GNUTLS_CONFIG --cflags`"
-    	    GNUTLS_LIBS="$GNUTLS_LIBS `$GNUTLS_CONFIG --libs`"
-	    GNUTLS_FOUND=yes
-	
-	    new_minvers=`echo $GNUTLS_NEW_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-	    if test "$vers" -lt "$new_minvers" ; then
-		GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DXMLSEC_GNUTLS_OLD=1"
-	    fi    
-	    AC_MSG_RESULT(yes)
-	else
-    	    AC_MSG_ERROR(You need at least gnutls $GNUTLS_MIN_VERSION for this version of $XMLSEC_PACKAGE)
-	fi	
-    fi
-fi
-
-if test "z$GNUTLS_FOUND" = "zyes" ; then 
-    XMLSEC_NO_GNUTLS="0"
-    GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DXMLSEC_CRYPTO_GNUTLS=1"
-
-    dnl first crypto library is default one
-    if test "z$XMLSEC_CRYPTO" = "z" ; then
-	XMLSEC_CRYPTO="gnutls"
-    	XMLSEC_CRYPTO_LIB="$GNUTLS_CRYPTO_LIB"
-	XMLSEC_CRYPTO_CFLAGS="$GNUTLS_CFLAGS"
-	XMLSEC_CRYPTO_LIBS="$GNUTLS_LIBS"
-    fi	
-    XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST gnutls"
-else
-    XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST gnutls"
-fi
-
-AM_CONDITIONAL(XMLSEC_NO_GNUTLS, test "z$XMLSEC_NO_GNUTLS" = "z1")
-AC_SUBST(XMLSEC_NO_GNUTLS)
-AC_SUBST(GNUTLS_CFLAGS)
-AC_SUBST(GNUTLS_LIBS)
-AC_SUBST(GNUTLS_CRYPTO_LIB)
-AC_SUBST(GNUTLS_MIN_VERSION)
-
-dnl ==========================================================================
 dnl See if we can find NSS and NSPR
 dnl Allow the use of:
 dnl   1.  Mozilla style distribution where all mozilla components (NSS, NSPR
@@ -530,24 +498,50 @@ NSS_LIBS_LIST="-lnss3 -lsmime3"
 NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
 NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
 NSS_FOUND="no"
+NSPR_PACKAGE=mozilla-nspr
+NSS_PACKAGE=mozilla-nss
+
 
 dnl if nss is disabled, bail out early
 AC_ARG_WITH(nss,     [  --with-nss=[PFX]          nss location])
 AC_ARG_WITH(nspr,    [  --with-nspr=[PFX]         nspr location (needed for NSS)])
+AC_ARG_WITH(seamonkey_ver, [  --with-seamonkey-ver=[VER]  mozilla version (alt to --with-nss, --with-nspr)])
 AC_ARG_WITH(mozilla_ver, [  --with-mozilla-ver=[VER]  mozilla version (alt to --with-nss, --with-nspr)])
 if test "z$with_nss" = "zno" -o "z$with_nspr" = "zno" ; then
     AC_MSG_CHECKING(for NSS libraries) 
     AC_MSG_RESULT(no)
     NSS_FOUND="without"
 elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then
-    PKG_CHECK_MODULES(NSS, mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION,
-	[NSS_FOUND=yes],
-	[NSS_FOUND=no])
+    dnl
+    dnl Mozilla's NSS/NSPR are distributed under different names
+    dnl in different distribution:
+    dnl 	mozilla-nspr and mozilla-nss
+    dnl		xulrunner-nspr and xulrunner-nss
+    dnl		nspr and nss
+    dnl We are going to try all options
+    dnl
+    if test "z$NSS_FOUND" = "zno" ; then
+        PKG_CHECK_MODULES(NSS, mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION,
+    	    [NSS_FOUND=yes NSPR_PACKAGE=mozilla-nspr NSS_PACKAGE=mozilla-nss],
+	    [NSS_FOUND=no])
+    fi
+    if test "z$NSS_FOUND" = "zno" ; then
+        PKG_CHECK_MODULES(NSS, xulrunner-nspr >= $MOZILLA_MIN_VERSION xulrunner-nss >= $MOZILLA_MIN_VERSION,
+    	    [NSS_FOUND=yes NSPR_PACKAGE=xulrunner-nspr NSS_PACKAGE=xulrunner-nss],
+	    [NSS_FOUND=no])
+    fi
+    if test "z$NSS_FOUND" = "zno" ; then
+        PKG_CHECK_MODULES(NSS, nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION,
+    	    [NSS_FOUND=yes NSPR_PACKAGE=nspr NSS_PACKAGE=nss],
+	    [NSS_FOUND=no])
+    fi
 fi
 
 if test "z$NSS_FOUND" = "zno" ; then 
     dnl process the mozilla options if any
-    if test "z$with_mozilla_ver" != "z" ; then
+    if test "z$with_seamonkey_ver" != "z" ; then
+        ac_mozilla_name=seamonkey-$with_seamonkey_ver
+    elif test "z$with_mozilla_ver" != "z" ; then
         ac_mozilla_name=mozilla-$with_mozilla_ver
     else
         ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
@@ -564,7 +558,7 @@ if test "z$NSS_FOUND" = "zno" ; then
 
     if test "z$with_nspr" != "z" ; then
 	NSPR_PREFIX="$with_nspr"
-	NSPR_CFLAGS="-I$with_nspr/include"
+	NSPR_CFLAGS="-I$with_nspr/include -I$with_nspr/include/nspr"
 	if test "z$with_gnu_ld" = "zyes" ; then
 	    NSPR_LIBS="-Wl,-rpath-link -Wl,$with_nspr/lib -L$with_nspr/lib $NSPR_LIBS_LIST"
 	else
@@ -635,7 +629,7 @@ if test "z$NSS_FOUND" = "zno" ; then
     NSS_NSS_H=""
 
     if test "z$with_nss" != "z" ; then
-	NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include"
+	NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss"
 	if test "z$with_gnu_ld" = "zyes" ; then
 	    NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST"
         else
@@ -727,6 +721,8 @@ fi
 
 AM_CONDITIONAL(XMLSEC_NO_NSS, test "z$XMLSEC_NO_NSS" = "z1")
 AC_SUBST(XMLSEC_NO_NSS)
+AC_SUBST(NSPR_PACKAGE)
+AC_SUBST(NSS_PACKAGE)
 AC_SUBST(NSS_CFLAGS)
 AC_SUBST(NSS_LIBS)
 AC_SUBST(NSS_CRYPTO_LIB)
@@ -735,6 +731,158 @@ AC_SUBST(NSPR_MIN_VERSION)
 AC_SUBST(MOZILLA_MIN_VERSION)
 
 dnl ==========================================================================
+dnl See if we can find GnuTLS
+dnl ==========================================================================
+GNUTLS_CONFIG="libgnutls-config"
+XMLSEC_NO_GNUTLS="1"
+GNUTLS_MIN_VERSION="0.8.1"
+GNUTLS_NEW_MIN_VERSION="1.0.0"
+GNUTLS_VERSION=""
+GNUTLS_CFLAGS=""
+GNUTLS_LIBS=""
+GNUTLS_CRYPTO_LIB="$XMLSEC_PACKAGE-gnutls"
+GNUTLS_FOUND="no"
+AC_ARG_WITH(gnutls, [  --with-gnutls=[PFX]       gnutls location])
+if test "z$with_gnutls" = "zno" ; then
+    AC_MSG_CHECKING(for gnutls libraries >= $GNUTLS_MIN_VERSION) 
+    AC_MSG_RESULT(no)
+    GNUTLS_FOUND="without"
+elif test "z$with_gnutls" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then
+    PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_NEW_MIN_VERSION,
+	[GNUTLS_FOUND=yes],
+	[GNUTLS_FOUND=no])
+    if test "z$GNUTLS_FOUND" = "zno" ; then 
+        PKG_CHECK_MODULES(GNUTLS, libgnutls >= $GNUTLS_NEW_MIN_VERSION,
+	    [GNUTLS_FOUND=yes],
+	    [GNUTLS_FOUND=no])
+    fi
+
+    if test "z$GNUTLS_FOUND" = "zno" ; then 
+	PKG_CHECK_MODULES(GNUTLS, libgnutls >= $GNUTLS_MIN_VERSION,
+	    [GNUTLS_FOUND=yes],
+	    [GNUTLS_FOUND=no])
+	if test "z$GNUTLS_FOUND" = "zyes" ; then 
+	    GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DXMLSEC_GNUTLS_OLD=1"
+	fi
+    fi
+fi
+
+if test "z$GNUTLS_FOUND" = "zno" ; then 
+    AC_MSG_CHECKING(for gnutls libraries >= $GNUTLS_MIN_VERSION) 
+    if test "z$with_gnutls" != "z" ; then
+	GNUTLS_CONFIG=$with_gnutls/bin/$GNUTLS_CONFIG
+    fi
+    if ! $GNUTLS_CONFIG --version > /dev/null 2>&1 ; then
+	if test "z$with_gnutls" != "z" ; then
+	    AC_MSG_ERROR(Unable to find gnutls at '$with_gnutls')
+	else 
+	    AC_MSG_RESULT(no)
+	fi
+    else
+        vers=`$GNUTLS_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+	minvers=`echo $GNUTLS_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+	if test "$vers" -ge "$minvers" ; then
+	    GNUTLS_CFLAGS="$GNUTLS_CFLAGS `$GNUTLS_CONFIG --cflags`"
+    	    GNUTLS_LIBS="$GNUTLS_LIBS `$GNUTLS_CONFIG --libs`"
+	    GNUTLS_FOUND=yes
+	
+	    new_minvers=`echo $GNUTLS_NEW_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+	    if test "$vers" -lt "$new_minvers" ; then
+		GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DXMLSEC_GNUTLS_OLD=1"
+	    fi    
+	    AC_MSG_RESULT(yes)
+	else
+    	    AC_MSG_ERROR(You need at least gnutls $GNUTLS_MIN_VERSION for this version of $XMLSEC_PACKAGE)
+	fi	
+    fi
+fi
+
+if test "z$GNUTLS_FOUND" = "zyes" ; then 
+    XMLSEC_NO_GNUTLS="0"
+    GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DXMLSEC_CRYPTO_GNUTLS=1"
+
+    dnl first crypto library is default one
+    if test "z$XMLSEC_CRYPTO" = "z" ; then
+	XMLSEC_CRYPTO="gnutls"
+    	XMLSEC_CRYPTO_LIB="$GNUTLS_CRYPTO_LIB"
+	XMLSEC_CRYPTO_CFLAGS="$GNUTLS_CFLAGS"
+	XMLSEC_CRYPTO_LIBS="$GNUTLS_LIBS"
+    fi	
+    XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST gnutls"
+else
+    XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST gnutls"
+fi
+
+AM_CONDITIONAL(XMLSEC_NO_GNUTLS, test "z$XMLSEC_NO_GNUTLS" = "z1")
+AC_SUBST(XMLSEC_NO_GNUTLS)
+AC_SUBST(GNUTLS_CFLAGS)
+AC_SUBST(GNUTLS_LIBS)
+AC_SUBST(GNUTLS_CRYPTO_LIB)
+AC_SUBST(GNUTLS_MIN_VERSION)
+
+dnl ==========================================================================
+dnl See if we can find MSCrypto
+dnl ==========================================================================
+XMLSEC_NO_MSCRYPTO="1"
+MSCRYPTO_CFLAGS=""
+MSCRYPTO_LIBS=""
+MSCRYPTO_CRYPTO_LIB="$XMLSEC_PACKAGE-mscrypto"
+MSCRYPTO_ENABLE='none'
+AC_ARG_ENABLE(mscrypto,
+	[  --enable-mscrypto       enable mscrypto (no)],
+	[MSCRYPTO_ENABLE=$enableval])
+if test "z$MSCRYPTO_ENABLE" != "zyes" ; then
+    AC_MSG_CHECKING(for mscrypto libraries)
+    AC_MSG_RESULT([$MSCRYPTO_ENABLE])
+else
+dnl cannot detect __stdcall functions
+dnl    AC_CHECK_LIB(crypt32, CertOpenStore, ....
+    LIBS_SAVE="$LIBS"
+    LIBS="$LIBS -lcrypt32"
+    AC_MSG_CHECKING(for mscrypto libraries)
+    AC_LINK_IFELSE([
+	#include <windows.h>
+	#include <wincrypt.h>
+	int main () { CertOpenStore(0,0,0,0,0);; return(0); }
+	],
+	[],
+	[MSCRYPTO_ENABLE="no"])
+    AC_MSG_RESULT([$MSCRYPTO_ENABLE])
+    LIBS="$LIBS_SAVE"
+fi
+
+if test "z$MSCRYPTO_ENABLE" = "zyes" ; then
+    XMLSEC_NO_MSCRYPTO="0"
+
+    MSCRYPTO_CFLAGS="$MSCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MSCRYPTO=1"
+    case $host in
+	*-*-mingw*)
+		dnl since mingw crypt32 library is limited
+		dnl we use own def-file
+		MSCRYPTO_LIBS='-Wl,$(srcdir)/mingw-crypt32.def';;
+	*)
+		MSCRYPTO_LIBS="-lcrypt32";;
+    esac
+
+    dnl first crypto library is default one
+    if test "z$XMLSEC_CRYPTO" = "z" ; then
+	XMLSEC_CRYPTO="mscrypto"
+    	XMLSEC_CRYPTO_LIB="$MSCRYPTO_CRYPTO_LIB"
+	XMLSEC_CRYPTO_CFLAGS="$MSCRYPTO_CFLAGS"
+	XMLSEC_CRYPTO_LIBS="$MSCRYPTO_LIBS"
+    fi	
+    XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST mscrypto"
+else
+    XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST mscrypto"
+fi
+
+AM_CONDITIONAL(XMLSEC_NO_MSCRYPTO, [test "z$XMLSEC_NO_MSCRYPTO" = "z1"])
+AC_SUBST(XMLSEC_NO_MSCRYPTO)
+AC_SUBST(MSCRYPTO_CFLAGS)
+AC_SUBST(MSCRYPTO_LIBS)
+AC_SUBST(MSCRYPTO_CRYPTO_LIB)
+
+dnl ==========================================================================
 dnl Do we have a crypto library?
 dnl ==========================================================================
 AC_MSG_CHECKING(for crypto library) 
@@ -954,6 +1102,22 @@ AM_CONDITIONAL(XMLSEC_NO_AES, test "z$XMLSEC_NO_AES" = "z1")
 AC_SUBST(XMLSEC_NO_AES)
 
 dnl ==========================================================================
+dnl See do we need GOST suport
+dnl ==========================================================================
+AC_MSG_CHECKING(for GOST support) 
+AC_ARG_ENABLE(gost,   [  --enable-gost           enable GOST support (no)])
+if test "z$enable_gost" != "zyes" ; then
+    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_GOST=1"
+    XMLSEC_NO_GOST="1"
+    AC_MSG_RESULT(no)
+else
+    XMLSEC_NO_GOST="0"
+    AC_MSG_RESULT(yes)
+fi    
+AM_CONDITIONAL(XMLSEC_NO_GOST, test "z$XMLSEC_NO_GOST" = "z1")
+AC_SUBST(XMLSEC_NO_GOST)
+
+dnl ==========================================================================
 dnl See do we need XMLDSig suport
 dnl ==========================================================================
 AC_MSG_CHECKING(for XMLDSig support) 
@@ -1162,6 +1326,12 @@ XMLSEC_NSS_LIBS="-L${libdir} -l$NSS_CRYPTO_LIB $XMLSEC_CORE_LIBS $NSS_LIBS"
 AC_SUBST(XMLSEC_NSS_CFLAGS)
 AC_SUBST(XMLSEC_NSS_LIBS)
 
+dnl No we will not generate pkg-config file for mscrypto !
+dnl XMLSEC_MSCRYPTO_CFLAGS="$XMLSEC_CORE_CFLAGS $MSCRYPTO_CFLAGS"
+dnl XMLSEC_MSCRYPTO_LIBS="-L${libdir} -l$MSCRYPTO_CRYPTO_LIB $XMLSEC_CORE_LIBS $MSCRYPTO_LIBS";;
+dnl AC_SUBST(XMLSEC_MSCRYPTO_CFLAGS)
+dnl AC_SUBST(XMLSEC_MSCRYPTO_LIBS)
+
 XMLSEC_CFLAGS="$XMLSEC_CORE_CFLAGS $LIBXML_CFLAGS $LIBXSLT_CFLAGS $XMLSEC_CRYPTO_CFLAGS"
 XMLSEC_LIBS="-L${libdir} -l$XMLSEC_CRYPTO_LIB $XMLSEC_CORE_LIBS $LIBXML_LIBS $LIBXSLT_LIBS $XMLSEC_CRYPTO_LIBS"
 AC_SUBST(XMLSEC_CFLAGS)
@@ -1172,6 +1342,8 @@ AC_SUBST(XMLSEC_APP_DEFINES)
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
+AC_SUBST(XMLSEC_EXTRA_LDFLAGS)
+AC_SUBST(XMLSEC_CRYPTO_EXTRA_LDFLAGS)
 
 AC_SUBST(XMLSEC_CRYPTO)
 AC_SUBST(XMLSEC_CRYPTO_LIST)
@@ -1182,6 +1354,8 @@ AC_SUBST(XMLSEC_CRYPTO_LIBS)
 
 XMLSEC_CRYPTO_PC_FILES_LIST=""
 for i in $XMLSEC_CRYPTO_LIST ; do
+    dnl skip pkg-config file for mscrypto
+    test x$i = xmscrypto && continue
     XMLSEC_CRYPTO_PC_FILES_LIST="$XMLSEC_CRYPTO_PC_FILES_LIST $XMLSEC_PACKAGE-$i.pc"
 done
 AC_SUBST(XMLSEC_CRYPTO_PC_FILES_LIST)
@@ -1189,6 +1363,28 @@ AC_SUBST(XMLSEC_CRYPTO_PC_FILES_LIST)
 dnl ==========================================================================
 dnl Writing result files
 dnl ==========================================================================
+if test "z$XMLSEC_NO_OPENSSL" != "z1" ; then
+AC_CONFIG_FILES([include/xmlsec/openssl/Makefile src/openssl/Makefile])
+fi
+
+if test "z$XMLSEC_NO_GNUTLS" != "z1" ; then
+AC_CONFIG_FILES([include/xmlsec/gnutls/Makefile src/gnutls/Makefile])
+fi
+
+if test "z$XMLSEC_NO_NSS" != "z1" ; then
+AC_CONFIG_FILES([include/xmlsec/nss/Makefile src/nss/Makefile])
+fi
+
+if test "z$XMLSEC_NO_MSCRYPTO" != "z1" ; then
+AC_CONFIG_FILES([include/xmlsec/mscrypto/Makefile src/mscrypto/Makefile])
+fi
+
+if test "z$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING" = "z1" ; then
+(rm -f xmlsec1.pc && $LN_S xmlsec1-$XMLSEC_CRYPTO.pc xmlsec1.pc)
+else
+AC_CONFIG_FILES([xmlsec1.pc:xmlsec.pc.in])
+fi
+
 AC_OUTPUT([
 include/xmlsec/version.h
 Makefile
@@ -1212,21 +1408,3 @@ man/Makefile
 
 dnl COPYING should be in "srcdir" not in "builddir"
 (cd $srcdir && rm -f COPYING.LIB COPYING && $LN_S Copyright COPYING)
-
-if test "z$XMLSEC_NO_OPENSSL" != "z1" ; then
-AC_OUTPUT([include/xmlsec/openssl/Makefile src/openssl/Makefile])
-fi
-
-if test "z$XMLSEC_NO_GNUTLS" != "z1" ; then
-AC_OUTPUT([include/xmlsec/gnutls/Makefile src/gnutls/Makefile])
-fi
-
-if test "z$XMLSEC_NO_NSS" != "z1" ; then
-AC_OUTPUT([include/xmlsec/nss/Makefile src/nss/Makefile])
-fi
-
-if test "z$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING" = "z1" ; then
-(rm -f xmlsec1.pc && $LN_S xmlsec1-$XMLSEC_CRYPTO.pc xmlsec1.pc)
-else
-AC_OUTPUT([xmlsec1.pc:xmlsec.pc.in])
-fi
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 5f7a4dc..28958d7 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -120,12 +120,17 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAN2HTML = @MAN2HTML@
 MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
+MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
+MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
 MV = @MV@
 NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
+NSPR_PACKAGE = @NSPR_PACKAGE@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_CRYPTO_LIB = @NSS_CRYPTO_LIB@
 NSS_LIBS = @NSS_LIBS@
 NSS_MIN_VERSION = @NSS_MIN_VERSION@
+NSS_PACKAGE = @NSS_PACKAGE@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_CRYPTO_LIB = @OPENSSL_CRYPTO_LIB@
@@ -143,6 +148,8 @@ PKG_CONFIG_ENABLED = @PKG_CONFIG_ENABLED@
 RANLIB = @RANLIB@
 RM = @RM@
 SET_MAKE = @SET_MAKE@
+SHAREDLIB_HACK_FALSE = @SHAREDLIB_HACK_FALSE@
+SHAREDLIB_HACK_TRUE = @SHAREDLIB_HACK_TRUE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TAR = @TAR@
@@ -155,6 +162,7 @@ XMLSEC_CORE_LIBS = @XMLSEC_CORE_LIBS@
 XMLSEC_CRYPTO = @XMLSEC_CRYPTO@
 XMLSEC_CRYPTO_CFLAGS = @XMLSEC_CRYPTO_CFLAGS@
 XMLSEC_CRYPTO_DISABLED_LIST = @XMLSEC_CRYPTO_DISABLED_LIST@
+XMLSEC_CRYPTO_EXTRA_LDFLAGS = @XMLSEC_CRYPTO_EXTRA_LDFLAGS@
 XMLSEC_CRYPTO_LIB = @XMLSEC_CRYPTO_LIB@
 XMLSEC_CRYPTO_LIBS = @XMLSEC_CRYPTO_LIBS@
 XMLSEC_CRYPTO_LIST = @XMLSEC_CRYPTO_LIST@
@@ -163,6 +171,7 @@ XMLSEC_DEFINES = @XMLSEC_DEFINES@
 XMLSEC_DL_INCLUDES = @XMLSEC_DL_INCLUDES@
 XMLSEC_DL_LIBS = @XMLSEC_DL_LIBS@
 XMLSEC_DOCDIR = @XMLSEC_DOCDIR@
+XMLSEC_EXTRA_LDFLAGS = @XMLSEC_EXTRA_LDFLAGS@
 XMLSEC_GNUTLS_CFLAGS = @XMLSEC_GNUTLS_CFLAGS@
 XMLSEC_GNUTLS_LIBS = @XMLSEC_GNUTLS_LIBS@
 XMLSEC_LIBDIR = @XMLSEC_LIBDIR@
@@ -185,6 +194,9 @@ XMLSEC_NO_DSA_TRUE = @XMLSEC_NO_DSA_TRUE@
 XMLSEC_NO_GNUTLS = @XMLSEC_NO_GNUTLS@
 XMLSEC_NO_GNUTLS_FALSE = @XMLSEC_NO_GNUTLS_FALSE@
 XMLSEC_NO_GNUTLS_TRUE = @XMLSEC_NO_GNUTLS_TRUE@
+XMLSEC_NO_GOST = @XMLSEC_NO_GOST@
+XMLSEC_NO_GOST_FALSE = @XMLSEC_NO_GOST_FALSE@
+XMLSEC_NO_GOST_TRUE = @XMLSEC_NO_GOST_TRUE@
 XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
 XMLSEC_NO_HMAC_FALSE = @XMLSEC_NO_HMAC_FALSE@
 XMLSEC_NO_HMAC_TRUE = @XMLSEC_NO_HMAC_TRUE@
@@ -192,6 +204,9 @@ XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
 XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
 XMLSEC_NO_MD5_FALSE = @XMLSEC_NO_MD5_FALSE@
 XMLSEC_NO_MD5_TRUE = @XMLSEC_NO_MD5_TRUE@
+XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
+XMLSEC_NO_MSCRYPTO_FALSE = @XMLSEC_NO_MSCRYPTO_FALSE@
+XMLSEC_NO_MSCRYPTO_TRUE = @XMLSEC_NO_MSCRYPTO_TRUE@
 XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
 XMLSEC_NO_NSS_FALSE = @XMLSEC_NO_NSS_FALSE@
 XMLSEC_NO_NSS_TRUE = @XMLSEC_NO_NSS_TRUE@
diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in
index be68edb..6e6cc5d 100644
--- a/docs/api/Makefile.in
+++ b/docs/api/Makefile.in
@@ -111,12 +111,17 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAN2HTML = @MAN2HTML@
 MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
+MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
+MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
 MV = @MV@
 NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
+NSPR_PACKAGE = @NSPR_PACKAGE@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_CRYPTO_LIB = @NSS_CRYPTO_LIB@
 NSS_LIBS = @NSS_LIBS@
 NSS_MIN_VERSION = @NSS_MIN_VERSION@
+NSS_PACKAGE = @NSS_PACKAGE@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_CRYPTO_LIB = @OPENSSL_CRYPTO_LIB@
@@ -134,6 +139,8 @@ PKG_CONFIG_ENABLED = @PKG_CONFIG_ENABLED@
 RANLIB = @RANLIB@
 RM = @RM@
 SET_MAKE = @SET_MAKE@
+SHAREDLIB_HACK_FALSE = @SHAREDLIB_HACK_FALSE@
+SHAREDLIB_HACK_TRUE = @SHAREDLIB_HACK_TRUE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TAR = @TAR@
@@ -146,6 +153,7 @@ XMLSEC_CORE_LIBS = @XMLSEC_CORE_LIBS@
 XMLSEC_CRYPTO = @XMLSEC_CRYPTO@
 XMLSEC_CRYPTO_CFLAGS = @XMLSEC_CRYPTO_CFLAGS@
 XMLSEC_CRYPTO_DISABLED_LIST = @XMLSEC_CRYPTO_DISABLED_LIST@
+XMLSEC_CRYPTO_EXTRA_LDFLAGS = @XMLSEC_CRYPTO_EXTRA_LDFLAGS@
 XMLSEC_CRYPTO_LIB = @XMLSEC_CRYPTO_LIB@
 XMLSEC_CRYPTO_LIBS = @XMLSEC_CRYPTO_LIBS@
 XMLSEC_CRYPTO_LIST = @XMLSEC_CRYPTO_LIST@
@@ -154,6 +162,7 @@ XMLSEC_DEFINES = @XMLSEC_DEFINES@
 XMLSEC_DL_INCLUDES = @XMLSEC_DL_INCLUDES@
 XMLSEC_DL_LIBS = @XMLSEC_DL_LIBS@
 XMLSEC_DOCDIR = @XMLSEC_DOCDIR@
+XMLSEC_EXTRA_LDFLAGS = @XMLSEC_EXTRA_LDFLAGS@
 XMLSEC_GNUTLS_CFLAGS = @XMLSEC_GNUTLS_CFLAGS@
 XMLSEC_GNUTLS_LIBS = @XMLSEC_GNUTLS_LIBS@
 XMLSEC_LIBDIR = @XMLSEC_LIBDIR@
@@ -176,6 +185,9 @@ XMLSEC_NO_DSA_TRUE = @XMLSEC_NO_DSA_TRUE@
 XMLSEC_NO_GNUTLS = @XMLSEC_NO_GNUTLS@
 XMLSEC_NO_GNUTLS_FALSE = @XMLSEC_NO_GNUTLS_FALSE@
 XMLSEC_NO_GNUTLS_TRUE = @XMLSEC_NO_GNUTLS_TRUE@
+XMLSEC_NO_GOST = @XMLSEC_NO_GOST@
+XMLSEC_NO_GOST_FALSE = @XMLSEC_NO_GOST_FALSE@
+XMLSEC_NO_GOST_TRUE = @XMLSEC_NO_GOST_TRUE@
 XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
 XMLSEC_NO_HMAC_FALSE = @XMLSEC_NO_HMAC_FALSE@
 XMLSEC_NO_HMAC_TRUE = @XMLSEC_NO_HMAC_TRUE@
@@ -183,6 +195,9 @@ XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
 XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
 XMLSEC_NO_MD5_FALSE = @XMLSEC_NO_MD5_FALSE@
 XMLSEC_NO_MD5_TRUE = @XMLSEC_NO_MD5_TRUE@
+XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
+XMLSEC_NO_MSCRYPTO_FALSE = @XMLSEC_NO_MSCRYPTO_FALSE@
+XMLSEC_NO_MSCRYPTO_TRUE = @XMLSEC_NO_MSCRYPTO_TRUE@
 XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
 XMLSEC_NO_NSS_FALSE = @XMLSEC_NO_NSS_FALSE@
 XMLSEC_NO_NSS_TRUE = @XMLSEC_NO_NSS_TRUE@
diff --git a/docs/api/chapters/new-crypto.sgml b/docs/api/chapters/new-crypto.sgml
index 5d992ad..08a936e 100644
--- a/docs/api/chapters/new-crypto.sgml
+++ b/docs/api/chapters/new-crypto.sgml
@@ -258,7 +258,7 @@ make
 	<para>XML Security Library "klass" includes three main parts:
 	<itemizedlist>
 	<listitem><para>"Klass" declaration structure that defines "klass" interfaces
-	and global constand data (for example, the human-readable name of 
+	and global constant data (for example, the human-readable name of 
 	the "klass").
 	<example>
 	    <title>Base transform "klass" and its child XPath transform "klass" structure.</title>
diff --git a/docs/api/index.html b/docs/api/index.html
index 101b9c2..dc4f67a 100644
--- a/docs/api/index.html
+++ b/docs/api/index.html
@@ -71,7 +71,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -80,8 +80,7 @@
 <table class="navigation" width="100%" cellpadding="2" cellspacing="0"><tr><th align="center" valign="MIDDLE"><p class="TITLE">XML Security Library Reference Manual<a name="AEN2"></a></p></th></tr></table>
 <h3 class="AUTHOR">
 <a name="AEN5"></a>Aleksey Sanin</h3>
-<div class="AFFILIATION"><div class="ADDRESS"><p class="ADDRESS">	����<code class="EMAIL"><<a href="mailto:aleksey at aleksey.com">aleksey at aleksey.com</a>></code><br>
-	��</p></div></div>
+<div class="AFFILIATION"><div class="ADDRESS"><p class="ADDRESS">	<code class="EMAIL"><<a href="mailto:aleksey at aleksey.com">aleksey at aleksey.com</a>></code><br></p></div></div>
 <p class="COPYRIGHT">Copyright � 2002-2003 Aleksey Sanin</p>
 <div><div class="ABSTRACT">
 <p></p>
@@ -194,99 +193,99 @@
 <dt><a href="xmlsec-ref.html">XML Security Core Library API Reference.</a></dt>
 <dd><dl>
 <dt>
-<a href="xmlsec-app.html">app</a>�--�</dt>
+<a href="xmlsec-app.html">app</a>--</dt>
 <dt>
-<a href="xmlsec-base64.html">base64</a>�--�</dt>
+<a href="xmlsec-base64.html">base64</a>--</dt>
 <dt>
-<a href="xmlsec-bn.html">bn</a>�--�</dt>
+<a href="xmlsec-bn.html">bn</a>--</dt>
 <dt>
-<a href="xmlsec-buffer.html">buffer</a>�--�</dt>
+<a href="xmlsec-buffer.html">buffer</a>--</dt>
 <dt>
-<a href="xmlsec-dl.html">dl</a>�--�</dt>
+<a href="xmlsec-dl.html">dl</a>--</dt>
 <dt>
-<a href="xmlsec-errors.html">errors</a>�--�</dt>
+<a href="xmlsec-errors.html">errors</a>--</dt>
 <dt>
-<a href="xmlsec-io.html">io</a>�--�</dt>
+<a href="xmlsec-io.html">io</a>--</dt>
 <dt>
-<a href="xmlsec-keyinfo.html">keyinfo</a>�--�</dt>
+<a href="xmlsec-keyinfo.html">keyinfo</a>--</dt>
 <dt>
-<a href="xmlsec-keysdata.html">keysdata</a>�--�</dt>
+<a href="xmlsec-keysdata.html">keysdata</a>--</dt>
 <dt>
-<a href="xmlsec-keys.html">keys</a>�--�</dt>
+<a href="xmlsec-keys.html">keys</a>--</dt>
 <dt>
-<a href="xmlsec-keysmngr.html">keysmngr</a>�--�</dt>
+<a href="xmlsec-keysmngr.html">keysmngr</a>--</dt>
 <dt>
-<a href="xmlsec-list.html">list</a>�--�</dt>
+<a href="xmlsec-list.html">list</a>--</dt>
 <dt>
-<a href="xmlsec-membuf.html">membuf</a>�--�</dt>
+<a href="xmlsec-membuf.html">membuf</a>--</dt>
 <dt>
-<a href="xmlsec-nodeset.html">nodeset</a>�--�</dt>
+<a href="xmlsec-nodeset.html">nodeset</a>--</dt>
 <dt>
-<a href="xmlsec-parser.html">parser</a>�--�</dt>
+<a href="xmlsec-parser.html">parser</a>--</dt>
 <dt>
-<a href="xmlsec-templates.html">templates</a>�--�</dt>
+<a href="xmlsec-templates.html">templates</a>--</dt>
 <dt>
-<a href="xmlsec-transforms.html">transforms</a>�--�</dt>
+<a href="xmlsec-transforms.html">transforms</a>--</dt>
 <dt>
-<a href="xmlsec-version.html">version</a>�--�</dt>
+<a href="xmlsec-version.html">version</a>--</dt>
 <dt>
-<a href="xmlsec-xmldsig.html">xmldsig</a>�--�</dt>
+<a href="xmlsec-xmldsig.html">xmldsig</a>--</dt>
 <dt>
-<a href="xmlsec-xmlenc.html">xmlenc</a>�--�</dt>
+<a href="xmlsec-xmlenc.html">xmlenc</a>--</dt>
 <dt>
-<a href="xmlsec-xmlsec.html">xmlsec</a>�--�</dt>
+<a href="xmlsec-xmlsec.html">xmlsec</a>--</dt>
 <dt>
-<a href="xmlsec-xmltree.html">xmltree</a>�--�</dt>
+<a href="xmlsec-xmltree.html">xmltree</a>--</dt>
 <dt>
-<a href="xmlsec-x509.html">x509</a>�--�</dt>
+<a href="xmlsec-x509.html">x509</a>--</dt>
 </dl></dd>
 <dt><a href="xmlsec-openssl-ref.html">XML Security Library for OpenSLL API Reference.</a></dt>
 <dd><dl>
 <dt>
-<a href="xmlsec-openssl-app.html">app</a>�--�</dt>
+<a href="xmlsec-openssl-app.html">app</a>--</dt>
 <dt>
-<a href="xmlsec-openssl-bn.html">bn</a>�--�</dt>
+<a href="xmlsec-openssl-bn.html">bn</a>--</dt>
 <dt>
-<a href="xmlsec-openssl-crypto.html">crypto</a>�--�</dt>
+<a href="xmlsec-openssl-crypto.html">crypto</a>--</dt>
 <dt>
-<a href="xmlsec-openssl-evp.html">evp</a>�--�</dt>
+<a href="xmlsec-openssl-evp.html">evp</a>--</dt>
 <dt>
-<a href="xmlsec-openssl-x509.html">x509</a>�--�</dt>
+<a href="xmlsec-openssl-x509.html">x509</a>--</dt>
 </dl></dd>
 <dt><a href="xmlsec-gnutls-ref.html">XML Security Library for GnuTLS API Reference.</a></dt>
 <dd><dl>
 <dt>
-<a href="xmlsec-gnutls-app.html">app</a>�--�</dt>
+<a href="xmlsec-gnutls-app.html">app</a>--</dt>
 <dt>
-<a href="xmlsec-gnutls-crypto.html">crypto</a>�--�</dt>
+<a href="xmlsec-gnutls-crypto.html">crypto</a>--</dt>
 </dl></dd>
 <dt><a href="xmlsec-nss-ref.html">XML Security Library for NSS API Reference.</a></dt>
 <dd><dl>
 <dt>
-<a href="xmlsec-nss-app.html">app</a>�--�</dt>
+<a href="xmlsec-nss-app.html">app</a>--</dt>
 <dt>
-<a href="xmlsec-nss-bignum.html">bignum</a>�--�</dt>
+<a href="xmlsec-nss-bignum.html">bignum</a>--</dt>
 <dt>
-<a href="xmlsec-nss-crypto.html">crypto</a>�--�</dt>
+<a href="xmlsec-nss-crypto.html">crypto</a>--</dt>
 <dt>
-<a href="xmlsec-nss-keysstore.html">keysstore</a>�--�</dt>
+<a href="xmlsec-nss-keysstore.html">keysstore</a>--</dt>
 <dt>
-<a href="xmlsec-nss-pkikeys.html">pkikeys</a>�--�</dt>
+<a href="xmlsec-nss-pkikeys.html">pkikeys</a>--</dt>
 <dt>
-<a href="xmlsec-nss-x509.html">x509</a>�--�</dt>
+<a href="xmlsec-nss-x509.html">x509</a>--</dt>
 </dl></dd>
 <dt><a href="xmlsec-mscrypto-ref.html">XML Security Library for MSCrypto API Reference.</a></dt>
 <dd><dl>
 <dt>
-<a href="xmlsec-mscrypto-app.html">app</a>�--�</dt>
+<a href="xmlsec-mscrypto-app.html">app</a>--</dt>
 <dt>
-<a href="xmlsec-mscrypto-certkeys.html">certkeys</a>�--�</dt>
+<a href="xmlsec-mscrypto-certkeys.html">certkeys</a>--</dt>
 <dt>
-<a href="xmlsec-mscrypto-crypto.html">crypto</a>�--�</dt>
+<a href="xmlsec-mscrypto-crypto.html">crypto</a>--</dt>
 <dt>
-<a href="xmlsec-mscrypto-keysstore.html">keysstore</a>�--�</dt>
+<a href="xmlsec-mscrypto-keysstore.html">keysstore</a>--</dt>
 <dt>
-<a href="xmlsec-mscrypto-x509.html">x509</a>�--�</dt>
+<a href="xmlsec-mscrypto-x509.html">x509</a>--</dt>
 </dl></dd>
 <dt><a href="xmlsec-index.html">XML Security Library Reference Index</a></dt>
 </dl></dd>
@@ -294,7 +293,7 @@
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
 <td align="left"></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes.html"><b>XML Security Library Tutorial�>>></b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes.html"><b>XML Security Library Tutorial>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-app.html b/docs/api/xmlsec-app.html
index 0aba20e..00afe50 100644
--- a/docs/api/xmlsec-app.html
+++ b/docs/api/xmlsec-app.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-APP"></a>app</h1>
 <div class="REFNAMEDIV">
-<a name="AEN836"></a><h2>Name</h2>app�--�</div>
+<a name="AEN836"></a><h2>Name</h2>app--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN839"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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);
@@ -239,7 +239,7 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1017"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1017"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys manager.</p></td>
 </tr>
 <tr>
@@ -854,7 +854,7 @@ by XMLSec command line utility and called before
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1614"><span style="white-space: nowrap"><var class="PARAMETER">config</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1614"><span style="white-space: nowrap"><var class="PARAMETER">config</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the path to crypto library configuration.</p></td>
 </tr>
 <tr>
@@ -890,7 +890,7 @@ and a default crypto key data stores.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1654"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1654"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
@@ -912,11 +912,11 @@ function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1680"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1680"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN1685"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1685"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
@@ -938,11 +938,11 @@ with <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRINIT"><span class="T
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1711"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1711"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN1716"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1716"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the uri.</p></td>
 </tr>
 <tr>
@@ -964,15 +964,15 @@ with <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRINIT"><span class="T
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1740"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1740"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN1745"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1745"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1750"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1750"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the type of keys to save (public/private/symmetric).</p></td>
 </tr>
 <tr>
@@ -995,19 +995,19 @@ untrusted certs in <var class="PARAMETER">store</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1776"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1776"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1781"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1781"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the certificate file.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1786"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1786"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1791"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1791"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate in <var class="PARAMETER">filename</var>
    			trusted or not.</p></td>
 </tr>
@@ -1031,23 +1031,23 @@ untrusted certs in <var class="PARAMETER">store</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1817"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1817"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1822"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1822"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1827"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1827"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1832"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1832"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1837"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1837"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
@@ -1071,19 +1071,19 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1861"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1861"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1866"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1866"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1871"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1871"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1876"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1876"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
@@ -1104,15 +1104,15 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1900"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1900"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1905"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1905"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1910"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1910"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
@@ -1132,8 +1132,8 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-ref.html"><b><<<�XML Security Core Library API Reference.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-base64.html"><b>base64�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-ref.html"><b><<<XML Security Core Library API Reference.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-base64.html"><b>base64>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-base64.html b/docs/api/xmlsec-base64.html
index 592c3c4..e316f01 100644
--- a/docs/api/xmlsec-base64.html
+++ b/docs/api/xmlsec-base64.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-BASE64"></a>base64</h1>
 <div class="REFNAMEDIV">
-<a name="AEN1934"></a><h2>Name</h2>base64�--�</div>
+<a name="AEN1934"></a><h2>Name</h2>base64--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN1937"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<pre class="SYNOPSIS">
 
 #define     <a href="xmlsec-base64.html#XMLSEC-BASE64-LINESIZE-CAPS">XMLSEC_BASE64_LINESIZE</a>
 <font>xmlSecBase64CtxPtr</font> <a href="xmlsec-base64.html#XMLSECBASE64CTXCREATE">xmlSecBase64CtxCreate</a>    (<font>int</font> encode,
@@ -140,11 +140,11 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2003"><span style="white-space: nowrap"><var class="PARAMETER">encode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2003"><span style="white-space: nowrap"><var class="PARAMETER">encode</var>:</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="AEN2008"><span style="white-space: nowrap"><var class="PARAMETER">columns</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2008"><span style="white-space: nowrap"><var class="PARAMETER">columns</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the max line length.</p></td>
 </tr>
 <tr>
@@ -163,7 +163,7 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2031"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2031"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to <font><span class="TYPE">xmlSecBase64Ctx</span></font> structure.</p></td>
 </tr></tbody></table>
 </div>
@@ -179,15 +179,15 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2051"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2051"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <font><span class="TYPE">xmlSecBase64Ctx</span></font> structure,</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2058"><span style="white-space: nowrap"><var class="PARAMETER">encode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2058"><span style="white-space: nowrap"><var class="PARAMETER">encode</var>:</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="AEN2063"><span style="white-space: nowrap"><var class="PARAMETER">columns</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2063"><span style="white-space: nowrap"><var class="PARAMETER">columns</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the max line length.</p></td>
 </tr>
 <tr>
@@ -205,7 +205,7 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2085"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2085"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <font><span class="TYPE">xmlSecBase64Ctx</span></font> structure,</p></td>
 </tr></tbody></table>
 </div>
@@ -223,23 +223,23 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2107"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2107"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to <font><span class="TYPE">xmlSecBase64Ctx</span></font> structure</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2114"><span style="white-space: nowrap"><var class="PARAMETER">in</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2114"><span style="white-space: nowrap"><var class="PARAMETER">in</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the input buffer</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2119"><span style="white-space: nowrap"><var class="PARAMETER">inSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2119"><span style="white-space: nowrap"><var class="PARAMETER">inSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the input buffer size</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2124"><span style="white-space: nowrap"><var class="PARAMETER">out</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2124"><span style="white-space: nowrap"><var class="PARAMETER">out</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the output buffer</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2129"><span style="white-space: nowrap"><var class="PARAMETER">outSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2129"><span style="white-space: nowrap"><var class="PARAMETER">outSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the output buffer size</p></td>
 </tr>
 <tr>
@@ -262,15 +262,15 @@ and finalizes the result.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2152"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2152"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to <font><span class="TYPE">xmlSecBase64Ctx</span></font> structure</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2159"><span style="white-space: nowrap"><var class="PARAMETER">out</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2159"><span style="white-space: nowrap"><var class="PARAMETER">out</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the output buffer</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2164"><span style="white-space: nowrap"><var class="PARAMETER">outSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2164"><span style="white-space: nowrap"><var class="PARAMETER">outSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the output buffer size</p></td>
 </tr>
 <tr>
@@ -294,15 +294,15 @@ The caller is responsible for freeing returned buffer using
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2189"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2189"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the input buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2194"><span style="white-space: nowrap"><var class="PARAMETER">len</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2194"><span style="white-space: nowrap"><var class="PARAMETER">len</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the input buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2199"><span style="white-space: nowrap"><var class="PARAMETER">columns</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2199"><span style="white-space: nowrap"><var class="PARAMETER">columns</var>:</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>
@@ -326,15 +326,15 @@ the output buffer.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2222"><span style="white-space: nowrap"><var class="PARAMETER">str</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2222"><span style="white-space: nowrap"><var class="PARAMETER">str</var>:</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="AEN2227"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2227"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the output buffer</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2232"><span style="white-space: nowrap"><var class="PARAMETER">len</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2232"><span style="white-space: nowrap"><var class="PARAMETER">len</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the output buffer size</p></td>
 </tr>
 <tr>
@@ -346,8 +346,8 @@ a negative value if an error occurs </p></td>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-app.html"><b><<<�app</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-bn.html"><b>bn�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-app.html"><b><<<app</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-bn.html"><b>bn>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-bn.html b/docs/api/xmlsec-bn.html
index d2f9275..1010dfb 100644
--- a/docs/api/xmlsec-bn.html
+++ b/docs/api/xmlsec-bn.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-BN"></a>bn</h1>
 <div class="REFNAMEDIV">
-<a name="AEN2247"></a><h2>Name</h2>bn�--�</div>
+<a name="AEN2247"></a><h2>Name</h2>bn--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN2250"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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);
@@ -189,7 +189,7 @@ by calling <var class="PARAMETER">xmlSecBnDestroy</var> function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2392"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2392"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the initial allocated BN size.</p></td>
 </tr>
 <tr>
@@ -207,7 +207,7 @@ by calling <var class="PARAMETER">xmlSecBnDestroy</var> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2415"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2415"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr></tbody></table>
 </div>
@@ -223,11 +223,11 @@ by calling <var class="PARAMETER">xmlSecBnFinalize</var> function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2433"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2433"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2438"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2438"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the initial allocated BN size.</p></td>
 </tr>
 <tr>
@@ -245,7 +245,7 @@ by calling <var class="PARAMETER">xmlSecBnFinalize</var> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2461"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2461"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr></tbody></table>
 </div>
@@ -259,7 +259,7 @@ by calling <var class="PARAMETER">xmlSecBnFinalize</var> function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2478"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2478"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
@@ -280,15 +280,15 @@ by calling <var class="PARAMETER">xmlSecBnFinalize</var> function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2503"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2503"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2508"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2508"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN2513"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2513"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the size of new BN data.</p></td>
 </tr>
 <tr>
@@ -307,7 +307,7 @@ by calling <var class="PARAMETER">xmlSecBnFinalize</var> function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2535"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2535"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
@@ -325,7 +325,7 @@ by calling <var class="PARAMETER">xmlSecBnFinalize</var> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2557"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2557"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr></tbody></table>
 </div>
@@ -341,15 +341,15 @@ by calling <var class="PARAMETER">xmlSecBnFinalize</var> function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2578"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2578"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2583"><span style="white-space: nowrap"><var class="PARAMETER">str</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2583"><span style="white-space: nowrap"><var class="PARAMETER">str</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the string with BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2588"><span style="white-space: nowrap"><var class="PARAMETER">base</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2588"><span style="white-space: nowrap"><var class="PARAMETER">base</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the base for <var class="PARAMETER">str</var>.</p></td>
 </tr>
 <tr>
@@ -370,11 +370,11 @@ freeing returned string with <var class="PARAMETER">xmlFree</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2614"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2614"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2619"><span style="white-space: nowrap"><var class="PARAMETER">base</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2619"><span style="white-space: nowrap"><var class="PARAMETER">base</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the base for returned string.</p></td>
 </tr>
 <tr>
@@ -394,11 +394,11 @@ freeing returned string with <var class="PARAMETER">xmlFree</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2643"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2643"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2648"><span style="white-space: nowrap"><var class="PARAMETER">str</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2648"><span style="white-space: nowrap"><var class="PARAMETER">str</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the string with BN.</p></td>
 </tr>
 <tr>
@@ -418,7 +418,7 @@ freeing returned string with <var class="PARAMETER">xmlFree</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2671"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2671"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
@@ -438,11 +438,11 @@ freeing returned string with <var class="PARAMETER">xmlFree</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2695"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2695"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2700"><span style="white-space: nowrap"><var class="PARAMETER">str</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2700"><span style="white-space: nowrap"><var class="PARAMETER">str</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the string with BN.</p></td>
 </tr>
 <tr>
@@ -462,7 +462,7 @@ freeing returned string with <var class="PARAMETER">xmlFree</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2723"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2723"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
@@ -482,11 +482,11 @@ freeing returned string with <var class="PARAMETER">xmlFree</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2747"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2747"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2752"><span style="white-space: nowrap"><var class="PARAMETER">multiplier</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2752"><span style="white-space: nowrap"><var class="PARAMETER">multiplier</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the multiplier.</p></td>
 </tr>
 <tr>
@@ -507,15 +507,15 @@ freeing returned string with <var class="PARAMETER">xmlFree</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2778"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2778"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2783"><span style="white-space: nowrap"><var class="PARAMETER">divider</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2783"><span style="white-space: nowrap"><var class="PARAMETER">divider</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the divider</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2788"><span style="white-space: nowrap"><var class="PARAMETER">mod</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2788"><span style="white-space: nowrap"><var class="PARAMETER">mod</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer for modulus result.</p></td>
 </tr>
 <tr>
@@ -535,11 +535,11 @@ freeing returned string with <var class="PARAMETER">xmlFree</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2812"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2812"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2817"><span style="white-space: nowrap"><var class="PARAMETER">delta</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2817"><span style="white-space: nowrap"><var class="PARAMETER">delta</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the delta.</p></td>
 </tr>
 <tr>
@@ -558,7 +558,7 @@ freeing returned string with <var class="PARAMETER">xmlFree</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2839"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2839"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
@@ -579,15 +579,15 @@ freeing returned string with <var class="PARAMETER">xmlFree</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2864"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2864"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2869"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2869"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN2874"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2874"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the <var class="PARAMETER">data</var> size.</p></td>
 </tr>
 <tr>
@@ -609,15 +609,15 @@ is greater than <var class="PARAMETER">data</var>.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2903"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2903"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2908"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2908"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN2913"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2913"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the <var class="PARAMETER">data</var> size.</p></td>
 </tr>
 <tr>
@@ -640,19 +640,19 @@ is greater than <var class="PARAMETER">data</var>.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2943"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2943"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2948"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2948"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</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="AEN2953"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2953"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the BN format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2958"><span style="white-space: nowrap"><var class="PARAMETER">reverse</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2958"><span style="white-space: nowrap"><var class="PARAMETER">reverse</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	if set then reverse read buffer after reading.</p></td>
 </tr>
 <tr>
@@ -675,23 +675,23 @@ is greater than <var class="PARAMETER">data</var>.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2984"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2984"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2989"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2989"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</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="AEN2994"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2994"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the BN format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2999"><span style="white-space: nowrap"><var class="PARAMETER">reverse</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2999"><span style="white-space: nowrap"><var class="PARAMETER">reverse</var>:</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="AEN3004"><span style="white-space: nowrap"><var class="PARAMETER">addLineBreaks</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3004"><span style="white-space: nowrap"><var class="PARAMETER">addLineBreaks</var>:</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>
@@ -715,27 +715,27 @@ is greater than <var class="PARAMETER">data</var>.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3031"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3031"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN3036"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3036"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</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="AEN3041"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3041"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</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="AEN3046"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3046"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the BN format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3051"><span style="white-space: nowrap"><var class="PARAMETER">reverse</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3051"><span style="white-space: nowrap"><var class="PARAMETER">reverse</var>:</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="AEN3056"><span style="white-space: nowrap"><var class="PARAMETER">addLineBreaks</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3056"><span style="white-space: nowrap"><var class="PARAMETER">addLineBreaks</var>:</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>
@@ -748,8 +748,8 @@ is greater than <var class="PARAMETER">data</var>.</p></td>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-base64.html"><b><<<�base64</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-buffer.html"><b>buffer�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-base64.html"><b><<<base64</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-buffer.html"><b>buffer>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-buffer.html b/docs/api/xmlsec-buffer.html
index f61b9c2..918e02f 100644
--- a/docs/api/xmlsec-buffer.html
+++ b/docs/api/xmlsec-buffer.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-BUFFER"></a>buffer</h1>
 <div class="REFNAMEDIV">
-<a name="AEN3071"></a><h2>Name</h2>buffer�--�</div>
+<a name="AEN3071"></a><h2>Name</h2>buffer--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN3074"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<pre class="SYNOPSIS">
 
 enum        <a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a>;
 struct      <a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a>;
@@ -208,11 +208,11 @@ struct      <a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a>;
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3226"><span style="white-space: nowrap"><var class="PARAMETER">defAllocMode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3226"><span style="white-space: nowrap"><var class="PARAMETER">defAllocMode</var>:</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="AEN3231"><span style="white-space: nowrap"><var class="PARAMETER">defInitialSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3231"><span style="white-space: nowrap"><var class="PARAMETER">defInitialSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the new default buffer minimal intial size.</p></td>
 </tr>
 </tbody></table>
@@ -229,7 +229,7 @@ to free the buffer.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3249"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3249"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the intial size.</p></td>
 </tr>
 <tr>
@@ -247,7 +247,7 @@ 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="AEN3272"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3272"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr></tbody></table>
 </div>
@@ -263,11 +263,11 @@ to free the buffer.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3292"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3292"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN3297"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3297"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the initial buffer size.</p></td>
 </tr>
 <tr>
@@ -286,7 +286,7 @@ function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN3320"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3320"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr></tbody></table>
 </div>
@@ -300,7 +300,7 @@ function.</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"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3336"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr>
 <tr>
@@ -321,15 +321,15 @@ function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3360"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3360"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN3365"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3365"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3370"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3370"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the data size.</p></td>
 </tr>
 <tr>
@@ -348,7 +348,7 @@ function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3391"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3391"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr>
 <tr>
@@ -369,11 +369,11 @@ have at least <var class="PARAMETER">size</var> bytes.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3414"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3414"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN3419"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3419"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the new data size.</p></td>
 </tr>
 <tr>
@@ -392,7 +392,7 @@ have at least <var class="PARAMETER">size</var> bytes.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3440"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3440"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr>
 <tr>
@@ -413,11 +413,11 @@ have at least <var class="PARAMETER">size</var> bytes.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3463"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3463"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN3468"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3468"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the new maximum size.</p></td>
 </tr>
 <tr>
@@ -435,7 +435,7 @@ have at least <var class="PARAMETER">size</var> bytes.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN3489"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3489"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr></tbody></table>
 </div>
@@ -451,15 +451,15 @@ have at least <var class="PARAMETER">size</var> bytes.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3508"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3508"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN3513"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3513"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3518"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3518"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the data size.</p></td>
 </tr>
 <tr>
@@ -480,15 +480,15 @@ have at least <var class="PARAMETER">size</var> bytes.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3542"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3542"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN3547"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3547"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3552"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3552"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the data size.</p></td>
 </tr>
 <tr>
@@ -508,11 +508,11 @@ have at least <var class="PARAMETER">size</var> bytes.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3575"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3575"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN3580"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3580"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the number of bytes to be removed.</p></td>
 </tr>
 <tr>
@@ -532,11 +532,11 @@ have at least <var class="PARAMETER">size</var> bytes.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3603"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3603"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN3608"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3608"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the number of bytes to be removed.</p></td>
 </tr>
 <tr>
@@ -556,11 +556,11 @@ have at least <var class="PARAMETER">size</var> bytes.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3631"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3631"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN3636"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3636"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the filename.</p></td>
 </tr>
 <tr>
@@ -582,11 +582,11 @@ result in the buffer.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3659"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3659"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN3664"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3664"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to node.</p></td>
 </tr>
 <tr>
@@ -608,15 +608,15 @@ result in the buffer.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3688"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3688"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN3693"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3693"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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="AEN3698"><span style="white-space: nowrap"><var class="PARAMETER">columns</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3698"><span style="white-space: nowrap"><var class="PARAMETER">columns</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the max line size fro base64 encoded data.</p></td>
 </tr>
 <tr>
@@ -637,7 +637,7 @@ responsible for destroying <var class="PARAMETER">buf</var> when processing is d
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3721"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3721"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer.</p></td>
 </tr>
 <tr>
@@ -649,8 +649,8 @@ occurs.</p></td>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-bn.html"><b><<<�bn</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-dl.html"><b>dl�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-bn.html"><b><<<bn</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-dl.html"><b>dl>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-custom-keys-manager.html b/docs/api/xmlsec-custom-keys-manager.html
index 64144e2..8429fe0 100644
--- a/docs/api/xmlsec-custom-keys-manager.html
+++ b/docs/api/xmlsec-custom-keys-manager.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -445,14 +445,15 @@ files_keys_store_find_key(xmlSecKeyStorePtr store, const xmlChar* name, xmlSecKe
     }
 
     return(key);
-}
</pre>
+}
+</pre>
 <p></p>
 </div>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-decrypt-with-keys-mngr.html"><b><<<�Decrypting data with keys manager.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-signature-klasses.html"><b>APPENDIX A. XML Security Library Signature Klasses.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-decrypt-with-keys-mngr.html"><b><<<Decrypting data with keys manager.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-signature-klasses.html"><b>APPENDIX A. XML Security Library Signature Klasses.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-decrypt-with-keys-mngr.html b/docs/api/xmlsec-decrypt-with-keys-mngr.html
index f092954..4bdbcc7 100644
--- a/docs/api/xmlsec-decrypt-with-keys-mngr.html
+++ b/docs/api/xmlsec-decrypt-with-keys-mngr.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -365,14 +365,15 @@ done:
 	xmlFreeDoc(doc); 
     }
     return(res);
-}
</pre>
+}
+</pre>
 <p></p>
 </div>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-decrypt-with-signle-key.html"><b><<<�Decrypting data with a single key.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-custom-keys-manager.html"><b>Writing a custom keys manager.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-decrypt-with-signle-key.html"><b><<<Decrypting data with a single key.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-custom-keys-manager.html"><b>Writing a custom keys manager.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-decrypt-with-signle-key.html b/docs/api/xmlsec-decrypt-with-signle-key.html
index 6401f65..05ab0e4 100644
--- a/docs/api/xmlsec-decrypt-with-signle-key.html
+++ b/docs/api/xmlsec-decrypt-with-signle-key.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -295,14 +295,15 @@ done:
 	xmlFreeDoc(doc); 
     }
     return(res);
-}
</pre>
+}
+</pre>
 <p></p>
 </div>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-encrypt-with-session-key.html"><b><<<�Encrypting data with a session key.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-decrypt-with-keys-mngr.html"><b>Decrypting data with keys manager.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-encrypt-with-session-key.html"><b><<<Encrypting data with a session key.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-decrypt-with-keys-mngr.html"><b>Decrypting data with keys manager.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-dl.html b/docs/api/xmlsec-dl.html
index cc9e546..a596410 100644
--- a/docs/api/xmlsec-dl.html
+++ b/docs/api/xmlsec-dl.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-DL"></a>dl</h1>
 <div class="REFNAMEDIV">
-<a name="AEN3736"></a><h2>Name</h2>dl�--�</div>
+<a name="AEN3736"></a><h2>Name</h2>dl--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN3739"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<pre class="SYNOPSIS">
 
 <font>int</font>         <a href="xmlsec-dl.html#XMLSECCRYPTODLFUNCTIONSREGISTERKEYDATAANDTRANSFORMS">xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms</a>
                                             (<font>xmlSecCryptoDLFunctionsPtr</font> functions);
@@ -121,7 +121,7 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3780"><span style="white-space: nowrap"><var class="PARAMETER">functions</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3780"><span style="white-space: nowrap"><var class="PARAMETER">functions</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the functions table.</p></td>
 </tr>
 <tr>
@@ -170,7 +170,7 @@ and <a href="xmlsec-dl.html#XMLSECCRYPTODLUNLOADLIBRARY"><span class="TYPE">xmlS
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3837"><span style="white-space: nowrap"><var class="PARAMETER">crypto</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3837"><span style="white-space: nowrap"><var class="PARAMETER">crypto</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired crypto library name ("openssl", "nss", ...).</p></td>
 </tr>
 <tr>
@@ -192,7 +192,7 @@ table. This function is NOT thread safe, application MUST NOT call <a href="xmls
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3864"><span style="white-space: nowrap"><var class="PARAMETER">crypto</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3864"><span style="white-space: nowrap"><var class="PARAMETER">crypto</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired crypto library name ("openssl", "nss", ...).</p></td>
 </tr>
 <tr>
@@ -214,7 +214,7 @@ and <a href="xmlsec-dl.html#XMLSECCRYPTODLUNLOADLIBRARY"><span class="TYPE">xmlS
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3891"><span style="white-space: nowrap"><var class="PARAMETER">crypto</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3891"><span style="white-space: nowrap"><var class="PARAMETER">crypto</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired crypto library name ("openssl", "nss", ...).</p></td>
 </tr>
 <tr>
@@ -233,7 +233,7 @@ and <a href="xmlsec-dl.html#XMLSECCRYPTODLUNLOADLIBRARY"><span class="TYPE">xmlS
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3912"><span style="white-space: nowrap"><var class="PARAMETER">functions</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3912"><span style="white-space: nowrap"><var class="PARAMETER">functions</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the new table</p></td>
 </tr>
 <tr>
@@ -258,8 +258,8 @@ and <a href="xmlsec-dl.html#XMLSECCRYPTODLUNLOADLIBRARY"><span class="TYPE">xmlS
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-buffer.html"><b><<<�buffer</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-errors.html"><b>errors�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-buffer.html"><b><<<buffer</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-errors.html"><b>errors>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-encrypt-dynamic-template.html b/docs/api/xmlsec-encrypt-dynamic-template.html
index cce4a9e..58b9f2f 100644
--- a/docs/api/xmlsec-encrypt-dynamic-template.html
+++ b/docs/api/xmlsec-encrypt-dynamic-template.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -316,7 +316,8 @@ done:
 	xmlFreeDoc(doc); 
     }
     return(res);
-}
</pre>
+}
+</pre>
 <p></p>
 </div>
 </div>
@@ -361,8 +362,8 @@ IgL/XoAQN3B27zD91b1ZLGh6QQ9CjnVD98+hYJ9TPp4piPnII4vGUA==</CipherValue>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-encrypt-template-file.html"><b><<<�Encrypting data with a template file.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-encrypt-with-session-key.html"><b>Encrypting data with a session key.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-encrypt-template-file.html"><b><<<Encrypting data with a template file.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-encrypt-with-session-key.html"><b>Encrypting data with a session key.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-encrypt-template-file.html b/docs/api/xmlsec-encrypt-template-file.html
index b2bbc04..6d330a4 100644
--- a/docs/api/xmlsec-encrypt-template-file.html
+++ b/docs/api/xmlsec-encrypt-template-file.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -292,7 +292,8 @@ done:
 	xmlFreeDoc(doc); 
     }
     return(res);
-}
</pre>
+}
+</pre>
 <p></p>
 </div>
 </div>
@@ -340,8 +341,8 @@ XML Security Library example: Encrypted binary data (encrypt1 example).
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-verify-with-restrictions.html"><b><<<�Verifying a signature with additional restrictions.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-encrypt-dynamic-template.html"><b>Encrypting data with a dynamicaly created template.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-verify-with-restrictions.html"><b><<<Verifying a signature with additional restrictions.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-encrypt-dynamic-template.html"><b>Encrypting data with a dynamicaly created template.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-encrypt-with-session-key.html b/docs/api/xmlsec-encrypt-with-session-key.html
index d4cd80c..5700e21 100644
--- a/docs/api/xmlsec-encrypt-with-session-key.html
+++ b/docs/api/xmlsec-encrypt-with-session-key.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -413,7 +413,8 @@ done:
 	xmlFreeDoc(doc); 
     }
     return(res);
-}
</pre>
+}
+</pre>
 <p></p>
 </div>
 </div>
@@ -471,8 +472,8 @@ s6ifbZgXIBsFdxPpMBUFlyTWAAO+NLooIwGoczXi14z62lHr7Ck6FA==</CipherValue>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-encrypt-dynamic-template.html"><b><<<�Encrypting data with a dynamicaly created template.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-decrypt-with-signle-key.html"><b>Decrypting data with a single key.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-encrypt-dynamic-template.html"><b><<<Encrypting data with a dynamicaly created template.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-decrypt-with-signle-key.html"><b>Decrypting data with a single key.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-encryption-klasses.html b/docs/api/xmlsec-encryption-klasses.html
index 3eac014..9ca4db8 100644
--- a/docs/api/xmlsec-encryption-klasses.html
+++ b/docs/api/xmlsec-encryption-klasses.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -94,8 +94,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-signature-klasses.html"><b><<<�APPENDIX A. XML Security Library Signature Klasses.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-reference.html"><b>XML Security Library API Reference.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-signature-klasses.html"><b><<<APPENDIX A. XML Security Library Signature Klasses.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-reference.html"><b>XML Security Library API Reference.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-errors.html b/docs/api/xmlsec-errors.html
index b102de8..e6af8e3 100644
--- a/docs/api/xmlsec-errors.html
+++ b/docs/api/xmlsec-errors.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-ERRORS"></a>errors</h1>
 <div class="REFNAMEDIV">
-<a name="AEN3942"></a><h2>Name</h2>errors�--�</div>
+<a name="AEN3942"></a><h2>Name</h2>errors--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN3945"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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>
@@ -584,31 +584,31 @@ in the <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod" target="
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4451"><span style="white-space: nowrap"><var class="PARAMETER">file</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4451"><span style="white-space: nowrap"><var class="PARAMETER">file</var>:</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="AEN4456"><span style="white-space: nowrap"><var class="PARAMETER">line</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4456"><span style="white-space: nowrap"><var class="PARAMETER">line</var>:</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="AEN4461"><span style="white-space: nowrap"><var class="PARAMETER">func</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4461"><span style="white-space: nowrap"><var class="PARAMETER">func</var>:</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="AEN4466"><span style="white-space: nowrap"><var class="PARAMETER">errorObject</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4466"><span style="white-space: nowrap"><var class="PARAMETER">errorObject</var>:</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="AEN4471"><span style="white-space: nowrap"><var class="PARAMETER">errorSubject</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4471"><span style="white-space: nowrap"><var class="PARAMETER">errorSubject</var>:</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="AEN4476"><span style="white-space: nowrap"><var class="PARAMETER">reason</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4476"><span style="white-space: nowrap"><var class="PARAMETER">reason</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error code.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4481"><span style="white-space: nowrap"><var class="PARAMETER">msg</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4481"><span style="white-space: nowrap"><var class="PARAMETER">msg</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the additional error message.</p></td>
 </tr>
 </tbody></table>
@@ -641,7 +641,7 @@ 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="AEN4520"><span style="white-space: nowrap"><var class="PARAMETER">callback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4520"><span style="white-space: nowrap"><var class="PARAMETER">callback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new errors callback function.</p></td>
 </tr></tbody></table>
 </div>
@@ -662,31 +662,31 @@ error reporting <font><span class="TYPE">xmlGenericError</span></font> function.
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4544"><span style="white-space: nowrap"><var class="PARAMETER">file</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4544"><span style="white-space: nowrap"><var class="PARAMETER">file</var>:</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="AEN4549"><span style="white-space: nowrap"><var class="PARAMETER">line</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4549"><span style="white-space: nowrap"><var class="PARAMETER">line</var>:</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="AEN4554"><span style="white-space: nowrap"><var class="PARAMETER">func</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4554"><span style="white-space: nowrap"><var class="PARAMETER">func</var>:</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="AEN4559"><span style="white-space: nowrap"><var class="PARAMETER">errorObject</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4559"><span style="white-space: nowrap"><var class="PARAMETER">errorObject</var>:</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="AEN4564"><span style="white-space: nowrap"><var class="PARAMETER">errorSubject</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4564"><span style="white-space: nowrap"><var class="PARAMETER">errorSubject</var>:</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="AEN4569"><span style="white-space: nowrap"><var class="PARAMETER">reason</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4569"><span style="white-space: nowrap"><var class="PARAMETER">reason</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error code.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4574"><span style="white-space: nowrap"><var class="PARAMETER">msg</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4574"><span style="white-space: nowrap"><var class="PARAMETER">msg</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the additional error message.</p></td>
 </tr>
 </tbody></table>
@@ -702,7 +702,7 @@ 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="AEN4590"><span style="white-space: nowrap"><var class="PARAMETER">enabled</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4590"><span style="white-space: nowrap"><var class="PARAMETER">enabled</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the flag.</p></td>
 </tr></tbody></table>
 </div>
@@ -716,7 +716,7 @@ errors callback.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4607"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4607"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error position.</p></td>
 </tr>
 <tr>
@@ -736,7 +736,7 @@ total number of known error codes.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4630"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4630"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error position.</p></td>
 </tr>
 <tr>
@@ -764,7 +764,7 @@ for the <a href="xmlsec-errors.html#XMLSECERROR"><code class="FUNCTION">xmlSecEr
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN4661"><span style="white-space: nowrap"><var class="PARAMETER">str</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4661"><span style="white-space: nowrap"><var class="PARAMETER">str</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the string.</p></td>
 </tr></tbody></table>
 </div>
@@ -795,35 +795,35 @@ function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4695"><span style="white-space: nowrap"><var class="PARAMETER">file</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4695"><span style="white-space: nowrap"><var class="PARAMETER">file</var>:</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="AEN4700"><span style="white-space: nowrap"><var class="PARAMETER">line</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4700"><span style="white-space: nowrap"><var class="PARAMETER">line</var>:</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="AEN4705"><span style="white-space: nowrap"><var class="PARAMETER">func</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4705"><span style="white-space: nowrap"><var class="PARAMETER">func</var>:</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="AEN4710"><span style="white-space: nowrap"><var class="PARAMETER">errorObject</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4710"><span style="white-space: nowrap"><var class="PARAMETER">errorObject</var>:</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="AEN4715"><span style="white-space: nowrap"><var class="PARAMETER">errorSubject</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4715"><span style="white-space: nowrap"><var class="PARAMETER">errorSubject</var>:</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="AEN4720"><span style="white-space: nowrap"><var class="PARAMETER">reason</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4720"><span style="white-space: nowrap"><var class="PARAMETER">reason</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the error code.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4725"><span style="white-space: nowrap"><var class="PARAMETER">msg</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4725"><span style="white-space: nowrap"><var class="PARAMETER">msg</var>:</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="AEN4730"><span style="white-space: nowrap"><var class="PARAMETER">...</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4730"><span style="white-space: nowrap"><var class="PARAMETER">...</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the parameters for the <var class="PARAMETER">msg</var>.</p></td>
 </tr>
 </tbody></table>
@@ -837,7 +837,7 @@ function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN4748"><span style="white-space: nowrap"><var class="PARAMETER">p</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4748"><span style="white-space: nowrap"><var class="PARAMETER">p</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> the expression.</p></td>
 </tr></tbody></table>
 </div>
@@ -851,19 +851,19 @@ function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4764"><span style="white-space: nowrap"><var class="PARAMETER">p</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4764"><span style="white-space: nowrap"><var class="PARAMETER">p</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> the expression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4769"><span style="white-space: nowrap"><var class="PARAMETER">ret</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4769"><span style="white-space: nowrap"><var class="PARAMETER">ret</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> the return value.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-dl.html"><b><<<�dl</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-io.html"><b>io�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-dl.html"><b><<<dl</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-io.html"><b>io>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-examples-sign-dynamimc-template.html b/docs/api/xmlsec-examples-sign-dynamimc-template.html
index b3b4f5f..2694c19 100644
--- a/docs/api/xmlsec-examples-sign-dynamimc-template.html
+++ b/docs/api/xmlsec-examples-sign-dynamimc-template.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -320,7 +320,8 @@ done:
 	xmlFreeDoc(doc); 
     }
     return(res);
-}
</pre>
+}
+</pre>
 <p></p>
 </div>
 </div>
@@ -381,8 +382,8 @@ JjbFqZO+OEzDRSbw3DkmuBA/mtlx+3t13SESfEub5hqoMdVmtth/eTb64dsPdl9r
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-examples-sign-template-file.html"><b><<<�Signing a template file.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-examples-sign-x509.html"><b>Signing with X509 certificate.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-examples-sign-template-file.html"><b><<<Signing a template file.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-examples-sign-x509.html"><b>Signing with X509 certificate.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-examples-sign-template-file.html b/docs/api/xmlsec-examples-sign-template-file.html
index db82779..c30487c 100644
--- a/docs/api/xmlsec-examples-sign-template-file.html
+++ b/docs/api/xmlsec-examples-sign-template-file.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -284,7 +284,8 @@ done:
 	xmlFreeDoc(doc); 
     }
     return(res);
-}
</pre>
+}
+</pre>
 <p></p>
 </div>
 </div>
@@ -318,7 +319,8 @@ XML Security Library example: Simple signature template file for sign1 example.
 	<KeyName/>
     </KeyInfo>
   </Signature>
-</Envelope>
</pre>
+</Envelope>
+</pre>
 <p></p>
 </div>
 </div>
@@ -363,8 +365,8 @@ x+YEjSjcO7SBIR1FiUA7pw==</SignatureValue>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-examples.html"><b><<<�Examples.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-examples-sign-dynamimc-template.html"><b>Signing a dynamicaly created template.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-examples.html"><b><<<Examples.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-examples-sign-dynamimc-template.html"><b>Signing a dynamicaly created template.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-examples-sign-x509.html b/docs/api/xmlsec-examples-sign-x509.html
index b9c0fd4..41461b9 100644
--- a/docs/api/xmlsec-examples-sign-x509.html
+++ b/docs/api/xmlsec-examples-sign-x509.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -333,7 +333,8 @@ done:
 	xmlFreeDoc(doc); 
     }
     return(res);
-}
</pre>
+}
+</pre>
 <p></p>
 </div>
 </div>
@@ -422,8 +423,8 @@ NJ2D</X509Certificate>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-examples-sign-dynamimc-template.html"><b><<<�Signing a dynamicaly created template.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-verify-with-key.html"><b>Verifying a signature with a single key.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-examples-sign-dynamimc-template.html"><b><<<Signing a dynamicaly created template.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-verify-with-key.html"><b>Verifying a signature with a single key.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-examples.html b/docs/api/xmlsec-examples.html
index 954577a..0572136 100644
--- a/docs/api/xmlsec-examples.html
+++ b/docs/api/xmlsec-examples.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -112,8 +112,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-sharing-results.html"><b><<<�Sharing the results.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-examples-sign-template-file.html"><b>Signing a template file.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-sharing-results.html"><b><<<Sharing the results.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-examples-sign-template-file.html"><b>Signing a template file.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-gnutls-app.html b/docs/api/xmlsec-gnutls-app.html
index 85543c3..4a37c0f 100644
--- a/docs/api/xmlsec-gnutls-app.html
+++ b/docs/api/xmlsec-gnutls-app.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-GNUTLS-APP"></a>app</h1>
 <div class="REFNAMEDIV">
-<a name="AEN23373"></a><h2>Name</h2>app�--�</div>
+<a name="AEN23373"></a><h2>Name</h2>app--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN23376"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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);
@@ -143,7 +143,7 @@ by XMLSec command line utility and called before
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23443"><span style="white-space: nowrap"><var class="PARAMETER">config</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23443"><span style="white-space: nowrap"><var class="PARAMETER">config</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the path to GnuTLS configuration (unused).</p></td>
 </tr>
 <tr>
@@ -179,7 +179,7 @@ and a default GnuTLS crypto key data stores.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23483"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23483"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
@@ -201,11 +201,11 @@ function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23509"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23509"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN23514"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23514"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
@@ -227,11 +227,11 @@ with <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRINIT"><span c
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23540"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23540"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN23545"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23545"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the uri.</p></td>
 </tr>
 <tr>
@@ -253,15 +253,15 @@ with <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRINIT"><span c
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23569"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23569"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN23574"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23574"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23579"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23579"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the type of keys to save (public/private/symmetric).</p></td>
 </tr>
 <tr>
@@ -284,19 +284,19 @@ untrusted certs in <var class="PARAMETER">store</var> (not implemented yet).</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23605"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23605"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23610"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23610"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the certificate file.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23615"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23615"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23620"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23620"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate in <var class="PARAMETER">filename</var>
    			trusted or not.</p></td>
 </tr>
@@ -320,23 +320,23 @@ untrusted certs in <var class="PARAMETER">store</var> (not implemented yet).</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23646"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23646"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23651"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23651"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23656"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23656"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23661"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23661"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23666"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23666"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
@@ -361,19 +361,19 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23690"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23690"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23695"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23695"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23700"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23700"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23705"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23705"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
@@ -395,15 +395,15 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23729"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23729"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23734"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23734"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23739"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23739"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
@@ -423,8 +423,8 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-gnutls-ref.html"><b><<<�XML Security Library for GnuTLS API Reference.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-gnutls-crypto.html"><b>crypto�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-gnutls-ref.html"><b><<<XML Security Library for GnuTLS API Reference.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-gnutls-crypto.html"><b>crypto>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-gnutls-crypto.html b/docs/api/xmlsec-gnutls-crypto.html
index d4a55da..01a7717 100644
--- a/docs/api/xmlsec-gnutls-crypto.html
+++ b/docs/api/xmlsec-gnutls-crypto.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-GNUTLS-CRYPTO"></a>crypto</h1>
 <div class="REFNAMEDIV">
-<a name="AEN23763"></a><h2>Name</h2>crypto�--�</div>
+<a name="AEN23763"></a><h2>Name</h2>crypto--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN23766"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<pre class="SYNOPSIS">
 
 <font>xmlSecCryptoDLFunctionsPtr</font> <a href="xmlsec-gnutls-crypto.html#XMLSECCRYPTOGETFUNCTIONS-GNUTLS">xmlSecCryptoGetFunctions_gnutls</a>
                                             (void);
@@ -198,7 +198,7 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23891"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23891"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys manager.</p></td>
 </tr>
 <tr>
@@ -218,11 +218,11 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23915"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23915"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23920"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23920"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the numer of bytes to generate.</p></td>
 </tr>
 <tr>
@@ -265,15 +265,15 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23966"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23966"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN23971"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23971"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN23976"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23976"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value size (in bytes).</p></td>
 </tr>
 <tr>
@@ -382,15 +382,15 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24091"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24091"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN24096"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24096"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN24101"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24101"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value size (in bytes).</p></td>
 </tr>
 <tr>
@@ -455,15 +455,15 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24170"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24170"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN24175"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24175"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN24180"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24180"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value size (in bytes).</p></td>
 </tr>
 <tr>
@@ -562,8 +562,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-gnutls-app.html"><b><<<�app</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-nss-ref.html"><b>XML Security Library for NSS API Reference.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-gnutls-app.html"><b><<<app</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-nss-ref.html"><b>XML Security Library for NSS API Reference.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-gnutls-ref.html b/docs/api/xmlsec-gnutls-ref.html
index 14d0f08..7cfe8a6 100644
--- a/docs/api/xmlsec-gnutls-ref.html
+++ b/docs/api/xmlsec-gnutls-ref.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -91,17 +91,17 @@
 <div class="TOC"><dl>
 <dt><b>Table of Contents</b></dt>
 <dt>
-<a href="xmlsec-gnutls-app.html">app</a>�--�</dt>
+<a href="xmlsec-gnutls-app.html">app</a>--</dt>
 <dt>
-<a href="xmlsec-gnutls-crypto.html">crypto</a>�--�</dt>
+<a href="xmlsec-gnutls-crypto.html">crypto</a>--</dt>
 </dl></div>
 <p>This section contains the API reference for xmlsec-gnutls. All
     the public interfaces are documented here. This reference guide is
     build by extracting comments from the code sources. </p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-openssl-x509.html"><b><<<�x509</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-gnutls-app.html"><b>app�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-openssl-x509.html"><b><<<x509</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-gnutls-app.html"><b>app>>></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 b6c917d..23cb68d 100644
--- a/docs/api/xmlsec-index.html
+++ b/docs/api/xmlsec-index.html
@@ -73,7 +73,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -1391,7 +1391,7 @@
 </ul>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-mscrypto-x509.html"><b><<<�x509</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-mscrypto-x509.html"><b><<<x509</b></a></td>
 <td align="right"></td>
 </tr></table>
 </td></tr></table></td>
diff --git a/docs/api/xmlsec-index.sgml b/docs/api/xmlsec-index.sgml
index 6c9d2c5..e69de29 100644
--- a/docs/api/xmlsec-index.sgml
+++ b/docs/api/xmlsec-index.sgml
@@ -1,1299 +0,0 @@
-<listitem><para><link linkend="ATTRIBUTE-UNUSED-CAPS">ATTRIBUTE-UNUSED</link></para></listitem>
-<listitem><para><link linkend="xmlEncCtxMode">xmlEncCtxMode</link></para></listitem>
-<listitem><para><link linkend="xmlSecAddChild">xmlSecAddChild</link></para></listitem>
-<listitem><para><link linkend="xmlSecAddChildNode">xmlSecAddChildNode</link></para></listitem>
-<listitem><para><link linkend="xmlSecAddIDs">xmlSecAddIDs</link></para></listitem>
-<listitem><para><link linkend="xmlSecAddNextSibling">xmlSecAddNextSibling</link></para></listitem>
-<listitem><para><link linkend="xmlSecAddPrevSibling">xmlSecAddPrevSibling</link></para></listitem>
-<listitem><para><link linkend="xmlSecAllocMode">xmlSecAllocMode</link></para></listitem>
-<listitem><para><link linkend="xmlSecAssert2">xmlSecAssert2</link></para></listitem>
-<listitem><para><link linkend="xmlSecAssert">xmlSecAssert</link></para></listitem>
-<listitem><para><link linkend="xmlSecBase64CtxCreate">xmlSecBase64CtxCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecBase64CtxDestroy">xmlSecBase64CtxDestroy</link></para></listitem>
-<listitem><para><link linkend="xmlSecBase64CtxFinalize">xmlSecBase64CtxFinalize</link></para></listitem>
-<listitem><para><link linkend="xmlSecBase64CtxFinal">xmlSecBase64CtxFinal</link></para></listitem>
-<listitem><para><link linkend="xmlSecBase64CtxInitialize">xmlSecBase64CtxInitialize</link></para></listitem>
-<listitem><para><link linkend="xmlSecBase64CtxUpdate">xmlSecBase64CtxUpdate</link></para></listitem>
-<listitem><para><link linkend="xmlSecBase64Decode">xmlSecBase64Decode</link></para></listitem>
-<listitem><para><link linkend="xmlSecBase64Encode">xmlSecBase64Encode</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-BASE64-LINESIZE-CAPS">XMLSEC-BASE64-LINESIZE</link></para></listitem>
-<listitem><para><link linkend="xmlSecBitMask">xmlSecBitMask</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnAdd">xmlSecBnAdd</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnBlobSetNodeValue">xmlSecBnBlobSetNodeValue</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnCompare">xmlSecBnCompare</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnCompareReverse">xmlSecBnCompareReverse</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnCreate">xmlSecBnCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnDestroy">xmlSecBnDestroy</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnDiv">xmlSecBnDiv</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnFinalize">xmlSecBnFinalize</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnFormat">xmlSecBnFormat</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnFromDecString">xmlSecBnFromDecString</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnFromHexString">xmlSecBnFromHexString</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnFromString">xmlSecBnFromString</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnGetData">xmlSecBnGetData</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnGetNodeValue">xmlSecBnGetNodeValue</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnGetSize">xmlSecBnGetSize</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnInitialize">xmlSecBnInitialize</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnMul">xmlSecBnMul</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnReverse">xmlSecBnReverse</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnSetData">xmlSecBnSetData</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnSetNodeValue">xmlSecBnSetNodeValue</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnToDecString">xmlSecBnToDecString</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnToHexString">xmlSecBnToHexString</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnToString">xmlSecBnToString</link></para></listitem>
-<listitem><para><link linkend="xmlSecBnZero">xmlSecBnZero</link></para></listitem>
-<listitem><para><link linkend="xmlSecBufferAppend">xmlSecBufferAppend</link></para></listitem>
-<listitem><para><link linkend="xmlSecBufferBase64NodeContentRead">xmlSecBufferBase64NodeContentRead</link></para></listitem>
-<listitem><para><link linkend="xmlSecBufferBase64NodeContentWrite">xmlSecBufferBase64NodeContentWrite</link></para></listitem>
-<listitem><para><link linkend="xmlSecBufferCreate">xmlSecBufferCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecBufferCreateOutputBuffer">xmlSecBufferCreateOutputBuffer</link></para></listitem>
-<listitem><para><link linkend="xmlSecBufferDestroy">xmlSecBufferDestroy</link></para></listitem>
-<listitem><para><link linkend="xmlSecBufferEmpty">xmlSecBufferEmpty</link></para></listitem>
-<listitem><para><link linkend="xmlSecBufferFinalize">xmlSecBufferFinalize</link></para></listitem>
-<listitem><para><link linkend="xmlSecBufferGetData">xmlSecBufferGetData</link></para></listitem>
-<listitem><para><link linkend="xmlSecBufferGetMaxSize">xmlSecBufferGetMaxSize</link></para></listitem>
-<listitem><para><link linkend="xmlSecBufferGetSize">xmlSecBufferGetSize</link></para></listitem>
-<listitem><para><link linkend="xmlSecBufferInitialize">xmlSecBufferInitialize</link></para></listitem>
-<listitem><para><link linkend="xmlSecBuffer">xmlSecBuffer</link></para></listitem>
-<listitem><para><link linkend="xmlSecBufferPrepend">xmlSecBufferPrepend</link></para></listitem>
-<listitem><para><link linkend="xmlSecBufferReadFile">xmlSecBufferReadFile</link></para></listitem>
-<listitem><para><link linkend="xmlSecBufferRemoveHead">xmlSecBufferRemoveHead</link></para></listitem>
-<listitem><para><link linkend="xmlSecBufferRemoveTail">xmlSecBufferRemoveTail</link></para></listitem>
-<listitem><para><link linkend="xmlSecBufferSetData">xmlSecBufferSetData</link></para></listitem>
-<listitem><para><link linkend="xmlSecBufferSetDefaultAllocMode">xmlSecBufferSetDefaultAllocMode</link></para></listitem>
-<listitem><para><link linkend="xmlSecBufferSetMaxSize">xmlSecBufferSetMaxSize</link></para></listitem>
-<listitem><para><link linkend="xmlSecBufferSetSize">xmlSecBufferSetSize</link></para></listitem>
-<listitem><para><link linkend="xmlSecByte">xmlSecByte</link></para></listitem>
-<listitem><para><link linkend="xmlSecCheckNodeName">xmlSecCheckNodeName</link></para></listitem>
-<listitem><para><link linkend="xmlSecCheckVersionExact">xmlSecCheckVersionExact</link></para></listitem>
-<listitem><para><link linkend="xmlSecCheckVersionExt">xmlSecCheckVersionExt</link></para></listitem>
-<listitem><para><link linkend="xmlSecCheckVersionMode">xmlSecCheckVersionMode</link></para></listitem>
-<listitem><para><link linkend="xmlSecCheckVersion">xmlSecCheckVersion</link></para></listitem>
-<listitem><para><link linkend="xmlSecCreateTree">xmlSecCreateTree</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppDefaultKeysMngrAdoptKey">xmlSecCryptoAppDefaultKeysMngrAdoptKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppDefaultKeysMngrInit">xmlSecCryptoAppDefaultKeysMngrInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppDefaultKeysMngrLoad">xmlSecCryptoAppDefaultKeysMngrLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppDefaultKeysMngrSave">xmlSecCryptoAppDefaultKeysMngrSave</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppGetDefaultPwdCallback">xmlSecCryptoAppGetDefaultPwdCallback</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppInitMethod">xmlSecCryptoAppInitMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppInit">xmlSecCryptoAppInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppKeyCertLoadMemoryMethod">xmlSecCryptoAppKeyCertLoadMemoryMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppKeyCertLoadMemory">xmlSecCryptoAppKeyCertLoadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppKeyCertLoadMethod">xmlSecCryptoAppKeyCertLoadMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppKeyCertLoad">xmlSecCryptoAppKeyCertLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppKeyLoadMemoryMethod">xmlSecCryptoAppKeyLoadMemoryMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppKeyLoadMemory">xmlSecCryptoAppKeyLoadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppKeyLoadMethod">xmlSecCryptoAppKeyLoadMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppKeyLoad">xmlSecCryptoAppKeyLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppKeysMngrCertLoadMemoryMethod">xmlSecCryptoAppKeysMngrCertLoadMemoryMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppKeysMngrCertLoadMemory">xmlSecCryptoAppKeysMngrCertLoadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppKeysMngrCertLoadMethod">xmlSecCryptoAppKeysMngrCertLoadMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppKeysMngrCertLoad">xmlSecCryptoAppKeysMngrCertLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppPkcs12LoadMemoryMethod">xmlSecCryptoAppPkcs12LoadMemoryMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppPkcs12LoadMemory">xmlSecCryptoAppPkcs12LoadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppPkcs12LoadMethod">xmlSecCryptoAppPkcs12LoadMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppPkcs12Load">xmlSecCryptoAppPkcs12Load</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppShutdownMethod">xmlSecCryptoAppShutdownMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoAppShutdown">xmlSecCryptoAppShutdown</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctions</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms">xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoDLGetFunctions">xmlSecCryptoDLGetFunctions</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoDLGetLibraryFunctions">xmlSecCryptoDLGetLibraryFunctions</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoDLInit">xmlSecCryptoDLInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoDLLoadLibrary">xmlSecCryptoDLLoadLibrary</link></para></listitem>
-<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-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>
-<listitem><para><link linkend="xmlSecCryptoGetFunctions-openssl-CAPS">xmlSecCryptoGetFunctions-openssl</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoInitMethod">xmlSecCryptoInitMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoInit">xmlSecCryptoInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoKeyDataStoreGetKlassMethod">xmlSecCryptoKeyDataStoreGetKlassMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoKeysMngrInitMethod">xmlSecCryptoKeysMngrInitMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoKeysMngrInit">xmlSecCryptoKeysMngrInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoShutdownMethod">xmlSecCryptoShutdownMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoShutdown">xmlSecCryptoShutdown</link></para></listitem>
-<listitem><para><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigCtxCreate">xmlSecDSigCtxCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigCtxDebugDump">xmlSecDSigCtxDebugDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigCtxDebugXmlDump">xmlSecDSigCtxDebugXmlDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigCtxDestroy">xmlSecDSigCtxDestroy</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigCtxEnableReferenceTransform">xmlSecDSigCtxEnableReferenceTransform</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigCtxEnableSignatureTransform">xmlSecDSigCtxEnableSignatureTransform</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigCtxFinalize">xmlSecDSigCtxFinalize</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigCtxGetPreSignBuffer">xmlSecDSigCtxGetPreSignBuffer</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigCtxInitialize">xmlSecDSigCtxInitialize</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigCtx">xmlSecDSigCtx</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigCtxSign">xmlSecDSigCtxSign</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigCtxVerify">xmlSecDSigCtxVerify</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS-CAPS">XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES-CAPS">XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE-CAPS">XMLSEC-DSIG-FLAGS-STORE-SIGNATURE</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES-CAPS">XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK-CAPS">XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigReferenceCtxCreate">xmlSecDSigReferenceCtxCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigReferenceCtxDebugDump">xmlSecDSigReferenceCtxDebugDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigReferenceCtxDebugXmlDump">xmlSecDSigReferenceCtxDebugXmlDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigReferenceCtxDestroy">xmlSecDSigReferenceCtxDestroy</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigReferenceCtxFinalize">xmlSecDSigReferenceCtxFinalize</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigReferenceCtxGetPreDigestBuffer">xmlSecDSigReferenceCtxGetPreDigestBuffer</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigReferenceCtxInitialize">xmlSecDSigReferenceCtxInitialize</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigReferenceCtxListGetKlass">xmlSecDSigReferenceCtxListGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigReferenceCtxListId">xmlSecDSigReferenceCtxListId</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtx</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigReferenceCtxProcessNode">xmlSecDSigReferenceCtxProcessNode</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</link></para></listitem>
-<listitem><para><link linkend="xmlSecDSigStatus">xmlSecDSigStatus</link></para></listitem>
-<listitem><para><link linkend="xmlSecEncCtxBinaryEncrypt">xmlSecEncCtxBinaryEncrypt</link></para></listitem>
-<listitem><para><link linkend="xmlSecEncCtxCopyUserPref">xmlSecEncCtxCopyUserPref</link></para></listitem>
-<listitem><para><link linkend="xmlSecEncCtxCreate">xmlSecEncCtxCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecEncCtxDebugDump">xmlSecEncCtxDebugDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecEncCtxDebugXmlDump">xmlSecEncCtxDebugXmlDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecEncCtxDecrypt">xmlSecEncCtxDecrypt</link></para></listitem>
-<listitem><para><link linkend="xmlSecEncCtxDecryptToBuffer">xmlSecEncCtxDecryptToBuffer</link></para></listitem>
-<listitem><para><link linkend="xmlSecEncCtxDestroy">xmlSecEncCtxDestroy</link></para></listitem>
-<listitem><para><link linkend="xmlSecEncCtxFinalize">xmlSecEncCtxFinalize</link></para></listitem>
-<listitem><para><link linkend="xmlSecEncCtxInitialize">xmlSecEncCtxInitialize</link></para></listitem>
-<listitem><para><link linkend="xmlSecEncCtx">xmlSecEncCtx</link></para></listitem>
-<listitem><para><link linkend="xmlSecEncCtxReset">xmlSecEncCtxReset</link></para></listitem>
-<listitem><para><link linkend="xmlSecEncCtxUriEncrypt">xmlSecEncCtxUriEncrypt</link></para></listitem>
-<listitem><para><link linkend="xmlSecEncCtxXmlEncrypt">xmlSecEncCtxXmlEncrypt</link></para></listitem>
-<listitem><para><link linkend="xmlSecError">xmlSecError</link></para></listitem>
-<listitem><para><link linkend="xmlSecErrorsCallback">xmlSecErrorsCallback</link></para></listitem>
-<listitem><para><link linkend="xmlSecErrorsDefaultCallbackEnableOutput">xmlSecErrorsDefaultCallbackEnableOutput</link></para></listitem>
-<listitem><para><link linkend="xmlSecErrorsDefaultCallback">xmlSecErrorsDefaultCallback</link></para></listitem>
-<listitem><para><link linkend="xmlSecErrorsGetCode">xmlSecErrorsGetCode</link></para></listitem>
-<listitem><para><link linkend="xmlSecErrorsGetMsg">xmlSecErrorsGetMsg</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-HERE-CAPS">XMLSEC-ERRORS-HERE</link></para></listitem>
-<listitem><para><link linkend="xmlSecErrorsInit">xmlSecErrorsInit</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-MAX-NUMBER-CAPS">XMLSEC-ERRORS-MAX-NUMBER</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-NO-MESSAGE-CAPS">XMLSEC-ERRORS-NO-MESSAGE</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-ASSERTION-CAPS">XMLSEC-ERRORS-R-ASSERTION</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-CERT-HAS-EXPIRED-CAPS">XMLSEC-ERRORS-R-CERT-HAS-EXPIRED</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-CERT-ISSUER-FAILED-CAPS">XMLSEC-ERRORS-R-CERT-ISSUER-FAILED</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-CERT-NOT-FOUND-CAPS">XMLSEC-ERRORS-R-CERT-NOT-FOUND</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-CERT-NOT-YET-VALID-CAPS">XMLSEC-ERRORS-R-CERT-NOT-YET-VALID</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-CERT-REVOKED-CAPS">XMLSEC-ERRORS-R-CERT-REVOKED</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-CERT-VERIFY-FAILED-CAPS">XMLSEC-ERRORS-R-CERT-VERIFY-FAILED</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-CRYPTO-FAILED-CAPS">XMLSEC-ERRORS-R-CRYPTO-FAILED</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-DATA-NOT-MATCH-CAPS">XMLSEC-ERRORS-R-DATA-NOT-MATCH</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-DISABLED-CAPS">XMLSEC-ERRORS-R-DISABLED</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE-CAPS">XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-DSIG-NO-REFERENCES-CAPS">XMLSEC-ERRORS-R-DSIG-NO-REFERENCES</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-INVALID-DATA-CAPS">XMLSEC-ERRORS-R-INVALID-DATA</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-INVALID-FORMAT-CAPS">XMLSEC-ERRORS-R-INVALID-FORMAT</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-INVALID-KEY-DATA-CAPS">XMLSEC-ERRORS-R-INVALID-KEY-DATA</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE-CAPS">XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE-CAPS">XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-INVALID-NODE-CONTENT-CAPS">XMLSEC-ERRORS-R-INVALID-NODE-CONTENT</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-INVALID-NODE-CAPS">XMLSEC-ERRORS-R-INVALID-NODE</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-INVALID-OPERATION-CAPS">XMLSEC-ERRORS-R-INVALID-OPERATION</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-INVALID-RESULT-CAPS">XMLSEC-ERRORS-R-INVALID-RESULT</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-INVALID-SIZE-CAPS">XMLSEC-ERRORS-R-INVALID-SIZE</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-INVALID-STATUS-CAPS">XMLSEC-ERRORS-R-INVALID-STATUS</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY-CAPS">XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-INVALID-TRANSFORM-CAPS">XMLSEC-ERRORS-R-INVALID-TRANSFORM</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-INVALID-TYPE-CAPS">XMLSEC-ERRORS-R-INVALID-TYPE</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-INVALID-URI-TYPE-CAPS">XMLSEC-ERRORS-R-INVALID-URI-TYPE</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-IO-FAILED-CAPS">XMLSEC-ERRORS-R-IO-FAILED</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST-CAPS">XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-KEYDATA-DISABLED-CAPS">XMLSEC-ERRORS-R-KEYDATA-DISABLED</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND-CAPS">XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-KEY-NOT-FOUND-CAPS">XMLSEC-ERRORS-R-KEY-NOT-FOUND</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-MALLOC-FAILED-CAPS">XMLSEC-ERRORS-R-MALLOC-FAILED</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL-CAPS">XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL-CAPS">XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH-CAPS">XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE-CAPS">XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT-CAPS">XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-NODE-NOT-FOUND-CAPS">XMLSEC-ERRORS-R-NODE-NOT-FOUND</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-NOT-IMPLEMENTED-CAPS">XMLSEC-ERRORS-R-NOT-IMPLEMENTED</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-STRDUP-FAILED-CAPS">XMLSEC-ERRORS-R-STRDUP-FAILED</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-TRANSFORM-DISABLED-CAPS">XMLSEC-ERRORS-R-TRANSFORM-DISABLED</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED-CAPS">XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-UNEXPECTED-NODE-CAPS">XMLSEC-ERRORS-R-UNEXPECTED-NODE</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-XML-FAILED-CAPS">XMLSEC-ERRORS-R-XML-FAILED</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-XMLSEC-FAILED-CAPS">XMLSEC-ERRORS-R-XMLSEC-FAILED</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-ERRORS-R-XSLT-FAILED-CAPS">XMLSEC-ERRORS-R-XSLT-FAILED</link></para></listitem>
-<listitem><para><link linkend="xmlSecErrorsSafeString">xmlSecErrorsSafeString</link></para></listitem>
-<listitem><para><link linkend="xmlSecErrorsSetCallback">xmlSecErrorsSetCallback</link></para></listitem>
-<listitem><para><link linkend="xmlSecErrorsShutdown">xmlSecErrorsShutdown</link></para></listitem>
-<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="xmlSecGenerateAndAddID">xmlSecGenerateAndAddID</link></para></listitem>
-<listitem><para><link linkend="xmlSecGenerateID">xmlSecGenerateID</link></para></listitem>
-<listitem><para><link linkend="xmlSecGetHex">xmlSecGetHex</link></para></listitem>
-<listitem><para><link linkend="xmlSecGetKeyCallback">xmlSecGetKeyCallback</link></para></listitem>
-<listitem><para><link linkend="xmlSecGetNextElementNode">xmlSecGetNextElementNode</link></para></listitem>
-<listitem><para><link linkend="xmlSecGetNodeNsHref">xmlSecGetNodeNsHref</link></para></listitem>
-<listitem><para><link linkend="xmlSecGetQName">xmlSecGetQName</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSAppDefaultKeysMngrAdoptKey">xmlSecGnuTLSAppDefaultKeysMngrAdoptKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSAppDefaultKeysMngrInit">xmlSecGnuTLSAppDefaultKeysMngrInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSAppDefaultKeysMngrLoad">xmlSecGnuTLSAppDefaultKeysMngrLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSAppDefaultKeysMngrSave">xmlSecGnuTLSAppDefaultKeysMngrSave</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSAppGetDefaultPwdCallback">xmlSecGnuTLSAppGetDefaultPwdCallback</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSAppInit">xmlSecGnuTLSAppInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSAppKeyCertLoadMemory">xmlSecGnuTLSAppKeyCertLoadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSAppKeyCertLoad">xmlSecGnuTLSAppKeyCertLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSAppKeyLoadMemory">xmlSecGnuTLSAppKeyLoadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSAppKeyLoad">xmlSecGnuTLSAppKeyLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSAppKeysMngrCertLoadMemory">xmlSecGnuTLSAppKeysMngrCertLoadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSAppKeysMngrCertLoad">xmlSecGnuTLSAppKeysMngrCertLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSAppPkcs12LoadMemory">xmlSecGnuTLSAppPkcs12LoadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSAppPkcs12Load">xmlSecGnuTLSAppPkcs12Load</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSAppShutdown">xmlSecGnuTLSAppShutdown</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSGenerateRandom">xmlSecGnuTLSGenerateRandom</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSInit">xmlSecGnuTLSInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSKeyDataAesGetKlass">xmlSecGnuTLSKeyDataAesGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSKeyDataAesId">xmlSecGnuTLSKeyDataAesId</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSKeyDataAesSet">xmlSecGnuTLSKeyDataAesSet</link></para></listitem>
-<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="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="xmlSecGnuTLSKeysMngrInit">xmlSecGnuTLSKeysMngrInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSShutdown">xmlSecGnuTLSShutdown</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSTransformAes128CbcGetKlass">xmlSecGnuTLSTransformAes128CbcGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSTransformAes128CbcId">xmlSecGnuTLSTransformAes128CbcId</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSTransformAes192CbcGetKlass">xmlSecGnuTLSTransformAes192CbcGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSTransformAes192CbcId">xmlSecGnuTLSTransformAes192CbcId</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSTransformAes256CbcGetKlass">xmlSecGnuTLSTransformAes256CbcGetKlass</link></para></listitem>
-<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="xmlSecGnuTLSTransformHmacMd5GetKlass">xmlSecGnuTLSTransformHmacMd5GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSTransformHmacMd5Id">xmlSecGnuTLSTransformHmacMd5Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSTransformHmacRipemd160GetKlass">xmlSecGnuTLSTransformHmacRipemd160GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSTransformHmacRipemd160Id">xmlSecGnuTLSTransformHmacRipemd160Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSTransformHmacSha1GetKlass">xmlSecGnuTLSTransformHmacSha1GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecGnuTLSTransformHmacSha1Id">xmlSecGnuTLSTransformHmacSha1Id</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="xmlSecInit">xmlSecInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecIOCleanupCallbacks">xmlSecIOCleanupCallbacks</link></para></listitem>
-<listitem><para><link linkend="xmlSecIOInit">xmlSecIOInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecIORegisterCallbacks">xmlSecIORegisterCallbacks</link></para></listitem>
-<listitem><para><link linkend="xmlSecIORegisterDefaultCallbacks">xmlSecIORegisterDefaultCallbacks</link></para></listitem>
-<listitem><para><link linkend="xmlSecIOShutdown">xmlSecIOShutdown</link></para></listitem>
-<listitem><para><link linkend="xmlSecIsEmptyNode">xmlSecIsEmptyNode</link></para></listitem>
-<listitem><para><link linkend="xmlSecIsEmptyString">xmlSecIsEmptyString</link></para></listitem>
-<listitem><para><link linkend="xmlSecIsHex">xmlSecIsHex</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyAdoptData">xmlSecKeyAdoptData</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyCheckId">xmlSecKeyCheckId</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyCopy">xmlSecKeyCopy</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyCreate">xmlSecKeyCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataAesGetKlass">xmlSecKeyDataAesGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataAesId">xmlSecKeyDataAesId</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataBinarySize">xmlSecKeyDataBinarySize</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataBinaryValueBinRead">xmlSecKeyDataBinaryValueBinRead</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataBinaryValueBinWrite">xmlSecKeyDataBinaryValueBinWrite</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataBinaryValueDebugDump">xmlSecKeyDataBinaryValueDebugDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataBinaryValueDebugXmlDump">xmlSecKeyDataBinaryValueDebugXmlDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataBinaryValueDuplicate">xmlSecKeyDataBinaryValueDuplicate</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataBinaryValueFinalize">xmlSecKeyDataBinaryValueFinalize</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataBinaryValueGetBuffer">xmlSecKeyDataBinaryValueGetBuffer</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataBinaryValueGetSize">xmlSecKeyDataBinaryValueGetSize</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataBinaryValueInitialize">xmlSecKeyDataBinaryValueInitialize</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataBinaryValueSetBuffer">xmlSecKeyDataBinaryValueSetBuffer</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataBinaryValueXmlRead">xmlSecKeyDataBinaryValueXmlRead</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataBinaryValueXmlWrite">xmlSecKeyDataBinaryValueXmlWrite</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataBinReadMethod">xmlSecKeyDataBinReadMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataBinRead">xmlSecKeyDataBinRead</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataBinWriteMethod">xmlSecKeyDataBinWriteMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataBinWrite">xmlSecKeyDataBinWrite</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataCheckId">xmlSecKeyDataCheckId</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataCheckSize">xmlSecKeyDataCheckSize</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataCheckUsage">xmlSecKeyDataCheckUsage</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataCreate">xmlSecKeyDataCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataDebugDumpMethod">xmlSecKeyDataDebugDumpMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataDebugDump">xmlSecKeyDataDebugDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataDebugXmlDump">xmlSecKeyDataDebugXmlDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataDesGetKlass">xmlSecKeyDataDesGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataDesId">xmlSecKeyDataDesId</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataDestroy">xmlSecKeyDataDestroy</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataDsaGetKlass">xmlSecKeyDataDsaGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataDsaId">xmlSecKeyDataDsaId</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataDuplicateMethod">xmlSecKeyDataDuplicateMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataDuplicate">xmlSecKeyDataDuplicate</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataEncryptedKeyGetKlass">xmlSecKeyDataEncryptedKeyGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataEncryptedKeyId">xmlSecKeyDataEncryptedKeyId</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataFinalizeMethod">xmlSecKeyDataFinalizeMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataGenerateMethod">xmlSecKeyDataGenerateMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataGenerate">xmlSecKeyDataGenerate</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataGetIdentifierMethod">xmlSecKeyDataGetIdentifierMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataGetIdentifier">xmlSecKeyDataGetIdentifier</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataGetName">xmlSecKeyDataGetName</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataGetSizeMethod">xmlSecKeyDataGetSizeMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataGetSize">xmlSecKeyDataGetSize</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataGetTypeMethod">xmlSecKeyDataGetTypeMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataGetType">xmlSecKeyDataGetType</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataHmacGetKlass">xmlSecKeyDataHmacGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataHmacId">xmlSecKeyDataHmacId</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataIdListDebugDump">xmlSecKeyDataIdListDebugDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataIdListDebugXmlDump">xmlSecKeyDataIdListDebugXmlDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataIdListFindByHref">xmlSecKeyDataIdListFindByHref</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataIdListFindByName">xmlSecKeyDataIdListFindByName</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataIdListFindByNode">xmlSecKeyDataIdListFindByNode</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataIdListFind">xmlSecKeyDataIdListFind</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataIdListGetKlass">xmlSecKeyDataIdListGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataIdListId">xmlSecKeyDataIdListId</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataIdsGet">xmlSecKeyDataIdsGet</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataIdsInit">xmlSecKeyDataIdsInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataIdsRegisterDefault">xmlSecKeyDataIdsRegisterDefault</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataIdsRegister">xmlSecKeyDataIdsRegister</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataIdsShutdown">xmlSecKeyDataIdsShutdown</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataIdUnknown">xmlSecKeyDataIdUnknown</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataInitMethod">xmlSecKeyDataInitMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataIsValid">xmlSecKeyDataIsValid</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataKlassGetName">xmlSecKeyDataKlassGetName</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataKlass">xmlSecKeyDataKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataListGetKlass">xmlSecKeyDataListGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataListId">xmlSecKeyDataListId</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyData">xmlSecKeyData</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataNameGetKlass">xmlSecKeyDataNameGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataNameId">xmlSecKeyDataNameId</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataRawX509CertGetKlass">xmlSecKeyDataRawX509CertGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataRawX509CertId">xmlSecKeyDataRawX509CertId</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataRetrievalMethodGetKlass">xmlSecKeyDataRetrievalMethodGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataRetrievalMethodId">xmlSecKeyDataRetrievalMethodId</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataRsaGetKlass">xmlSecKeyDataRsaGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataRsaId">xmlSecKeyDataRsaId</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataStoreCheckId">xmlSecKeyDataStoreCheckId</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataStoreCheckSize">xmlSecKeyDataStoreCheckSize</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataStoreCreate">xmlSecKeyDataStoreCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataStoreDestroy">xmlSecKeyDataStoreDestroy</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataStoreFinalizeMethod">xmlSecKeyDataStoreFinalizeMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataStoreGetName">xmlSecKeyDataStoreGetName</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataStoreIdUnknown">xmlSecKeyDataStoreIdUnknown</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataStoreInitializeMethod">xmlSecKeyDataStoreInitializeMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataStoreIsValid">xmlSecKeyDataStoreIsValid</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataStoreKlassGetName">xmlSecKeyDataStoreKlassGetName</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataStoreKlass">xmlSecKeyDataStoreKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataStore">xmlSecKeyDataStore</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataStorePtrListGetKlass">xmlSecKeyDataStorePtrListGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataStorePtrListId">xmlSecKeyDataStorePtrListId</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataTypeAny">xmlSecKeyDataTypeAny</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataTypeNone">xmlSecKeyDataTypeNone</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataTypePermanent">xmlSecKeyDataTypePermanent</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataTypePrivate">xmlSecKeyDataTypePrivate</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataTypePublic">xmlSecKeyDataTypePublic</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataTypeSession">xmlSecKeyDataTypeSession</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataTypeSymmetric">xmlSecKeyDataTypeSymmetric</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataTypeTrusted">xmlSecKeyDataTypeTrusted</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataTypeUnknown">xmlSecKeyDataTypeUnknown</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataUsageAny">xmlSecKeyDataUsageAny</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataUsageKeyInfoNode">xmlSecKeyDataUsageKeyInfoNode</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataUsageKeyInfoNodeRead">xmlSecKeyDataUsageKeyInfoNodeRead</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataUsageKeyInfoNodeWrite">xmlSecKeyDataUsageKeyInfoNodeWrite</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataUsageKeyValueNode">xmlSecKeyDataUsageKeyValueNode</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataUsageKeyValueNodeRead">xmlSecKeyDataUsageKeyValueNodeRead</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataUsageKeyValueNodeWrite">xmlSecKeyDataUsageKeyValueNodeWrite</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataUsageRetrievalMethodNodeBin">xmlSecKeyDataUsageRetrievalMethodNodeBin</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataUsageRetrievalMethodNode">xmlSecKeyDataUsageRetrievalMethodNode</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataUsageRetrievalMethodNodeXml">xmlSecKeyDataUsageRetrievalMethodNodeXml</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataUsageUnknown">xmlSecKeyDataUsageUnknown</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataValueGetKlass">xmlSecKeyDataValueGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataValueId">xmlSecKeyDataValueId</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataX509GetKlass">xmlSecKeyDataX509GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataX509Id">xmlSecKeyDataX509Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataXmlReadMethod">xmlSecKeyDataXmlReadMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataXmlRead">xmlSecKeyDataXmlRead</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataXmlWriteMethod">xmlSecKeyDataXmlWriteMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDataXmlWrite">xmlSecKeyDataXmlWrite</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDebugDump">xmlSecKeyDebugDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDebugXmlDump">xmlSecKeyDebugXmlDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDestroy">xmlSecKeyDestroy</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyDuplicate">xmlSecKeyDuplicate</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyEmpty">xmlSecKeyEmpty</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyEnsureData">xmlSecKeyEnsureData</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyGenerateByName">xmlSecKeyGenerateByName</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyGenerate">xmlSecKeyGenerate</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyGetData">xmlSecKeyGetData</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyGetName">xmlSecKeyGetName</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyGetType">xmlSecKeyGetType</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyGetValue">xmlSecKeyGetValue</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyInfoCtxCopyUserPref">xmlSecKeyInfoCtxCopyUserPref</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyInfoCtxCreateEncCtx">xmlSecKeyInfoCtxCreateEncCtx</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyInfoCtxCreate">xmlSecKeyInfoCtxCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyInfoCtxDebugDump">xmlSecKeyInfoCtxDebugDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyInfoCtxDebugXmlDump">xmlSecKeyInfoCtxDebugXmlDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyInfoCtxDestroy">xmlSecKeyInfoCtxDestroy</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyInfoCtxFinalize">xmlSecKeyInfoCtxFinalize</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyInfoCtxInitialize">xmlSecKeyInfoCtxInitialize</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyInfoCtxReset">xmlSecKeyInfoCtxReset</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND-CAPS">XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION-CAPS">XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN-CAPS">XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD-CAPS">XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF-CAPS">XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF-CAPS">XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE-CAPS">XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD-CAPS">XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS-CAPS">XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS-CAPS">XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT-CAPS">XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT-CAPS">XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD-CAPS">XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyInfoMode">xmlSecKeyInfoMode</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyInfoNodeRead">xmlSecKeyInfoNodeRead</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyInfoNodeWrite">xmlSecKeyInfoNodeWrite</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyIsValid">xmlSecKeyIsValid</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyMatch">xmlSecKeyMatch</link></para></listitem>
-<listitem><para><link linkend="xmlSecKey">xmlSecKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyPtrListGetKlass">xmlSecKeyPtrListGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyPtrListId">xmlSecKeyPtrListId</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyReadBinaryFile">xmlSecKeyReadBinaryFile</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyReadBuffer">xmlSecKeyReadBuffer</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyReadMemory">xmlSecKeyReadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyReqCopy">xmlSecKeyReqCopy</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyReqDebugDump">xmlSecKeyReqDebugDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyReqDebugXmlDump">xmlSecKeyReqDebugXmlDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyReqFinalize">xmlSecKeyReqFinalize</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyReqInitialize">xmlSecKeyReqInitialize</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyReqMatchKey">xmlSecKeyReqMatchKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyReqMatchKeyValue">xmlSecKeyReqMatchKeyValue</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyReq">xmlSecKeyReq</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyReqReset">xmlSecKeyReqReset</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeySetName">xmlSecKeySetName</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeySetValue">xmlSecKeySetValue</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeysMngrAdoptDataStore">xmlSecKeysMngrAdoptDataStore</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeysMngrAdoptKeysStore">xmlSecKeysMngrAdoptKeysStore</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeysMngrCreate">xmlSecKeysMngrCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeysMngrDestroy">xmlSecKeysMngrDestroy</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeysMngrFindKey">xmlSecKeysMngrFindKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeysMngrGetDataStore">xmlSecKeysMngrGetDataStore</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeysMngrGetKey">xmlSecKeysMngrGetKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeysMngrGetKeysStore">xmlSecKeysMngrGetKeysStore</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeysMngr">xmlSecKeysMngr</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyStoreCheckId">xmlSecKeyStoreCheckId</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyStoreCheckSize">xmlSecKeyStoreCheckSize</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyStoreCreate">xmlSecKeyStoreCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyStoreDestroy">xmlSecKeyStoreDestroy</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyStoreFinalizeMethod">xmlSecKeyStoreFinalizeMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyStoreFindKeyMethod">xmlSecKeyStoreFindKeyMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyStoreFindKey">xmlSecKeyStoreFindKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyStoreGetName">xmlSecKeyStoreGetName</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyStoreIdUnknown">xmlSecKeyStoreIdUnknown</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyStoreInitializeMethod">xmlSecKeyStoreInitializeMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyStoreIsValid">xmlSecKeyStoreIsValid</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyStoreKlassGetName">xmlSecKeyStoreKlassGetName</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyStoreKlass">xmlSecKeyStoreKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyStore">xmlSecKeyStore</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyUsageAny">xmlSecKeyUsageAny</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyUsageDecrypt">xmlSecKeyUsageDecrypt</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyUsageEncrypt">xmlSecKeyUsageEncrypt</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyUsageKeyExchange">xmlSecKeyUsageKeyExchange</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyUsage">xmlSecKeyUsage</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyUsageSign">xmlSecKeyUsageSign</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyUsageVerify">xmlSecKeyUsageVerify</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyUseWithCopy">xmlSecKeyUseWithCopy</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyUseWithCreate">xmlSecKeyUseWithCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyUseWithDebugDump">xmlSecKeyUseWithDebugDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyUseWithDebugXmlDump">xmlSecKeyUseWithDebugXmlDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyUseWithDestroy">xmlSecKeyUseWithDestroy</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyUseWithDuplicate">xmlSecKeyUseWithDuplicate</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyUseWithFinalize">xmlSecKeyUseWithFinalize</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyUseWithInitialize">xmlSecKeyUseWithInitialize</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyUseWith">xmlSecKeyUseWith</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyUseWithPtrListGetKlass">xmlSecKeyUseWithPtrListGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyUseWithPtrListId">xmlSecKeyUseWithPtrListId</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyUseWithReset">xmlSecKeyUseWithReset</link></para></listitem>
-<listitem><para><link linkend="xmlSecKeyUseWithSet">xmlSecKeyUseWithSet</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppDefaultKeysMngrAdoptKey">xmlSecMSCryptoAppDefaultKeysMngrAdoptKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppDefaultKeysMngrInit">xmlSecMSCryptoAppDefaultKeysMngrInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppDefaultKeysMngrLoad">xmlSecMSCryptoAppDefaultKeysMngrLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppDefaultKeysMngrSave">xmlSecMSCryptoAppDefaultKeysMngrSave</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppGetCertStoreName">xmlSecMSCryptoAppGetCertStoreName</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppGetDefaultPwdCallback">xmlSecMSCryptoAppGetDefaultPwdCallback</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppInit">xmlSecMSCryptoAppInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppKeyCertLoadMemory">xmlSecMSCryptoAppKeyCertLoadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppKeyCertLoad">xmlSecMSCryptoAppKeyCertLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppKeyLoadMemory">xmlSecMSCryptoAppKeyLoadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppKeyLoad">xmlSecMSCryptoAppKeyLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppKeysMngrCertLoadMemory">xmlSecMSCryptoAppKeysMngrCertLoadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppKeysMngrCertLoad">xmlSecMSCryptoAppKeysMngrCertLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppPkcs12LoadMemory">xmlSecMSCryptoAppPkcs12LoadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppPkcs12Load">xmlSecMSCryptoAppPkcs12Load</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoAppShutdown">xmlSecMSCryptoAppShutdown</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoCertAdopt">xmlSecMSCryptoCertAdopt</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoCertDup">xmlSecMSCryptoCertDup</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoCertStrToName">xmlSecMSCryptoCertStrToName</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoErrorsDefaultCallback">xmlSecMSCryptoErrorsDefaultCallback</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoGenerateRandom">xmlSecMSCryptoGenerateRandom</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoInit">xmlSecMSCryptoInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataAesGetKlass">xmlSecMSCryptoKeyDataAesGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataAesId">xmlSecMSCryptoKeyDataAesId</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataAesSet">xmlSecMSCryptoKeyDataAesSet</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataDesGetKlass">xmlSecMSCryptoKeyDataDesGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataDesId">xmlSecMSCryptoKeyDataDesId</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataDsaGetKlass">xmlSecMSCryptoKeyDataDsaGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataDsaId">xmlSecMSCryptoKeyDataDsaId</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataGetCert">xmlSecMSCryptoKeyDataGetCert</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataGetKey">xmlSecMSCryptoKeyDataGetKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataRawX509CertGetKlass">xmlSecMSCryptoKeyDataRawX509CertGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataRawX509CertId">xmlSecMSCryptoKeyDataRawX509CertId</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataRsaGetKlass">xmlSecMSCryptoKeyDataRsaGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataRsaId">xmlSecMSCryptoKeyDataRsaId</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataX509AdoptCert">xmlSecMSCryptoKeyDataX509AdoptCert</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataX509AdoptCrl">xmlSecMSCryptoKeyDataX509AdoptCrl</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataX509AdoptKeyCert">xmlSecMSCryptoKeyDataX509AdoptKeyCert</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataX509GetCert">xmlSecMSCryptoKeyDataX509GetCert</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataX509GetCertsSize">xmlSecMSCryptoKeyDataX509GetCertsSize</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataX509GetCrl">xmlSecMSCryptoKeyDataX509GetCrl</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataX509GetCrlsSize">xmlSecMSCryptoKeyDataX509GetCrlsSize</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataX509GetKeyCert">xmlSecMSCryptoKeyDataX509GetKeyCert</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataX509GetKlass">xmlSecMSCryptoKeyDataX509GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeyDataX509Id">xmlSecMSCryptoKeyDataX509Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeysMngrInit">xmlSecMSCryptoKeysMngrInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeysStoreAdoptKey">xmlSecMSCryptoKeysStoreAdoptKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeysStoreGetKlass">xmlSecMSCryptoKeysStoreGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeysStoreId">xmlSecMSCryptoKeysStoreId</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeysStoreLoad">xmlSecMSCryptoKeysStoreLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoKeysStoreSave">xmlSecMSCryptoKeysStoreSave</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoShutdown">xmlSecMSCryptoShutdown</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoTransformAes128CbcGetKlass">xmlSecMSCryptoTransformAes128CbcGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoTransformAes128CbcId">xmlSecMSCryptoTransformAes128CbcId</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoTransformAes192CbcGetKlass">xmlSecMSCryptoTransformAes192CbcGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoTransformAes192CbcId">xmlSecMSCryptoTransformAes192CbcId</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoTransformAes256CbcGetKlass">xmlSecMSCryptoTransformAes256CbcGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoTransformAes256CbcId">xmlSecMSCryptoTransformAes256CbcId</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoTransformDes3CbcGetKlass">xmlSecMSCryptoTransformDes3CbcGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoTransformDes3CbcId">xmlSecMSCryptoTransformDes3CbcId</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoTransformDsaSha1GetKlass">xmlSecMSCryptoTransformDsaSha1GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoTransformDsaSha1Id">xmlSecMSCryptoTransformDsaSha1Id</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>
-<listitem><para><link linkend="xmlSecMSCryptoTransformRsaSha1Id">xmlSecMSCryptoTransformRsaSha1Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoTransformSha1GetKlass">xmlSecMSCryptoTransformSha1GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoTransformSha1Id">xmlSecMSCryptoTransformSha1Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoX509StoreAdoptCert">xmlSecMSCryptoX509StoreAdoptCert</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoX509StoreAdoptKeyStore">xmlSecMSCryptoX509StoreAdoptKeyStore</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoX509StoreAdoptTrustedStore">xmlSecMSCryptoX509StoreAdoptTrustedStore</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoX509StoreAdoptUntrustedStore">xmlSecMSCryptoX509StoreAdoptUntrustedStore</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoX509StoreFindCert">xmlSecMSCryptoX509StoreFindCert</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoX509StoreGetKlass">xmlSecMSCryptoX509StoreGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoX509StoreId">xmlSecMSCryptoX509StoreId</link></para></listitem>
-<listitem><para><link linkend="xmlSecMSCryptoX509StoreVerify">xmlSecMSCryptoX509StoreVerify</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-NO-AES-CAPS">XMLSEC-NO-AES</link></para></listitem>
-<listitem><para><link linkend="xmlSecNodeGetName">xmlSecNodeGetName</link></para></listitem>
-<listitem><para><link linkend="xmlSecNodeSetAddList">xmlSecNodeSetAddList</link></para></listitem>
-<listitem><para><link linkend="xmlSecNodeSetAdd">xmlSecNodeSetAdd</link></para></listitem>
-<listitem><para><link linkend="xmlSecNodeSetContains">xmlSecNodeSetContains</link></para></listitem>
-<listitem><para><link linkend="xmlSecNodeSetCreate">xmlSecNodeSetCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecNodeSetDebugDump">xmlSecNodeSetDebugDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecNodeSetDestroy">xmlSecNodeSetDestroy</link></para></listitem>
-<listitem><para><link linkend="xmlSecNodeSetDocDestroy">xmlSecNodeSetDocDestroy</link></para></listitem>
-<listitem><para><link linkend="xmlSecNodeSetDumpTextNodes">xmlSecNodeSetDumpTextNodes</link></para></listitem>
-<listitem><para><link linkend="xmlSecNodeSetGetChildren">xmlSecNodeSetGetChildren</link></para></listitem>
-<listitem><para><link linkend="xmlSecNodeSet">xmlSecNodeSet</link></para></listitem>
-<listitem><para><link linkend="xmlSecNodeSetOp">xmlSecNodeSetOp</link></para></listitem>
-<listitem><para><link linkend="xmlSecNodeSetType">xmlSecNodeSetType</link></para></listitem>
-<listitem><para><link linkend="xmlSecNodeSetWalkCallback">xmlSecNodeSetWalkCallback</link></para></listitem>
-<listitem><para><link linkend="xmlSecNodeSetWalk">xmlSecNodeSetWalk</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-NO-SHA224-CAPS">XMLSEC-NO-SHA224</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-NO-SHA256-CAPS">XMLSEC-NO-SHA256</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-NO-SHA384-CAPS">XMLSEC-NO-SHA384</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-NO-SHA512-CAPS">XMLSEC-NO-SHA512</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssAppDefaultKeysMngrAdoptKey">xmlSecNssAppDefaultKeysMngrAdoptKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssAppDefaultKeysMngrInit">xmlSecNssAppDefaultKeysMngrInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssAppDefaultKeysMngrLoad">xmlSecNssAppDefaultKeysMngrLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssAppDefaultKeysMngrSave">xmlSecNssAppDefaultKeysMngrSave</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssAppGetDefaultPwdCallback">xmlSecNssAppGetDefaultPwdCallback</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssAppInit">xmlSecNssAppInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssAppKeyCertLoadMemory">xmlSecNssAppKeyCertLoadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssAppKeyCertLoad">xmlSecNssAppKeyCertLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssAppKeyCertLoadSECItem">xmlSecNssAppKeyCertLoadSECItem</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssAppKeyFromCertLoadSECItem">xmlSecNssAppKeyFromCertLoadSECItem</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssAppKeyLoadMemory">xmlSecNssAppKeyLoadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssAppKeyLoad">xmlSecNssAppKeyLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssAppKeyLoadSECItem">xmlSecNssAppKeyLoadSECItem</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssAppKeysMngrCertLoadMemory">xmlSecNssAppKeysMngrCertLoadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssAppKeysMngrCertLoad">xmlSecNssAppKeysMngrCertLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssAppKeysMngrCertLoadSECItem">xmlSecNssAppKeysMngrCertLoadSECItem</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssAppPkcs12LoadMemory">xmlSecNssAppPkcs12LoadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssAppPkcs12Load">xmlSecNssAppPkcs12Load</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssAppPkcs12LoadSECItem">xmlSecNssAppPkcs12LoadSECItem</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssAppShutdown">xmlSecNssAppShutdown</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssErrorsDefaultCallback">xmlSecNssErrorsDefaultCallback</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssGenerateRandom">xmlSecNssGenerateRandom</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssGetInternalKeySlot">xmlSecNssGetInternalKeySlot</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssInit">xmlSecNssInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataAesGetKlass">xmlSecNssKeyDataAesGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataAesId">xmlSecNssKeyDataAesId</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataAesSet">xmlSecNssKeyDataAesSet</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataDesGetKlass">xmlSecNssKeyDataDesGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataDesId">xmlSecNssKeyDataDesId</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataDesSet">xmlSecNssKeyDataDesSet</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataDsaGetKlass">xmlSecNssKeyDataDsaGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataDsaId">xmlSecNssKeyDataDsaId</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataHmacGetKlass">xmlSecNssKeyDataHmacGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataHmacId">xmlSecNssKeyDataHmacId</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataHmacSet">xmlSecNssKeyDataHmacSet</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataRawX509CertGetKlass">xmlSecNssKeyDataRawX509CertGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataRawX509CertId">xmlSecNssKeyDataRawX509CertId</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataRsaGetKlass">xmlSecNssKeyDataRsaGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataRsaId">xmlSecNssKeyDataRsaId</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataX509AdoptCert">xmlSecNssKeyDataX509AdoptCert</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataX509AdoptCrl">xmlSecNssKeyDataX509AdoptCrl</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataX509AdoptKeyCert">xmlSecNssKeyDataX509AdoptKeyCert</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataX509GetCert">xmlSecNssKeyDataX509GetCert</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataX509GetCertsSize">xmlSecNssKeyDataX509GetCertsSize</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataX509GetCrl">xmlSecNssKeyDataX509GetCrl</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataX509GetCrlsSize">xmlSecNssKeyDataX509GetCrlsSize</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataX509GetKeyCert">xmlSecNssKeyDataX509GetKeyCert</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataX509GetKlass">xmlSecNssKeyDataX509GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeyDataX509Id">xmlSecNssKeyDataX509Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeysMngrInit">xmlSecNssKeysMngrInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeysStoreAdoptKey">xmlSecNssKeysStoreAdoptKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeysStoreGetKlass">xmlSecNssKeysStoreGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeysStoreId">xmlSecNssKeysStoreId</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeysStoreLoad">xmlSecNssKeysStoreLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssKeysStoreSave">xmlSecNssKeysStoreSave</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssNodeGetBigNumValue">xmlSecNssNodeGetBigNumValue</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssNodeSetBigNumValue">xmlSecNssNodeSetBigNumValue</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssPKIAdoptKey">xmlSecNssPKIAdoptKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssPKIKeyDataDuplicate">xmlSecNssPKIKeyDataDuplicate</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssPKIKeyDataGetKeyType">xmlSecNssPKIKeyDataGetKeyType</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssPKIKeyDataGetPrivKey">xmlSecNssPKIKeyDataGetPrivKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssPKIKeyDataGetPubKey">xmlSecNssPKIKeyDataGetPubKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssShutdown">xmlSecNssShutdown</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformAes128CbcGetKlass">xmlSecNssTransformAes128CbcGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformAes128CbcId">xmlSecNssTransformAes128CbcId</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformAes192CbcGetKlass">xmlSecNssTransformAes192CbcGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformAes192CbcId">xmlSecNssTransformAes192CbcId</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformAes256CbcGetKlass">xmlSecNssTransformAes256CbcGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformAes256CbcId">xmlSecNssTransformAes256CbcId</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformDes3CbcGetKlass">xmlSecNssTransformDes3CbcGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformDes3CbcId">xmlSecNssTransformDes3CbcId</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformDsaSha1GetKlass">xmlSecNssTransformDsaSha1GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformDsaSha1Id">xmlSecNssTransformDsaSha1Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformHmacMd5GetKlass">xmlSecNssTransformHmacMd5GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformHmacMd5Id">xmlSecNssTransformHmacMd5Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformHmacRipemd160GetKlass">xmlSecNssTransformHmacRipemd160GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformHmacRipemd160Id">xmlSecNssTransformHmacRipemd160Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformHmacSha1GetKlass">xmlSecNssTransformHmacSha1GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformHmacSha1Id">xmlSecNssTransformHmacSha1Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformKWAes128GetKlass">xmlSecNssTransformKWAes128GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformKWAes128Id">xmlSecNssTransformKWAes128Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformKWAes192GetKlass">xmlSecNssTransformKWAes192GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformKWAes192Id">xmlSecNssTransformKWAes192Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformKWAes256GetKlass">xmlSecNssTransformKWAes256GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformKWAes256Id">xmlSecNssTransformKWAes256Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformKWDes3GetKlass">xmlSecNssTransformKWDes3GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformKWDes3Id">xmlSecNssTransformKWDes3Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformRsaOaepGetKlass">xmlSecNssTransformRsaOaepGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformRsaOaepId">xmlSecNssTransformRsaOaepId</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformRsaPkcs1GetKlass">xmlSecNssTransformRsaPkcs1GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformRsaPkcs1Id">xmlSecNssTransformRsaPkcs1Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformRsaSha1GetKlass">xmlSecNssTransformRsaSha1GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformRsaSha1Id">xmlSecNssTransformRsaSha1Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformSha1GetKlass">xmlSecNssTransformSha1GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssTransformSha1Id">xmlSecNssTransformSha1Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssX509CertGetKey">xmlSecNssX509CertGetKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssX509StoreAdoptCert">xmlSecNssX509StoreAdoptCert</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssX509StoreFindCert">xmlSecNssX509StoreFindCert</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssX509StoreGetKlass">xmlSecNssX509StoreGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssX509StoreId">xmlSecNssX509StoreId</link></para></listitem>
-<listitem><para><link linkend="xmlSecNssX509StoreVerify">xmlSecNssX509StoreVerify</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppDefaultKeysMngrAdoptKey">xmlSecOpenSSLAppDefaultKeysMngrAdoptKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppDefaultKeysMngrInit">xmlSecOpenSSLAppDefaultKeysMngrInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppDefaultKeysMngrLoad">xmlSecOpenSSLAppDefaultKeysMngrLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppDefaultKeysMngrSave">xmlSecOpenSSLAppDefaultKeysMngrSave</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppGetDefaultPwdCallback">xmlSecOpenSSLAppGetDefaultPwdCallback</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppInit">xmlSecOpenSSLAppInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppKeyCertLoadBIO">xmlSecOpenSSLAppKeyCertLoadBIO</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppKeyCertLoadMemory">xmlSecOpenSSLAppKeyCertLoadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppKeyCertLoad">xmlSecOpenSSLAppKeyCertLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppKeyFromCertLoadBIO">xmlSecOpenSSLAppKeyFromCertLoadBIO</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppKeyLoadBIO">xmlSecOpenSSLAppKeyLoadBIO</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppKeyLoadMemory">xmlSecOpenSSLAppKeyLoadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppKeyLoad">xmlSecOpenSSLAppKeyLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppKeysMngrAddCertsPath">xmlSecOpenSSLAppKeysMngrAddCertsPath</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppKeysMngrCertLoadBIO">xmlSecOpenSSLAppKeysMngrCertLoadBIO</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppKeysMngrCertLoadMemory">xmlSecOpenSSLAppKeysMngrCertLoadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppKeysMngrCertLoad">xmlSecOpenSSLAppKeysMngrCertLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppPkcs12LoadBIO">xmlSecOpenSSLAppPkcs12LoadBIO</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppPkcs12LoadMemory">xmlSecOpenSSLAppPkcs12LoadMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppPkcs12Load">xmlSecOpenSSLAppPkcs12Load</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLAppShutdown">xmlSecOpenSSLAppShutdown</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLErrorsDefaultCallback">xmlSecOpenSSLErrorsDefaultCallback</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-OPENSSL-ERRORS-FUNCTION-CAPS">XMLSEC-OPENSSL-ERRORS-FUNCTION</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-OPENSSL-ERRORS-LIB-CAPS">XMLSEC-OPENSSL-ERRORS-LIB</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLEvpKeyAdopt">xmlSecOpenSSLEvpKeyAdopt</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLEvpKeyDataAdoptEvp">xmlSecOpenSSLEvpKeyDataAdoptEvp</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLEvpKeyDataGetEvp">xmlSecOpenSSLEvpKeyDataGetEvp</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLEvpKeyDup">xmlSecOpenSSLEvpKeyDup</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLGenerateRandom">xmlSecOpenSSLGenerateRandom</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLGetDefaultTrustedCertsFolder">xmlSecOpenSSLGetDefaultTrustedCertsFolder</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLInit">xmlSecOpenSSLInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataAesGetKlass">xmlSecOpenSSLKeyDataAesGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataAesId">xmlSecOpenSSLKeyDataAesId</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataAesSet">xmlSecOpenSSLKeyDataAesSet</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataDesGetKlass">xmlSecOpenSSLKeyDataDesGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataDesId">xmlSecOpenSSLKeyDataDesId</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataDesSet">xmlSecOpenSSLKeyDataDesSet</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataDsaAdoptDsa">xmlSecOpenSSLKeyDataDsaAdoptDsa</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataDsaAdoptEvp">xmlSecOpenSSLKeyDataDsaAdoptEvp</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataDsaGetDsa">xmlSecOpenSSLKeyDataDsaGetDsa</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataDsaGetEvp">xmlSecOpenSSLKeyDataDsaGetEvp</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataDsaGetKlass">xmlSecOpenSSLKeyDataDsaGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataDsaId">xmlSecOpenSSLKeyDataDsaId</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataHmacGetKlass">xmlSecOpenSSLKeyDataHmacGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataHmacId">xmlSecOpenSSLKeyDataHmacId</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataHmacSet">xmlSecOpenSSLKeyDataHmacSet</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataRawX509CertGetKlass">xmlSecOpenSSLKeyDataRawX509CertGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataRawX509CertId">xmlSecOpenSSLKeyDataRawX509CertId</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataRsaAdoptEvp">xmlSecOpenSSLKeyDataRsaAdoptEvp</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataRsaAdoptRsa">xmlSecOpenSSLKeyDataRsaAdoptRsa</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataRsaGetEvp">xmlSecOpenSSLKeyDataRsaGetEvp</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataRsaGetKlass">xmlSecOpenSSLKeyDataRsaGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataRsaGetRsa">xmlSecOpenSSLKeyDataRsaGetRsa</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataRsaId">xmlSecOpenSSLKeyDataRsaId</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataX509AdoptCert">xmlSecOpenSSLKeyDataX509AdoptCert</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataX509AdoptCrl">xmlSecOpenSSLKeyDataX509AdoptCrl</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataX509AdoptKeyCert">xmlSecOpenSSLKeyDataX509AdoptKeyCert</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataX509GetCert">xmlSecOpenSSLKeyDataX509GetCert</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataX509GetCertsSize">xmlSecOpenSSLKeyDataX509GetCertsSize</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataX509GetCrl">xmlSecOpenSSLKeyDataX509GetCrl</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataX509GetCrlsSize">xmlSecOpenSSLKeyDataX509GetCrlsSize</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataX509GetKeyCert">xmlSecOpenSSLKeyDataX509GetKeyCert</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataX509GetKlass">xmlSecOpenSSLKeyDataX509GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeyDataX509Id">xmlSecOpenSSLKeyDataX509Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLKeysMngrInit">xmlSecOpenSSLKeysMngrInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLNodeGetBNValue">xmlSecOpenSSLNodeGetBNValue</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLNodeSetBNValue">xmlSecOpenSSLNodeSetBNValue</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLSetDefaultTrustedCertsFolder">xmlSecOpenSSLSetDefaultTrustedCertsFolder</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLShutdown">xmlSecOpenSSLShutdown</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformAes128CbcGetKlass">xmlSecOpenSSLTransformAes128CbcGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformAes128CbcId">xmlSecOpenSSLTransformAes128CbcId</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformAes192CbcGetKlass">xmlSecOpenSSLTransformAes192CbcGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformAes192CbcId">xmlSecOpenSSLTransformAes192CbcId</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformAes256CbcGetKlass">xmlSecOpenSSLTransformAes256CbcGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformAes256CbcId">xmlSecOpenSSLTransformAes256CbcId</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformDes3CbcGetKlass">xmlSecOpenSSLTransformDes3CbcGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformDes3CbcId">xmlSecOpenSSLTransformDes3CbcId</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformDsaSha1GetKlass">xmlSecOpenSSLTransformDsaSha1GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformDsaSha1Id">xmlSecOpenSSLTransformDsaSha1Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformHmacMd5GetKlass">xmlSecOpenSSLTransformHmacMd5GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformHmacMd5Id">xmlSecOpenSSLTransformHmacMd5Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformHmacRipemd160GetKlass">xmlSecOpenSSLTransformHmacRipemd160GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformHmacRipemd160Id">xmlSecOpenSSLTransformHmacRipemd160Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformHmacSha1GetKlass">xmlSecOpenSSLTransformHmacSha1GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformHmacSha1Id">xmlSecOpenSSLTransformHmacSha1Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformHmacSha224GetKlass">xmlSecOpenSSLTransformHmacSha224GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformHmacSha224Id">xmlSecOpenSSLTransformHmacSha224Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformHmacSha256GetKlass">xmlSecOpenSSLTransformHmacSha256GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformHmacSha256Id">xmlSecOpenSSLTransformHmacSha256Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformHmacSha384GetKlass">xmlSecOpenSSLTransformHmacSha384GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformHmacSha384Id">xmlSecOpenSSLTransformHmacSha384Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformHmacSha512GetKlass">xmlSecOpenSSLTransformHmacSha512GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformHmacSha512Id">xmlSecOpenSSLTransformHmacSha512Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformKWAes128GetKlass">xmlSecOpenSSLTransformKWAes128GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformKWAes128Id">xmlSecOpenSSLTransformKWAes128Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformKWAes192GetKlass">xmlSecOpenSSLTransformKWAes192GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformKWAes192Id">xmlSecOpenSSLTransformKWAes192Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformKWAes256GetKlass">xmlSecOpenSSLTransformKWAes256GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformKWAes256Id">xmlSecOpenSSLTransformKWAes256Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformKWDes3GetKlass">xmlSecOpenSSLTransformKWDes3GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformKWDes3Id">xmlSecOpenSSLTransformKWDes3Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformMd5GetKlass">xmlSecOpenSSLTransformMd5GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformMd5Id">xmlSecOpenSSLTransformMd5Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformRipemd160GetKlass">xmlSecOpenSSLTransformRipemd160GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformRipemd160Id">xmlSecOpenSSLTransformRipemd160Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformRsaMd5GetKlass">xmlSecOpenSSLTransformRsaMd5GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformRsaMd5Id">xmlSecOpenSSLTransformRsaMd5Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformRsaOaepGetKlass">xmlSecOpenSSLTransformRsaOaepGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformRsaOaepId">xmlSecOpenSSLTransformRsaOaepId</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformRsaPkcs1GetKlass">xmlSecOpenSSLTransformRsaPkcs1GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformRsaPkcs1Id">xmlSecOpenSSLTransformRsaPkcs1Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformRsaRipemd160GetKlass">xmlSecOpenSSLTransformRsaRipemd160GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformRsaRipemd160Id">xmlSecOpenSSLTransformRsaRipemd160Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformRsaSha1GetKlass">xmlSecOpenSSLTransformRsaSha1GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformRsaSha1Id">xmlSecOpenSSLTransformRsaSha1Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformRsaSha224GetKlass">xmlSecOpenSSLTransformRsaSha224GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformRsaSha224Id">xmlSecOpenSSLTransformRsaSha224Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformRsaSha256GetKlass">xmlSecOpenSSLTransformRsaSha256GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformRsaSha256Id">xmlSecOpenSSLTransformRsaSha256Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformRsaSha384GetKlass">xmlSecOpenSSLTransformRsaSha384GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformRsaSha384Id">xmlSecOpenSSLTransformRsaSha384Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformRsaSha512GetKlass">xmlSecOpenSSLTransformRsaSha512GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformRsaSha512Id">xmlSecOpenSSLTransformRsaSha512Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformSha1GetKlass">xmlSecOpenSSLTransformSha1GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformSha1Id">xmlSecOpenSSLTransformSha1Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformSha224GetKlass">xmlSecOpenSSLTransformSha224GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformSha224Id">xmlSecOpenSSLTransformSha224Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformSha256GetKlass">xmlSecOpenSSLTransformSha256GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformSha256Id">xmlSecOpenSSLTransformSha256Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformSha384GetKlass">xmlSecOpenSSLTransformSha384GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformSha384Id">xmlSecOpenSSLTransformSha384Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformSha512GetKlass">xmlSecOpenSSLTransformSha512GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLTransformSha512Id">xmlSecOpenSSLTransformSha512Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLX509CertGetKey">xmlSecOpenSSLX509CertGetKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLX509StoreAddCertsPath">xmlSecOpenSSLX509StoreAddCertsPath</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLX509StoreAdoptCert">xmlSecOpenSSLX509StoreAdoptCert</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLX509StoreFindCert">xmlSecOpenSSLX509StoreFindCert</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLX509StoreGetKlass">xmlSecOpenSSLX509StoreGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLX509StoreId">xmlSecOpenSSLX509StoreId</link></para></listitem>
-<listitem><para><link linkend="xmlSecOpenSSLX509StoreVerify">xmlSecOpenSSLX509StoreVerify</link></para></listitem>
-<listitem><para><link linkend="xmlSecParseFile">xmlSecParseFile</link></para></listitem>
-<listitem><para><link linkend="xmlSecParseMemoryExt">xmlSecParseMemoryExt</link></para></listitem>
-<listitem><para><link linkend="xmlSecParseMemory">xmlSecParseMemory</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrDebugDumpItemMethod">xmlSecPtrDebugDumpItemMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrDestroyItemMethod">xmlSecPtrDestroyItemMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrDuplicateItemMethod">xmlSecPtrDuplicateItemMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrListAdd">xmlSecPtrListAdd</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrListCheckId">xmlSecPtrListCheckId</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrListCopy">xmlSecPtrListCopy</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrListCreate">xmlSecPtrListCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrListDebugDump">xmlSecPtrListDebugDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrListDebugXmlDump">xmlSecPtrListDebugXmlDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrListDestroy">xmlSecPtrListDestroy</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrListDuplicate">xmlSecPtrListDuplicate</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrListEmpty">xmlSecPtrListEmpty</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrListFinalize">xmlSecPtrListFinalize</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrListGetItem">xmlSecPtrListGetItem</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrListGetName">xmlSecPtrListGetName</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrListGetSize">xmlSecPtrListGetSize</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrListIdUnknown">xmlSecPtrListIdUnknown</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrListInitialize">xmlSecPtrListInitialize</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrListIsValid">xmlSecPtrListIsValid</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrListKlassGetName">xmlSecPtrListKlassGetName</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrListKlass">xmlSecPtrListKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrList">xmlSecPtrList</link></para></listitem>
-<listitem><para><link linkend="xmlSecPtrListRemove">xmlSecPtrListRemove</link></para></listitem>
-<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="xmlSecQName2BitMaskDebugDump">xmlSecQName2BitMaskDebugDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2BitMaskDebugXmlDump">xmlSecQName2BitMaskDebugXmlDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2BitMaskGetBitMaskFromString">xmlSecQName2BitMaskGetBitMaskFromString</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2BitMaskGetBitMask">xmlSecQName2BitMaskGetBitMask</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2BitMaskGetInfo">xmlSecQName2BitMaskGetInfo</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2BitMaskGetStringFromBitMask">xmlSecQName2BitMaskGetStringFromBitMask</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2BitMaskInfoConstPtr">xmlSecQName2BitMaskInfoConstPtr</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2BitMaskInfo">xmlSecQName2BitMaskInfo</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2BitMaskNodesRead">xmlSecQName2BitMaskNodesRead</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2BitMaskNodesWrite">xmlSecQName2BitMaskNodesWrite</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2IntegerAttributeRead">xmlSecQName2IntegerAttributeRead</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2IntegerAttributeWrite">xmlSecQName2IntegerAttributeWrite</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2IntegerDebugDump">xmlSecQName2IntegerDebugDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2IntegerDebugXmlDump">xmlSecQName2IntegerDebugXmlDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2IntegerGetInfo">xmlSecQName2IntegerGetInfo</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2IntegerGetIntegerFromString">xmlSecQName2IntegerGetIntegerFromString</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2IntegerGetInteger">xmlSecQName2IntegerGetInteger</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2IntegerGetStringFromInteger">xmlSecQName2IntegerGetStringFromInteger</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2IntegerInfoConstPtr">xmlSecQName2IntegerInfoConstPtr</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2IntegerInfo">xmlSecQName2IntegerInfo</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2IntegerNodeRead">xmlSecQName2IntegerNodeRead</link></para></listitem>
-<listitem><para><link linkend="xmlSecQName2IntegerNodeWrite">xmlSecQName2IntegerNodeWrite</link></para></listitem>
-<listitem><para><link linkend="xmlSecReplaceContent">xmlSecReplaceContent</link></para></listitem>
-<listitem><para><link linkend="xmlSecReplaceNodeBuffer">xmlSecReplaceNodeBuffer</link></para></listitem>
-<listitem><para><link linkend="xmlSecReplaceNode">xmlSecReplaceNode</link></para></listitem>
-<listitem><para><link linkend="xmlSecShutdown">xmlSecShutdown</link></para></listitem>
-<listitem><para><link linkend="xmlSecSimpleKeysStoreAdoptKey">xmlSecSimpleKeysStoreAdoptKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecSimpleKeysStoreGetKeys">xmlSecSimpleKeysStoreGetKeys</link></para></listitem>
-<listitem><para><link linkend="xmlSecSimpleKeysStoreGetKlass">xmlSecSimpleKeysStoreGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecSimpleKeysStoreId">xmlSecSimpleKeysStoreId</link></para></listitem>
-<listitem><para><link linkend="xmlSecSimpleKeysStoreLoad">xmlSecSimpleKeysStoreLoad</link></para></listitem>
-<listitem><para><link linkend="xmlSecSimpleKeysStoreSave">xmlSecSimpleKeysStoreSave</link></para></listitem>
-<listitem><para><link linkend="xmlSecSize">xmlSecSize</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap11AddBodyEntry">xmlSecSoap11AddBodyEntry</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap11AddFaultEntry">xmlSecSoap11AddFaultEntry</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap11CheckEnvelope">xmlSecSoap11CheckEnvelope</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap11CreateEnvelope">xmlSecSoap11CreateEnvelope</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap11EnsureHeader">xmlSecSoap11EnsureHeader</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap11GetBodyEntriesNumber">xmlSecSoap11GetBodyEntriesNumber</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap11GetBodyEntry">xmlSecSoap11GetBodyEntry</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap11GetBody">xmlSecSoap11GetBody</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap11GetFaultEntry">xmlSecSoap11GetFaultEntry</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap11GetHeader">xmlSecSoap11GetHeader</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap12AddBodyEntry">xmlSecSoap12AddBodyEntry</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap12AddFaultDetailEntry">xmlSecSoap12AddFaultDetailEntry</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap12AddFaultEntry">xmlSecSoap12AddFaultEntry</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap12AddFaultReasonText">xmlSecSoap12AddFaultReasonText</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap12AddFaultSubcode">xmlSecSoap12AddFaultSubcode</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap12CheckEnvelope">xmlSecSoap12CheckEnvelope</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap12CreateEnvelope">xmlSecSoap12CreateEnvelope</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap12EnsureHeader">xmlSecSoap12EnsureHeader</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap12FaultCode">xmlSecSoap12FaultCode</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap12GetBodyEntriesNumber">xmlSecSoap12GetBodyEntriesNumber</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap12GetBodyEntry">xmlSecSoap12GetBodyEntry</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap12GetBody">xmlSecSoap12GetBody</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap12GetFaultEntry">xmlSecSoap12GetFaultEntry</link></para></listitem>
-<listitem><para><link linkend="xmlSecSoap12GetHeader">xmlSecSoap12GetHeader</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-STACK-OF-X509-CRL-CAPS">XMLSEC-STACK-OF-X509-CRL</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-STACK-OF-X509-CAPS">XMLSEC-STACK-OF-X509</link></para></listitem>
-<listitem><para><link linkend="xmlSecStringListGetKlass">xmlSecStringListGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecStringListId">xmlSecStringListId</link></para></listitem>
-<listitem><para><link linkend="xmlSecStrPrintf">xmlSecStrPrintf</link></para></listitem>
-<listitem><para><link linkend="xmlSecStrVPrintf">xmlSecStrVPrintf</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplCipherReferenceAddTransform">xmlSecTmplCipherReferenceAddTransform</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplEncDataAddEncProperty">xmlSecTmplEncDataAddEncProperty</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplEncDataCreate">xmlSecTmplEncDataCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplEncDataEnsureCipherReference">xmlSecTmplEncDataEnsureCipherReference</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplEncDataEnsureCipherValue">xmlSecTmplEncDataEnsureCipherValue</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplEncDataEnsureEncProperties">xmlSecTmplEncDataEnsureEncProperties</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplEncDataEnsureKeyInfo">xmlSecTmplEncDataEnsureKeyInfo</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplEncDataGetEncMethodNode">xmlSecTmplEncDataGetEncMethodNode</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplKeyInfoAddEncryptedKey">xmlSecTmplKeyInfoAddEncryptedKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplKeyInfoAddKeyName">xmlSecTmplKeyInfoAddKeyName</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplKeyInfoAddKeyValue">xmlSecTmplKeyInfoAddKeyValue</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplKeyInfoAddRetrievalMethod">xmlSecTmplKeyInfoAddRetrievalMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplKeyInfoAddX509Data">xmlSecTmplKeyInfoAddX509Data</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplManifestAddReference">xmlSecTmplManifestAddReference</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplObjectAddManifest">xmlSecTmplObjectAddManifest</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplObjectAddSignProperties">xmlSecTmplObjectAddSignProperties</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplReferenceAddTransform">xmlSecTmplReferenceAddTransform</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplReferenceListAddDataReference">xmlSecTmplReferenceListAddDataReference</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplReferenceListAddKeyReference">xmlSecTmplReferenceListAddKeyReference</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplRetrievalMethodAddTransform">xmlSecTmplRetrievalMethodAddTransform</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplSignatureAddObject">xmlSecTmplSignatureAddObject</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplSignatureAddReference">xmlSecTmplSignatureAddReference</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplSignatureCreate">xmlSecTmplSignatureCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplSignatureEnsureKeyInfo">xmlSecTmplSignatureEnsureKeyInfo</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplSignatureGetC14NMethodNode">xmlSecTmplSignatureGetC14NMethodNode</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplSignatureGetSignMethodNode">xmlSecTmplSignatureGetSignMethodNode</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplTransformAddC14NInclNamespaces">xmlSecTmplTransformAddC14NInclNamespaces</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplTransformAddHmacOutputLength">xmlSecTmplTransformAddHmacOutputLength</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplTransformAddRsaOaepParam">xmlSecTmplTransformAddRsaOaepParam</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplTransformAddXPath2">xmlSecTmplTransformAddXPath2</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplTransformAddXPath">xmlSecTmplTransformAddXPath</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplTransformAddXPointer">xmlSecTmplTransformAddXPointer</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplTransformAddXsltStylesheet">xmlSecTmplTransformAddXsltStylesheet</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplX509DataAddCertificate">xmlSecTmplX509DataAddCertificate</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplX509DataAddCRL">xmlSecTmplX509DataAddCRL</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplX509DataAddIssuerSerial">xmlSecTmplX509DataAddIssuerSerial</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplX509DataAddSKI">xmlSecTmplX509DataAddSKI</link></para></listitem>
-<listitem><para><link linkend="xmlSecTmplX509DataAddSubjectName">xmlSecTmplX509DataAddSubjectName</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformAes128CbcGetKlass">xmlSecTransformAes128CbcGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformAes128CbcId">xmlSecTransformAes128CbcId</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformAes192CbcGetKlass">xmlSecTransformAes192CbcGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformAes192CbcId">xmlSecTransformAes192CbcId</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformAes256CbcGetKlass">xmlSecTransformAes256CbcGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformAes256CbcId">xmlSecTransformAes256CbcId</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformBase64GetKlass">xmlSecTransformBase64GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformBase64Id">xmlSecTransformBase64Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformBase64SetLineSize">xmlSecTransformBase64SetLineSize</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-TRANSFORM-BINARY-CHUNK-CAPS">XMLSEC-TRANSFORM-BINARY-CHUNK</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCheckId">xmlSecTransformCheckId</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCheckSize">xmlSecTransformCheckSize</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCheckType">xmlSecTransformCheckType</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformConnect">xmlSecTransformConnect</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCreateInputBuffer">xmlSecTransformCreateInputBuffer</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCreate">xmlSecTransformCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCreateOutputBuffer">xmlSecTransformCreateOutputBuffer</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxAppend">xmlSecTransformCtxAppend</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxBinaryExecute">xmlSecTransformCtxBinaryExecute</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxCopyUserPref">xmlSecTransformCtxCopyUserPref</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxCreateAndAppend">xmlSecTransformCtxCreateAndAppend</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxCreateAndPrepend">xmlSecTransformCtxCreateAndPrepend</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxCreate">xmlSecTransformCtxCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxDebugDump">xmlSecTransformCtxDebugDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxDebugXmlDump">xmlSecTransformCtxDebugXmlDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxDestroy">xmlSecTransformCtxDestroy</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxExecute">xmlSecTransformCtxExecute</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxFinalize">xmlSecTransformCtxFinalize</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK-CAPS">XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxInitialize">xmlSecTransformCtxInitialize</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtx">xmlSecTransformCtx</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxNodeRead">xmlSecTransformCtxNodeRead</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxNodesListRead">xmlSecTransformCtxNodesListRead</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxPreExecuteCallback">xmlSecTransformCtxPreExecuteCallback</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxPrepare">xmlSecTransformCtxPrepare</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxPrepend">xmlSecTransformCtxPrepend</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxReset">xmlSecTransformCtxReset</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxSetUri">xmlSecTransformCtxSetUri</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxUriExecute">xmlSecTransformCtxUriExecute</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformCtxXmlExecute">xmlSecTransformCtxXmlExecute</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformDataTypeBin">xmlSecTransformDataTypeBin</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformDataTypeUnknown">xmlSecTransformDataTypeUnknown</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformDataTypeXml">xmlSecTransformDataTypeXml</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformDebugDump">xmlSecTransformDebugDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformDebugXmlDump">xmlSecTransformDebugXmlDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformDefaultGetDataType">xmlSecTransformDefaultGetDataType</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformDefaultPopBin">xmlSecTransformDefaultPopBin</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformDefaultPopXml">xmlSecTransformDefaultPopXml</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformDefaultPushBin">xmlSecTransformDefaultPushBin</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformDefaultPushXml">xmlSecTransformDefaultPushXml</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformDes3CbcGetKlass">xmlSecTransformDes3CbcGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformDes3CbcId">xmlSecTransformDes3CbcId</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformDestroy">xmlSecTransformDestroy</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformDsaSha1GetKlass">xmlSecTransformDsaSha1GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformDsaSha1Id">xmlSecTransformDsaSha1Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformEnvelopedGetKlass">xmlSecTransformEnvelopedGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformEnvelopedId">xmlSecTransformEnvelopedId</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformExclC14NGetKlass">xmlSecTransformExclC14NGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformExclC14NId">xmlSecTransformExclC14NId</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformExclC14NWithCommentsGetKlass">xmlSecTransformExclC14NWithCommentsGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformExclC14NWithCommentsId">xmlSecTransformExclC14NWithCommentsId</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformExecuteMethod">xmlSecTransformExecuteMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformExecute">xmlSecTransformExecute</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformFinalizeMethod">xmlSecTransformFinalizeMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformGetDataTypeMethod">xmlSecTransformGetDataTypeMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformGetDataType">xmlSecTransformGetDataType</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformGetName">xmlSecTransformGetName</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformHmacMd5GetKlass">xmlSecTransformHmacMd5GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformHmacMd5Id">xmlSecTransformHmacMd5Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformHmacRipemd160GetKlass">xmlSecTransformHmacRipemd160GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformHmacRipemd160Id">xmlSecTransformHmacRipemd160Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformHmacSha1GetKlass">xmlSecTransformHmacSha1GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformHmacSha1Id">xmlSecTransformHmacSha1Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformHmacSha224GetKlass">xmlSecTransformHmacSha224GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformHmacSha224Id">xmlSecTransformHmacSha224Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformHmacSha256GetKlass">xmlSecTransformHmacSha256GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformHmacSha256Id">xmlSecTransformHmacSha256Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformHmacSha384GetKlass">xmlSecTransformHmacSha384GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformHmacSha384Id">xmlSecTransformHmacSha384Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformHmacSha512GetKlass">xmlSecTransformHmacSha512GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformHmacSha512Id">xmlSecTransformHmacSha512Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformIdListDebugDump">xmlSecTransformIdListDebugDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformIdListDebugXmlDump">xmlSecTransformIdListDebugXmlDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformIdListFindByHref">xmlSecTransformIdListFindByHref</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformIdListFindByName">xmlSecTransformIdListFindByName</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformIdListFind">xmlSecTransformIdListFind</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformIdListGetKlass">xmlSecTransformIdListGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformIdListId">xmlSecTransformIdListId</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformIdsGet">xmlSecTransformIdsGet</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformIdsInit">xmlSecTransformIdsInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformIdsRegisterDefault">xmlSecTransformIdsRegisterDefault</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformIdsRegister">xmlSecTransformIdsRegister</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformIdsShutdown">xmlSecTransformIdsShutdown</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformIdUnknown">xmlSecTransformIdUnknown</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformInclC14NGetKlass">xmlSecTransformInclC14NGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformInclC14NId">xmlSecTransformInclC14NId</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformInclC14NWithCommentsGetKlass">xmlSecTransformInclC14NWithCommentsGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformInclC14NWithCommentsId">xmlSecTransformInclC14NWithCommentsId</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformInitializeMethod">xmlSecTransformInitializeMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformInputURIGetKlass">xmlSecTransformInputURIGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformInputURIId">xmlSecTransformInputURIId</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformInputURIOpen">xmlSecTransformInputURIOpen</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformIsValid">xmlSecTransformIsValid</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformKlassGetName">xmlSecTransformKlassGetName</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformKlass">xmlSecTransformKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformKWAes128GetKlass">xmlSecTransformKWAes128GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformKWAes128Id">xmlSecTransformKWAes128Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformKWAes192GetKlass">xmlSecTransformKWAes192GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformKWAes192Id">xmlSecTransformKWAes192Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformKWAes256GetKlass">xmlSecTransformKWAes256GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformKWAes256Id">xmlSecTransformKWAes256Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformKWDes3GetKlass">xmlSecTransformKWDes3GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformKWDes3Id">xmlSecTransformKWDes3Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformMd5GetKlass">xmlSecTransformMd5GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformMd5Id">xmlSecTransformMd5Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformMemBufGetBuffer">xmlSecTransformMemBufGetBuffer</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformMemBufGetKlass">xmlSecTransformMemBufGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformMemBufId">xmlSecTransformMemBufId</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformMode">xmlSecTransformMode</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransform">xmlSecTransform</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformNodeReadMethod">xmlSecTransformNodeReadMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformNodeRead">xmlSecTransformNodeRead</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformNodeWriteMethod">xmlSecTransformNodeWriteMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformOperation">xmlSecTransformOperation</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformPopBinMethod">xmlSecTransformPopBinMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformPopBin">xmlSecTransformPopBin</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformPopXmlMethod">xmlSecTransformPopXmlMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformPopXml">xmlSecTransformPopXml</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformPump">xmlSecTransformPump</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformPushBinMethod">xmlSecTransformPushBinMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformPushBin">xmlSecTransformPushBin</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformPushXmlMethod">xmlSecTransformPushXmlMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformPushXml">xmlSecTransformPushXml</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRemove">xmlSecTransformRemove</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRemoveXmlTagsC14NGetKlass">xmlSecTransformRemoveXmlTagsC14NGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRemoveXmlTagsC14NId">xmlSecTransformRemoveXmlTagsC14NId</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRipemd160GetKlass">xmlSecTransformRipemd160GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRipemd160Id">xmlSecTransformRipemd160Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRsaMd5GetKlass">xmlSecTransformRsaMd5GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRsaMd5Id">xmlSecTransformRsaMd5Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRsaOaepGetKlass">xmlSecTransformRsaOaepGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRsaOaepId">xmlSecTransformRsaOaepId</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRsaPkcs1GetKlass">xmlSecTransformRsaPkcs1GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRsaPkcs1Id">xmlSecTransformRsaPkcs1Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRsaRipemd160GetKlass">xmlSecTransformRsaRipemd160GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRsaRipemd160Id">xmlSecTransformRsaRipemd160Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRsaSha1GetKlass">xmlSecTransformRsaSha1GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRsaSha1Id">xmlSecTransformRsaSha1Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRsaSha224GetKlass">xmlSecTransformRsaSha224GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRsaSha224Id">xmlSecTransformRsaSha224Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRsaSha256GetKlass">xmlSecTransformRsaSha256GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRsaSha256Id">xmlSecTransformRsaSha256Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRsaSha384GetKlass">xmlSecTransformRsaSha384GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRsaSha384Id">xmlSecTransformRsaSha384Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRsaSha512GetKlass">xmlSecTransformRsaSha512GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformRsaSha512Id">xmlSecTransformRsaSha512Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformSetKeyMethod">xmlSecTransformSetKeyMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformSetKey">xmlSecTransformSetKey</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformSetKeyReq">xmlSecTransformSetKeyReq</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformSetKeyRequirementsMethod">xmlSecTransformSetKeyRequirementsMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformSha1GetKlass">xmlSecTransformSha1GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformSha1Id">xmlSecTransformSha1Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformSha224GetKlass">xmlSecTransformSha224GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformSha224Id">xmlSecTransformSha224Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformSha256GetKlass">xmlSecTransformSha256GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformSha256Id">xmlSecTransformSha256Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformSha384GetKlass">xmlSecTransformSha384GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformSha384Id">xmlSecTransformSha384Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformSha512GetKlass">xmlSecTransformSha512GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformSha512Id">xmlSecTransformSha512Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformStatus">xmlSecTransformStatus</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformUriTypeAny">xmlSecTransformUriTypeAny</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformUriTypeCheck">xmlSecTransformUriTypeCheck</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformUriTypeEmpty">xmlSecTransformUriTypeEmpty</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformUriTypeLocal">xmlSecTransformUriTypeLocal</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformUriType">xmlSecTransformUriType</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformUriTypeNone">xmlSecTransformUriTypeNone</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformUriTypeRemote">xmlSecTransformUriTypeRemote</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformUriTypeSameDocument">xmlSecTransformUriTypeSameDocument</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformUsageAny">xmlSecTransformUsageAny</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformUsageC14NMethod">xmlSecTransformUsageC14NMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformUsageDigestMethod">xmlSecTransformUsageDigestMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformUsageDSigTransform">xmlSecTransformUsageDSigTransform</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformUsageEncryptionMethod">xmlSecTransformUsageEncryptionMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformUsageSignatureMethod">xmlSecTransformUsageSignatureMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformUsageUnknown">xmlSecTransformUsageUnknown</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformVerifyMethod">xmlSecTransformVerifyMethod</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformVerify">xmlSecTransformVerify</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformVerifyNodeContent">xmlSecTransformVerifyNodeContent</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformVisa3DHackGetKlass">xmlSecTransformVisa3DHackGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformVisa3DHackId">xmlSecTransformVisa3DHackId</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformVisa3DHackSetID">xmlSecTransformVisa3DHackSetID</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformXmlParserGetKlass">xmlSecTransformXmlParserGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformXmlParserId">xmlSecTransformXmlParserId</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformXPath2GetKlass">xmlSecTransformXPath2GetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformXPath2Id">xmlSecTransformXPath2Id</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformXPathGetKlass">xmlSecTransformXPathGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformXPathId">xmlSecTransformXPathId</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformXPointerGetKlass">xmlSecTransformXPointerGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformXPointerId">xmlSecTransformXPointerId</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformXPointerSetExpr">xmlSecTransformXPointerSetExpr</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformXsltGetKlass">xmlSecTransformXsltGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecTransformXsltId">xmlSecTransformXsltId</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-VERSION-INFO-CAPS">XMLSEC-VERSION-INFO</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-VERSION-MAJOR-CAPS">XMLSEC-VERSION-MAJOR</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-VERSION-MINOR-CAPS">XMLSEC-VERSION-MINOR</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-VERSION-CAPS">XMLSEC-VERSION</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-VERSION-SUBMINOR-CAPS">XMLSEC-VERSION-SUBMINOR</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-X509DATA-CERTIFICATE-NODE-CAPS">XMLSEC-X509DATA-CERTIFICATE-NODE</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-X509DATA-CRL-NODE-CAPS">XMLSEC-X509DATA-CRL-NODE</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-X509DATA-DEFAULT-CAPS">XMLSEC-X509DATA-DEFAULT</link></para></listitem>
-<listitem><para><link linkend="xmlSecX509DataGetNodeContent">xmlSecX509DataGetNodeContent</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-X509DATA-ISSUERSERIAL-NODE-CAPS">XMLSEC-X509DATA-ISSUERSERIAL-NODE</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-X509DATA-SKI-NODE-CAPS">XMLSEC-X509DATA-SKI-NODE</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-X509DATA-SUBJECTNAME-NODE-CAPS">XMLSEC-X509DATA-SUBJECTNAME-NODE</link></para></listitem>
-<listitem><para><link linkend="xmlSecX509StoreGetKlass">xmlSecX509StoreGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecX509StoreId">xmlSecX509StoreId</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-XKMS-KEY-BINDING-REASON-MASK-ISSUER-TRAST-CAPS">XMLSEC-XKMS-KEY-BINDING-REASON-MASK-ISSUER-TRAST</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-XKMS-KEY-BINDING-REASON-MASK-REVOCATION-STATUS-CAPS">XMLSEC-XKMS-KEY-BINDING-REASON-MASK-REVOCATION-STATUS</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-XKMS-KEY-BINDING-REASON-MASK-SIGNATURE-CAPS">XMLSEC-XKMS-KEY-BINDING-REASON-MASK-SIGNATURE</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-XKMS-KEY-BINDING-REASON-MASK-VALIDITY-INTERVAL-CAPS">XMLSEC-XKMS-KEY-BINDING-REASON-MASK-VALIDITY-INTERVAL</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsKeyBindingStatus">xmlSecXkmsKeyBindingStatus</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-XKMS-NO-RESPONSE-LIMIT-CAPS">XMLSEC-XKMS-NO-RESPONSE-LIMIT</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithDebugDump">xmlSecXkmsRespondWithDebugDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithDebugXmlDump">xmlSecXkmsRespondWithDebugXmlDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithDefaultNodeRead">xmlSecXkmsRespondWithDefaultNodeRead</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithDefaultNodeWrite">xmlSecXkmsRespondWithDefaultNodeWrite</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithIdListFindByNodeValue">xmlSecXkmsRespondWithIdListFindByNodeValue</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithIdListFind">xmlSecXkmsRespondWithIdListFind</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithIdListGetKlass">xmlSecXkmsRespondWithIdListGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithIdListId">xmlSecXkmsRespondWithIdListId</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithIdListWrite">xmlSecXkmsRespondWithIdListWrite</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithIdsGet">xmlSecXkmsRespondWithIdsGet</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithIdsInit">xmlSecXkmsRespondWithIdsInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithIdsRegisterDefault">xmlSecXkmsRespondWithIdsRegisterDefault</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithIdsRegister">xmlSecXkmsRespondWithIdsRegister</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithIdsShutdown">xmlSecXkmsRespondWithIdsShutdown</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithIdUnknown">xmlSecXkmsRespondWithIdUnknown</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithKeyNameGetKlass">xmlSecXkmsRespondWithKeyNameGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithKeyNameId">xmlSecXkmsRespondWithKeyNameId</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithKeyValueGetKlass">xmlSecXkmsRespondWithKeyValueGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithKeyValueId">xmlSecXkmsRespondWithKeyValueId</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithNodeRead">xmlSecXkmsRespondWithNodeRead</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithNodeWrite">xmlSecXkmsRespondWithNodeWrite</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithPGPGetKlass">xmlSecXkmsRespondWithPGPGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithPGPId">xmlSecXkmsRespondWithPGPId</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithPrivateKeyGetKlass">xmlSecXkmsRespondWithPrivateKeyGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithPrivateKeyId">xmlSecXkmsRespondWithPrivateKeyId</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithRetrievalMethodGetKlass">xmlSecXkmsRespondWithRetrievalMethodGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithRetrievalMethodId">xmlSecXkmsRespondWithRetrievalMethodId</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithSPKIGetKlass">xmlSecXkmsRespondWithSPKIGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithSPKIId">xmlSecXkmsRespondWithSPKIId</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithX509CertGetKlass">xmlSecXkmsRespondWithX509CertGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithX509CertId">xmlSecXkmsRespondWithX509CertId</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithX509ChainGetKlass">xmlSecXkmsRespondWithX509ChainGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithX509ChainId">xmlSecXkmsRespondWithX509ChainId</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithX509CRLGetKlass">xmlSecXkmsRespondWithX509CRLGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsRespondWithX509CRLId">xmlSecXkmsRespondWithX509CRLId</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-XKMS-RESPONSE-MECHANISM-MASK-PENDING-CAPS">XMLSEC-XKMS-RESPONSE-MECHANISM-MASK-PENDING</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-XKMS-RESPONSE-MECHANISM-MASK-REPRESENT-CAPS">XMLSEC-XKMS-RESPONSE-MECHANISM-MASK-REPRESENT</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-XKMS-RESPONSE-MECHANISM-MASK-REQUEST-SIGNATURE-VALUE-CAPS">XMLSEC-XKMS-RESPONSE-MECHANISM-MASK-REQUEST-SIGNATURE-VALUE</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsResultMajor">xmlSecXkmsResultMajor</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsResultMinor">xmlSecXkmsResultMinor</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerCtxCopyUserPref">xmlSecXkmsServerCtxCopyUserPref</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerCtxCreate">xmlSecXkmsServerCtxCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerCtxDebugDump">xmlSecXkmsServerCtxDebugDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerCtxDebugXmlDump">xmlSecXkmsServerCtxDebugXmlDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerCtxDestroy">xmlSecXkmsServerCtxDestroy</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerCtxFatalErrorResponseCreate">xmlSecXkmsServerCtxFatalErrorResponseCreate</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerCtxFinalize">xmlSecXkmsServerCtxFinalize</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerCtxInitialize">xmlSecXkmsServerCtxInitialize</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerCtx">xmlSecXkmsServerCtx</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerCtxProcess">xmlSecXkmsServerCtxProcess</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerCtxPtrListGetKlass">xmlSecXkmsServerCtxPtrListGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerCtxPtrListId">xmlSecXkmsServerCtxPtrListId</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerCtxRequestRead">xmlSecXkmsServerCtxRequestRead</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerCtxRequestUnwrap">xmlSecXkmsServerCtxRequestUnwrap</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerCtxReset">xmlSecXkmsServerCtxReset</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerCtxResponseWrap">xmlSecXkmsServerCtxResponseWrap</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerCtxResponseWrite">xmlSecXkmsServerCtxResponseWrite</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerCtxSetResult">xmlSecXkmsServerCtxSetResult</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-XKMS-SERVER-FLAGS-STOP-ON-UNKNOWN-KEY-USAGE-CAPS">XMLSEC-XKMS-SERVER-FLAGS-STOP-ON-UNKNOWN-KEY-USAGE</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-XKMS-SERVER-FLAGS-STOP-ON-UNKNOWN-RESPOND-WITH-CAPS">XMLSEC-XKMS-SERVER-FLAGS-STOP-ON-UNKNOWN-RESPOND-WITH</link></para></listitem>
-<listitem><para><link linkend="XMLSEC-XKMS-SERVER-FLAGS-STOP-ON-UNKNOWN-RESPONSE-MECHANISM-CAPS">XMLSEC-XKMS-SERVER-FLAGS-STOP-ON-UNKNOWN-RESPONSE-MECHANISM</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerFormatFromString">xmlSecXkmsServerFormatFromString</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerFormat">xmlSecXkmsServerFormat</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerFormatToString">xmlSecXkmsServerFormatToString</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestCompoundGetKlass">xmlSecXkmsServerRequestCompoundGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestCompoundId">xmlSecXkmsServerRequestCompoundId</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestDebugDump">xmlSecXkmsServerRequestDebugDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestDebugXmlDump">xmlSecXkmsServerRequestDebugXmlDump</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestExecute">xmlSecXkmsServerRequestExecute</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestIdListFindByName">xmlSecXkmsServerRequestIdListFindByName</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestIdListFindByNode">xmlSecXkmsServerRequestIdListFindByNode</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestIdListFind">xmlSecXkmsServerRequestIdListFind</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestIdListGetKlass">xmlSecXkmsServerRequestIdListGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestIdListId">xmlSecXkmsServerRequestIdListId</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestIdsGet">xmlSecXkmsServerRequestIdsGet</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestIdsInit">xmlSecXkmsServerRequestIdsInit</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestIdsRegisterDefault">xmlSecXkmsServerRequestIdsRegisterDefault</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestIdsRegister">xmlSecXkmsServerRequestIdsRegister</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestIdsShutdown">xmlSecXkmsServerRequestIdsShutdown</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestIdUnknown">xmlSecXkmsServerRequestIdUnknown</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestLocateGetKlass">xmlSecXkmsServerRequestLocateGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestLocateId">xmlSecXkmsServerRequestLocateId</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestNodeRead">xmlSecXkmsServerRequestNodeRead</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestNodeWrite">xmlSecXkmsServerRequestNodeWrite</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestResultGetKlass">xmlSecXkmsServerRequestResultGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestResultId">xmlSecXkmsServerRequestResultId</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestStatusGetKlass">xmlSecXkmsServerRequestStatusGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestStatusId">xmlSecXkmsServerRequestStatusId</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestValidateGetKlass">xmlSecXkmsServerRequestValidateGetKlass</link></para></listitem>
-<listitem><para><link linkend="xmlSecXkmsServerRequestValidateId">xmlSecXkmsServerRequestValidateId</link></para></listitem>
diff --git a/docs/api/xmlsec-io.html b/docs/api/xmlsec-io.html
index 3bf4f07..5315538 100644
--- a/docs/api/xmlsec-io.html
+++ b/docs/api/xmlsec-io.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-IO"></a>io</h1>
 <div class="REFNAMEDIV">
-<a name="AEN4779"></a><h2>Name</h2>io�--�</div>
+<a name="AEN4779"></a><h2>Name</h2>io--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN4782"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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);
@@ -172,19 +172,19 @@ compiled-in I/O.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4877"><span style="white-space: nowrap"><var class="PARAMETER">matchFunc</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4877"><span style="white-space: nowrap"><var class="PARAMETER">matchFunc</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>  	the protocol match callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4882"><span style="white-space: nowrap"><var class="PARAMETER">openFunc</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4882"><span style="white-space: nowrap"><var class="PARAMETER">openFunc</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>  		the open stream callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4887"><span style="white-space: nowrap"><var class="PARAMETER">readFunc</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4887"><span style="white-space: nowrap"><var class="PARAMETER">readFunc</var>:</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="AEN4892"><span style="white-space: nowrap"><var class="PARAMETER">closeFunc</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4892"><span style="white-space: nowrap"><var class="PARAMETER">closeFunc</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>  	the close stream callback.</p></td>
 </tr>
 <tr>
@@ -226,11 +226,11 @@ compiled-in I/O.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4938"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4938"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN4943"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4943"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the URL to open.</p></td>
 </tr>
 <tr>
@@ -241,8 +241,8 @@ compiled-in I/O.</p>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-errors.html"><b><<<�errors</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-keyinfo.html"><b>keyinfo�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-errors.html"><b><<<errors</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-keyinfo.html"><b>keyinfo>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-keyinfo.html b/docs/api/xmlsec-keyinfo.html
index b10eac5..40e90fe 100644
--- a/docs/api/xmlsec-keyinfo.html
+++ b/docs/api/xmlsec-keyinfo.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-KEYINFO"></a>keyinfo</h1>
 <div class="REFNAMEDIV">
-<a name="AEN4958"></a><h2>Name</h2>keyinfo�--�</div>
+<a name="AEN4958"></a><h2>Name</h2>keyinfo--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN4961"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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,
@@ -156,15 +156,15 @@ and stores into <var class="PARAMETER">key</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5053"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5053"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>:</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"><dsig:KeyInfo/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5059"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5059"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</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="AEN5064"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5064"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr>
 <tr>
@@ -185,15 +185,15 @@ and stores into <var class="PARAMETER">key</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5091"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5091"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>:</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"><dsig:KeyInfo/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5097"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5097"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</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="AEN5102"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5102"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr>
 <tr>
@@ -491,7 +491,7 @@ function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5403"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5403"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager (may be NULL).</p></td>
 </tr>
 <tr>
@@ -509,7 +509,7 @@ function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN5427"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5427"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr></tbody></table>
 </div>
@@ -525,11 +525,11 @@ responsible for cleaning it up by <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXF
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5448"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5448"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5454"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5454"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager (may be NULL).</p></td>
 </tr>
 <tr>
@@ -548,7 +548,7 @@ function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN5478"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5478"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr></tbody></table>
 </div>
@@ -561,7 +561,7 @@ function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN5496"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5496"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr></tbody></table>
 </div>
@@ -576,11 +576,11 @@ function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5516"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5516"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>:</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="AEN5521"><span style="white-space: nowrap"><var class="PARAMETER">src</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5521"><span style="white-space: nowrap"><var class="PARAMETER">src</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to source context object.</p></td>
 </tr>
 <tr>
@@ -600,7 +600,7 @@ of <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo" target="_top"><ds
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5544"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5544"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr>
 <tr>
@@ -620,11 +620,11 @@ of <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo" target="_top"><ds
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5568"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5568"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5574"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5574"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the output file pointer.</p></td>
 </tr>
 </tbody></table>
@@ -640,11 +640,11 @@ of <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo" target="_top"><ds
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5592"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5592"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5598"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5598"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the output file pointer.</p></td>
 </tr>
 </tbody></table>
@@ -766,8 +766,8 @@ without any additional processing.</p>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-io.html"><b><<<�io</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-keysdata.html"><b>keysdata�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-io.html"><b><<<io</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-keysdata.html"><b>keysdata>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-keys.html b/docs/api/xmlsec-keys.html
index 91c3226..eb99f16 100644
--- a/docs/api/xmlsec-keys.html
+++ b/docs/api/xmlsec-keys.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-KEYS"></a>keys</h1>
 <div class="REFNAMEDIV">
-<a name="AEN8256"></a><h2>Name</h2>keys�--�</div>
+<a name="AEN8256"></a><h2>Name</h2>keys--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN8259"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<pre class="SYNOPSIS">
 
 typedef     <a href="xmlsec-keys.html#XMLSECKEYUSAGE">xmlSecKeyUsage</a>;
 #define     <a href="xmlsec-keys.html#XMLSECKEYUSAGESIGN">xmlSecKeyUsageSign</a>
@@ -251,7 +251,7 @@ const <font>xmlChar</font>* <a href="xmlsec-keys.html#XMLSECKEYGETNAME">xmlSecKe
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8498"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8498"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
 </tr>
 <tr>
@@ -269,7 +269,7 @@ const <font>xmlChar</font>* <a href="xmlsec-keys.html#XMLSECKEYGETNAME">xmlSecKe
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8520"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8520"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
 </tr></tbody></table>
 </div>
@@ -282,7 +282,7 @@ const <font>xmlChar</font>* <a href="xmlsec-keys.html#XMLSECKEYGETNAME">xmlSecKe
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8537"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8537"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
 </tr></tbody></table>
 </div>
@@ -297,11 +297,11 @@ const <font>xmlChar</font>* <a href="xmlsec-keys.html#XMLSECKEYGETNAME">xmlSecKe
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8556"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8556"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>:</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="AEN8561"><span style="white-space: nowrap"><var class="PARAMETER">src</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8561"><span style="white-space: nowrap"><var class="PARAMETER">src</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the pointer to source object.</p></td>
 </tr>
 <tr>
@@ -322,11 +322,11 @@ returned object with <var class="PARAMETER">xmlSecKeyUseWithDestroy</var> functi
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8584"><span style="white-space: nowrap"><var class="PARAMETER">application</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8584"><span style="white-space: nowrap"><var class="PARAMETER">application</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>        the application value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8589"><span style="white-space: nowrap"><var class="PARAMETER">identifier</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8589"><span style="white-space: nowrap"><var class="PARAMETER">identifier</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the identifier value.</p></td>
 </tr>
 <tr>
@@ -347,7 +347,7 @@ returned object with <var class="PARAMETER">xmlSecKeyUseWithDestroy</var> functi
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8612"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8612"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
 </tr>
 <tr>
@@ -366,7 +366,7 @@ functions.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8636"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8636"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
 </tr></tbody></table>
 </div>
@@ -382,15 +382,15 @@ functions.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8657"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8657"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>:</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="AEN8662"><span style="white-space: nowrap"><var class="PARAMETER">application</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8662"><span style="white-space: nowrap"><var class="PARAMETER">application</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>        the new application value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8667"><span style="white-space: nowrap"><var class="PARAMETER">identifier</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8667"><span style="white-space: nowrap"><var class="PARAMETER">identifier</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the new identifier value.</p></td>
 </tr>
 <tr>
@@ -410,11 +410,11 @@ functions.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8690"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8690"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>:</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="AEN8695"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8695"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -430,11 +430,11 @@ functions.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8713"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8713"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>:</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="AEN8718"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8718"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -555,7 +555,7 @@ cleaning it with <a href="xmlsec-keys.html#XMLSECKEYREQFINALIZE"><span class="TY
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8843"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8843"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key requirements object.</p></td>
 </tr>
 <tr>
@@ -574,7 +574,7 @@ function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8866"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8866"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key requirements object.</p></td>
 </tr></tbody></table>
 </div>
@@ -587,7 +587,7 @@ function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8882"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8882"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key requirements object.</p></td>
 </tr></tbody></table>
 </div>
@@ -602,11 +602,11 @@ function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8901"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8901"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>:</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="AEN8906"><span style="white-space: nowrap"><var class="PARAMETER">src</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8906"><span style="white-space: nowrap"><var class="PARAMETER">src</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to source object.</p></td>
 </tr>
 <tr>
@@ -626,11 +626,11 @@ function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8930"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8930"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>:</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="AEN8935"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8935"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
@@ -651,11 +651,11 @@ if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8959"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8959"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>:</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="AEN8964"><span style="white-space: nowrap"><var class="PARAMETER">value</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8964"><span style="white-space: nowrap"><var class="PARAMETER">value</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key value.</p></td>
 </tr>
 <tr>
@@ -676,11 +676,11 @@ if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8988"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8988"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>:</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="AEN8993"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8993"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -696,11 +696,11 @@ if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9012"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9012"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>:</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="AEN9017"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9017"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -772,7 +772,7 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN9098"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9098"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key.</p></td>
 </tr></tbody></table>
 </div>
@@ -785,7 +785,7 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN9115"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9115"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr></tbody></table>
 </div>
@@ -799,7 +799,7 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9132"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9132"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</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>
@@ -820,11 +820,11 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9160"><span style="white-space: nowrap"><var class="PARAMETER">keyDst</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9160"><span style="white-space: nowrap"><var class="PARAMETER">keyDst</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9165"><span style="white-space: nowrap"><var class="PARAMETER">keySrc</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9165"><span style="white-space: nowrap"><var class="PARAMETER">keySrc</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the source key.</p></td>
 </tr>
 <tr>
@@ -843,7 +843,7 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9188"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9188"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
@@ -863,11 +863,11 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9212"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9212"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9217"><span style="white-space: nowrap"><var class="PARAMETER">name</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9217"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the new key name.</p></td>
 </tr>
 <tr>
@@ -886,7 +886,7 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9239"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9239"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
@@ -905,7 +905,7 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9262"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9262"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
@@ -925,11 +925,11 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9286"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9286"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9291"><span style="white-space: nowrap"><var class="PARAMETER">value</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9291"><span style="white-space: nowrap"><var class="PARAMETER">value</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the new value.</p></td>
 </tr>
 <tr>
@@ -949,11 +949,11 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9313"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9313"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9318"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9318"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the requested data klass.</p></td>
 </tr>
 <tr>
@@ -974,11 +974,11 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9345"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9345"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9350"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9350"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the requested data klass.</p></td>
 </tr>
 <tr>
@@ -999,11 +999,11 @@ by <var class="PARAMETER">key</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9376"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9376"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9381"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9381"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key data.</p></td>
 </tr>
 <tr>
@@ -1023,11 +1023,11 @@ by <var class="PARAMETER">key</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9405"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9405"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9410"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9410"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -1043,11 +1043,11 @@ by <var class="PARAMETER">key</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9429"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9429"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9434"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9434"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -1064,15 +1064,15 @@ by <var class="PARAMETER">key</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9454"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9454"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>:</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="AEN9459"><span style="white-space: nowrap"><var class="PARAMETER">sizeBits</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9459"><span style="white-space: nowrap"><var class="PARAMETER">sizeBits</var>:</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="AEN9464"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9464"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the new key type (session, permanent, ...).</p></td>
 </tr>
 <tr>
@@ -1093,15 +1093,15 @@ by <var class="PARAMETER">key</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9489"><span style="white-space: nowrap"><var class="PARAMETER">name</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9489"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</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="AEN9494"><span style="white-space: nowrap"><var class="PARAMETER">sizeBits</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9494"><span style="white-space: nowrap"><var class="PARAMETER">sizeBits</var>:</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="AEN9499"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9499"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the new key type (session, permanent, ...).</p></td>
 </tr>
 <tr>
@@ -1122,15 +1122,15 @@ by <var class="PARAMETER">key</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9523"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9523"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9528"><span style="white-space: nowrap"><var class="PARAMETER">name</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9528"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</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="AEN9533"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9533"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key requirements.</p></td>
 </tr>
 <tr>
@@ -1150,11 +1150,11 @@ by <var class="PARAMETER">key</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9556"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9556"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>:</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="AEN9561"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9561"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the buffer that contains the binary data.</p></td>
 </tr>
 <tr>
@@ -1174,11 +1174,11 @@ by <var class="PARAMETER">key</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9585"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9585"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>:</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="AEN9590"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9590"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key binary filename.</p></td>
 </tr>
 <tr>
@@ -1199,15 +1199,15 @@ by <var class="PARAMETER">key</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9615"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9615"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>:</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="AEN9620"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9620"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN9625"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9625"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the size of the memory block</p></td>
 </tr>
 <tr>
@@ -1226,7 +1226,7 @@ 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="AEN9646"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9646"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to key.</p></td>
 </tr></tbody></table>
 </div>
@@ -1240,11 +1240,11 @@ or 0 otherwise.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9663"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9663"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9668"><span style="white-space: nowrap"><var class="PARAMETER">keyId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9668"><span style="white-space: nowrap"><var class="PARAMETER">keyId</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> the key Id.</p></td>
 </tr>
 </tbody></table>
@@ -1272,8 +1272,8 @@ or 0 otherwise.</p>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-keysdata.html"><b><<<�keysdata</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-keysmngr.html"><b>keysmngr�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-keysdata.html"><b><<<keysdata</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-keysmngr.html"><b>keysmngr>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-keysdata.html b/docs/api/xmlsec-keysdata.html
index f863648..d374c54 100644
--- a/docs/api/xmlsec-keysdata.html
+++ b/docs/api/xmlsec-keysdata.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-KEYSDATA"></a>keysdata</h1>
 <div class="REFNAMEDIV">
-<a name="AEN5720"></a><h2>Name</h2>keysdata�--�</div>
+<a name="AEN5720"></a><h2>Name</h2>keysdata--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN5723"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<pre class="SYNOPSIS">
 
 typedef     <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a>;
 #define     <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGEUNKNOWN">xmlSecKeyDataUsageUnknown</a>
@@ -578,7 +578,7 @@ key data klasses: <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyName" targe
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6317"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6317"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the key data klass.</p></td>
 </tr>
 <tr>
@@ -627,7 +627,7 @@ Caller is responsible for destroing returend object with
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6370"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6370"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data id.</p></td>
 </tr>
 <tr>
@@ -648,7 +648,7 @@ destroing returend object with <a href="xmlsec-keysdata.html#XMLSECKEYDATADESTRO
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6394"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6394"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to the key data.</p></td>
 </tr>
 <tr>
@@ -667,7 +667,7 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN6415"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6415"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to the key data.</p></td>
 </tr></tbody></table>
 </div>
@@ -683,15 +683,15 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6433"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6433"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN6438"><span style="white-space: nowrap"><var class="PARAMETER">sizeBits</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6438"><span style="white-space: nowrap"><var class="PARAMETER">sizeBits</var>:</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="AEN6443"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6443"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key data type.</p></td>
 </tr>
 <tr>
@@ -710,7 +710,7 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6464"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6464"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key data.</p></td>
 </tr>
 <tr>
@@ -729,7 +729,7 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6485"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6485"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key data.</p></td>
 </tr>
 <tr>
@@ -748,7 +748,7 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6506"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6506"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key data.</p></td>
 </tr>
 <tr>
@@ -768,11 +768,11 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6528"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6528"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN6533"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6533"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -788,11 +788,11 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6550"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6550"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN6555"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6555"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -810,19 +810,19 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6577"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6577"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6582"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6582"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the destination key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6587"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6587"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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="AEN6592"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6592"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr>
 <tr>
@@ -844,19 +844,19 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6620"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6620"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6625"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6625"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the source key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6630"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6630"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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="AEN6635"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6635"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr>
 <tr>
@@ -879,23 +879,23 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6664"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6664"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6669"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6669"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the destination key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6674"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6674"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the input binary buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6679"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6679"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the input buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6684"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6684"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo" target="_top"><dsig:KeyInfo/></a> node processing context.</p></td>
 </tr>
 <tr>
@@ -918,23 +918,23 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6713"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6713"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6718"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6718"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the source key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6723"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6723"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the output binary buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6728"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6728"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the output buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6733"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6733"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo" target="_top"><dsig:KeyInfo/></a> node processing context.</p></td>
 </tr>
 <tr>
@@ -952,7 +952,7 @@ or NULL if an error occurs.</p></td>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN6753"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6753"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key data.</p></td>
 </tr></tbody></table>
 </div>
@@ -966,7 +966,7 @@ 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="AEN6769"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6769"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to data.</p></td>
 </tr></tbody></table>
 </div>
@@ -980,11 +980,11 @@ or 0 otherwise.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6786"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6786"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6791"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6791"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data Id.</p></td>
 </tr>
 </tbody></table>
@@ -999,11 +999,11 @@ or 0 otherwise.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6807"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6807"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6812"><span style="white-space: nowrap"><var class="PARAMETER">usg</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6812"><span style="white-space: nowrap"><var class="PARAMETER">usg</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data usage.</p></td>
 </tr>
 </tbody></table>
@@ -1018,11 +1018,11 @@ or 0 otherwise.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6829"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6829"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6834"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6834"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the expected size.</p></td>
 </tr>
 </tbody></table>
@@ -1045,7 +1045,7 @@ or 0 otherwise.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6858"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6858"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key data.</p></td>
 </tr>
 <tr>
@@ -1065,11 +1065,11 @@ or 0 otherwise.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6880"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6880"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>:</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="AEN6885"><span style="white-space: nowrap"><var class="PARAMETER">src</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6885"><span style="white-space: nowrap"><var class="PARAMETER">src</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the poiniter to source key data.</p></td>
 </tr>
 <tr>
@@ -1088,7 +1088,7 @@ 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="AEN6906"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6906"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data.</p></td>
 </tr></tbody></table>
 </div>
@@ -1105,19 +1105,19 @@ by the key data object must be freed inside this method.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6925"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6925"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6930"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6930"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6935"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6935"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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="AEN6940"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6940"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo" target="_top"><dsig:KeyInfo/></a> node processing context.</p></td>
 </tr>
 <tr>
@@ -1139,19 +1139,19 @@ by the key data object must be freed inside this method.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6965"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6965"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6970"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6970"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6975"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6975"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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="AEN6980"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6980"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the <dsig:KeyInfo> node processing context.</p></td>
 </tr>
 <tr>
@@ -1174,23 +1174,23 @@ by the key data object must be freed inside this method.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7005"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7005"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7010"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7010"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7015"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7015"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the input buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7020"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7020"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7025"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7025"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo" target="_top"><dsig:KeyInfo/></a> node processing context.</p></td>
 </tr>
 <tr>
@@ -1213,23 +1213,23 @@ by the key data object must be freed inside this method.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7051"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7051"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7056"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7056"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7061"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7061"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the output buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7066"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7066"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7071"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7071"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo" target="_top"><dsig:KeyInfo/></a> node processing context.</p></td>
 </tr>
 <tr>
@@ -1250,15 +1250,15 @@ by the key data object must be freed inside this method.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7095"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7095"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN7100"><span style="white-space: nowrap"><var class="PARAMETER">sizeBits</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7100"><span style="white-space: nowrap"><var class="PARAMETER">sizeBits</var>:</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="AEN7105"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7105"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the required key type (session/permanent, etc.)</p></td>
 </tr>
 <tr>
@@ -1278,7 +1278,7 @@ by the key data object must be freed inside this method.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7126"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7126"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		 the data.</p></td>
 </tr>
 <tr>
@@ -1297,7 +1297,7 @@ by the key data object must be freed inside this method.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7147"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7147"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key data.</p></td>
 </tr>
 <tr>
@@ -1318,7 +1318,7 @@ X509 data identifier is the subject of the verified cert).</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7168"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7168"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key data.</p></td>
 </tr>
 <tr>
@@ -1338,11 +1338,11 @@ X509 data identifier is the subject of the verified cert).</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7190"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7190"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7195"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7195"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</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>
@@ -1491,7 +1491,7 @@ 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="AEN7350"><span style="white-space: nowrap"><var class="PARAMETER">klass</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7350"><span style="white-space: nowrap"><var class="PARAMETER">klass</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -1548,11 +1548,11 @@ X509 data identifier is the subject of the verified cert).</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7415"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7415"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</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="AEN7420"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7420"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key data klass.</p></td>
 </tr>
 <tr>
@@ -1577,19 +1577,19 @@ value if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7450"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7450"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</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="AEN7455"><span style="white-space: nowrap"><var class="PARAMETER">nodeName</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7455"><span style="white-space: nowrap"><var class="PARAMETER">nodeName</var>:</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="AEN7460"><span style="white-space: nowrap"><var class="PARAMETER">nodeNs</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7460"><span style="white-space: nowrap"><var class="PARAMETER">nodeNs</var>:</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="AEN7465"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7465"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key data usage.</p></td>
 </tr>
 <tr>
@@ -1611,15 +1611,15 @@ value if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7491"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7491"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</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="AEN7496"><span style="white-space: nowrap"><var class="PARAMETER">href</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7496"><span style="white-space: nowrap"><var class="PARAMETER">href</var>:</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="AEN7501"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7501"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key data usage.</p></td>
 </tr>
 <tr>
@@ -1641,15 +1641,15 @@ value if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7527"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7527"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</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="AEN7532"><span style="white-space: nowrap"><var class="PARAMETER">name</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7532"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</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="AEN7537"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7537"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key data usage.</p></td>
 </tr>
 <tr>
@@ -1669,11 +1669,11 @@ value if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7560"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7560"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</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="AEN7565"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7565"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -1689,11 +1689,11 @@ value if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7583"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7583"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</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="AEN7588"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7588"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -1717,7 +1717,7 @@ value if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7612"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7612"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to binary key data.</p></td>
 </tr>
 <tr>
@@ -1738,11 +1738,11 @@ value if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7636"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7636"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>:</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="AEN7641"><span style="white-space: nowrap"><var class="PARAMETER">src</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7641"><span style="white-space: nowrap"><var class="PARAMETER">src</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to source binary key data.</p></td>
 </tr>
 <tr>
@@ -1761,7 +1761,7 @@ value if an error occurs.</p></td>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN7662"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7662"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to binary key data.</p></td>
 </tr></tbody></table>
 </div>
@@ -1778,19 +1778,19 @@ value if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7683"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7683"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7688"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7688"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</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="AEN7693"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7693"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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="AEN7698"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7698"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr>
 <tr>
@@ -1814,19 +1814,19 @@ sets to the <var class="PARAMETER">node</var> content.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7726"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7726"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7731"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7731"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</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="AEN7736"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7736"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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="AEN7741"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7741"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr>
 <tr>
@@ -1849,23 +1849,23 @@ sets to the <var class="PARAMETER">node</var> content.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7770"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7770"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7775"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7775"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</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="AEN7780"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7780"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the source binary buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7785"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7785"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</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="AEN7790"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7790"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr>
 <tr>
@@ -1889,23 +1889,23 @@ sets to the <var class="PARAMETER">node</var> content.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7819"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7819"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7824"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7824"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</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="AEN7829"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7829"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination binary buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7834"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7834"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</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="AEN7839"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7839"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr>
 <tr>
@@ -1926,11 +1926,11 @@ sets to the <var class="PARAMETER">node</var> content.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7863"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7863"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN7868"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7868"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -1947,11 +1947,11 @@ sets to the <var class="PARAMETER">node</var> content.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7886"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7886"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN7891"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7891"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -1966,7 +1966,7 @@ sets to the <var class="PARAMETER">node</var> content.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7907"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7907"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to binary key data.</p></td>
 </tr>
 <tr>
@@ -1986,7 +1986,7 @@ sets to the <var class="PARAMETER">node</var> content.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7928"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7928"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to binary key data.</p></td>
 </tr>
 <tr>
@@ -2008,15 +2008,15 @@ sets to the <var class="PARAMETER">node</var> content.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7953"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7953"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN7958"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7958"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN7963"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7963"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the binary buffer size.</p></td>
 </tr>
 <tr>
@@ -2069,7 +2069,7 @@ for freeng returned object with <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8016"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8016"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the store id.</p></td>
 </tr>
 <tr>
@@ -2089,7 +2089,7 @@ function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8039"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8039"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to the key data store..</p></td>
 </tr></tbody></table>
 </div>
@@ -2102,7 +2102,7 @@ function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8053"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8053"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to store.</p></td>
 </tr></tbody></table>
 </div>
@@ -2116,7 +2116,7 @@ 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="AEN8069"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8069"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to store.</p></td>
 </tr></tbody></table>
 </div>
@@ -2130,11 +2130,11 @@ or 0 otherwise.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8086"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8086"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8091"><span style="white-space: nowrap"><var class="PARAMETER">storeId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8091"><span style="white-space: nowrap"><var class="PARAMETER">storeId</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the store Id.</p></td>
 </tr>
 </tbody></table>
@@ -2149,11 +2149,11 @@ or 0 otherwise.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8108"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8108"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8113"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8113"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the expected size.</p></td>
 </tr>
 </tbody></table>
@@ -2177,7 +2177,7 @@ or 0 otherwise.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8137"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8137"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data store.</p></td>
 </tr>
 <tr>
@@ -2196,7 +2196,7 @@ 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="AEN8158"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8158"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data store.</p></td>
 </tr></tbody></table>
 </div>
@@ -2263,7 +2263,7 @@ 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="AEN8223"><span style="white-space: nowrap"><var class="PARAMETER">klass</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8223"><span style="white-space: nowrap"><var class="PARAMETER">klass</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to store klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -2291,8 +2291,8 @@ or 0 otherwise.</p>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-keyinfo.html"><b><<<�keyinfo</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-keys.html"><b>keys�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-keyinfo.html"><b><<<keyinfo</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-keys.html"><b>keys>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-keysmngr.html b/docs/api/xmlsec-keysmngr.html
index 59e5448..5eb3a48 100644
--- a/docs/api/xmlsec-keysmngr.html
+++ b/docs/api/xmlsec-keysmngr.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-KEYSMNGR"></a>keysmngr</h1>
 <div class="REFNAMEDIV">
-<a name="AEN9701"></a><h2>Name</h2>keysmngr�--�</div>
+<a name="AEN9701"></a><h2>Name</h2>keysmngr--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN9704"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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);
@@ -172,7 +172,7 @@ an error occurs.</p></td>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN9823"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9823"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys manager.</p></td>
 </tr></tbody></table>
 </div>
@@ -189,15 +189,15 @@ for destroying the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9843"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9843"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN9848"><span style="white-space: nowrap"><var class="PARAMETER">name</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9848"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9853"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9853"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> node processing context.</p></td>
 </tr>
 <tr>
@@ -217,11 +217,11 @@ for destroying the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9877"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9877"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN9882"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9882"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys store.</p></td>
 </tr>
 <tr>
@@ -241,7 +241,7 @@ for destroying the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9903"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9903"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys manager.</p></td>
 </tr>
 <tr>
@@ -262,11 +262,11 @@ there is no store or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9926"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9926"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN9931"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9931"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to data store.</p></td>
 </tr>
 <tr>
@@ -287,11 +287,11 @@ there is no store or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9954"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9954"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN9959"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9959"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the desired data store klass.</p></td>
 </tr>
 <tr>
@@ -312,11 +312,11 @@ occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9983"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9983"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>:</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"><dsig:KeyInfo/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9989"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9989"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> node processing context.</p></td>
 </tr>
 <tr>
@@ -365,11 +365,11 @@ an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10042"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10042"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>:</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"><dsig:KeyInfo/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10048"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10048"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> node processing context.	</p></td>
 </tr>
 <tr>
@@ -420,7 +420,7 @@ for freeing the returned store by calling <a href="xmlsec-keysmngr.html#XMLSECKE
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10102"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10102"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the key store klass.</p></td>
 </tr>
 <tr>
@@ -438,7 +438,7 @@ for freeing the returned store by calling <a href="xmlsec-keysmngr.html#XMLSECKE
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10125"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10125"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys store. </p></td>
 </tr></tbody></table>
 </div>
@@ -455,15 +455,15 @@ the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10145"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10145"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</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="AEN10150"><span style="white-space: nowrap"><var class="PARAMETER">name</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10150"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10155"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10155"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> node processing context.</p></td>
 </tr>
 <tr>
@@ -481,7 +481,7 @@ the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10175"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10175"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to store.</p></td>
 </tr></tbody></table>
 </div>
@@ -495,7 +495,7 @@ 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="AEN10191"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10191"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to store.</p></td>
 </tr></tbody></table>
 </div>
@@ -509,11 +509,11 @@ or 0 otherwise.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10208"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10208"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10213"><span style="white-space: nowrap"><var class="PARAMETER">storeId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10213"><span style="white-space: nowrap"><var class="PARAMETER">storeId</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the store Id.</p></td>
 </tr>
 </tbody></table>
@@ -528,11 +528,11 @@ or 0 otherwise.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10230"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10230"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10235"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10235"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the expected size.</p></td>
 </tr>
 </tbody></table>
@@ -556,7 +556,7 @@ or 0 otherwise.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10259"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10259"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the store.</p></td>
 </tr>
 <tr>
@@ -574,7 +574,7 @@ 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="AEN10280"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10280"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the store.</p></td>
 </tr></tbody></table>
 </div>
@@ -591,15 +591,15 @@ the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10300"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10300"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10305"><span style="white-space: nowrap"><var class="PARAMETER">name</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10305"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10310"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10310"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to key info context.</p></td>
 </tr>
 <tr>
@@ -676,7 +676,7 @@ the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10386"><span style="white-space: nowrap"><var class="PARAMETER">klass</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10386"><span style="white-space: nowrap"><var class="PARAMETER">klass</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to store klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -713,11 +713,11 @@ the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10428"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10428"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</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="AEN10433"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10433"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
@@ -738,15 +738,15 @@ the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10456"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10456"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</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="AEN10461"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10461"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10466"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10466"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to associated keys manager. </p></td>
 </tr>
 <tr>
@@ -767,15 +767,15 @@ the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10490"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10490"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</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="AEN10495"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10495"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10500"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10500"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the saved keys type (public, private, ...).</p></td>
 </tr>
 <tr>
@@ -786,8 +786,8 @@ the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-keys.html"><b><<<�keys</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-list.html"><b>list�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-keys.html"><b><<<keys</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-list.html"><b>list>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-list.html b/docs/api/xmlsec-list.html
index 15ce952..d2f6a48 100644
--- a/docs/api/xmlsec-list.html
+++ b/docs/api/xmlsec-list.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-LIST"></a>list</h1>
 <div class="REFNAMEDIV">
-<a name="AEN10515"></a><h2>Name</h2>list�--�</div>
+<a name="AEN10515"></a><h2>Name</h2>list--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN10518"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<pre class="SYNOPSIS">
 
 struct      <a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a>;
 <font>void</font>        <a href="xmlsec-list.html#XMLSECPTRLISTSETDEFAULTALLOCMODE">xmlSecPtrListSetDefaultAllocMode</a>
@@ -189,11 +189,11 @@ struct      <a href="xmlsec-list.html#XMLSECPTRLISTKLASS">xmlSecPtrListKlass</a>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10652"><span style="white-space: nowrap"><var class="PARAMETER">defAllocMode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10652"><span style="white-space: nowrap"><var class="PARAMETER">defAllocMode</var>:</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="AEN10657"><span style="white-space: nowrap"><var class="PARAMETER">defInitialSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10657"><span style="white-space: nowrap"><var class="PARAMETER">defInitialSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the new default minimal initial size.</p></td>
 </tr>
 </tbody></table>
@@ -210,11 +210,11 @@ for cleaning up by calling <a href="xmlsec-list.html#XMLSECPTRLISTFINALIZE"><spa
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10676"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10676"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10681"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10681"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the list klass.</p></td>
 </tr>
 <tr>
@@ -233,7 +233,7 @@ function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10704"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10704"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr></tbody></table>
 </div>
@@ -248,7 +248,7 @@ by calling <a href="xmlsec-list.html#XMLSECPTRLISTDESTROY"><span class="TYPE">xm
 <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"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10722"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the list klass.</p></td>
 </tr>
 <tr>
@@ -266,7 +266,7 @@ by calling <a href="xmlsec-list.html#XMLSECPTRLISTDESTROY"><span class="TYPE">xm
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10746"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10746"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr></tbody></table>
 </div>
@@ -279,7 +279,7 @@ by calling <a href="xmlsec-list.html#XMLSECPTRLISTDESTROY"><span class="TYPE">xm
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10763"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10763"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr></tbody></table>
 </div>
@@ -296,11 +296,11 @@ we jsut copy pointers to items.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10786"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10786"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>:</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="AEN10791"><span style="white-space: nowrap"><var class="PARAMETER">src</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10791"><span style="white-space: nowrap"><var class="PARAMETER">src</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to source list.</p></td>
 </tr>
 <tr>
@@ -319,7 +319,7 @@ we jsut copy pointers to items.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10813"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10813"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr>
 <tr>
@@ -338,7 +338,7 @@ we jsut copy pointers to items.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10834"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10834"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr>
 <tr>
@@ -358,11 +358,11 @@ we jsut copy pointers to items.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10857"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10857"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10862"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10862"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the item position.</p></td>
 </tr>
 <tr>
@@ -383,11 +383,11 @@ than the number of items in the list or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10888"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10888"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10893"><span style="white-space: nowrap"><var class="PARAMETER">item</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10893"><span style="white-space: nowrap"><var class="PARAMETER">item</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the item.</p></td>
 </tr>
 <tr>
@@ -409,15 +409,15 @@ is destroyed.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10917"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10917"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10922"><span style="white-space: nowrap"><var class="PARAMETER">item</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10922"><span style="white-space: nowrap"><var class="PARAMETER">item</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the item.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10927"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10927"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pos.</p></td>
 </tr>
 <tr>
@@ -437,11 +437,11 @@ is destroyed.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10950"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10950"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10955"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10955"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the position.</p></td>
 </tr>
 <tr>
@@ -461,11 +461,11 @@ is destroyed.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10979"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10979"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10984"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10984"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -481,11 +481,11 @@ is destroyed.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11003"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11003"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11008"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11008"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -499,7 +499,7 @@ 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="AEN11022"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11022"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the ponter to list.</p></td>
 </tr></tbody></table>
 </div>
@@ -513,7 +513,7 @@ 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="AEN11038"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11038"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to list.</p></td>
 </tr></tbody></table>
 </div>
@@ -527,11 +527,11 @@ or 0 otherwise.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11055"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11055"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11060"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11060"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the list Id.</p></td>
 </tr>
 </tbody></table>
@@ -554,7 +554,7 @@ or 0 otherwise.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11085"><span style="white-space: nowrap"><var class="PARAMETER">ptr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11085"><span style="white-space: nowrap"><var class="PARAMETER">ptr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the poinetr to list item.</p></td>
 </tr>
 <tr>
@@ -572,7 +572,7 @@ 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="AEN11107"><span style="white-space: nowrap"><var class="PARAMETER">ptr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11107"><span style="white-space: nowrap"><var class="PARAMETER">ptr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the poinetr to list item.</p></td>
 </tr></tbody></table>
 </div>
@@ -587,11 +587,11 @@ or 0 otherwise.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11126"><span style="white-space: nowrap"><var class="PARAMETER">ptr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11126"><span style="white-space: nowrap"><var class="PARAMETER">ptr</var>:</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="AEN11131"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11131"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -643,7 +643,7 @@ 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="AEN11184"><span style="white-space: nowrap"><var class="PARAMETER">klass</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11184"><span style="white-space: nowrap"><var class="PARAMETER">klass</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the list klass.
 2</p></td>
 </tr></tbody></table>
@@ -671,8 +671,8 @@ or 0 otherwise.</p>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-keysmngr.html"><b><<<�keysmngr</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-membuf.html"><b>membuf�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-keysmngr.html"><b><<<keysmngr</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-membuf.html"><b>membuf>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-membuf.html b/docs/api/xmlsec-membuf.html
index 15ab077..1f99cce 100644
--- a/docs/api/xmlsec-membuf.html
+++ b/docs/api/xmlsec-membuf.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-MEMBUF"></a>membuf</h1>
 <div class="REFNAMEDIV">
-<a name="AEN11217"></a><h2>Name</h2>membuf�--�</div>
+<a name="AEN11217"></a><h2>Name</h2>membuf--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN11220"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<pre class="SYNOPSIS">
 
 #define     <a href="xmlsec-membuf.html#XMLSECTRANSFORMMEMBUFID">xmlSecTransformMemBufId</a>
 <font>xmlSecTransformId</font> <a href="xmlsec-membuf.html#XMLSECTRANSFORMMEMBUFGETKLASS">xmlSecTransformMemBufGetKlass</a>
@@ -137,7 +137,7 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11268"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11268"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to memory buffer transform.</p></td>
 </tr>
 <tr>
@@ -148,8 +148,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-list.html"><b><<<�list</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-nodeset.html"><b>nodeset�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-list.html"><b><<<list</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-nodeset.html"><b>nodeset>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-mscrypto-app.html b/docs/api/xmlsec-mscrypto-app.html
index 2e3dc8c..b81a80a 100644
--- a/docs/api/xmlsec-mscrypto-app.html
+++ b/docs/api/xmlsec-mscrypto-app.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-MSCRYPTO-APP"></a>app</h1>
 <div class="REFNAMEDIV">
-<a name="AEN26824"></a><h2>Name</h2>app�--�</div>
+<a name="AEN26824"></a><h2>Name</h2>app--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN26827"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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);
@@ -169,7 +169,7 @@ by XMLSec command line utility and called before
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26924"><span style="white-space: nowrap"><var class="PARAMETER">config</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26924"><span style="white-space: nowrap"><var class="PARAMETER">config</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the name of another then the default ms certificate store.</p></td>
 </tr>
 <tr>
@@ -219,7 +219,7 @@ and a default MSCrypto crypto key data stores.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26980"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26980"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
@@ -241,11 +241,11 @@ function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27006"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27006"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN27011"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27011"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
@@ -267,11 +267,11 @@ with <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT"><sp
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27037"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27037"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN27042"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27042"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the uri.</p></td>
 </tr>
 <tr>
@@ -293,15 +293,15 @@ with <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT"><sp
 <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"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27066"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN27071"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27071"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>   the destination filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27076"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27076"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the type of keys to save (public/private/symmetric).</p></td>
 </tr>
 <tr>
@@ -325,19 +325,19 @@ untrusted certs in <var class="PARAMETER">store</var> (not implemented yet).</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27102"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27102"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27107"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27107"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the certificate file.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27112"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27112"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27117"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27117"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate in <var class="PARAMETER">filename</var>
    			trusted or not.</p></td>
 </tr>
@@ -363,23 +363,23 @@ untrusted certs in <var class="PARAMETER">store</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27145"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27145"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27150"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27150"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the binary certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27155"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27155"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</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="AEN27160"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27160"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27165"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27165"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate in <var class="PARAMETER">filename</var>
    			trusted or not.</p></td>
 </tr>
@@ -403,23 +403,23 @@ untrusted certs in <var class="PARAMETER">store</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27191"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27191"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27196"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27196"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27201"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27201"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27206"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27206"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27211"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27211"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
@@ -443,27 +443,27 @@ untrusted certs in <var class="PARAMETER">store</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27237"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27237"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27242"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27242"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27247"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27247"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27252"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27252"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27257"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27257"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27262"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27262"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
@@ -485,19 +485,19 @@ untrusted certs in <var class="PARAMETER">store</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27286"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27286"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27291"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27291"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27296"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27296"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27301"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27301"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
@@ -521,23 +521,23 @@ untrusted certs in <var class="PARAMETER">store</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27326"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27326"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN27331"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27331"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</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="AEN27336"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27336"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27341"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27341"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27346"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27346"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
@@ -558,15 +558,15 @@ untrusted certs in <var class="PARAMETER">store</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27370"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27370"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27375"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27375"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27380"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27380"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
@@ -589,19 +589,19 @@ untrusted certs in <var class="PARAMETER">store</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27405"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27405"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27410"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27410"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the binary certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27415"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27415"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</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="AEN27420"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27420"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
@@ -621,8 +621,8 @@ untrusted certs in <var class="PARAMETER">store</var>.</p>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-mscrypto-ref.html"><b><<<�XML Security Library for MSCrypto API Reference.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-mscrypto-certkeys.html"><b>certkeys�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-mscrypto-ref.html"><b><<<XML Security Library for MSCrypto API Reference.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-mscrypto-certkeys.html"><b>certkeys>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-mscrypto-certkeys.html b/docs/api/xmlsec-mscrypto-certkeys.html
index f1d6507..54e5127 100644
--- a/docs/api/xmlsec-mscrypto-certkeys.html
+++ b/docs/api/xmlsec-mscrypto-certkeys.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-MSCRYPTO-CERTKEYS"></a>certkeys</h1>
 <div class="REFNAMEDIV">
-<a name="AEN27444"></a><h2>Name</h2>certkeys�--�</div>
+<a name="AEN27444"></a><h2>Name</h2>certkeys--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN27447"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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,
@@ -116,7 +116,7 @@ returned PCCERT_CONTEXT must not be released by the caller.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27480"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27480"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key data to retrieve certificate from.</p></td>
 </tr>
 <tr>
@@ -137,11 +137,11 @@ returned HKEY must not be destroyed by the caller.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27502"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27502"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN27507"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27507"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>              type of key requested (public/private)</p></td>
 </tr>
 <tr>
@@ -160,7 +160,7 @@ returned HKEY must not be destroyed by the caller.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27529"><span style="white-space: nowrap"><var class="PARAMETER">pCert</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27529"><span style="white-space: nowrap"><var class="PARAMETER">pCert</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to cert.</p></td>
 </tr>
 <tr>
@@ -181,11 +181,11 @@ NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27551"><span style="white-space: nowrap"><var class="PARAMETER">pCert</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27551"><span style="white-space: nowrap"><var class="PARAMETER">pCert</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to cert.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27556"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27556"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the expected key type.</p></td>
 </tr>
 <tr>
@@ -196,8 +196,8 @@ NULL if an error occurs.</p></td>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-mscrypto-app.html"><b><<<�app</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-mscrypto-crypto.html"><b>crypto�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-mscrypto-app.html"><b><<<app</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-mscrypto-crypto.html"><b>crypto>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-mscrypto-crypto.html b/docs/api/xmlsec-mscrypto-crypto.html
index 18e952b..d4d9bb2 100644
--- a/docs/api/xmlsec-mscrypto-crypto.html
+++ b/docs/api/xmlsec-mscrypto-crypto.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-MSCRYPTO-CRYPTO"></a>crypto</h1>
 <div class="REFNAMEDIV">
-<a name="AEN27571"></a><h2>Name</h2>crypto�--�</div>
+<a name="AEN27571"></a><h2>Name</h2>crypto--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN27574"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<pre class="SYNOPSIS">
 
 <font>xmlSecCryptoDLFunctionsPtr</font> <a href="xmlsec-mscrypto-crypto.html#XMLSECCRYPTOGETFUNCTIONS-MSCRYPTO">xmlSecCryptoGetFunctions_mscrypto</a>
                                             (void);
@@ -207,7 +207,7 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27707"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27707"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys manager.</p></td>
 </tr>
 <tr>
@@ -228,11 +228,11 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27731"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27731"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27736"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27736"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the numer of bytes to generate.</p></td>
 </tr>
 <tr>
@@ -258,31 +258,31 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27763"><span style="white-space: nowrap"><var class="PARAMETER">file</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27763"><span style="white-space: nowrap"><var class="PARAMETER">file</var>:</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="AEN27768"><span style="white-space: nowrap"><var class="PARAMETER">line</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27768"><span style="white-space: nowrap"><var class="PARAMETER">line</var>:</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="AEN27773"><span style="white-space: nowrap"><var class="PARAMETER">func</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27773"><span style="white-space: nowrap"><var class="PARAMETER">func</var>:</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="AEN27778"><span style="white-space: nowrap"><var class="PARAMETER">errorObject</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27778"><span style="white-space: nowrap"><var class="PARAMETER">errorObject</var>:</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="AEN27783"><span style="white-space: nowrap"><var class="PARAMETER">errorSubject</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27783"><span style="white-space: nowrap"><var class="PARAMETER">errorSubject</var>:</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="AEN27788"><span style="white-space: nowrap"><var class="PARAMETER">reason</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27788"><span style="white-space: nowrap"><var class="PARAMETER">reason</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error code.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27793"><span style="white-space: nowrap"><var class="PARAMETER">msg</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27793"><span style="white-space: nowrap"><var class="PARAMETER">msg</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the additional error message.</p></td>
 </tr>
 </tbody></table>
@@ -300,19 +300,19 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27813"><span style="white-space: nowrap"><var class="PARAMETER">dwCertEncodingType</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27813"><span style="white-space: nowrap"><var class="PARAMETER">dwCertEncodingType</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the encoding used.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27818"><span style="white-space: nowrap"><var class="PARAMETER">pszX500</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27818"><span style="white-space: nowrap"><var class="PARAMETER">pszX500</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the string to convert.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27823"><span style="white-space: nowrap"><var class="PARAMETER">dwStrType</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27823"><span style="white-space: nowrap"><var class="PARAMETER">dwStrType</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the string type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27828"><span style="white-space: nowrap"><var class="PARAMETER">len</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27828"><span style="white-space: nowrap"><var class="PARAMETER">len</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the result len.</p></td>
 </tr>
 <tr>
@@ -487,15 +487,15 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28012"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28012"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN28017"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28017"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN28022"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28022"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value size (in bytes).</p></td>
 </tr>
 <tr>
@@ -616,8 +616,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-mscrypto-certkeys.html"><b><<<�certkeys</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-mscrypto-keysstore.html"><b>keysstore�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-mscrypto-certkeys.html"><b><<<certkeys</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-mscrypto-keysstore.html"><b>keysstore>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-mscrypto-keysstore.html b/docs/api/xmlsec-mscrypto-keysstore.html
index c270309..09fa672 100644
--- a/docs/api/xmlsec-mscrypto-keysstore.html
+++ b/docs/api/xmlsec-mscrypto-keysstore.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-MSCRYPTO-KEYSSTORE"></a>keysstore</h1>
 <div class="REFNAMEDIV">
-<a name="AEN28152"></a><h2>Name</h2>keysstore�--�</div>
+<a name="AEN28152"></a><h2>Name</h2>keysstore--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN28155"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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>
@@ -143,11 +143,11 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28217"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28217"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</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="AEN28222"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28222"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
@@ -168,15 +168,15 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28245"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28245"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</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="AEN28250"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28250"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28255"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28255"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to associated keys manager. </p></td>
 </tr>
 <tr>
@@ -197,15 +197,15 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28279"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28279"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</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="AEN28284"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28284"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28289"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28289"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the saved keys type (public, private, ...).</p></td>
 </tr>
 <tr>
@@ -216,8 +216,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-mscrypto-crypto.html"><b><<<�crypto</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-mscrypto-x509.html"><b>x509�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-mscrypto-crypto.html"><b><<<crypto</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-mscrypto-x509.html"><b>x509>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-mscrypto-ref.html b/docs/api/xmlsec-mscrypto-ref.html
index 9cc1d4f..c4f23e9 100644
--- a/docs/api/xmlsec-mscrypto-ref.html
+++ b/docs/api/xmlsec-mscrypto-ref.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -91,23 +91,23 @@
 <div class="TOC"><dl>
 <dt><b>Table of Contents</b></dt>
 <dt>
-<a href="xmlsec-mscrypto-app.html">app</a>�--�</dt>
+<a href="xmlsec-mscrypto-app.html">app</a>--</dt>
 <dt>
-<a href="xmlsec-mscrypto-certkeys.html">certkeys</a>�--�</dt>
+<a href="xmlsec-mscrypto-certkeys.html">certkeys</a>--</dt>
 <dt>
-<a href="xmlsec-mscrypto-crypto.html">crypto</a>�--�</dt>
+<a href="xmlsec-mscrypto-crypto.html">crypto</a>--</dt>
 <dt>
-<a href="xmlsec-mscrypto-keysstore.html">keysstore</a>�--�</dt>
+<a href="xmlsec-mscrypto-keysstore.html">keysstore</a>--</dt>
 <dt>
-<a href="xmlsec-mscrypto-x509.html">x509</a>�--�</dt>
+<a href="xmlsec-mscrypto-x509.html">x509</a>--</dt>
 </dl></div>
 <p>This section contains the API reference for xmlsec-mscrypto. All
     the public interfaces are documented here. This reference guide is
     build by extracting comments from the code sources. </p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-nss-x509.html"><b><<<�x509</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-mscrypto-app.html"><b>app�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-nss-x509.html"><b><<<x509</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-mscrypto-app.html"><b>app>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-mscrypto-x509.html b/docs/api/xmlsec-mscrypto-x509.html
index 3bcb9cf..74b7b45 100644
--- a/docs/api/xmlsec-mscrypto-x509.html
+++ b/docs/api/xmlsec-mscrypto-x509.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-MSCRYPTO-X509"></a>x509</h1>
 <div class="REFNAMEDIV">
-<a name="AEN28304"></a><h2>Name</h2>x509�--�</div>
+<a name="AEN28304"></a><h2>Name</h2>x509--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN28307"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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>
@@ -177,7 +177,7 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28407"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28407"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
@@ -199,11 +199,11 @@ extraction or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28430"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28430"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN28435"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28435"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to MSCRYPTO X509 certificate.</p></td>
 </tr>
 <tr>
@@ -224,11 +224,11 @@ extraction or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28457"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28457"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN28462"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28462"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to MSCRYPTO X509 certificate.</p></td>
 </tr>
 <tr>
@@ -249,11 +249,11 @@ extraction or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28484"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28484"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN28489"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28489"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired certificate position.</p></td>
 </tr>
 <tr>
@@ -274,7 +274,7 @@ number of certificates in <var class="PARAMETER">data</var> or an error occurs.<
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28513"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28513"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
@@ -295,11 +295,11 @@ number of certificates in <var class="PARAMETER">data</var> or an error occurs.<
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28536"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28536"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN28541"><span style="white-space: nowrap"><var class="PARAMETER">crl</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28541"><span style="white-space: nowrap"><var class="PARAMETER">crl</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to MSCrypto X509 CRL.</p></td>
 </tr>
 <tr>
@@ -320,11 +320,11 @@ number of certificates in <var class="PARAMETER">data</var> or an error occurs.<
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28563"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28563"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN28568"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28568"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>                the desired CRL position.</p></td>
 </tr>
 <tr>
@@ -345,7 +345,7 @@ number of CRLs in <var class="PARAMETER">data</var> or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28592"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28592"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
 </tr>
 <tr>
@@ -414,27 +414,27 @@ number of CRLs in <var class="PARAMETER">data</var> or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28666"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28666"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</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="AEN28671"><span style="white-space: nowrap"><var class="PARAMETER">subjectName</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28671"><span style="white-space: nowrap"><var class="PARAMETER">subjectName</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the desired certificate name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28676"><span style="white-space: nowrap"><var class="PARAMETER">issuerName</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28676"><span style="white-space: nowrap"><var class="PARAMETER">issuerName</var>:</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="AEN28681"><span style="white-space: nowrap"><var class="PARAMETER">issuerSerial</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28681"><span style="white-space: nowrap"><var class="PARAMETER">issuerSerial</var>:</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="AEN28686"><span style="white-space: nowrap"><var class="PARAMETER">ski</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28686"><span style="white-space: nowrap"><var class="PARAMETER">ski</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired certificate SKI.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28691"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28691"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr>
 <tr>
@@ -457,15 +457,15 @@ or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28716"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28716"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 certificate context store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28721"><span style="white-space: nowrap"><var class="PARAMETER">certs</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28721"><span style="white-space: nowrap"><var class="PARAMETER">certs</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the untrusted certificates stack.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28726"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28726"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr>
 <tr>
@@ -487,15 +487,15 @@ or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28751"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28751"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</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="AEN28756"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28756"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</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="AEN28761"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28761"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the certificate type (trusted/untrusted).</p></td>
 </tr>
 <tr>
@@ -506,8 +506,8 @@ or an error occurs.</p></td>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-mscrypto-keysstore.html"><b><<<�keysstore</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-index.html"><b>XML Security Library Reference Index�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-mscrypto-keysstore.html"><b><<<keysstore</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-index.html"><b>XML Security Library Reference Index>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-nodeset.html b/docs/api/xmlsec-nodeset.html
index 5b795e4..70cc1ba 100644
--- a/docs/api/xmlsec-nodeset.html
+++ b/docs/api/xmlsec-nodeset.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-NODESET"></a>nodeset</h1>
 <div class="REFNAMEDIV">
-<a name="AEN11285"></a><h2>Name</h2>nodeset�--�</div>
+<a name="AEN11285"></a><h2>Name</h2>nodeset--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN11288"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<pre class="SYNOPSIS">
 
 enum        <a href="xmlsec-nodeset.html#XMLSECNODESETTYPE">xmlSecNodeSetType</a>;
 enum        <a href="xmlsec-nodeset.html#XMLSECNODESETOP">xmlSecNodeSetOp</a>;
@@ -277,19 +277,19 @@ struct      <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSet</a>;
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11492"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11492"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>:</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="AEN11499"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11499"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</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="AEN11504"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11504"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 			the pointer to the <var class="PARAMETER">cur</var> parent node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11510"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11510"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 			the pointer to application specific data.</p></td>
 </tr>
 <tr>
@@ -312,15 +312,15 @@ by calling <a href="xmlsec-nodeset.html#XMLSECNODESETDESTROY"><span class="TYPE"
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11535"><span style="white-space: nowrap"><var class="PARAMETER">doc</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11535"><span style="white-space: nowrap"><var class="PARAMETER">doc</var>:</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="AEN11540"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11540"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the list of nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11545"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11545"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the nodes set type.</p></td>
 </tr>
 <tr>
@@ -338,7 +338,7 @@ by calling <a href="xmlsec-nodeset.html#XMLSECNODESETDESTROY"><span class="TYPE"
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11568"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11568"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to node set.</p></td>
 </tr></tbody></table>
 </div>
@@ -351,7 +351,7 @@ by calling <a href="xmlsec-nodeset.html#XMLSECNODESETDESTROY"><span class="TYPE"
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11584"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11584"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to node set.</p></td>
 </tr></tbody></table>
 </div>
@@ -367,15 +367,15 @@ by calling <a href="xmlsec-nodeset.html#XMLSECNODESETDESTROY"><span class="TYPE"
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11603"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11603"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>:</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="AEN11608"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11608"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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="AEN11613"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11613"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to <var class="PARAMETER">node</var> parent node.</p></td>
 </tr>
 <tr>
@@ -397,15 +397,15 @@ and a negative value if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11642"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11642"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>:</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="AEN11647"><span style="white-space: nowrap"><var class="PARAMETER">newNSet</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11647"><span style="white-space: nowrap"><var class="PARAMETER">newNSet</var>:</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="AEN11652"><span style="white-space: nowrap"><var class="PARAMETER">op</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11652"><span style="white-space: nowrap"><var class="PARAMETER">op</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the operation type.</p></td>
 </tr>
 <tr>
@@ -427,15 +427,15 @@ occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11678"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11678"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>:</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="AEN11683"><span style="white-space: nowrap"><var class="PARAMETER">newNSet</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11683"><span style="white-space: nowrap"><var class="PARAMETER">newNSet</var>:</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="AEN11688"><span style="white-space: nowrap"><var class="PARAMETER">op</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11688"><span style="white-space: nowrap"><var class="PARAMETER">op</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the operation type.</p></td>
 </tr>
 <tr>
@@ -467,19 +467,19 @@ occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11726"><span style="white-space: nowrap"><var class="PARAMETER">doc</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11726"><span style="white-space: nowrap"><var class="PARAMETER">doc</var>:</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="AEN11731"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11731"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>:</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="AEN11736"><span style="white-space: nowrap"><var class="PARAMETER">withComments</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11736"><span style="white-space: nowrap"><var class="PARAMETER">withComments</var>:</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="AEN11741"><span style="white-space: nowrap"><var class="PARAMETER">invert</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11741"><span style="white-space: nowrap"><var class="PARAMETER">invert</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the "invert" flag.</p></td>
 </tr>
 <tr>
@@ -503,15 +503,15 @@ is interrupted.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11769"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11769"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>:</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="AEN11774"><span style="white-space: nowrap"><var class="PARAMETER">walkFunc</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11774"><span style="white-space: nowrap"><var class="PARAMETER">walkFunc</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the callback functions.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11779"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11779"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the application specific data passed to the <var class="PARAMETER">walkFunc</var>.</p></td>
 </tr>
 <tr>
@@ -531,11 +531,11 @@ is interrupted.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11804"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11804"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>:</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="AEN11809"><span style="white-space: nowrap"><var class="PARAMETER">out</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11809"><span style="white-space: nowrap"><var class="PARAMETER">out</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the output buffer.</p></td>
 </tr>
 <tr>
@@ -555,19 +555,19 @@ is interrupted.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11833"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11833"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>:</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="AEN11838"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11838"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-membuf.html"><b><<<�membuf</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-parser.html"><b>parser�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-membuf.html"><b><<<membuf</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-parser.html"><b>parser>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-compiling-others.html b/docs/api/xmlsec-notes-compiling-others.html
index aa2a02e..e7ecdd3 100644
--- a/docs/api/xmlsec-notes-compiling-others.html
+++ b/docs/api/xmlsec-notes-compiling-others.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -95,8 +95,8 @@
 	</p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-compiling-windows.html"><b><<<�Compiling and linking on Windows.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-init-shutdown.html"><b>Initialization and shutdown.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-compiling-windows.html"><b><<<Compiling and linking on Windows.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-init-shutdown.html"><b>Initialization and shutdown.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-compiling-unix.html b/docs/api/xmlsec-notes-compiling-unix.html
index d24af2b..c1e6f4b 100644
--- a/docs/api/xmlsec-notes-compiling-unix.html
+++ b/docs/api/xmlsec-notes-compiling-unix.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -216,8 +216,8 @@ clean:
 </ul>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-include-files.html"><b><<<�Include files.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-compiling-windows.html"><b>Compiling and linking on Windows.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-include-files.html"><b><<<Include files.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-compiling-windows.html"><b>Compiling and linking on Windows.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-compiling-windows.html b/docs/api/xmlsec-notes-compiling-windows.html
index 02e3ce2..651be27 100644
--- a/docs/api/xmlsec-notes-compiling-windows.html
+++ b/docs/api/xmlsec-notes-compiling-windows.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -131,8 +131,8 @@
 </ul>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-compiling-unix.html"><b><<<�Compiling and linking on Unix.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-compiling-others.html"><b>Compiling and linking on other systems.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-compiling-unix.html"><b><<<Compiling and linking on Unix.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-compiling-others.html"><b>Compiling and linking on other systems.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-compiling.html b/docs/api/xmlsec-notes-compiling.html
index 178c193..7e5283b 100644
--- a/docs/api/xmlsec-notes-compiling.html
+++ b/docs/api/xmlsec-notes-compiling.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -110,8 +110,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-structure.html"><b><<<�XML Security Library Structure.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-include-files.html"><b>Include files.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-structure.html"><b><<<XML Security Library Structure.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-include-files.html"><b>Include files.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-contexts.html b/docs/api/xmlsec-notes-contexts.html
index 4791cbe..a961517 100644
--- a/docs/api/xmlsec-notes-contexts.html
+++ b/docs/api/xmlsec-notes-contexts.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -222,8 +222,8 @@ done:
 </div>
     </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-transforms.html"><b><<<�Transforms and transforms chain.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto.html"><b>Adding support for new cryptographic library.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-transforms.html"><b><<<Transforms and transforms chain.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto.html"><b>Adding support for new cryptographic library.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-custom-keys-store.html b/docs/api/xmlsec-notes-custom-keys-store.html
index 3a9a947..1c3c312 100644
--- a/docs/api/xmlsec-notes-custom-keys-store.html
+++ b/docs/api/xmlsec-notes-custom-keys-store.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -243,8 +243,8 @@ files_keys_store_find_key(xmlSecKeyStorePtr store, const xmlChar* name, xmlSecKe
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-keys-mngr-verify-decrypt.html"><b><<<�Using keys manager for verification/decryption.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-x509.html"><b>Using X509 Certificates.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-keys-mngr-verify-decrypt.html"><b><<<Using keys manager for verification/decryption.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-x509.html"><b>Using X509 Certificates.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-decrypt.html b/docs/api/xmlsec-notes-decrypt.html
index a05693b..6f2c8e7 100644
--- a/docs/api/xmlsec-notes-decrypt.html
+++ b/docs/api/xmlsec-notes-decrypt.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -198,8 +198,8 @@ done:
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-verify.html"><b><<<�Verifying a signed document</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-keys.html"><b>Keys.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-verify.html"><b><<<Verifying a signed document</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-keys.html"><b>Keys.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-dynamic-encryption-templates.html b/docs/api/xmlsec-notes-dynamic-encryption-templates.html
index 819c6c4..8294a7b 100644
--- a/docs/api/xmlsec-notes-dynamic-encryption-templates.html
+++ b/docs/api/xmlsec-notes-dynamic-encryption-templates.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -233,8 +233,8 @@ done:
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-dynamic-signature-templates.html"><b><<<�Creating dynamic signature templates.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-verify-decrypt.html"><b>Verifing and decrypting documents.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-dynamic-signature-templates.html"><b><<<Creating dynamic signature templates.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-verify-decrypt.html"><b>Verifing and decrypting documents.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-dynamic-signature-templates.html b/docs/api/xmlsec-notes-dynamic-signature-templates.html
index 393c88e..7ea0447 100644
--- a/docs/api/xmlsec-notes-dynamic-signature-templates.html
+++ b/docs/api/xmlsec-notes-dynamic-signature-templates.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -243,8 +243,8 @@ done:
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-templates.html"><b><<<�Creating dynamic templates.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-dynamic-encryption-templates.html"><b>Creating dynamic encryption templates.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-templates.html"><b><<<Creating dynamic templates.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-dynamic-encryption-templates.html"><b>Creating dynamic encryption templates.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-encrypt.html b/docs/api/xmlsec-notes-encrypt.html
index e34cb53..40cf598 100644
--- a/docs/api/xmlsec-notes-encrypt.html
+++ b/docs/api/xmlsec-notes-encrypt.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -216,8 +216,8 @@ done:
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-sign.html"><b><<<�Signing a document.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-templates.html"><b>Creating dynamic templates.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-sign.html"><b><<<Signing a document.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-templates.html"><b>Creating dynamic templates.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-include-files.html b/docs/api/xmlsec-notes-include-files.html
index 777fe61..58ad642 100644
--- a/docs/api/xmlsec-notes-include-files.html
+++ b/docs/api/xmlsec-notes-include-files.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -134,8 +134,8 @@
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-compiling.html"><b><<<�Building the application with XML Security Library.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-compiling-unix.html"><b>Compiling and linking on Unix.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-compiling.html"><b><<<Building the application with XML Security Library.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-compiling-unix.html"><b>Compiling and linking on Unix.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-init-shutdown.html b/docs/api/xmlsec-notes-init-shutdown.html
index e263f14..bcd0963 100644
--- a/docs/api/xmlsec-notes-init-shutdown.html
+++ b/docs/api/xmlsec-notes-init-shutdown.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -187,8 +187,8 @@
 </div>
     </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-compiling-others.html"><b><<<�Compiling and linking on other systems.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-sign-encrypt.html"><b>Signing and encrypting documents.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-compiling-others.html"><b><<<Compiling and linking on other systems.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-sign-encrypt.html"><b>Signing and encrypting documents.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-keys-manager-sign-enc.html b/docs/api/xmlsec-notes-keys-manager-sign-enc.html
index 3fd3b70..7a8db55 100644
--- a/docs/api/xmlsec-notes-keys-manager-sign-enc.html
+++ b/docs/api/xmlsec-notes-keys-manager-sign-enc.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -300,8 +300,8 @@ done:
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-simple-keys-store.html"><b><<<�Simple keys store.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-keys-mngr-verify-decrypt.html"><b>Using keys manager for verification/decryption.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-simple-keys-store.html"><b><<<Simple keys store.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-keys-mngr-verify-decrypt.html"><b>Using keys manager for verification/decryption.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-keys-mngr-verify-decrypt.html b/docs/api/xmlsec-notes-keys-mngr-verify-decrypt.html
index 0ef0b0e..e311d2a 100644
--- a/docs/api/xmlsec-notes-keys-mngr-verify-decrypt.html
+++ b/docs/api/xmlsec-notes-keys-mngr-verify-decrypt.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -172,8 +172,8 @@ load_des_keys(char** files, int files_size) {
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-keys-manager-sign-enc.html"><b><<<�Using keys manager for signatures/encryption.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-custom-keys-store.html"><b>Implementing a custom keys store.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-keys-manager-sign-enc.html"><b><<<Using keys manager for signatures/encryption.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-custom-keys-store.html"><b>Implementing a custom keys store.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-keys.html b/docs/api/xmlsec-notes-keys.html
index 83eefca..a8af4e3 100644
--- a/docs/api/xmlsec-notes-keys.html
+++ b/docs/api/xmlsec-notes-keys.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -113,8 +113,8 @@
     </p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-decrypt.html"><b><<<�Decrypting an encrypted document</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-keysmngr.html"><b>Keys manager.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-decrypt.html"><b><<<Decrypting an encrypted document</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-keysmngr.html"><b>Keys manager.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-keysmngr.html b/docs/api/xmlsec-notes-keysmngr.html
index 6cc8c37..2b8e06d 100644
--- a/docs/api/xmlsec-notes-keysmngr.html
+++ b/docs/api/xmlsec-notes-keysmngr.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -133,8 +133,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-keys.html"><b><<<�Keys.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-simple-keys-store.html"><b>Simple keys store.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-keys.html"><b><<<Keys.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-simple-keys-store.html"><b>Simple keys store.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-new-crypto-functions.html b/docs/api/xmlsec-notes-new-crypto-functions.html
index a135af4..7917356 100644
--- a/docs/api/xmlsec-notes-new-crypto-functions.html
+++ b/docs/api/xmlsec-notes-new-crypto-functions.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -144,8 +144,8 @@
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-skeleton.html"><b><<<�Creating a framework from the skeleton.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-klasses.html"><b>Klasses and objects.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-skeleton.html"><b><<<Creating a framework from the skeleton.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-klasses.html"><b>Klasses and objects.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-new-crypto-key-stores.html b/docs/api/xmlsec-notes-new-crypto-key-stores.html
index 0975164..d9bd24d 100644
--- a/docs/api/xmlsec-notes-new-crypto-key-stores.html
+++ b/docs/api/xmlsec-notes-new-crypto-key-stores.html
@@ -45,7 +45,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
diff --git a/docs/api/xmlsec-notes-new-crypto-keys.html b/docs/api/xmlsec-notes-new-crypto-keys.html
index 2a35064..dedbbf2 100644
--- a/docs/api/xmlsec-notes-new-crypto-keys.html
+++ b/docs/api/xmlsec-notes-new-crypto-keys.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -96,8 +96,8 @@
 <p>TODO</p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-transforms.html"><b><<<�Cryptographic transforms.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-simple-keys-mngr.html"><b>Default keys manager.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-transforms.html"><b><<<Cryptographic transforms.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-simple-keys-mngr.html"><b>Default keys manager.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-new-crypto-klasses.html b/docs/api/xmlsec-notes-new-crypto-klasses.html
index ade6630..6ee6eef 100644
--- a/docs/api/xmlsec-notes-new-crypto-klasses.html
+++ b/docs/api/xmlsec-notes-new-crypto-klasses.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -103,7 +103,7 @@
 <ul>
 <li>
 <p>"Klass" declaration structure that defines "klass" interfaces
-	and global constand data (for example, the human-readable name of 
+	and global constant data (for example, the human-readable name of 
 	the "klass").
 	</p>
 <div class="EXAMPLE">
@@ -210,8 +210,8 @@ xmlSecTransformXPathGetKlass(void) {
 </ul>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-functions.html"><b><<<�xmlSecCryptoApp* functions.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-transforms.html"><b>Cryptographic transforms.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-functions.html"><b><<<xmlSecCryptoApp* functions.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-transforms.html"><b>Cryptographic transforms.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-new-crypto-sharing-results.html b/docs/api/xmlsec-notes-new-crypto-sharing-results.html
index 4e99372..c918ee7 100644
--- a/docs/api/xmlsec-notes-new-crypto-sharing-results.html
+++ b/docs/api/xmlsec-notes-new-crypto-sharing-results.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -118,8 +118,8 @@
 	I will try to review and check in your patch as soon as possible.
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-simple-keys-mngr.html"><b><<<�Default keys manager.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-examples.html"><b>Examples.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-simple-keys-mngr.html"><b><<<Default keys manager.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-examples.html"><b>Examples.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-new-crypto-simple-keys-mngr.html b/docs/api/xmlsec-notes-new-crypto-simple-keys-mngr.html
index 5fcd5d5..93cd4db 100644
--- a/docs/api/xmlsec-notes-new-crypto-simple-keys-mngr.html
+++ b/docs/api/xmlsec-notes-new-crypto-simple-keys-mngr.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -95,8 +95,8 @@
 	</p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-keys.html"><b><<<�Keys data and keys data stores.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-sharing-results.html"><b>Sharing the results.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-keys.html"><b><<<Keys data and keys data stores.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-sharing-results.html"><b>Sharing the results.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-new-crypto-skeleton.html b/docs/api/xmlsec-notes-new-crypto-skeleton.html
index 1bbdb80..e79e994 100644
--- a/docs/api/xmlsec-notes-new-crypto-skeleton.html
+++ b/docs/api/xmlsec-notes-new-crypto-skeleton.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -247,8 +247,8 @@ make
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto.html"><b><<<�Adding support for new cryptographic library.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-functions.html"><b>xmlSecCryptoApp* functions.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto.html"><b><<<Adding support for new cryptographic library.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-functions.html"><b>xmlSecCryptoApp* functions.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-new-crypto-transforms.html b/docs/api/xmlsec-notes-new-crypto-transforms.html
index c47f1f2..9abff81 100644
--- a/docs/api/xmlsec-notes-new-crypto-transforms.html
+++ b/docs/api/xmlsec-notes-new-crypto-transforms.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -163,8 +163,8 @@
 	</p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-klasses.html"><b><<<�Klasses and objects.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-keys.html"><b>Keys data and keys data stores.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-klasses.html"><b><<<Klasses and objects.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-keys.html"><b>Keys data and keys data stores.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-new-crypto.html b/docs/api/xmlsec-notes-new-crypto.html
index a12e454..37dbfa4 100644
--- a/docs/api/xmlsec-notes-new-crypto.html
+++ b/docs/api/xmlsec-notes-new-crypto.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -129,8 +129,8 @@
     </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-contexts.html"><b><<<�Using context objects.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-skeleton.html"><b>Creating a framework from the skeleton.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-contexts.html"><b><<<Using context objects.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-skeleton.html"><b>Creating a framework from the skeleton.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-overview.html b/docs/api/xmlsec-notes-overview.html
index e0fa271..3005cd8 100644
--- a/docs/api/xmlsec-notes-overview.html
+++ b/docs/api/xmlsec-notes-overview.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -95,8 +95,8 @@
 	</p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes.html"><b><<<�XML Security Library Tutorial</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-structure.html"><b>XML Security Library Structure.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes.html"><b><<<XML Security Library Tutorial</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-structure.html"><b>XML Security Library Structure.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-sign-encrypt.html b/docs/api/xmlsec-notes-sign-encrypt.html
index 5972124..37478dd 100644
--- a/docs/api/xmlsec-notes-sign-encrypt.html
+++ b/docs/api/xmlsec-notes-sign-encrypt.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -113,8 +113,8 @@
 	</div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-init-shutdown.html"><b><<<�Initialization and shutdown.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-sign.html"><b>Signing a document.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-init-shutdown.html"><b><<<Initialization and shutdown.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-sign.html"><b>Signing a document.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-sign-x509.html b/docs/api/xmlsec-notes-sign-x509.html
index 9ea99db..683b8e9 100644
--- a/docs/api/xmlsec-notes-sign-x509.html
+++ b/docs/api/xmlsec-notes-sign-x509.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -169,8 +169,8 @@
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-x509.html"><b><<<�Using X509 Certificates.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-verify-x509.html"><b>Verifing document signed with X509 certificates.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-x509.html"><b><<<Using X509 Certificates.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-verify-x509.html"><b>Verifing document signed with X509 certificates.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-sign.html b/docs/api/xmlsec-notes-sign.html
index e3a398a..da43976 100644
--- a/docs/api/xmlsec-notes-sign.html
+++ b/docs/api/xmlsec-notes-sign.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -203,8 +203,8 @@ done:
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-sign-encrypt.html"><b><<<�Signing and encrypting documents.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-encrypt.html"><b>Encrypting data.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-sign-encrypt.html"><b><<<Signing and encrypting documents.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-encrypt.html"><b>Encrypting data.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-simple-keys-store.html b/docs/api/xmlsec-notes-simple-keys-store.html
index 933fa00..cf51bcd 100644
--- a/docs/api/xmlsec-notes-simple-keys-store.html
+++ b/docs/api/xmlsec-notes-simple-keys-store.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -170,8 +170,8 @@ load_keys(char** files, int files_size) {
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-keysmngr.html"><b><<<�Keys manager.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-keys-manager-sign-enc.html"><b>Using keys manager for signatures/encryption.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-keysmngr.html"><b><<<Keys manager.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-keys-manager-sign-enc.html"><b>Using keys manager for signatures/encryption.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-structure.html b/docs/api/xmlsec-notes-structure.html
index 78d22c4..af34c51 100644
--- a/docs/api/xmlsec-notes-structure.html
+++ b/docs/api/xmlsec-notes-structure.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -107,8 +107,8 @@
 	a matter of changing several #include directives.</p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-overview.html"><b><<<�Overview.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-compiling.html"><b>Building the application with XML Security Library.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-overview.html"><b><<<Overview.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-compiling.html"><b>Building the application with XML Security Library.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-templates.html b/docs/api/xmlsec-notes-templates.html
index d402dcf..a12d205 100644
--- a/docs/api/xmlsec-notes-templates.html
+++ b/docs/api/xmlsec-notes-templates.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -107,8 +107,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-encrypt.html"><b><<<�Encrypting data.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-dynamic-signature-templates.html"><b>Creating dynamic signature templates.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-encrypt.html"><b><<<Encrypting data.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-dynamic-signature-templates.html"><b>Creating dynamic signature templates.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-transforms.html b/docs/api/xmlsec-notes-transforms.html
index 42e9123..c433e48 100644
--- a/docs/api/xmlsec-notes-transforms.html
+++ b/docs/api/xmlsec-notes-transforms.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -147,8 +147,8 @@
 </div>
     </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-verify-x509.html"><b><<<�Verifing document signed with X509 certificates.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-contexts.html"><b>Using context objects.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-verify-x509.html"><b><<<Verifing document signed with X509 certificates.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-contexts.html"><b>Using context objects.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-verify-decrypt.html b/docs/api/xmlsec-notes-verify-decrypt.html
index a2518e3..9694e2f 100644
--- a/docs/api/xmlsec-notes-verify-decrypt.html
+++ b/docs/api/xmlsec-notes-verify-decrypt.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -113,8 +113,8 @@
 	</div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-dynamic-encryption-templates.html"><b><<<�Creating dynamic encryption templates.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-verify.html"><b>Verifying a signed document�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-dynamic-encryption-templates.html"><b><<<Creating dynamic encryption templates.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-verify.html"><b>Verifying a signed document>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-verify-x509.html b/docs/api/xmlsec-notes-verify-x509.html
index 9101d3f..48e9e6d 100644
--- a/docs/api/xmlsec-notes-verify-x509.html
+++ b/docs/api/xmlsec-notes-verify-x509.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -173,8 +173,8 @@ load_trusted_certs(char** files, int files_size) {
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-sign-x509.html"><b><<<�Signing data with X509 certificate.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-transforms.html"><b>Transforms and transforms chain.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-sign-x509.html"><b><<<Signing data with X509 certificate.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-transforms.html"><b>Transforms and transforms chain.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-verify.html b/docs/api/xmlsec-notes-verify.html
index 07270e2..b01c04f 100644
--- a/docs/api/xmlsec-notes-verify.html
+++ b/docs/api/xmlsec-notes-verify.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -203,8 +203,8 @@ done:
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-verify-decrypt.html"><b><<<�Verifing and decrypting documents.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-decrypt.html"><b>Decrypting an encrypted document�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-verify-decrypt.html"><b><<<Verifing and decrypting documents.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-decrypt.html"><b>Decrypting an encrypted document>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-x509.html b/docs/api/xmlsec-notes-x509.html
index 192731b..aeb367b 100644
--- a/docs/api/xmlsec-notes-x509.html
+++ b/docs/api/xmlsec-notes-x509.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -107,8 +107,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-custom-keys-store.html"><b><<<�Implementing a custom keys store.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-sign-x509.html"><b>Signing data with X509 certificate.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-custom-keys-store.html"><b><<<Implementing a custom keys store.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-sign-x509.html"><b>Signing data with X509 certificate.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes.html b/docs/api/xmlsec-notes.html
index 53e534b..81f43a3 100644
--- a/docs/api/xmlsec-notes.html
+++ b/docs/api/xmlsec-notes.html
@@ -73,7 +73,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -108,8 +108,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="index.html"><b><<<�XML Security Library Reference Manual</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-overview.html"><b>Overview.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="index.html"><b><<<XML Security Library Reference Manual</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-overview.html"><b>Overview.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-nss-app.html b/docs/api/xmlsec-nss-app.html
index c8cd259..b332dc9 100644
--- a/docs/api/xmlsec-nss-app.html
+++ b/docs/api/xmlsec-nss-app.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-NSS-APP"></a>app</h1>
 <div class="REFNAMEDIV">
-<a name="AEN24290"></a><h2>Name</h2>app�--�</div>
+<a name="AEN24290"></a><h2>Name</h2>app--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN24293"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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);
@@ -181,7 +181,7 @@ by XMLSec command line utility and called before
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24416"><span style="white-space: nowrap"><var class="PARAMETER">config</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24416"><span style="white-space: nowrap"><var class="PARAMETER">config</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the path to NSS database files.</p></td>
 </tr>
 <tr>
@@ -216,7 +216,7 @@ and a default NSS crypto key data stores.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24456"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24456"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
@@ -238,11 +238,11 @@ function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24482"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24482"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN24487"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24487"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
@@ -263,11 +263,11 @@ with <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRINIT"><span class="
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24513"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24513"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN24518"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24518"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the uri.</p></td>
 </tr>
 <tr>
@@ -288,15 +288,15 @@ with <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRINIT"><span class="
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24542"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24542"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN24547"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24547"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24552"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24552"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the type of keys to save (public/private/symmetric).</p></td>
 </tr>
 <tr>
@@ -319,19 +319,19 @@ untrusted certs in <var class="PARAMETER">store</var></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24578"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24578"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN24583"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24583"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the certificate file.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24588"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24588"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</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="AEN24593"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24593"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the certificate type (trusted/untrusted).</p></td>
 </tr>
 <tr>
@@ -356,23 +356,23 @@ untrusted certs in <var class="PARAMETER">store</var></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24620"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24620"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN24625"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24625"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24630"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24630"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</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="AEN24635"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24635"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</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="AEN24640"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24640"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the certificate type (trusted/untrusted).</p></td>
 </tr>
 <tr>
@@ -396,19 +396,19 @@ untrusted certs in <var class="PARAMETER">store</var></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24666"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24666"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN24671"><span style="white-space: nowrap"><var class="PARAMETER">secItem</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24671"><span style="white-space: nowrap"><var class="PARAMETER">secItem</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to SECItem.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24676"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24676"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</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="AEN24681"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24681"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the certificate type (trusted/untrusted).</p></td>
 </tr>
 <tr>
@@ -431,23 +431,23 @@ untrusted certs in <var class="PARAMETER">store</var></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24706"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24706"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24711"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24711"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24716"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24716"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24721"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24721"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24726"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24726"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
@@ -471,27 +471,27 @@ untrusted certs in <var class="PARAMETER">store</var></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24753"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24753"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24758"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24758"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</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="AEN24763"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24763"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key data format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24768"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24768"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key data2 password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24773"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24773"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24778"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24778"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
@@ -514,23 +514,23 @@ untrusted certs in <var class="PARAMETER">store</var></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24803"><span style="white-space: nowrap"><var class="PARAMETER">secItem</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24803"><span style="white-space: nowrap"><var class="PARAMETER">secItem</var>:</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="AEN24808"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24808"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24813"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24813"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24818"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24818"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24823"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24823"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
@@ -554,19 +554,19 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24847"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24847"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24852"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24852"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24857"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24857"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24862"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24862"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
@@ -591,23 +591,23 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24887"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24887"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24892"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24892"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</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="AEN24897"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24897"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24902"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24902"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24907"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24907"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
@@ -631,19 +631,19 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24931"><span style="white-space: nowrap"><var class="PARAMETER">secItem</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24931"><span style="white-space: nowrap"><var class="PARAMETER">secItem</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the <var class="PARAMETER">SECItem</var> object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24937"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24937"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24942"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24942"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24947"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24947"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
@@ -664,15 +664,15 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24971"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24971"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24976"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24976"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24981"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24981"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
@@ -694,19 +694,19 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25006"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25006"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25011"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25011"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25016"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25016"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</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="AEN25021"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25021"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate format.</p></td>
 </tr>
 <tr>
@@ -727,15 +727,15 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25045"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25045"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25050"><span style="white-space: nowrap"><var class="PARAMETER">secItem</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25050"><span style="white-space: nowrap"><var class="PARAMETER">secItem</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to SECItem.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25055"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25055"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate format.</p></td>
 </tr>
 <tr>
@@ -756,11 +756,11 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25077"><span style="white-space: nowrap"><var class="PARAMETER">secItem</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25077"><span style="white-space: nowrap"><var class="PARAMETER">secItem</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the <var class="PARAMETER">SECItem</var> object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25083"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25083"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the cert format.</p></td>
 </tr>
 <tr>
@@ -780,8 +780,8 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-nss-ref.html"><b><<<�XML Security Library for NSS API Reference.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-nss-bignum.html"><b>bignum�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-nss-ref.html"><b><<<XML Security Library for NSS API Reference.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-nss-bignum.html"><b>bignum>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-nss-bignum.html b/docs/api/xmlsec-nss-bignum.html
index 4d3292e..ee89a32 100644
--- a/docs/api/xmlsec-nss-bignum.html
+++ b/docs/api/xmlsec-nss-bignum.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-NSS-BIGNUM"></a>bignum</h1>
 <div class="REFNAMEDIV">
-<a name="AEN25107"></a><h2>Name</h2>bignum�--�</div>
+<a name="AEN25107"></a><h2>Name</h2>bignum--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN25110"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<pre class="SYNOPSIS">
 
 <font>SECItem</font>*    <a href="xmlsec-nss-bignum.html#XMLSECNSSNODEGETBIGNUMVALUE">xmlSecNssNodeGetBigNumValue</a>     (<font>PRArenaPool</font> *arena,
                                              const <font>xmlNodePtr</font> cur,
@@ -120,15 +120,15 @@ one is created (caller is responsible for freeing it).</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25143"><span style="white-space: nowrap"><var class="PARAMETER">arena</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25143"><span style="white-space: nowrap"><var class="PARAMETER">arena</var>:</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="AEN25148"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25148"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</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="AEN25153"><span style="white-space: nowrap"><var class="PARAMETER">a</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25153"><span style="white-space: nowrap"><var class="PARAMETER">a</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> a SECItem object to hold the BigNum value</p></td>
 </tr>
 <tr>
@@ -154,15 +154,15 @@ before and after the CryptoBinary string.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25178"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25178"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</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="AEN25183"><span style="white-space: nowrap"><var class="PARAMETER">a</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25183"><span style="white-space: nowrap"><var class="PARAMETER">a</var>:</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="AEN25188"><span style="white-space: nowrap"><var class="PARAMETER">addLineBreaks</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25188"><span style="white-space: nowrap"><var class="PARAMETER">addLineBreaks</var>:</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>
@@ -175,8 +175,8 @@ before and after the CryptoBinary string.</p>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-nss-app.html"><b><<<�app</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-nss-crypto.html"><b>crypto�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-nss-app.html"><b><<<app</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-nss-crypto.html"><b>crypto>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-nss-crypto.html b/docs/api/xmlsec-nss-crypto.html
index 4bbb3ed..5928d8c 100644
--- a/docs/api/xmlsec-nss-crypto.html
+++ b/docs/api/xmlsec-nss-crypto.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-NSS-CRYPTO"></a>crypto</h1>
 <div class="REFNAMEDIV">
-<a name="AEN25203"></a><h2>Name</h2>crypto�--�</div>
+<a name="AEN25203"></a><h2>Name</h2>crypto--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN25206"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<pre class="SYNOPSIS">
 
 <font>xmlSecCryptoDLFunctionsPtr</font> <a href="xmlsec-nss-crypto.html#XMLSECCRYPTOGETFUNCTIONS-NSS">xmlSecCryptoGetFunctions_nss</a>
                                             (void);
@@ -228,7 +228,7 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25367"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25367"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys manager.</p></td>
 </tr>
 <tr>
@@ -248,11 +248,11 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25391"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25391"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25396"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25396"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the numer of bytes to generate.</p></td>
 </tr>
 <tr>
@@ -277,31 +277,31 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25423"><span style="white-space: nowrap"><var class="PARAMETER">file</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25423"><span style="white-space: nowrap"><var class="PARAMETER">file</var>:</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="AEN25428"><span style="white-space: nowrap"><var class="PARAMETER">line</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25428"><span style="white-space: nowrap"><var class="PARAMETER">line</var>:</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="AEN25433"><span style="white-space: nowrap"><var class="PARAMETER">func</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25433"><span style="white-space: nowrap"><var class="PARAMETER">func</var>:</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="AEN25438"><span style="white-space: nowrap"><var class="PARAMETER">errorObject</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25438"><span style="white-space: nowrap"><var class="PARAMETER">errorObject</var>:</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="AEN25443"><span style="white-space: nowrap"><var class="PARAMETER">errorSubject</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25443"><span style="white-space: nowrap"><var class="PARAMETER">errorSubject</var>:</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="AEN25448"><span style="white-space: nowrap"><var class="PARAMETER">reason</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25448"><span style="white-space: nowrap"><var class="PARAMETER">reason</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error code.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25453"><span style="white-space: nowrap"><var class="PARAMETER">msg</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25453"><span style="white-space: nowrap"><var class="PARAMETER">msg</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the additional error message.</p></td>
 </tr>
 </tbody></table>
@@ -339,15 +339,15 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25494"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25494"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN25499"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25499"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN25504"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25504"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value size (in bytes).</p></td>
 </tr>
 <tr>
@@ -521,15 +521,15 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25688"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25688"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN25693"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25693"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN25698"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25698"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value size (in bytes).</p></td>
 </tr>
 <tr>
@@ -659,15 +659,15 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25836"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25836"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN25841"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25841"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN25846"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25846"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value size (in bytes).</p></td>
 </tr>
 <tr>
@@ -831,8 +831,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-nss-bignum.html"><b><<<�bignum</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-nss-keysstore.html"><b>keysstore�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-nss-bignum.html"><b><<<bignum</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-nss-keysstore.html"><b>keysstore>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-nss-keysstore.html b/docs/api/xmlsec-nss-keysstore.html
index 3532ed6..5742227 100644
--- a/docs/api/xmlsec-nss-keysstore.html
+++ b/docs/api/xmlsec-nss-keysstore.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-NSS-KEYSSTORE"></a>keysstore</h1>
 <div class="REFNAMEDIV">
-<a name="AEN26022"></a><h2>Name</h2>keysstore�--�</div>
+<a name="AEN26022"></a><h2>Name</h2>keysstore--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN26025"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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);
@@ -141,11 +141,11 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26087"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26087"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</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="AEN26092"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26092"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
@@ -166,15 +166,15 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26115"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26115"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</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="AEN26120"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26120"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26125"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26125"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to associated keys manager. </p></td>
 </tr>
 <tr>
@@ -195,15 +195,15 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26149"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26149"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</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="AEN26154"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26154"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26159"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26159"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the saved keys type (public, private, ...).</p></td>
 </tr>
 <tr>
@@ -214,8 +214,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-nss-crypto.html"><b><<<�crypto</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-nss-pkikeys.html"><b>pkikeys�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-nss-crypto.html"><b><<<crypto</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-nss-pkikeys.html"><b>pkikeys>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-nss-pkikeys.html b/docs/api/xmlsec-nss-pkikeys.html
index 2224eb8..ea03da5 100644
--- a/docs/api/xmlsec-nss-pkikeys.html
+++ b/docs/api/xmlsec-nss-pkikeys.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-NSS-PKIKEYS"></a>pkikeys</h1>
 <div class="REFNAMEDIV">
-<a name="AEN26174"></a><h2>Name</h2>pkikeys�--�</div>
+<a name="AEN26174"></a><h2>Name</h2>pkikeys--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN26177"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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);
@@ -120,11 +120,11 @@ Key handles.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26214"><span style="white-space: nowrap"><var class="PARAMETER">privkey</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26214"><span style="white-space: nowrap"><var class="PARAMETER">privkey</var>:</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="AEN26219"><span style="white-space: nowrap"><var class="PARAMETER">pubkey</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26219"><span style="white-space: nowrap"><var class="PARAMETER">pubkey</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the NSS Public Key handle</p></td>
 </tr>
 <tr>
@@ -144,7 +144,7 @@ Key handles.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26240"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26240"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to NSS Key data.</p></td>
 </tr>
 <tr>
@@ -165,7 +165,7 @@ Caller is responsible for freeing the key when done</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26261"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26261"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to NSS Key data.</p></td>
 </tr>
 <tr>
@@ -185,7 +185,7 @@ Caller is responsible for freeing the key when done</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26282"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26282"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to NSS Key data.</p></td>
 </tr>
 <tr>
@@ -205,11 +205,11 @@ Caller is responsible for freeing the key when done</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26304"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26304"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>:</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="AEN26309"><span style="white-space: nowrap"><var class="PARAMETER">src</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26309"><span style="white-space: nowrap"><var class="PARAMETER">src</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to NSS Key data to copy from.</p></td>
 </tr>
 <tr>
@@ -220,8 +220,8 @@ Caller is responsible for freeing the key when done</p></td>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-nss-keysstore.html"><b><<<�keysstore</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-nss-x509.html"><b>x509�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-nss-keysstore.html"><b><<<keysstore</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-nss-x509.html"><b>x509>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-nss-ref.html b/docs/api/xmlsec-nss-ref.html
index 70ccae7..228e5ed 100644
--- a/docs/api/xmlsec-nss-ref.html
+++ b/docs/api/xmlsec-nss-ref.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -91,25 +91,25 @@
 <div class="TOC"><dl>
 <dt><b>Table of Contents</b></dt>
 <dt>
-<a href="xmlsec-nss-app.html">app</a>�--�</dt>
+<a href="xmlsec-nss-app.html">app</a>--</dt>
 <dt>
-<a href="xmlsec-nss-bignum.html">bignum</a>�--�</dt>
+<a href="xmlsec-nss-bignum.html">bignum</a>--</dt>
 <dt>
-<a href="xmlsec-nss-crypto.html">crypto</a>�--�</dt>
+<a href="xmlsec-nss-crypto.html">crypto</a>--</dt>
 <dt>
-<a href="xmlsec-nss-keysstore.html">keysstore</a>�--�</dt>
+<a href="xmlsec-nss-keysstore.html">keysstore</a>--</dt>
 <dt>
-<a href="xmlsec-nss-pkikeys.html">pkikeys</a>�--�</dt>
+<a href="xmlsec-nss-pkikeys.html">pkikeys</a>--</dt>
 <dt>
-<a href="xmlsec-nss-x509.html">x509</a>�--�</dt>
+<a href="xmlsec-nss-x509.html">x509</a>--</dt>
 </dl></div>
 <p>This section contains the API reference for xmlsec-nss. All
     the public interfaces are documented here. This reference guide is
     build by extracting comments from the code sources. </p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-gnutls-crypto.html"><b><<<�crypto</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-nss-app.html"><b>app�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-gnutls-crypto.html"><b><<<crypto</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-nss-app.html"><b>app>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-nss-x509.html b/docs/api/xmlsec-nss-x509.html
index 7ba5d5c..3837cac 100644
--- a/docs/api/xmlsec-nss-x509.html
+++ b/docs/api/xmlsec-nss-x509.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-NSS-X509"></a>x509</h1>
 <div class="REFNAMEDIV">
-<a name="AEN26324"></a><h2>Name</h2>x509�--�</div>
+<a name="AEN26324"></a><h2>Name</h2>x509--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN26327"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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>
@@ -171,7 +171,7 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26430"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26430"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
@@ -193,11 +193,11 @@ extraction or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26453"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26453"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN26458"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26458"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to NSS X509 certificate.</p></td>
 </tr>
 <tr>
@@ -217,11 +217,11 @@ extraction or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26480"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26480"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN26485"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26485"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to NSS X509 certificate.</p></td>
 </tr>
 <tr>
@@ -242,11 +242,11 @@ extraction or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26507"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26507"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN26512"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26512"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired certificate position.</p></td>
 </tr>
 <tr>
@@ -267,7 +267,7 @@ number of certificates in <var class="PARAMETER">data</var> or an error occurs.<
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26536"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26536"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
@@ -287,11 +287,11 @@ number of certificates in <var class="PARAMETER">data</var> or an error occurs.<
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26559"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26559"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN26564"><span style="white-space: nowrap"><var class="PARAMETER">crl</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26564"><span style="white-space: nowrap"><var class="PARAMETER">crl</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to NSS X509 CRL.</p></td>
 </tr>
 <tr>
@@ -311,11 +311,11 @@ number of certificates in <var class="PARAMETER">data</var> or an error occurs.<
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26586"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26586"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN26591"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26591"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>                the desired CRL position.</p></td>
 </tr>
 <tr>
@@ -335,7 +335,7 @@ number of CRLs in <var class="PARAMETER">data</var> or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26615"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26615"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
 </tr>
 <tr>
@@ -354,7 +354,7 @@ number of CRLs in <var class="PARAMETER">data</var> or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26638"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26638"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate.</p></td>
 </tr>
 <tr>
@@ -422,27 +422,27 @@ number of CRLs in <var class="PARAMETER">data</var> or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26711"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26711"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</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="AEN26716"><span style="white-space: nowrap"><var class="PARAMETER">subjectName</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26716"><span style="white-space: nowrap"><var class="PARAMETER">subjectName</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the desired certificate name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26721"><span style="white-space: nowrap"><var class="PARAMETER">issuerName</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26721"><span style="white-space: nowrap"><var class="PARAMETER">issuerName</var>:</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="AEN26726"><span style="white-space: nowrap"><var class="PARAMETER">issuerSerial</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26726"><span style="white-space: nowrap"><var class="PARAMETER">issuerSerial</var>:</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="AEN26731"><span style="white-space: nowrap"><var class="PARAMETER">ski</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26731"><span style="white-space: nowrap"><var class="PARAMETER">ski</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired certificate SKI.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26736"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26736"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr>
 <tr>
@@ -464,15 +464,15 @@ or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26761"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26761"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</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="AEN26766"><span style="white-space: nowrap"><var class="PARAMETER">certs</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26766"><span style="white-space: nowrap"><var class="PARAMETER">certs</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the untrusted certificates stack.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26771"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26771"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr>
 <tr>
@@ -493,15 +493,15 @@ or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26796"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26796"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</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="AEN26801"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26801"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</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="AEN26806"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26806"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the certificate type (trusted/untrusted).</p></td>
 </tr>
 <tr>
@@ -512,8 +512,8 @@ or an error occurs.</p></td>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-nss-pkikeys.html"><b><<<�pkikeys</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-mscrypto-ref.html"><b>XML Security Library for MSCrypto API Reference.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-nss-pkikeys.html"><b><<<pkikeys</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-mscrypto-ref.html"><b>XML Security Library for MSCrypto API Reference.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-openssl-app.html b/docs/api/xmlsec-openssl-app.html
index 1f01bd9..50106c5 100644
--- a/docs/api/xmlsec-openssl-app.html
+++ b/docs/api/xmlsec-openssl-app.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-OPENSSL-APP"></a>app</h1>
 <div class="REFNAMEDIV">
-<a name="AEN20612"></a><h2>Name</h2>app�--�</div>
+<a name="AEN20612"></a><h2>Name</h2>app--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN20615"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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);
@@ -190,7 +190,7 @@ by XMLSec command line utility and called before
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20742"><span style="white-space: nowrap"><var class="PARAMETER">config</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20742"><span style="white-space: nowrap"><var class="PARAMETER">config</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the path to certs.</p></td>
 </tr>
 <tr>
@@ -226,7 +226,7 @@ and a default OpenSSL crypto key data stores.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20782"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20782"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
@@ -248,11 +248,11 @@ function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20808"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20808"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN20813"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20813"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
@@ -274,11 +274,11 @@ with <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRINIT"><span
 <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"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20839"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN20844"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20844"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the uri.</p></td>
 </tr>
 <tr>
@@ -300,15 +300,15 @@ with <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRINIT"><span
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20868"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20868"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</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="AEN20873"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20873"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20878"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20878"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the type of keys to save (public/private/symmetric).</p></td>
 </tr>
 <tr>
@@ -332,19 +332,19 @@ untrusted certs in <var class="PARAMETER">store</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20904"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20904"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20909"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20909"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the certificate file.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20914"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20914"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20919"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20919"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate in <var class="PARAMETER">filename</var>
    			trusted or not.</p></td>
 </tr>
@@ -370,23 +370,23 @@ untrusted certs in <var class="PARAMETER">store</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20947"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20947"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20952"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20952"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20957"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20957"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</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="AEN20962"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20962"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20967"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20967"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate trusted or not.</p></td>
 </tr>
 <tr>
@@ -410,19 +410,19 @@ untrusted certs in <var class="PARAMETER">store</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20992"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20992"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20997"><span style="white-space: nowrap"><var class="PARAMETER">bio</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20997"><span style="white-space: nowrap"><var class="PARAMETER">bio</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the certificate BIO.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21002"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21002"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21007"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21007"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate trusted or not.</p></td>
 </tr>
 <tr>
@@ -443,11 +443,11 @@ untrusted certs in <var class="PARAMETER">store</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21030"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21030"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21035"><span style="white-space: nowrap"><var class="PARAMETER">path</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21035"><span style="white-space: nowrap"><var class="PARAMETER">path</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the path to trusted certificates.</p></td>
 </tr>
 <tr>
@@ -470,23 +470,23 @@ untrusted certs in <var class="PARAMETER">store</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21060"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21060"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21065"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21065"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21070"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21070"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21075"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21075"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21080"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21080"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
@@ -510,27 +510,27 @@ untrusted certs in <var class="PARAMETER">store</var>.</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"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21106"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21111"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21111"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</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="AEN21116"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21116"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21121"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21121"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21126"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21126"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21131"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21131"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
@@ -553,23 +553,23 @@ untrusted certs in <var class="PARAMETER">store</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21156"><span style="white-space: nowrap"><var class="PARAMETER">bio</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21156"><span style="white-space: nowrap"><var class="PARAMETER">bio</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key BIO.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21161"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21161"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21166"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21166"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21171"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21171"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21176"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21176"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
@@ -593,19 +593,19 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21200"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21200"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21205"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21205"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21210"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21210"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21215"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21215"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
@@ -631,23 +631,23 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21240"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21240"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21245"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21245"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</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="AEN21250"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21250"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21255"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21255"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21260"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21260"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
@@ -671,19 +671,19 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21284"><span style="white-space: nowrap"><var class="PARAMETER">bio</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21284"><span style="white-space: nowrap"><var class="PARAMETER">bio</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 key bio.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21289"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21289"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21294"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21294"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21299"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21299"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
@@ -704,15 +704,15 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21323"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21323"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21328"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21328"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21333"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21333"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
@@ -735,19 +735,19 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21357"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21357"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21362"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21362"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21367"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21367"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</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="AEN21372"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21372"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
@@ -768,15 +768,15 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21395"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21395"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21400"><span style="white-space: nowrap"><var class="PARAMETER">bio</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21400"><span style="white-space: nowrap"><var class="PARAMETER">bio</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate bio.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21405"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21405"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
@@ -797,11 +797,11 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21427"><span style="white-space: nowrap"><var class="PARAMETER">bio</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21427"><span style="white-space: nowrap"><var class="PARAMETER">bio</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the BIO.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21432"><span style="white-space: nowrap"><var class="PARAMETER">format</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21432"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the cert format.</p></td>
 </tr>
 <tr>
@@ -821,8 +821,8 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-openssl-ref.html"><b><<<�XML Security Library for OpenSLL API Reference.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-openssl-bn.html"><b>bn�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-openssl-ref.html"><b><<<XML Security Library for OpenSLL API Reference.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-openssl-bn.html"><b>bn>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-openssl-bn.html b/docs/api/xmlsec-openssl-bn.html
index d6b01c8..31faab8 100644
--- a/docs/api/xmlsec-openssl-bn.html
+++ b/docs/api/xmlsec-openssl-bn.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-OPENSSL-BN"></a>bn</h1>
 <div class="REFNAMEDIV">
-<a name="AEN21456"></a><h2>Name</h2>bn�--�</div>
+<a name="AEN21456"></a><h2>Name</h2>bn--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN21459"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<pre class="SYNOPSIS">
 
 <font>BIGNUM</font>*     <a href="xmlsec-openssl-bn.html#XMLSECOPENSSLNODEGETBNVALUE">xmlSecOpenSSLNodeGetBNValue</a>     (const <font>xmlNodePtr</font> cur,
                                              <font>BIGNUM</font> **a);
@@ -118,11 +118,11 @@ BIGNUM is created (caller is responsible for freeing it).</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21490"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21490"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</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="AEN21495"><span style="white-space: nowrap"><var class="PARAMETER">a</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21495"><span style="white-space: nowrap"><var class="PARAMETER">a</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> the BIGNUM buffer.</p></td>
 </tr>
 <tr>
@@ -148,15 +148,15 @@ before and after the CryptoBinary string.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21520"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21520"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</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="AEN21525"><span style="white-space: nowrap"><var class="PARAMETER">a</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21525"><span style="white-space: nowrap"><var class="PARAMETER">a</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> the BIGNUM.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21530"><span style="white-space: nowrap"><var class="PARAMETER">addLineBreaks</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21530"><span style="white-space: nowrap"><var class="PARAMETER">addLineBreaks</var>:</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>
@@ -169,8 +169,8 @@ before and after the CryptoBinary string.</p>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-openssl-app.html"><b><<<�app</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-openssl-crypto.html"><b>crypto�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-openssl-app.html"><b><<<app</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-openssl-crypto.html"><b>crypto>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-openssl-crypto.html b/docs/api/xmlsec-openssl-crypto.html
index c6bd31f..70f483b 100644
--- a/docs/api/xmlsec-openssl-crypto.html
+++ b/docs/api/xmlsec-openssl-crypto.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-OPENSSL-CRYPTO"></a>crypto</h1>
 <div class="REFNAMEDIV">
-<a name="AEN21545"></a><h2>Name</h2>crypto�--�</div>
+<a name="AEN21545"></a><h2>Name</h2>crypto--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN21548"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<pre class="SYNOPSIS">
 
 <font>xmlSecCryptoDLFunctionsPtr</font> <a href="xmlsec-openssl-crypto.html#XMLSECCRYPTOGETFUNCTIONS-OPENSSL">xmlSecCryptoGetFunctions_openssl</a>
                                             (void);
@@ -257,7 +257,7 @@ const <font>xmlChar</font>* <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGET
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21750"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21750"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys manager.</p></td>
 </tr>
 <tr>
@@ -277,11 +277,11 @@ const <font>xmlChar</font>* <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGET
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21774"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21774"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21779"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21779"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the numer of bytes to generate.</p></td>
 </tr>
 <tr>
@@ -301,7 +301,7 @@ const <font>xmlChar</font>* <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGET
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21800"><span style="white-space: nowrap"><var class="PARAMETER">path</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21800"><span style="white-space: nowrap"><var class="PARAMETER">path</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the default trusted certs path.</p></td>
 </tr>
 <tr>
@@ -358,15 +358,15 @@ const <font>xmlChar</font>* <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGET
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21861"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21861"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN21866"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21866"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN21871"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21871"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value size (in bytes).</p></td>
 </tr>
 <tr>
@@ -541,15 +541,15 @@ const <font>xmlChar</font>* <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGET
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22055"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22055"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN22060"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22060"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN22065"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22065"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value size (in bytes).</p></td>
 </tr>
 <tr>
@@ -635,11 +635,11 @@ const <font>xmlChar</font>* <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGET
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22156"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22156"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN22161"><span style="white-space: nowrap"><var class="PARAMETER">dsa</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22161"><span style="white-space: nowrap"><var class="PARAMETER">dsa</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to OpenSSL DSA key.</p></td>
 </tr>
 <tr>
@@ -658,7 +658,7 @@ const <font>xmlChar</font>* <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGET
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22182"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22182"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to DSA key data.</p></td>
 </tr>
 <tr>
@@ -678,11 +678,11 @@ const <font>xmlChar</font>* <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGET
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22204"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22204"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN22209"><span style="white-space: nowrap"><var class="PARAMETER">pKey</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22209"><span style="white-space: nowrap"><var class="PARAMETER">pKey</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to OpenSSL EVP key.</p></td>
 </tr>
 <tr>
@@ -701,7 +701,7 @@ const <font>xmlChar</font>* <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGET
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22230"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22230"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to DSA key data.</p></td>
 </tr>
 <tr>
@@ -766,15 +766,15 @@ const <font>xmlChar</font>* <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGET
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22299"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22299"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN22304"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22304"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</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="AEN22309"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22309"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value size (in bytes).</p></td>
 </tr>
 <tr>
@@ -904,11 +904,11 @@ const <font>xmlChar</font>* <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGET
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22446"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22446"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN22451"><span style="white-space: nowrap"><var class="PARAMETER">rsa</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22451"><span style="white-space: nowrap"><var class="PARAMETER">rsa</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to OpenSSL RSA key.</p></td>
 </tr>
 <tr>
@@ -927,7 +927,7 @@ const <font>xmlChar</font>* <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGET
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22472"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22472"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to RSA key data.</p></td>
 </tr>
 <tr>
@@ -947,11 +947,11 @@ const <font>xmlChar</font>* <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGET
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22494"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22494"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN22499"><span style="white-space: nowrap"><var class="PARAMETER">pKey</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22499"><span style="white-space: nowrap"><var class="PARAMETER">pKey</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to OpenSSL EVP key.</p></td>
 </tr>
 <tr>
@@ -970,7 +970,7 @@ const <font>xmlChar</font>* <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGET
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22520"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22520"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to RSA key data.</p></td>
 </tr>
 <tr>
@@ -1100,39 +1100,39 @@ const <font>xmlChar</font>* <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGET
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22655"><span style="white-space: nowrap"><var class="PARAMETER">file</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22655"><span style="white-space: nowrap"><var class="PARAMETER">file</var>:</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="AEN22660"><span style="white-space: nowrap"><var class="PARAMETER">line</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22660"><span style="white-space: nowrap"><var class="PARAMETER">line</var>:</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="AEN22665"><span style="white-space: nowrap"><var class="PARAMETER">func</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22665"><span style="white-space: nowrap"><var class="PARAMETER">func</var>:</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="AEN22670"><span style="white-space: nowrap"><var class="PARAMETER">errorObject</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22670"><span style="white-space: nowrap"><var class="PARAMETER">errorObject</var>:</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="AEN22675"><span style="white-space: nowrap"><var class="PARAMETER">errorSubject</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22675"><span style="white-space: nowrap"><var class="PARAMETER">errorSubject</var>:</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="AEN22680"><span style="white-space: nowrap"><var class="PARAMETER">reason</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22680"><span style="white-space: nowrap"><var class="PARAMETER">reason</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error code.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22685"><span style="white-space: nowrap"><var class="PARAMETER">msg</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22685"><span style="white-space: nowrap"><var class="PARAMETER">msg</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the additional error message.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-openssl-bn.html"><b><<<�bn</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-openssl-evp.html"><b>evp�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-openssl-bn.html"><b><<<bn</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-openssl-evp.html"><b>evp>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-openssl-evp.html b/docs/api/xmlsec-openssl-evp.html
index 7165cba..e3a4b53 100644
--- a/docs/api/xmlsec-openssl-evp.html
+++ b/docs/api/xmlsec-openssl-evp.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-OPENSSL-EVP"></a>evp</h1>
 <div class="REFNAMEDIV">
-<a name="AEN22695"></a><h2>Name</h2>evp�--�</div>
+<a name="AEN22695"></a><h2>Name</h2>evp--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN22698"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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);
@@ -115,11 +115,11 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22731"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22731"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN22736"><span style="white-space: nowrap"><var class="PARAMETER">pKey</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22736"><span style="white-space: nowrap"><var class="PARAMETER">pKey</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to EVP key.</p></td>
 </tr>
 <tr>
@@ -138,7 +138,7 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22757"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22757"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to OpenSSL EVP data.</p></td>
 </tr>
 <tr>
@@ -157,7 +157,7 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22779"><span style="white-space: nowrap"><var class="PARAMETER">pKey</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22779"><span style="white-space: nowrap"><var class="PARAMETER">pKey</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to EVP_PKEY.</p></td>
 </tr>
 <tr>
@@ -176,7 +176,7 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22800"><span style="white-space: nowrap"><var class="PARAMETER">pKey</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22800"><span style="white-space: nowrap"><var class="PARAMETER">pKey</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to EVP_PKEY.</p></td>
 </tr>
 <tr>
@@ -187,8 +187,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-openssl-crypto.html"><b><<<�crypto</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-openssl-x509.html"><b>x509�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-openssl-crypto.html"><b><<<crypto</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-openssl-x509.html"><b>x509>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-openssl-ref.html b/docs/api/xmlsec-openssl-ref.html
index 86fecd6..e0812af 100644
--- a/docs/api/xmlsec-openssl-ref.html
+++ b/docs/api/xmlsec-openssl-ref.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -91,23 +91,23 @@
 <div class="TOC"><dl>
 <dt><b>Table of Contents</b></dt>
 <dt>
-<a href="xmlsec-openssl-app.html">app</a>�--�</dt>
+<a href="xmlsec-openssl-app.html">app</a>--</dt>
 <dt>
-<a href="xmlsec-openssl-bn.html">bn</a>�--�</dt>
+<a href="xmlsec-openssl-bn.html">bn</a>--</dt>
 <dt>
-<a href="xmlsec-openssl-crypto.html">crypto</a>�--�</dt>
+<a href="xmlsec-openssl-crypto.html">crypto</a>--</dt>
 <dt>
-<a href="xmlsec-openssl-evp.html">evp</a>�--�</dt>
+<a href="xmlsec-openssl-evp.html">evp</a>--</dt>
 <dt>
-<a href="xmlsec-openssl-x509.html">x509</a>�--�</dt>
+<a href="xmlsec-openssl-x509.html">x509</a>--</dt>
 </dl></div>
 <p>This section contains the API reference for xmlsec-openssl. All
     the public interfaces are documented here. This reference guide is
     build by extracting comments from the code sources. </p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-x509.html"><b><<<�x509</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-openssl-app.html"><b>app�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-x509.html"><b><<<x509</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-openssl-app.html"><b>app>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-openssl-x509.html b/docs/api/xmlsec-openssl-x509.html
index 677313d..a7f9486 100644
--- a/docs/api/xmlsec-openssl-x509.html
+++ b/docs/api/xmlsec-openssl-x509.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-OPENSSL-X509"></a>x509</h1>
 <div class="REFNAMEDIV">
-<a name="AEN22815"></a><h2>Name</h2>x509�--�</div>
+<a name="AEN22815"></a><h2>Name</h2>x509--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN22818"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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>
@@ -196,7 +196,7 @@
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22944"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22944"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
@@ -218,11 +218,11 @@ extraction or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22967"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22967"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN22972"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22972"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to OpenSSL X509 certificate.</p></td>
 </tr>
 <tr>
@@ -243,11 +243,11 @@ extraction or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22994"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22994"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN22999"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22999"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to OpenSSL X509 certificate.</p></td>
 </tr>
 <tr>
@@ -267,11 +267,11 @@ extraction or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23021"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23021"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN23026"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23026"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired certificate position.</p></td>
 </tr>
 <tr>
@@ -292,7 +292,7 @@ number of certificates in <var class="PARAMETER">data</var> or an error occurs.<
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23050"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23050"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
@@ -313,11 +313,11 @@ number of certificates in <var class="PARAMETER">data</var> or an error occurs.<
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23073"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23073"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN23078"><span style="white-space: nowrap"><var class="PARAMETER">crl</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23078"><span style="white-space: nowrap"><var class="PARAMETER">crl</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to OpenSSL X509 CRL.</p></td>
 </tr>
 <tr>
@@ -337,11 +337,11 @@ number of certificates in <var class="PARAMETER">data</var> or an error occurs.<
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23100"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23100"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN23105"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23105"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired CRL position.</p></td>
 </tr>
 <tr>
@@ -362,7 +362,7 @@ number of CRLs in <var class="PARAMETER">data</var> or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23129"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23129"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
@@ -382,7 +382,7 @@ number of CRLs in <var class="PARAMETER">data</var> or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23152"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23152"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate.</p></td>
 </tr>
 <tr>
@@ -450,27 +450,27 @@ number of CRLs in <var class="PARAMETER">data</var> or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23225"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23225"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</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="AEN23230"><span style="white-space: nowrap"><var class="PARAMETER">subjectName</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23230"><span style="white-space: nowrap"><var class="PARAMETER">subjectName</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the desired certificate name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23235"><span style="white-space: nowrap"><var class="PARAMETER">issuerName</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23235"><span style="white-space: nowrap"><var class="PARAMETER">issuerName</var>:</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="AEN23240"><span style="white-space: nowrap"><var class="PARAMETER">issuerSerial</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23240"><span style="white-space: nowrap"><var class="PARAMETER">issuerSerial</var>:</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="AEN23245"><span style="white-space: nowrap"><var class="PARAMETER">ski</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23245"><span style="white-space: nowrap"><var class="PARAMETER">ski</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired certificate SKI.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23250"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23250"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr>
 <tr>
@@ -493,19 +493,19 @@ or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23276"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23276"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</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="AEN23281"><span style="white-space: nowrap"><var class="PARAMETER">certs</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23281"><span style="white-space: nowrap"><var class="PARAMETER">certs</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the untrusted certificates stack.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23286"><span style="white-space: nowrap"><var class="PARAMETER">crls</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23286"><span style="white-space: nowrap"><var class="PARAMETER">crls</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the crls stack.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23291"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23291"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> element processing context.</p></td>
 </tr>
 <tr>
@@ -526,15 +526,15 @@ or an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23316"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23316"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</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="AEN23321"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23321"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</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="AEN23326"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23326"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate type (trusted/untrusted).</p></td>
 </tr>
 <tr>
@@ -556,11 +556,11 @@ in <var class="PARAMETER">store</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23350"><span style="white-space: nowrap"><var class="PARAMETER">store</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23350"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</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="AEN23355"><span style="white-space: nowrap"><var class="PARAMETER">path</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23355"><span style="white-space: nowrap"><var class="PARAMETER">path</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> the path to the certs dir.</p></td>
 </tr>
 <tr>
@@ -571,8 +571,8 @@ in <var class="PARAMETER">store</var>.</p>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-openssl-evp.html"><b><<<�evp</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-gnutls-ref.html"><b>XML Security Library for GnuTLS API Reference.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-openssl-evp.html"><b><<<evp</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-gnutls-ref.html"><b>XML Security Library for GnuTLS API Reference.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-parser.html b/docs/api/xmlsec-parser.html
index ac9f461..51b80d6 100644
--- a/docs/api/xmlsec-parser.html
+++ b/docs/api/xmlsec-parser.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-PARSER"></a>parser</h1>
 <div class="REFNAMEDIV">
-<a name="AEN11848"></a><h2>Name</h2>parser�--�</div>
+<a name="AEN11848"></a><h2>Name</h2>parser--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN11851"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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,
@@ -123,7 +123,7 @@ c14n issue. The code is copied from <font><code class="FUNCTION">xmlSAXParseFile
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11892"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11892"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the filename.</p></td>
 </tr>
 <tr>
@@ -145,15 +145,15 @@ c14n issue. The code is copied from <font><code class="FUNCTION">xmlSAXParseMemo
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11917"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11917"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the input buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11922"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11922"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the input buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11927"><span style="white-space: nowrap"><var class="PARAMETER">recovery</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11927"><span style="white-space: nowrap"><var class="PARAMETER">recovery</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the flag.</p></td>
 </tr>
 <tr>
@@ -177,27 +177,27 @@ c14n issue. The code is copied from <font><code class="FUNCTION">xmlSAXParseMemo
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11956"><span style="white-space: nowrap"><var class="PARAMETER">prefix</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11956"><span style="white-space: nowrap"><var class="PARAMETER">prefix</var>:</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="AEN11961"><span style="white-space: nowrap"><var class="PARAMETER">prefixSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11961"><span style="white-space: nowrap"><var class="PARAMETER">prefixSize</var>:</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="AEN11966"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11966"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>:</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="AEN11971"><span style="white-space: nowrap"><var class="PARAMETER">bufferSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11971"><span style="white-space: nowrap"><var class="PARAMETER">bufferSize</var>:</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="AEN11976"><span style="white-space: nowrap"><var class="PARAMETER">postfix</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11976"><span style="white-space: nowrap"><var class="PARAMETER">postfix</var>:</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="AEN11981"><span style="white-space: nowrap"><var class="PARAMETER">postfixSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11981"><span style="white-space: nowrap"><var class="PARAMETER">postfixSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the size of the third part of the input.</p></td>
 </tr>
 <tr>
@@ -230,8 +230,8 @@ c14n issue. The code is copied from <font><code class="FUNCTION">xmlSAXParseMemo
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-nodeset.html"><b><<<�nodeset</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-templates.html"><b>templates�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-nodeset.html"><b><<<nodeset</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-templates.html"><b>templates>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-ref.html b/docs/api/xmlsec-ref.html
index e9d8f61..dbc264f 100644
--- a/docs/api/xmlsec-ref.html
+++ b/docs/api/xmlsec-ref.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -91,59 +91,59 @@
 <div class="TOC"><dl>
 <dt><b>Table of Contents</b></dt>
 <dt>
-<a href="xmlsec-app.html">app</a>�--�</dt>
+<a href="xmlsec-app.html">app</a>--</dt>
 <dt>
-<a href="xmlsec-base64.html">base64</a>�--�</dt>
+<a href="xmlsec-base64.html">base64</a>--</dt>
 <dt>
-<a href="xmlsec-bn.html">bn</a>�--�</dt>
+<a href="xmlsec-bn.html">bn</a>--</dt>
 <dt>
-<a href="xmlsec-buffer.html">buffer</a>�--�</dt>
+<a href="xmlsec-buffer.html">buffer</a>--</dt>
 <dt>
-<a href="xmlsec-dl.html">dl</a>�--�</dt>
+<a href="xmlsec-dl.html">dl</a>--</dt>
 <dt>
-<a href="xmlsec-errors.html">errors</a>�--�</dt>
+<a href="xmlsec-errors.html">errors</a>--</dt>
 <dt>
-<a href="xmlsec-io.html">io</a>�--�</dt>
+<a href="xmlsec-io.html">io</a>--</dt>
 <dt>
-<a href="xmlsec-keyinfo.html">keyinfo</a>�--�</dt>
+<a href="xmlsec-keyinfo.html">keyinfo</a>--</dt>
 <dt>
-<a href="xmlsec-keysdata.html">keysdata</a>�--�</dt>
+<a href="xmlsec-keysdata.html">keysdata</a>--</dt>
 <dt>
-<a href="xmlsec-keys.html">keys</a>�--�</dt>
+<a href="xmlsec-keys.html">keys</a>--</dt>
 <dt>
-<a href="xmlsec-keysmngr.html">keysmngr</a>�--�</dt>
+<a href="xmlsec-keysmngr.html">keysmngr</a>--</dt>
 <dt>
-<a href="xmlsec-list.html">list</a>�--�</dt>
+<a href="xmlsec-list.html">list</a>--</dt>
 <dt>
-<a href="xmlsec-membuf.html">membuf</a>�--�</dt>
+<a href="xmlsec-membuf.html">membuf</a>--</dt>
 <dt>
-<a href="xmlsec-nodeset.html">nodeset</a>�--�</dt>
+<a href="xmlsec-nodeset.html">nodeset</a>--</dt>
 <dt>
-<a href="xmlsec-parser.html">parser</a>�--�</dt>
+<a href="xmlsec-parser.html">parser</a>--</dt>
 <dt>
-<a href="xmlsec-templates.html">templates</a>�--�</dt>
+<a href="xmlsec-templates.html">templates</a>--</dt>
 <dt>
-<a href="xmlsec-transforms.html">transforms</a>�--�</dt>
+<a href="xmlsec-transforms.html">transforms</a>--</dt>
 <dt>
-<a href="xmlsec-version.html">version</a>�--�</dt>
+<a href="xmlsec-version.html">version</a>--</dt>
 <dt>
-<a href="xmlsec-xmldsig.html">xmldsig</a>�--�</dt>
+<a href="xmlsec-xmldsig.html">xmldsig</a>--</dt>
 <dt>
-<a href="xmlsec-xmlenc.html">xmlenc</a>�--�</dt>
+<a href="xmlsec-xmlenc.html">xmlenc</a>--</dt>
 <dt>
-<a href="xmlsec-xmlsec.html">xmlsec</a>�--�</dt>
+<a href="xmlsec-xmlsec.html">xmlsec</a>--</dt>
 <dt>
-<a href="xmlsec-xmltree.html">xmltree</a>�--�</dt>
+<a href="xmlsec-xmltree.html">xmltree</a>--</dt>
 <dt>
-<a href="xmlsec-x509.html">x509</a>�--�</dt>
+<a href="xmlsec-x509.html">x509</a>--</dt>
 </dl></div>
 <p>This section contains the API reference for xmlsec. All
     the public interfaces are documented here. This reference guide is
     build by extracting comments from the code sources. </p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-reference.html"><b><<<�XML Security Library API Reference.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-app.html"><b>app�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-reference.html"><b><<<XML Security Library API Reference.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-app.html"><b>app>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-reference.html b/docs/api/xmlsec-reference.html
index 52c3a70..83f20f7 100644
--- a/docs/api/xmlsec-reference.html
+++ b/docs/api/xmlsec-reference.html
@@ -73,7 +73,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -98,8 +98,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-encryption-klasses.html"><b><<<�APPENDIX B. XML Security Library Encryption Klasses.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-ref.html"><b>XML Security Core Library API Reference.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-encryption-klasses.html"><b><<<APPENDIX B. XML Security Library Encryption Klasses.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-ref.html"><b>XML Security Core Library API Reference.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-signature-klasses.html b/docs/api/xmlsec-signature-klasses.html
index 35a61ac..3d2b8be 100644
--- a/docs/api/xmlsec-signature-klasses.html
+++ b/docs/api/xmlsec-signature-klasses.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -94,8 +94,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-custom-keys-manager.html"><b><<<�Writing a custom keys manager.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-encryption-klasses.html"><b>APPENDIX B. XML Security Library Encryption Klasses.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-custom-keys-manager.html"><b><<<Writing a custom keys manager.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-encryption-klasses.html"><b>APPENDIX B. XML Security Library Encryption Klasses.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-templates.html b/docs/api/xmlsec-templates.html
index 640a63e..7c11338 100644
--- a/docs/api/xmlsec-templates.html
+++ b/docs/api/xmlsec-templates.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-TEMPLATES"></a>templates</h1>
 <div class="REFNAMEDIV">
-<a name="AEN12019"></a><h2>Name</h2>templates�--�</div>
+<a name="AEN12019"></a><h2>Name</h2>templates--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN12022"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<pre class="SYNOPSIS">
 
 <font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLSIGNATURECREATE">xmlSecTmplSignatureCreate</a>       (<font>xmlDocPtr</font> doc,
                                              <font>xmlSecTransformId</font> c14nMethodId,
@@ -219,22 +219,22 @@ in the XML document.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12200"><span style="white-space: nowrap"><var class="PARAMETER">doc</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12200"><span style="white-space: nowrap"><var class="PARAMETER">doc</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to signature document or NULL; in the 
 		second case, application must later call <var class="PARAMETER">xmlSetTreeDoc</var>
 		to ensure that all the children nodes have correct 
 		pointer to XML document.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12206"><span style="white-space: nowrap"><var class="PARAMETER">c14nMethodId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12206"><span style="white-space: nowrap"><var class="PARAMETER">c14nMethodId</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the signature canonicalization method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12211"><span style="white-space: nowrap"><var class="PARAMETER">signMethodId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12211"><span style="white-space: nowrap"><var class="PARAMETER">signMethodId</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the signature  method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12216"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12216"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the node id (may be NULL).</p></td>
 </tr>
 <tr>
@@ -257,11 +257,11 @@ node <var class="PARAMETER">signNode</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12242"><span style="white-space: nowrap"><var class="PARAMETER">signNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12242"><span style="white-space: nowrap"><var class="PARAMETER">signNode</var>:</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"><dsig:Signature/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12248"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12248"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the node id (may be NULL).</p></td>
 </tr>
 <tr>
@@ -287,23 +287,23 @@ Type (<var class="PARAMETER">type</var>) attributes and the required children <a
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12282"><span style="white-space: nowrap"><var class="PARAMETER">signNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12282"><span style="white-space: nowrap"><var class="PARAMETER">signNode</var>:</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"><dsig:Signature/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12288"><span style="white-space: nowrap"><var class="PARAMETER">digestMethodId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12288"><span style="white-space: nowrap"><var class="PARAMETER">digestMethodId</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the reference digest method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12293"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12293"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</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="AEN12298"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12298"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</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="AEN12303"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12303"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the reference node type (may be NULL).</p></td>
 </tr>
 <tr>
@@ -326,19 +326,19 @@ if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12331"><span style="white-space: nowrap"><var class="PARAMETER">signNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12331"><span style="white-space: nowrap"><var class="PARAMETER">signNode</var>:</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"><dsig:Signature/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12337"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12337"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</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="AEN12342"><span style="white-space: nowrap"><var class="PARAMETER">mimeType</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12342"><span style="white-space: nowrap"><var class="PARAMETER">mimeType</var>:</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="AEN12347"><span style="white-space: nowrap"><var class="PARAMETER">encoding</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12347"><span style="white-space: nowrap"><var class="PARAMETER">encoding</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the object encoding (may be NULL).</p></td>
 </tr>
 <tr>
@@ -359,7 +359,7 @@ if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12371"><span style="white-space: nowrap"><var class="PARAMETER">signNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12371"><span style="white-space: nowrap"><var class="PARAMETER">signNode</var>:</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"><dsig:Signature /></a> node.</p></td>
 </tr>
 <tr>
@@ -379,7 +379,7 @@ if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12396"><span style="white-space: nowrap"><var class="PARAMETER">signNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12396"><span style="white-space: nowrap"><var class="PARAMETER">signNode</var>:</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"><dsig:Signature /></a> node.</p></td>
 </tr>
 <tr>
@@ -399,11 +399,11 @@ if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12423"><span style="white-space: nowrap"><var class="PARAMETER">referenceNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12423"><span style="white-space: nowrap"><var class="PARAMETER">referenceNode</var>:</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"><dsig:Reference/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12429"><span style="white-space: nowrap"><var class="PARAMETER">transformId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12429"><span style="white-space: nowrap"><var class="PARAMETER">transformId</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the transform method id.</p></td>
 </tr>
 <tr>
@@ -426,15 +426,15 @@ error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12456"><span style="white-space: nowrap"><var class="PARAMETER">objectNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12456"><span style="white-space: nowrap"><var class="PARAMETER">objectNode</var>:</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"><dsig:Object/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12462"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12462"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</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="AEN12467"><span style="white-space: nowrap"><var class="PARAMETER">target</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12467"><span style="white-space: nowrap"><var class="PARAMETER">target</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Target  (may be NULL).</p></td>
 </tr>
 <tr>
@@ -455,11 +455,11 @@ if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12493"><span style="white-space: nowrap"><var class="PARAMETER">objectNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12493"><span style="white-space: nowrap"><var class="PARAMETER">objectNode</var>:</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"><dsig:Object/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12499"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12499"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the node id (may be NULL).</p></td>
 </tr>
 <tr>
@@ -485,23 +485,23 @@ Type (<var class="PARAMETER">type</var>) attributes and the required children <a
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12533"><span style="white-space: nowrap"><var class="PARAMETER">manifestNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12533"><span style="white-space: nowrap"><var class="PARAMETER">manifestNode</var>:</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"><dsig:Manifest/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12539"><span style="white-space: nowrap"><var class="PARAMETER">digestMethodId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12539"><span style="white-space: nowrap"><var class="PARAMETER">digestMethodId</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the reference digest method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12544"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12544"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</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="AEN12549"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12549"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</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="AEN12554"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12554"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the reference node type (may be NULL).</p></td>
 </tr>
 <tr>
@@ -526,29 +526,29 @@ if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12582"><span style="white-space: nowrap"><var class="PARAMETER">doc</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12582"><span style="white-space: nowrap"><var class="PARAMETER">doc</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to signature document or NULL; in the later
 		case, application must later call <var class="PARAMETER">xmlSetTreeDoc</var> to ensure 
 		that all the children nodes have correct pointer to XML document.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12588"><span style="white-space: nowrap"><var class="PARAMETER">encMethodId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12588"><span style="white-space: nowrap"><var class="PARAMETER">encMethodId</var>:</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="AEN12593"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12593"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Id attribute (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12598"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12598"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Type attribute (optional)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12603"><span style="white-space: nowrap"><var class="PARAMETER">mimeType</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12603"><span style="white-space: nowrap"><var class="PARAMETER">mimeType</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the MimeType attribute (optional)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12608"><span style="white-space: nowrap"><var class="PARAMETER">encoding</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12608"><span style="white-space: nowrap"><var class="PARAMETER">encoding</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Encoding attribute (optional)</p></td>
 </tr>
 <tr>
@@ -569,11 +569,11 @@ if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12634"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12634"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>:</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"><enc:EncryptedData/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12640"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12640"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the Id attrbibute (optional).</p></td>
 </tr>
 <tr>
@@ -596,11 +596,11 @@ node <var class="PARAMETER">encNode</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12666"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12666"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>:</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"><enc:EncryptedData/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12672"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12672"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Id attribute (optional).</p></td>
 </tr>
 <tr>
@@ -624,15 +624,15 @@ NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12700"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12700"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>:</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"><enc:EncryptedData/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12706"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12706"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Id attribute (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12711"><span style="white-space: nowrap"><var class="PARAMETER">target</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12711"><span style="white-space: nowrap"><var class="PARAMETER">target</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Target attribute (optional).</p></td>
 </tr>
 <tr>
@@ -653,7 +653,7 @@ NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12736"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12736"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>:</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"><enc:EncryptedData/></a> node.</p></td>
 </tr>
 <tr>
@@ -676,11 +676,11 @@ to the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData" target="_to
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12764"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12764"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>:</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"><enc:EncryptedData/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12770"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12770"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the URI attribute (may be NULL).</p></td>
 </tr>
 <tr>
@@ -701,7 +701,7 @@ NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12793"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12793"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>:</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"><enc:EcnryptedData /></a> node.</p></td>
 </tr>
 <tr>
@@ -724,11 +724,11 @@ child node of the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12823"><span style="white-space: nowrap"><var class="PARAMETER">cipherReferenceNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12823"><span style="white-space: nowrap"><var class="PARAMETER">cipherReferenceNode</var>:</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"><enc:CipherReference/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12829"><span style="white-space: nowrap"><var class="PARAMETER">transformId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12829"><span style="white-space: nowrap"><var class="PARAMETER">transformId</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the transform id.</p></td>
 </tr>
 <tr>
@@ -750,11 +750,11 @@ NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12854"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12854"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>:</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"><enc:EncryptedKey/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12860"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12860"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>                        uri to reference (optional)</p></td>
 </tr>
 <tr>
@@ -776,11 +776,11 @@ NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12885"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12885"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>:</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"><enc:EncryptedKey/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12891"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12891"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>                        uri to reference (optional)</p></td>
 </tr>
 <tr>
@@ -801,11 +801,11 @@ NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12917"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12917"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>:</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"><dsig:KeyInfo/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12923"><span style="white-space: nowrap"><var class="PARAMETER">name</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12923"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key name (optional).	</p></td>
 </tr>
 <tr>
@@ -825,7 +825,7 @@ NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12948"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12948"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>:</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"><dsig:KeyInfo/></a> node.</p></td>
 </tr>
 <tr>
@@ -845,7 +845,7 @@ NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12974"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12974"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>:</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"><dsig:KeyInfo/></a> node.</p></td>
 </tr>
 <tr>
@@ -868,15 +868,15 @@ NULL if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13002"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13002"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>:</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"><dsig:KeyInfo/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13008"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13008"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the URI attribute (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13013"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13013"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Type attribute(optional).</p></td>
 </tr>
 <tr>
@@ -899,11 +899,11 @@ if required) to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMet
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13040"><span style="white-space: nowrap"><var class="PARAMETER">retrMethodNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13040"><span style="white-space: nowrap"><var class="PARAMETER">retrMethodNode</var>:</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"><dsig:RetrievalMethod/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13046"><span style="white-space: nowrap"><var class="PARAMETER">transformId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13046"><span style="white-space: nowrap"><var class="PARAMETER">transformId</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the transform id.</p></td>
 </tr>
 <tr>
@@ -929,23 +929,23 @@ the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo" target="_top"><d
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13075"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13075"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>:</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"><dsig:KeyInfo/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13081"><span style="white-space: nowrap"><var class="PARAMETER">encMethodId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13081"><span style="white-space: nowrap"><var class="PARAMETER">encMethodId</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the encryption method (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13086"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13086"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Id attribute (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13091"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13091"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Type attribute (optional). </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13096"><span style="white-space: nowrap"><var class="PARAMETER">recipient</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13096"><span style="white-space: nowrap"><var class="PARAMETER">recipient</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Recipient attribute (optional). </p></td>
 </tr>
 <tr>
@@ -968,11 +968,11 @@ node <var class="PARAMETER">node</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13121"><span style="white-space: nowrap"><var class="PARAMETER">transformNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13121"><span style="white-space: nowrap"><var class="PARAMETER">transformNode</var>:</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"><dsig:Transform/></a> node</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13127"><span style="white-space: nowrap"><var class="PARAMETER">bitsLen</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13127"><span style="white-space: nowrap"><var class="PARAMETER">bitsLen</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the required length in bits</p></td>
 </tr>
 <tr>
@@ -994,15 +994,15 @@ node <var class="PARAMETER">node</var>.</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"><var class="PARAMETER">transformNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13152"><span style="white-space: nowrap"><var class="PARAMETER">transformNode</var>:</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"><dsig:Transform/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13158"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13158"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the OAEP param buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13163"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13163"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the OAEP param buffer size.</p></td>
 </tr>
 <tr>
@@ -1023,11 +1023,11 @@ node <var class="PARAMETER">node</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13186"><span style="white-space: nowrap"><var class="PARAMETER">transformNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13186"><span style="white-space: nowrap"><var class="PARAMETER">transformNode</var>:</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"><dsig:Transform/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13192"><span style="white-space: nowrap"><var class="PARAMETER">xslt</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13192"><span style="white-space: nowrap"><var class="PARAMETER">xslt</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the XSLT transform exspression.</p></td>
 </tr>
 <tr>
@@ -1048,11 +1048,11 @@ node <var class="PARAMETER">node</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13215"><span style="white-space: nowrap"><var class="PARAMETER">transformNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13215"><span style="white-space: nowrap"><var class="PARAMETER">transformNode</var>:</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"><dsig:Transform/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13221"><span style="white-space: nowrap"><var class="PARAMETER">prefixList</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13221"><span style="white-space: nowrap"><var class="PARAMETER">prefixList</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the white space delimited  list of namespace prefixes, 
 		where "<font><span class="TYPE">default</span></font>" indicates the default namespace
 		(optional).</p></td>
@@ -1076,15 +1076,15 @@ node <var class="PARAMETER">node</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13248"><span style="white-space: nowrap"><var class="PARAMETER">transformNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13248"><span style="white-space: nowrap"><var class="PARAMETER">transformNode</var>:</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"><dsig:Transform/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13254"><span style="white-space: nowrap"><var class="PARAMETER">expression</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13254"><span style="white-space: nowrap"><var class="PARAMETER">expression</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the XPath expression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13259"><span style="white-space: nowrap"><var class="PARAMETER">nsList</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13259"><span style="white-space: nowrap"><var class="PARAMETER">nsList</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the NULL terminated list of namespace prefix/href pairs
 		(optional).</p></td>
 </tr>
@@ -1108,19 +1108,19 @@ node <var class="PARAMETER">node</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13285"><span style="white-space: nowrap"><var class="PARAMETER">transformNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13285"><span style="white-space: nowrap"><var class="PARAMETER">transformNode</var>:</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"><dsig:Transform/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13291"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13291"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</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="AEN13296"><span style="white-space: nowrap"><var class="PARAMETER">expression</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13296"><span style="white-space: nowrap"><var class="PARAMETER">expression</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the XPath expression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13301"><span style="white-space: nowrap"><var class="PARAMETER">nsList</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13301"><span style="white-space: nowrap"><var class="PARAMETER">nsList</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the NULL terminated list of namespace prefix/href pairs.
 		(optional).</p></td>
 </tr>
@@ -1143,15 +1143,15 @@ node <var class="PARAMETER">node</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13326"><span style="white-space: nowrap"><var class="PARAMETER">transformNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13326"><span style="white-space: nowrap"><var class="PARAMETER">transformNode</var>:</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"><dsig:Transform/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13332"><span style="white-space: nowrap"><var class="PARAMETER">expression</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13332"><span style="white-space: nowrap"><var class="PARAMETER">expression</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the XPath expression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13337"><span style="white-space: nowrap"><var class="PARAMETER">nsList</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13337"><span style="white-space: nowrap"><var class="PARAMETER">nsList</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the NULL terminated list of namespace prefix/href pairs.
 		(optional).</p></td>
 </tr>
@@ -1163,8 +1163,8 @@ node <var class="PARAMETER">node</var>.</p>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-parser.html"><b><<<�parser</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-transforms.html"><b>transforms�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-parser.html"><b><<<parser</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-transforms.html"><b>transforms>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-transforms.html b/docs/api/xmlsec-transforms.html
index c5d327b..c28e914 100644
--- a/docs/api/xmlsec-transforms.html
+++ b/docs/api/xmlsec-transforms.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-TRANSFORMS"></a>transforms</h1>
 <div class="REFNAMEDIV">
-<a name="AEN13352"></a><h2>Name</h2>transforms�--�</div>
+<a name="AEN13352"></a><h2>Name</h2>transforms--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN13355"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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);
@@ -440,7 +440,7 @@ transform klasses: XPath transform, Base64 transform, ...</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13832"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13832"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the transform klass.</p></td>
 </tr>
 <tr>
@@ -627,11 +627,11 @@ transform klasses: XPath transform, Base64 transform, ...</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14014"><span style="white-space: nowrap"><var class="PARAMETER">type</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14014"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the expected URI type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14019"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14019"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the uri for checking.</p></td>
 </tr>
 <tr>
@@ -751,7 +751,7 @@ aborting transforms execution (if necessary).</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14138"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14138"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform's context. </p></td>
 </tr>
 <tr>
@@ -894,7 +894,7 @@ occurs.</p></td>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN14279"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14279"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr></tbody></table>
 </div>
@@ -910,7 +910,7 @@ The caller is responsible for cleaing up returend object by calling
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14297"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14297"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
@@ -928,7 +928,7 @@ The caller is responsible for cleaing up returend object by calling
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN14321"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14321"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr></tbody></table>
 </div>
@@ -941,7 +941,7 @@ The caller is responsible for cleaing up returend object by calling
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN14337"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14337"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr></tbody></table>
 </div>
@@ -956,11 +956,11 @@ The caller is responsible for cleaing up returend object by calling
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14356"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14356"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>:</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="AEN14361"><span style="white-space: nowrap"><var class="PARAMETER">src</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14361"><span style="white-space: nowrap"><var class="PARAMETER">src</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to source transforms chain processing context.</p></td>
 </tr>
 <tr>
@@ -1003,15 +1003,15 @@ all descendents including namespaces and attributes -- but not comments.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14395"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14395"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</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="AEN14400"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14400"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the URI.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14405"><span style="white-space: nowrap"><var class="PARAMETER">hereNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14405"><span style="white-space: nowrap"><var class="PARAMETER">hereNode</var>:</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>
@@ -1033,11 +1033,11 @@ all descendents including namespaces and attributes -- but not comments.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14431"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14431"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</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="AEN14436"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14436"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to new transform.</p></td>
 </tr>
 <tr>
@@ -1058,11 +1058,11 @@ all descendents including namespaces and attributes -- but not comments.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14462"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14462"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</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="AEN14467"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14467"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to new transform.</p></td>
 </tr>
 <tr>
@@ -1084,11 +1084,11 @@ transforms in the <var class="PARAMETER">ctx</var> (see <a href="xmlsec-transfor
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14492"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14492"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</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="AEN14497"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14497"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the new transform klass.</p></td>
 </tr>
 <tr>
@@ -1110,11 +1110,11 @@ transforms in the <var class="PARAMETER">ctx</var> (see <a href="xmlsec-transfor
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14522"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14522"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</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="AEN14527"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14527"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the new transform klass.</p></td>
 </tr>
 <tr>
@@ -1137,15 +1137,15 @@ of transforms in <var class="PARAMETER">ctx</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14552"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14552"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</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="AEN14557"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14557"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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="AEN14562"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14562"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the transform's usage (signature, encryption, etc.).</p></td>
 </tr>
 <tr>
@@ -1167,15 +1167,15 @@ appends them to the current transforms chain in <var class="PARAMETER">ctx</var>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14588"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14588"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</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="AEN14593"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14593"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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"><dsig:Transform/></a> nodes parent node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14599"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14599"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the transform's usage (signature, encryption, etc.).</p></td>
 </tr>
 <tr>
@@ -1195,11 +1195,11 @@ appends them to the current transforms chain in <var class="PARAMETER">ctx</var>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14622"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14622"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</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="AEN14627"><span style="white-space: nowrap"><var class="PARAMETER">inputDataType</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14627"><span style="white-space: nowrap"><var class="PARAMETER">inputDataType</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the expected input type.</p></td>
 </tr>
 <tr>
@@ -1220,15 +1220,15 @@ appends them to the current transforms chain in <var class="PARAMETER">ctx</var>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14651"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14651"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</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="AEN14656"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14656"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN14661"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14661"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the input data size.</p></td>
 </tr>
 <tr>
@@ -1248,11 +1248,11 @@ appends them to the current transforms chain in <var class="PARAMETER">ctx</var>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14684"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14684"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</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="AEN14689"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14689"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the URI.</p></td>
 </tr>
 <tr>
@@ -1272,11 +1272,11 @@ appends them to the current transforms chain in <var class="PARAMETER">ctx</var>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14713"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14713"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</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="AEN14718"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14718"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the input node set.</p></td>
 </tr>
 <tr>
@@ -1296,11 +1296,11 @@ appends them to the current transforms chain in <var class="PARAMETER">ctx</var>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14741"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14741"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</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="AEN14746"><span style="white-space: nowrap"><var class="PARAMETER">doc</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14746"><span style="white-space: nowrap"><var class="PARAMETER">doc</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to input document.</p></td>
 </tr>
 <tr>
@@ -1320,11 +1320,11 @@ appends them to the current transforms chain in <var class="PARAMETER">ctx</var>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14769"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14769"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</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="AEN14774"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14774"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -1340,11 +1340,11 @@ appends them to the current transforms chain in <var class="PARAMETER">ctx</var>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14792"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14792"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</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="AEN14797"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14797"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -1441,7 +1441,7 @@ destroying returned tansform using <a href="xmlsec-transforms.html#XMLSECTRANSFO
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14900"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14900"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the transform id to create.</p></td>
 </tr>
 <tr>
@@ -1459,7 +1459,7 @@ destroying returned tansform using <a href="xmlsec-transforms.html#XMLSECTRANSFO
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN14923"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14923"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to transform.</p></td>
 </tr></tbody></table>
 </div>
@@ -1479,15 +1479,15 @@ destroying returned tansform using <a href="xmlsec-transforms.html#XMLSECTRANSFO
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14946"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14946"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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="AEN14951"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14951"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>:</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="AEN14956"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14956"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform's chaing processing context.</p></td>
 </tr>
 <tr>
@@ -1509,15 +1509,15 @@ no more data is available.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14981"><span style="white-space: nowrap"><var class="PARAMETER">left</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14981"><span style="white-space: nowrap"><var class="PARAMETER">left</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the source pumping transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14986"><span style="white-space: nowrap"><var class="PARAMETER">right</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14986"><span style="white-space: nowrap"><var class="PARAMETER">right</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination pumping transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14991"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14991"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform's chaing processing context.</p></td>
 </tr>
 <tr>
@@ -1537,11 +1537,11 @@ no more data is available.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15013"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15013"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15018"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15018"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key. </p></td>
 </tr>
 <tr>
@@ -1561,11 +1561,11 @@ no more data is available.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15042"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15042"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15047"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15047"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys requirements object. </p></td>
 </tr>
 <tr>
@@ -1589,19 +1589,19 @@ result is stored in the <font><span class="TYPE">status</span></font> member of
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15075"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15075"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15080"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15080"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN15085"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15085"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15090"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15090"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform's chaing processing context.</p></td>
 </tr>
 <tr>
@@ -1624,15 +1624,15 @@ function to verify binary results.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15116"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15116"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15121"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15121"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15126"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15126"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform's chaing processing context.</p></td>
 </tr>
 <tr>
@@ -1655,15 +1655,15 @@ type (binary or XML).</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15151"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15151"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15156"><span style="white-space: nowrap"><var class="PARAMETER">mode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15156"><span style="white-space: nowrap"><var class="PARAMETER">mode</var>:</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="AEN15161"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15161"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform's chaing processing context.</p></td>
 </tr>
 <tr>
@@ -1686,24 +1686,24 @@ type (binary or XML).</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15188"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15188"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN15193"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15193"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the input binary data,</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15198"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15198"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the input data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15203"><span style="white-space: nowrap"><var class="PARAMETER">final</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15203"><span style="white-space: nowrap"><var class="PARAMETER">final</var>:</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="AEN15208"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15208"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform context object.</p></td>
 </tr>
 <tr>
@@ -1728,23 +1728,23 @@ placed in the <var class="PARAMETER">dataSize</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15235"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15235"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN15240"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15240"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN15245"><span style="white-space: nowrap"><var class="PARAMETER">maxDataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15245"><span style="white-space: nowrap"><var class="PARAMETER">maxDataSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the size of the buffer <font><span class="TYPE">data</span></font>.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15252"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15252"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</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="AEN15257"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15257"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform context object.</p></td>
 </tr>
 <tr>
@@ -1765,15 +1765,15 @@ placed in the <var class="PARAMETER">dataSize</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15281"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15281"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN15286"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15286"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the input nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15291"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15291"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform context object.</p></td>
 </tr>
 <tr>
@@ -1795,15 +1795,15 @@ returns result in <var class="PARAMETER">nodes</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15315"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15315"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN15320"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15320"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>:</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="AEN15325"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15325"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform context object.</p></td>
 </tr>
 <tr>
@@ -1824,15 +1824,15 @@ returns result in <var class="PARAMETER">nodes</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15348"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15348"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15353"><span style="white-space: nowrap"><var class="PARAMETER">last</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15353"><span style="white-space: nowrap"><var class="PARAMETER">last</var>:</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="AEN15358"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15358"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform's chaing processing context.</p></td>
 </tr>
 <tr>
@@ -1852,11 +1852,11 @@ returns result in <var class="PARAMETER">nodes</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15381"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15381"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15386"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15386"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -1872,11 +1872,11 @@ returns result in <var class="PARAMETER">nodes</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15404"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15404"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15409"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15409"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -1890,7 +1890,7 @@ returns result in <var class="PARAMETER">nodes</var>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN15423"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15423"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr></tbody></table>
 </div>
@@ -1903,7 +1903,7 @@ returns result in <var class="PARAMETER">nodes</var>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN15438"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15438"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to transform.</p></td>
 </tr></tbody></table>
 </div>
@@ -1918,11 +1918,11 @@ or 0 otherwise.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15454"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15454"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15459"><span style="white-space: nowrap"><var class="PARAMETER">t</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15459"><span style="white-space: nowrap"><var class="PARAMETER">t</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 			the transform type.</p></td>
 </tr>
 </tbody></table>
@@ -1938,11 +1938,11 @@ or 0 otherwise.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15475"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15475"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15480"><span style="white-space: nowrap"><var class="PARAMETER">i</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15480"><span style="white-space: nowrap"><var class="PARAMETER">i</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the transform id.</p></td>
 </tr>
 </tbody></table>
@@ -1958,11 +1958,11 @@ bytes or 0 otherwise.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15496"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15496"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15501"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15501"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the transform object size.</p></td>
 </tr>
 </tbody></table>
@@ -1993,15 +1993,15 @@ processing instructions. The output of this transform is an octet stream.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15525"><span style="white-space: nowrap"><var class="PARAMETER">left</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15525"><span style="white-space: nowrap"><var class="PARAMETER">left</var>:</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="AEN15530"><span style="white-space: nowrap"><var class="PARAMETER">right</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15530"><span style="white-space: nowrap"><var class="PARAMETER">right</var>:</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="AEN15535"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15535"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform's chaing processing context.</p></td>
 </tr>
 <tr>
@@ -2019,7 +2019,7 @@ 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="AEN15557"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15557"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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>
@@ -2038,15 +2038,15 @@ methods.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15579"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15579"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15584"><span style="white-space: nowrap"><var class="PARAMETER">mode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15584"><span style="white-space: nowrap"><var class="PARAMETER">mode</var>:</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="AEN15589"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15589"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform's chaing processing context.</p></td>
 </tr>
 <tr>
@@ -2070,24 +2070,24 @@ results to next transform.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15616"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15616"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN15621"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15621"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the input binary data,</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15626"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15626"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the input data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15631"><span style="white-space: nowrap"><var class="PARAMETER">final</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15631"><span style="white-space: nowrap"><var class="PARAMETER">final</var>:</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="AEN15636"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15636"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform context object.</p></td>
 </tr>
 <tr>
@@ -2112,23 +2112,23 @@ size of returned data is placed in the <var class="PARAMETER">dataSize</var>.</p
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15663"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15663"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN15668"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15668"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN15673"><span style="white-space: nowrap"><var class="PARAMETER">maxDataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15673"><span style="white-space: nowrap"><var class="PARAMETER">maxDataSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the size of the buffer <font><span class="TYPE">data</span></font>.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15680"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15680"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</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="AEN15685"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15685"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform context object.</p></td>
 </tr>
 <tr>
@@ -2150,15 +2150,15 @@ result to the next transform in the chain.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15709"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15709"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN15714"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15714"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the input nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15719"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15719"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform context object.</p></td>
 </tr>
 <tr>
@@ -2180,15 +2180,15 @@ by calling transform's execute method and returns result in <var class="PARAMETE
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15743"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15743"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN15748"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15748"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>:</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="AEN15753"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15753"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform context object.</p></td>
 </tr>
 <tr>
@@ -2209,11 +2209,11 @@ by calling transform's execute method and returns result in <var class="PARAMETE
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15776"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15776"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15781"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15781"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform context object.</p></td>
 </tr>
 <tr>
@@ -2234,11 +2234,11 @@ by calling transform's execute method and returns result in <var class="PARAMETE
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15804"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15804"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15809"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15809"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform context object.</p></td>
 </tr>
 <tr>
@@ -2258,7 +2258,7 @@ by calling transform's execute method and returns result in <var class="PARAMETE
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15830"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15830"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to transform object.</p></td>
 </tr>
 <tr>
@@ -2277,7 +2277,7 @@ by calling transform's execute method and returns result in <var class="PARAMETE
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN15851"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15851"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to transform object.</p></td>
 </tr></tbody></table>
 </div>
@@ -2295,15 +2295,15 @@ data type in specified mode <var class="PARAMETER">mode</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15870"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15870"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN15875"><span style="white-space: nowrap"><var class="PARAMETER">mode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15875"><span style="white-space: nowrap"><var class="PARAMETER">mode</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the mode.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15880"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15880"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform context object.</p></td>
 </tr>
 <tr>
@@ -2326,15 +2326,15 @@ the <var class="PARAMETER">node</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15904"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15904"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN15909"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15909"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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"><dsig:Transform/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15915"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15915"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform context object.</p></td>
 </tr>
 <tr>
@@ -2356,15 +2356,15 @@ the <var class="PARAMETER">node</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15939"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15939"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN15944"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15944"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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"><dsig:Transform/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15950"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15950"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform context object.</p></td>
 </tr>
 <tr>
@@ -2385,11 +2385,11 @@ the <var class="PARAMETER">node</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15972"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15972"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN15977"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15977"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to key requirements structure.</p></td>
 </tr>
 <tr>
@@ -2409,11 +2409,11 @@ the <var class="PARAMETER">node</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15999"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15999"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN16004"><span style="white-space: nowrap"><var class="PARAMETER">key</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16004"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 			the pointer to key.</p></td>
 </tr>
 <tr>
@@ -2438,19 +2438,19 @@ if verification succeeded or <font><span class="TYPE">xmlSecTransformStatusFail<
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16035"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16035"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN16040"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16040"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the input buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16045"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16045"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the size of input buffer <var class="PARAMETER">data</var>.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16051"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16051"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform context object.</p></td>
 </tr>
 <tr>
@@ -2474,24 +2474,24 @@ result to the next transform in the chain.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16077"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16077"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN16082"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16082"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the input binary data,</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16087"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16087"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the input data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16092"><span style="white-space: nowrap"><var class="PARAMETER">final</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16092"><span style="white-space: nowrap"><var class="PARAMETER">final</var>:</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="AEN16097"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16097"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform context object.</p></td>
 </tr>
 <tr>
@@ -2516,23 +2516,23 @@ data is placed in the <var class="PARAMETER">dataSize</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16124"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16124"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN16129"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16129"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN16134"><span style="white-space: nowrap"><var class="PARAMETER">maxDataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16134"><span style="white-space: nowrap"><var class="PARAMETER">maxDataSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the size of the buffer <var class="PARAMETER">data</var>.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16140"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16140"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</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="AEN16145"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16145"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform context object.</p></td>
 </tr>
 <tr>
@@ -2554,15 +2554,15 @@ transform in the chain.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16169"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16169"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN16174"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16174"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the input nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16179"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16179"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform context object.</p></td>
 </tr>
 <tr>
@@ -2584,15 +2584,15 @@ process the data and return result in <var class="PARAMETER">nodes</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16203"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16203"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN16208"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16208"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>:</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="AEN16213"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16213"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform context object.</p></td>
 </tr>
 <tr>
@@ -2613,15 +2613,15 @@ process the data and return result in <var class="PARAMETER">nodes</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16236"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16236"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN16241"><span style="white-space: nowrap"><var class="PARAMETER">last</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16241"><span style="white-space: nowrap"><var class="PARAMETER">last</var>:</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="AEN16246"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16246"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform context object.</p></td>
 </tr>
 <tr>
@@ -2763,7 +2763,7 @@ process the data and return result in <var class="PARAMETER">nodes</var>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN16398"><span style="white-space: nowrap"><var class="PARAMETER">klass</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16398"><span style="white-space: nowrap"><var class="PARAMETER">klass</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the transofrm's klass.</p></td>
 </tr></tbody></table>
 </div>
@@ -2800,11 +2800,11 @@ process the data and return result in <var class="PARAMETER">nodes</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16440"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16440"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</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="AEN16445"><span style="white-space: nowrap"><var class="PARAMETER">transformId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16445"><span style="white-space: nowrap"><var class="PARAMETER">transformId</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform klass.</p></td>
 </tr>
 <tr>
@@ -2827,15 +2827,15 @@ value if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16473"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16473"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</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="AEN16478"><span style="white-space: nowrap"><var class="PARAMETER">href</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16478"><span style="white-space: nowrap"><var class="PARAMETER">href</var>:</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="AEN16483"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16483"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired transform usage.</p></td>
 </tr>
 <tr>
@@ -2857,15 +2857,15 @@ value if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16509"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16509"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</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="AEN16514"><span style="white-space: nowrap"><var class="PARAMETER">name</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16514"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</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="AEN16519"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16519"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired transform usage.</p></td>
 </tr>
 <tr>
@@ -2885,11 +2885,11 @@ value if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16542"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16542"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</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="AEN16547"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16547"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -2906,11 +2906,11 @@ value if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16565"><span style="white-space: nowrap"><var class="PARAMETER">list</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16565"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</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="AEN16570"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16570"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -2962,11 +2962,11 @@ the encoded content of an element.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16621"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16621"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN16626"><span style="white-space: nowrap"><var class="PARAMETER">lineSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16626"><span style="white-space: nowrap"><var class="PARAMETER">lineSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new max line size.</p></td>
 </tr>
 </tbody></table>
@@ -3187,19 +3187,19 @@ http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-XPath</span></fon
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16842"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16842"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN16847"><span style="white-space: nowrap"><var class="PARAMETER">expr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16847"><span style="white-space: nowrap"><var class="PARAMETER">expr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the XPointer expression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16852"><span style="white-space: nowrap"><var class="PARAMETER">nodeSetType</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16852"><span style="white-space: nowrap"><var class="PARAMETER">nodeSetType</var>:</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="AEN16857"><span style="white-space: nowrap"><var class="PARAMETER">hereNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16857"><span style="white-space: nowrap"><var class="PARAMETER">hereNode</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to "here" node.</p></td>
 </tr>
 <tr>
@@ -3323,11 +3323,11 @@ expressions thru XPath/XPointer engine, we need to have this hack here.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16962"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16962"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</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="AEN16967"><span style="white-space: nowrap"><var class="PARAMETER">id</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16967"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the ID value.</p></td>
 </tr>
 <tr>
@@ -3338,8 +3338,8 @@ expressions thru XPath/XPointer engine, we need to have this hack here.</p>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-templates.html"><b><<<�templates</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-version.html"><b>version�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-templates.html"><b><<<templates</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-version.html"><b>version>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-verify-with-key.html b/docs/api/xmlsec-verify-with-key.html
index c7ad76e..5211621 100644
--- a/docs/api/xmlsec-verify-with-key.html
+++ b/docs/api/xmlsec-verify-with-key.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -287,14 +287,15 @@ done:
     }
     return(res);
 }
-
</pre>
+
+</pre>
 <p></p>
 </div>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-examples-sign-x509.html"><b><<<�Signing with X509 certificate.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-verify-with-keys-mngr.html"><b>Verifying a signature with keys manager.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-examples-sign-x509.html"><b><<<Signing with X509 certificate.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-verify-with-keys-mngr.html"><b>Verifying a signature with keys manager.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-verify-with-keys-mngr.html b/docs/api/xmlsec-verify-with-keys-mngr.html
index 39b46a0..df190a4 100644
--- a/docs/api/xmlsec-verify-with-keys-mngr.html
+++ b/docs/api/xmlsec-verify-with-keys-mngr.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -357,14 +357,15 @@ done:
     }
     return(res);
 }
-
</pre>
+
+</pre>
 <p></p>
 </div>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-verify-with-key.html"><b><<<�Verifying a signature with a single key.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-verify-with-x509.html"><b>Verifying a signature with X509 certificates.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-verify-with-key.html"><b><<<Verifying a signature with a single key.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-verify-with-x509.html"><b>Verifying a signature with X509 certificates.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-verify-with-restrictions.html b/docs/api/xmlsec-verify-with-restrictions.html
index 863ad53..ad6ab32 100644
--- a/docs/api/xmlsec-verify-with-restrictions.html
+++ b/docs/api/xmlsec-verify-with-restrictions.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -382,7 +382,8 @@ done:
     }
     return(res);
 }
-
</pre>
+
+</pre>
 <p></p>
 </div>
 </div>
@@ -691,8 +692,8 @@ NJ2D</X509Certificate>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-verify-with-x509.html"><b><<<�Verifying a signature with X509 certificates.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-encrypt-template-file.html"><b>Encrypting data with a template file.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-verify-with-x509.html"><b><<<Verifying a signature with X509 certificates.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-encrypt-template-file.html"><b>Encrypting data with a template file.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-verify-with-x509.html b/docs/api/xmlsec-verify-with-x509.html
index 335c121..907565d 100644
--- a/docs/api/xmlsec-verify-with-x509.html
+++ b/docs/api/xmlsec-verify-with-x509.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -339,14 +339,15 @@ done:
     }
     return(res);
 }
-
</pre>
+
+</pre>
 <p></p>
 </div>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-verify-with-keys-mngr.html"><b><<<�Verifying a signature with keys manager.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-verify-with-restrictions.html"><b>Verifying a signature with additional restrictions.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-verify-with-keys-mngr.html"><b><<<Verifying a signature with keys manager.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-verify-with-restrictions.html"><b>Verifying a signature with additional restrictions.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-version.html b/docs/api/xmlsec-version.html
index ae3271e..6d541ea 100644
--- a/docs/api/xmlsec-version.html
+++ b/docs/api/xmlsec-version.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-VERSION"></a>version</h1>
 <div class="REFNAMEDIV">
-<a name="AEN16982"></a><h2>Name</h2>version�--�</div>
+<a name="AEN16982"></a><h2>Name</h2>version--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN16985"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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>
@@ -148,8 +148,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-transforms.html"><b><<<�transforms</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-xmldsig.html"><b>xmldsig�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-transforms.html"><b><<<transforms</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-xmldsig.html"><b>xmldsig>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-x509.html b/docs/api/xmlsec-x509.html
index 46e75ad..245b547 100644
--- a/docs/api/xmlsec-x509.html
+++ b/docs/api/xmlsec-x509.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-X509"></a>x509</h1>
 <div class="REFNAMEDIV">
-<a name="AEN20492"></a><h2>Name</h2>x509�--�</div>
+<a name="AEN20492"></a><h2>Name</h2>x509--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN20495"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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>
@@ -170,15 +170,15 @@ a bits mask.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20581"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20581"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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"><dsig:X509Data/></a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20587"><span style="white-space: nowrap"><var class="PARAMETER">deleteChildren</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20587"><span style="white-space: nowrap"><var class="PARAMETER">deleteChildren</var>:</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="AEN20592"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20592"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</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"><dsig:KeyInfo/></a> node processing context.</p></td>
 </tr>
 <tr>
@@ -190,8 +190,8 @@ or a negative value if an error occurs.</p></td>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-xmltree.html"><b><<<�xmltree</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-openssl-ref.html"><b>XML Security Library for OpenSLL API Reference.�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-xmltree.html"><b><<<xmltree</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-openssl-ref.html"><b>XML Security Library for OpenSLL API Reference.>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-xmldsig.html b/docs/api/xmlsec-xmldsig.html
index 6d5d716..d6c83a8 100644
--- a/docs/api/xmlsec-xmldsig.html
+++ b/docs/api/xmlsec-xmldsig.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-XMLDSIG"></a>xmldsig</h1>
 <div class="REFNAMEDIV">
-<a name="AEN17043"></a><h2>Name</h2>xmldsig�--�</div>
+<a name="AEN17043"></a><h2>Name</h2>xmldsig--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN17046"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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>
@@ -382,7 +382,7 @@ The caller is responsible for destroying returend object by calling
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17402"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17402"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
@@ -401,7 +401,7 @@ occurs.</p></td>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17425"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17425"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</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"><dsig:Signature/></a> processing context.</p></td>
 </tr></tbody></table>
 </div>
@@ -418,11 +418,11 @@ The caller is responsible for cleaing up returend object by calling
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17446"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17446"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</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"><dsig:Signature/></a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17452"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17452"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
@@ -440,7 +440,7 @@ The caller is responsible for cleaing up returend object by calling
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17476"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17476"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</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"><dsig:Signature/></a> processing context.</p></td>
 </tr></tbody></table>
 </div>
@@ -455,11 +455,11 @@ The caller is responsible for cleaing up returend object by calling
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17495"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17495"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</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"><dsig:Signature/></a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17501"><span style="white-space: nowrap"><var class="PARAMETER">tmpl</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17501"><span style="white-space: nowrap"><var class="PARAMETER">tmpl</var>:</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"><dsig:Signature/></a> node with signature template.</p></td>
 </tr>
 <tr>
@@ -480,11 +480,11 @@ in <font><span class="TYPE">status</span></font> member of the <var class="PARAM
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17528"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17528"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</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"><dsig:Signature/></a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17534"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17534"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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"><dsig:Signature/></a> node.</p></td>
 </tr>
 <tr>
@@ -506,11 +506,11 @@ signature verification result) or a negative value if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17562"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17562"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</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"><dsig:Signature/></a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17568"><span style="white-space: nowrap"><var class="PARAMETER">transformId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17568"><span style="white-space: nowrap"><var class="PARAMETER">transformId</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform klass.</p></td>
 </tr>
 <tr>
@@ -531,11 +531,11 @@ signature verification result) or a negative value if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17592"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17592"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</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"><dsig:Signature/></a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17598"><span style="white-space: nowrap"><var class="PARAMETER">transformId</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17598"><span style="white-space: nowrap"><var class="PARAMETER">transformId</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform klass.</p></td>
 </tr>
 <tr>
@@ -557,7 +557,7 @@ just before signature claculation (valid if and only if
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17622"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17622"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</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"><dsig:Signature/></a> processing context.</p></td>
 </tr>
 <tr>
@@ -577,11 +577,11 @@ just before signature claculation (valid if and only if
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17647"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17647"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</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"><dsig:Signature/></a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17653"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17653"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -597,11 +597,11 @@ just before signature claculation (valid if and only if
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17672"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17672"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</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"><dsig:Signature/></a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17678"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17678"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -728,11 +728,11 @@ function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17818"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17818"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</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"><dsig:Signature/></a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17824"><span style="white-space: nowrap"><var class="PARAMETER">origin</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17824"><span style="white-space: nowrap"><var class="PARAMETER">origin</var>:</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"><dsig:SignedInfo/></a> or <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest" target="_top"><dsig:Manifest/></a> node).</p></td>
 </tr>
 <tr>
@@ -750,7 +750,7 @@ function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17849"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17849"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>:</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"><dsig:Reference/></a> element processing context.</p></td>
 </tr></tbody></table>
 </div>
@@ -769,15 +769,15 @@ function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17871"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17871"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>:</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"><dsig:Reference/></a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17877"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17877"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</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"><dsig:Signature/></a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17883"><span style="white-space: nowrap"><var class="PARAMETER">origin</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17883"><span style="white-space: nowrap"><var class="PARAMETER">origin</var>:</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"><dsig:SignedInfo/></a> or <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest" target="_top"><dsig:Manifest/></a> node).</p></td>
 </tr>
 <tr>
@@ -795,7 +795,7 @@ function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17908"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17908"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>:</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"><dsig:Reference/></a> element processing context.</p></td>
 </tr></tbody></table>
 </div>
@@ -821,11 +821,11 @@ from elsewhere.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17929"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17929"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>:</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"><dsig:Reference/></a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17935"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17935"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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"><dsig:Reference/></a> node.</p></td>
 </tr>
 <tr>
@@ -848,7 +848,7 @@ is set).</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17962"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17962"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>:</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"><dsig:Reference/></a> element processing context.</p></td>
 </tr>
 <tr>
@@ -868,11 +868,11 @@ is set).</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17987"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17987"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>:</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"><dsig:Reference/></a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17993"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17993"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -889,11 +889,11 @@ is set).</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18012"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18012"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>:</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"><dsig:Reference/></a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18018"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18018"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -922,8 +922,8 @@ is set).</p>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-version.html"><b><<<�version</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-xmlenc.html"><b>xmlenc�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-version.html"><b><<<version</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-xmlenc.html"><b>xmlenc>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-xmlenc.html b/docs/api/xmlsec-xmlenc.html
index 2069a17..02c0939 100644
--- a/docs/api/xmlsec-xmlenc.html
+++ b/docs/api/xmlsec-xmlenc.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-XMLENC"></a>xmlenc</h1>
 <div class="REFNAMEDIV">
-<a name="AEN18053"></a><h2>Name</h2>xmlenc�--�</div>
+<a name="AEN18053"></a><h2>Name</h2>xmlenc--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN18056"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<pre class="SYNOPSIS">
 
 enum        <a href="xmlsec-xmlenc.html#XMLENCCTXMODE">xmlEncCtxMode</a>;
 struct      <a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtx</a>;
@@ -322,7 +322,7 @@ The caller is responsible for destroying returend object by calling
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18342"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18342"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
@@ -341,7 +341,7 @@ occurs.</p></td>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN18365"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18365"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</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"><enc:EncryptedData/></a> processing context.</p></td>
 </tr></tbody></table>
 </div>
@@ -358,11 +358,11 @@ The caller is responsible for cleaing up returend object by calling
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18386"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18386"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</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"><enc:EncryptedData/></a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18392"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18392"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
@@ -380,7 +380,7 @@ The caller is responsible for cleaing up returend object by calling
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN18414"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18414"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</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"><enc:EncryptedData/></a> processing context.</p></td>
 </tr></tbody></table>
 </div>
@@ -395,11 +395,11 @@ The caller is responsible for cleaing up returend object by calling
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18434"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18434"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>:</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="AEN18439"><span style="white-space: nowrap"><var class="PARAMETER">src</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18439"><span style="white-space: nowrap"><var class="PARAMETER">src</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to source context.</p></td>
 </tr>
 <tr>
@@ -417,7 +417,7 @@ The caller is responsible for cleaing up returend object by calling
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN18461"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18461"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</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"><enc:EncryptedData/></a> processing context.</p></td>
 </tr></tbody></table>
 </div>
@@ -434,19 +434,19 @@ The caller is responsible for cleaing up returend object by calling
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18483"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18483"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</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"><enc:EncryptedData/></a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18489"><span style="white-space: nowrap"><var class="PARAMETER">tmpl</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18489"><span style="white-space: nowrap"><var class="PARAMETER">tmpl</var>:</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"><enc:EncryptedData/></a> template node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18495"><span style="white-space: nowrap"><var class="PARAMETER">data</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18495"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</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="AEN18500"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18500"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the <var class="PARAMETER">data</var> buffer size.</p></td>
 </tr>
 <tr>
@@ -468,15 +468,15 @@ with result <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData" target
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18528"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18528"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</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"><enc:EncryptedData/></a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18534"><span style="white-space: nowrap"><var class="PARAMETER">tmpl</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18534"><span style="white-space: nowrap"><var class="PARAMETER">tmpl</var>:</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"><enc:EncryptedData/></a> template node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18540"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18540"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to node for encryption.</p></td>
 </tr>
 <tr>
@@ -497,15 +497,15 @@ with result <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData" target
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18565"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18565"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</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"><enc:EncryptedData/></a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18571"><span style="white-space: nowrap"><var class="PARAMETER">tmpl</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18571"><span style="white-space: nowrap"><var class="PARAMETER">tmpl</var>:</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"><enc:EncryptedData/></a> template node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18577"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18577"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the URI.</p></td>
 </tr>
 <tr>
@@ -525,11 +525,11 @@ with result <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData" target
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18601"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18601"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</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"><enc:EncryptedData/></a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18607"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18607"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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"><enc:EncryptedData/></a> node.</p></td>
 </tr>
 <tr>
@@ -549,11 +549,11 @@ with result <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData" target
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18632"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18632"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</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"><enc:EncryptedData/></a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18638"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18638"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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"><enc:EncryptedData/></a> node.</p></td>
 </tr>
 <tr>
@@ -573,11 +573,11 @@ with result <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData" target
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18663"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18663"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</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"><enc:EncryptedData/></a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18669"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18669"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -593,19 +593,19 @@ with result <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData" target
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18688"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18688"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</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"><enc:EncryptedData/></a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18694"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18694"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-xmldsig.html"><b><<<�xmldsig</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-xmlsec.html"><b>xmlsec�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-xmldsig.html"><b><<<xmldsig</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-xmlsec.html"><b>xmlsec>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-xmlsec.html b/docs/api/xmlsec-xmlsec.html
index 85a5317..bb53544 100644
--- a/docs/api/xmlsec-xmlsec.html
+++ b/docs/api/xmlsec-xmlsec.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-XMLSEC"></a>xmlsec</h1>
 <div class="REFNAMEDIV">
-<a name="AEN18704"></a><h2>Name</h2>xmlsec�--�</div>
+<a name="AEN18704"></a><h2>Name</h2>xmlsec--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN18707"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<pre class="SYNOPSIS">
 
 typedef     <font>xmlSecPtr</font>;
 #define     <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>
@@ -220,19 +220,19 @@ value if an error occurs.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18835"><span style="white-space: nowrap"><var class="PARAMETER">major</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18835"><span style="white-space: nowrap"><var class="PARAMETER">major</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the major version number.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18840"><span style="white-space: nowrap"><var class="PARAMETER">minor</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18840"><span style="white-space: nowrap"><var class="PARAMETER">minor</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the minor version number.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18845"><span style="white-space: nowrap"><var class="PARAMETER">subminor</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18845"><span style="white-space: nowrap"><var class="PARAMETER">subminor</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the subminor version number.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18850"><span style="white-space: nowrap"><var class="PARAMETER">mode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18850"><span style="white-space: nowrap"><var class="PARAMETER">mode</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the version check mode.</p></td>
 </tr>
 <tr>
@@ -252,8 +252,8 @@ value if an error occurs.</p>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-xmlenc.html"><b><<<�xmlenc</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-xmltree.html"><b>xmltree�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-xmlenc.html"><b><<<xmlenc</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-xmltree.html"><b>xmltree>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-xmltree.html b/docs/api/xmlsec-xmltree.html
index b58be05..a98a5e9 100644
--- a/docs/api/xmlsec-xmltree.html
+++ b/docs/api/xmlsec-xmltree.html
@@ -74,7 +74,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="../images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -88,10 +88,10 @@
 <h1>
 <a name="XMLSEC-XMLTREE"></a>xmltree</h1>
 <div class="REFNAMEDIV">
-<a name="AEN18873"></a><h2>Name</h2>xmltree�--�</div>
+<a name="AEN18873"></a><h2>Name</h2>xmltree--</div>
 <div class="REFSYNOPSISDIV">
 <a name="AEN18876"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
+<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);
@@ -241,7 +241,7 @@ struct      <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKINFO">xmlSecQName2Bi
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN19094"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19094"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to node.</p></td>
 </tr></tbody></table>
 </div>
@@ -255,7 +255,7 @@ struct      <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKINFO">xmlSecQName2Bi
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19110"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19110"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to node.</p></td>
 </tr>
 <tr>
@@ -276,15 +276,15 @@ struct      <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKINFO">xmlSecQName2Bi
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19133"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19133"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</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="AEN19138"><span style="white-space: nowrap"><var class="PARAMETER">name</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19138"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the name,</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19143"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19143"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the namespace href.</p></td>
 </tr>
 <tr>
@@ -303,7 +303,7 @@ struct      <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKINFO">xmlSecQName2Bi
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19164"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19164"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to an XML node.</p></td>
 </tr>
 <tr>
@@ -325,15 +325,15 @@ namespace href.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19188"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19188"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>:</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="AEN19193"><span style="white-space: nowrap"><var class="PARAMETER">name</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19193"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19198"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19198"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the namespace href (may be NULL).</p></td>
 </tr>
 <tr>
@@ -356,15 +356,15 @@ and namespace href.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19222"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19222"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</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="AEN19227"><span style="white-space: nowrap"><var class="PARAMETER">name</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19227"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19232"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19232"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the namespace href (may be NULL).</p></td>
 </tr>
 <tr>
@@ -387,15 +387,15 @@ namespace href.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19256"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19256"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>:</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="AEN19261"><span style="white-space: nowrap"><var class="PARAMETER">name</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19261"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19266"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19266"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the namespace href (may be NULL).</p></td>
 </tr>
 <tr>
@@ -417,15 +417,15 @@ node is not found.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19292"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19292"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>:</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="AEN19297"><span style="white-space: nowrap"><var class="PARAMETER">name</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19297"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new node name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19302"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19302"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new node namespace.</p></td>
 </tr>
 <tr>
@@ -445,11 +445,11 @@ node is not found.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19326"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19326"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>:</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="AEN19331"><span style="white-space: nowrap"><var class="PARAMETER">child</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19331"><span style="white-space: nowrap"><var class="PARAMETER">child</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new node.</p></td>
 </tr>
 <tr>
@@ -470,15 +470,15 @@ node is not found.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19357"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19357"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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="AEN19362"><span style="white-space: nowrap"><var class="PARAMETER">name</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19362"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new node name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19367"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19367"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new node namespace.</p></td>
 </tr>
 <tr>
@@ -499,15 +499,15 @@ node is not found.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19393"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19393"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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="AEN19398"><span style="white-space: nowrap"><var class="PARAMETER">name</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19398"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new node name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19403"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19403"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new node namespace.</p></td>
 </tr>
 <tr>
@@ -527,11 +527,11 @@ node is not found.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19427"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19427"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the current node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19432"><span style="white-space: nowrap"><var class="PARAMETER">newNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19432"><span style="white-space: nowrap"><var class="PARAMETER">newNode</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new node.</p></td>
 </tr>
 <tr>
@@ -551,11 +551,11 @@ node is not found.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19456"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19456"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the current node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19461"><span style="white-space: nowrap"><var class="PARAMETER">newNode</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19461"><span style="white-space: nowrap"><var class="PARAMETER">newNode</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new node.</p></td>
 </tr>
 <tr>
@@ -576,15 +576,15 @@ node is not found.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19486"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19486"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the current node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19491"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19491"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the XML data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19496"><span style="white-space: nowrap"><var class="PARAMETER">size</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19496"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the XML data size.</p></td>
 </tr>
 <tr>
@@ -606,15 +606,15 @@ from the <var class="PARAMETER">ids</var> list to the <var class="PARAMETER">doc
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19522"><span style="white-space: nowrap"><var class="PARAMETER">doc</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19522"><span style="white-space: nowrap"><var class="PARAMETER">doc</var>:</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="AEN19527"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19527"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</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="AEN19532"><span style="white-space: nowrap"><var class="PARAMETER">ids</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19532"><span style="white-space: nowrap"><var class="PARAMETER">ids</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to a NULL terminated list of ID attributes.</p></td>
 </tr>
 </tbody></table>
@@ -633,19 +633,19 @@ and puts it in the attribute <var class="PARAMETER">attrName</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19554"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19554"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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="AEN19559"><span style="white-space: nowrap"><var class="PARAMETER">attrName</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19559"><span style="white-space: nowrap"><var class="PARAMETER">attrName</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the ID attr name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19564"><span style="white-space: nowrap"><var class="PARAMETER">prefix</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19564"><span style="white-space: nowrap"><var class="PARAMETER">prefix</var>:</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="AEN19569"><span style="white-space: nowrap"><var class="PARAMETER">len</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19569"><span style="white-space: nowrap"><var class="PARAMETER">len</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the length of ID.</p></td>
 </tr>
 <tr>
@@ -666,11 +666,11 @@ The caller is responsible for freeing returned string using <var class="PARAMETE
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19594"><span style="white-space: nowrap"><var class="PARAMETER">prefix</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19594"><span style="white-space: nowrap"><var class="PARAMETER">prefix</var>:</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="AEN19599"><span style="white-space: nowrap"><var class="PARAMETER">len</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19599"><span style="white-space: nowrap"><var class="PARAMETER">len</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the length of ID.</p></td>
 </tr>
 <tr>
@@ -690,11 +690,11 @@ The caller is responsible for freeing returned string using <var class="PARAMETE
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19622"><span style="white-space: nowrap"><var class="PARAMETER">rootNodeName</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19622"><span style="white-space: nowrap"><var class="PARAMETER">rootNodeName</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the root node name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19627"><span style="white-space: nowrap"><var class="PARAMETER">rootNodeNs</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19627"><span style="white-space: nowrap"><var class="PARAMETER">rootNodeNs</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the root node namespace (otpional).</p></td>
 </tr>
 <tr>
@@ -713,7 +713,7 @@ The caller is responsible for freeing returned string using <var class="PARAMETE
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19649"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19649"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the node to check</p></td>
 </tr>
 <tr>
@@ -732,7 +732,7 @@ The caller is responsible for freeing returned string using <var class="PARAMETE
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19672"><span style="white-space: nowrap"><var class="PARAMETER">str</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19672"><span style="white-space: nowrap"><var class="PARAMETER">str</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the string to check</p></td>
 </tr>
 <tr>
@@ -754,15 +754,15 @@ Caller is responsible for freeing returned string with xmlFree.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19699"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19699"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the context node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19704"><span style="white-space: nowrap"><var class="PARAMETER">href</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19704"><span style="white-space: nowrap"><var class="PARAMETER">href</var>:</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="AEN19709"><span style="white-space: nowrap"><var class="PARAMETER">local</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19709"><span style="white-space: nowrap"><var class="PARAMETER">local</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the QName local part.</p></td>
 </tr>
 <tr>
@@ -780,7 +780,7 @@ 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="AEN19729"><span style="white-space: nowrap"><var class="PARAMETER">c</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19729"><span style="white-space: nowrap"><var class="PARAMETER">c</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 			the character.</p></td>
 </tr></tbody></table>
 </div>
@@ -793,7 +793,7 @@ 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="AEN19744"><span style="white-space: nowrap"><var class="PARAMETER">c</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19744"><span style="white-space: nowrap"><var class="PARAMETER">c</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p> 			the character,</p></td>
 </tr></tbody></table>
 </div>
@@ -828,11 +828,11 @@ Caller is responsible for freeing returned string with xmlFree.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19776"><span style="white-space: nowrap"><var class="PARAMETER">info</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19776"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname<->integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19781"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19781"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the integer value.</p></td>
 </tr>
 <tr>
@@ -855,19 +855,19 @@ is not found.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19807"><span style="white-space: nowrap"><var class="PARAMETER">info</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19807"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname<->integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19812"><span style="white-space: nowrap"><var class="PARAMETER">qnameHref</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19812"><span style="white-space: nowrap"><var class="PARAMETER">qnameHref</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>          the qname href value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19817"><span style="white-space: nowrap"><var class="PARAMETER">qnameLocalPart</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19817"><span style="white-space: nowrap"><var class="PARAMETER">qnameLocalPart</var>:</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="AEN19822"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19822"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the pointer to result integer value.</p></td>
 </tr>
 <tr>
@@ -889,24 +889,25 @@ is not found.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19845"><span style="white-space: nowrap"><var class="PARAMETER">info</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19845"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p></p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19850"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19850"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p></p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19855"><span style="white-space: nowrap"><var class="PARAMETER">qname</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19855"><span style="white-space: nowrap"><var class="PARAMETER">qname</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p></p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19860"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19860"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p></p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="AEN19865"><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>
+<td align="LEFT" valign="TOP"><p>
+</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -924,15 +925,15 @@ is responsible for freeing returned string with <var class="PARAMETER">xmlFree</
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19886"><span style="white-space: nowrap"><var class="PARAMETER">info</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19886"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname<->integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19891"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19891"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19896"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19896"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the integer value.</p></td>
 </tr>
 <tr>
@@ -954,15 +955,15 @@ from <var class="PARAMETER">info</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19921"><span style="white-space: nowrap"><var class="PARAMETER">info</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19921"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname<->integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19926"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19926"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19931"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19931"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the pointer to result integer value.</p></td>
 </tr>
 <tr>
@@ -985,23 +986,23 @@ from <var class="PARAMETER">info</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19958"><span style="white-space: nowrap"><var class="PARAMETER">info</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19958"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname<->integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19963"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19963"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the parent node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19968"><span style="white-space: nowrap"><var class="PARAMETER">nodeName</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19968"><span style="white-space: nowrap"><var class="PARAMETER">nodeName</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the child node name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19973"><span style="white-space: nowrap"><var class="PARAMETER">nodeNs</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19973"><span style="white-space: nowrap"><var class="PARAMETER">nodeNs</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>             the child node namespace.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19978"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19978"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the integer value.</p></td>
 </tr>
 <tr>
@@ -1025,19 +1026,19 @@ according to <var class="PARAMETER">info</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20005"><span style="white-space: nowrap"><var class="PARAMETER">info</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20005"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname<->integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20010"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20010"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the element node. </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20015"><span style="white-space: nowrap"><var class="PARAMETER">attrName</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20015"><span style="white-space: nowrap"><var class="PARAMETER">attrName</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the attribute name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20020"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20020"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the pointer to result integer value.</p></td>
 </tr>
 <tr>
@@ -1061,19 +1062,19 @@ attribute <var class="PARAMETER">attrName</var> in <var class="PARAMETER">node</
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20047"><span style="white-space: nowrap"><var class="PARAMETER">info</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20047"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname<->integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20052"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20052"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the parent node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20057"><span style="white-space: nowrap"><var class="PARAMETER">attrName</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20057"><span style="white-space: nowrap"><var class="PARAMETER">attrName</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the name of attribute.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20062"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20062"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the integer value.</p></td>
 </tr>
 <tr>
@@ -1095,19 +1096,19 @@ attribute <var class="PARAMETER">attrName</var> in <var class="PARAMETER">node</
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20088"><span style="white-space: nowrap"><var class="PARAMETER">info</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20088"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname<->integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20093"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20093"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20098"><span style="white-space: nowrap"><var class="PARAMETER">name</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20098"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p></p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20103"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20103"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -1125,19 +1126,19 @@ attribute <var class="PARAMETER">attrName</var> in <var class="PARAMETER">node</
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20124"><span style="white-space: nowrap"><var class="PARAMETER">info</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20124"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname<->integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20129"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20129"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20134"><span style="white-space: nowrap"><var class="PARAMETER">name</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20134"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p></p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20139"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20139"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -1180,11 +1181,11 @@ attribute <var class="PARAMETER">attrName</var> in <var class="PARAMETER">node</
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20178"><span style="white-space: nowrap"><var class="PARAMETER">info</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20178"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname<->bit mask mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20183"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20183"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the bit mask.</p></td>
 </tr>
 <tr>
@@ -1206,19 +1207,19 @@ attribute <var class="PARAMETER">attrName</var> in <var class="PARAMETER">node</
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20210"><span style="white-space: nowrap"><var class="PARAMETER">info</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20210"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname<->bit mask mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20215"><span style="white-space: nowrap"><var class="PARAMETER">qnameLocalPart</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20215"><span style="white-space: nowrap"><var class="PARAMETER">qnameLocalPart</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>     the qname LocalPart value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20220"><span style="white-space: nowrap"><var class="PARAMETER">qnameHref</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20220"><span style="white-space: nowrap"><var class="PARAMETER">qnameHref</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>          the qname Href value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20225"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20225"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to result mask.</p></td>
 </tr>
 <tr>
@@ -1244,28 +1245,28 @@ after all the <<var class="PARAMETER">nodeNs</var>:<var class="PARAMETER">nod
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20257"><span style="white-space: nowrap"><var class="PARAMETER">info</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20257"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname<->bit mask mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20262"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20262"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the start.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20267"><span style="white-space: nowrap"><var class="PARAMETER">nodeName</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20267"><span style="white-space: nowrap"><var class="PARAMETER">nodeName</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the mask nodes name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20272"><span style="white-space: nowrap"><var class="PARAMETER">nodeNs</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20272"><span style="white-space: nowrap"><var class="PARAMETER">nodeNs</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>             the mask nodes namespace.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20277"><span style="white-space: nowrap"><var class="PARAMETER">stopOnUnknown</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20277"><span style="white-space: nowrap"><var class="PARAMETER">stopOnUnknown</var>:</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="AEN20282"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20282"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to result mask.</p></td>
 </tr>
 <tr>
@@ -1287,24 +1288,25 @@ after all the <<var class="PARAMETER">nodeNs</var>:<var class="PARAMETER">nod
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20305"><span style="white-space: nowrap"><var class="PARAMETER">info</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20305"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p></p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20310"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20310"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p></p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20315"><span style="white-space: nowrap"><var class="PARAMETER">qname</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20315"><span style="white-space: nowrap"><var class="PARAMETER">qname</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p></p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20320"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20320"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p></p></td>
 </tr>
 <tr>
 <td align="LEFT" valign="TOP"><a name="AEN20325"><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>
+<td align="LEFT" valign="TOP"><p>
+</p></td>
 </tr>
 </tbody></table>
 </div>
@@ -1322,15 +1324,15 @@ is responsible for freeing returned string with <var class="PARAMETER">xmlFree</
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20346"><span style="white-space: nowrap"><var class="PARAMETER">info</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20346"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname<->integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20351"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20351"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20356"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20356"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the mask.</p></td>
 </tr>
 <tr>
@@ -1353,23 +1355,23 @@ is responsible for freeing returned string with <var class="PARAMETER">xmlFree</
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20385"><span style="white-space: nowrap"><var class="PARAMETER">info</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20385"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname<->bit mask mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20390"><span style="white-space: nowrap"><var class="PARAMETER">node</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20390"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</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="AEN20395"><span style="white-space: nowrap"><var class="PARAMETER">nodeName</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20395"><span style="white-space: nowrap"><var class="PARAMETER">nodeName</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the mask nodes name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20400"><span style="white-space: nowrap"><var class="PARAMETER">nodeNs</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20400"><span style="white-space: nowrap"><var class="PARAMETER">nodeNs</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>             the mask nodes namespace.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20405"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20405"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the bit mask.</p></td>
 </tr>
 <tr>
@@ -1391,19 +1393,19 @@ is responsible for freeing returned string with <var class="PARAMETER">xmlFree</
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20431"><span style="white-space: nowrap"><var class="PARAMETER">info</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20431"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname<->bit mask mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20436"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20436"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the bit mask.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20441"><span style="white-space: nowrap"><var class="PARAMETER">name</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20441"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p></p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20446"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20446"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
@@ -1421,27 +1423,27 @@ is responsible for freeing returned string with <var class="PARAMETER">xmlFree</
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20467"><span style="white-space: nowrap"><var class="PARAMETER">info</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20467"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname<->bit mask mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20472"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20472"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the bit mask.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20477"><span style="white-space: nowrap"><var class="PARAMETER">name</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20477"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p></p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20482"><span style="white-space: nowrap"><var class="PARAMETER">output</var>�:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20482"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
 <td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-xmlsec.html"><b><<<�xmlsec</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-x509.html"><b>x509�>>></b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-xmlsec.html"><b><<<xmlsec</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-x509.html"><b>x509>>></b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/authors.html b/docs/authors.html
index 8542824..91099da 100644
--- a/docs/authors.html
+++ b/docs/authors.html
@@ -39,7 +39,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -49,9 +49,10 @@
 <ul>
 <li>Aleksey Sanin <aleksey-at-aleksey-dot-com></li>
     <li>Igor Zlatkovic <igor-at-stud-dot-fh-frankfurt-dot-de></li>
-    <li>John Belmonte  <jvb-at-prairienet-dot-org></li>
-    <li>Tej Arora <tej-at-netscape-dot-com> (<a href="http://www.aol.com">AOL</a>)</li>
-    <li>Wouter Ketting <wsh-at-xs4all-dot-nl> (<a href="http://www.cordys.com">Cordys</a>)</li>
+    <li>John Belmonte  <john-at-neggie-dot-net></li>
+    <li>Tej Arora <tej-at-netscape-dot-com> (<a href="http://www.aol.com">AOL, Inc.</a>)</li>
+    <li>Wouter Ketting <wsh-at-xs4all-dot-nl> (<a href="http://www.cordys.com">Cordys R&D BV</a>)</li>
+    <li>Dmitry Belyavsky <beldmit-at-cryptocom-dot-ru> (<a href="http://www.cryptocom.ru">Cryptocom LTD</a>)</li>
 </ul>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/bugs.html b/docs/bugs.html
index 8369610..428c0ad 100644
--- a/docs/bugs.html
+++ b/docs/bugs.html
@@ -39,7 +39,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
diff --git a/docs/c14n.html b/docs/c14n.html
index 36316fb..7e5ff1f 100644
--- a/docs/c14n.html
+++ b/docs/c14n.html
@@ -39,7 +39,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
diff --git a/docs/documentation.html b/docs/documentation.html
index 082cb1d..c193666 100644
--- a/docs/documentation.html
+++ b/docs/documentation.html
@@ -39,28 +39,26 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
-<div align="center">
-            <h1>Documentation</h1>
+<div align="center">
+            <h1>Documentation</h1>
             </div>
 <ul>
 <li>
 <a href="related.html#books">Books</a><br>
-</li>
-              <li><a href="faq.html">F.A.Q.</a></li>
-              <li><a href="api/xmlsec-notes.html">Tutorial</a></li>
-              <li>
-                <a href="api/xmlsec-reference.html">API Reference Manual</a>
-(automaticaly generated from sources using gtk-doc utility)</li>
-              <li><a href="api/xmlsec-examples.html">Examples</a></li>
-              <li><a href="xmlsec-man.html">xmlsec utility man page</a></li>
-              <li><a href="http://www.aleksey.com/pipermail/xmlsec">Mailing
-list archive</a></li>
-              <li><a href="api-0.0.x/documentation.html">Old
-documentation</a></li>
+</li>
+              <li><a href="faq.html">F.A.Q.</a></li>
+              <li><a href="api/xmlsec-notes.html">Tutorial</a></li>
+              <li>
+                <a href="api/xmlsec-reference.html">API Reference Manual</a>
+(automaticaly generated from sources using gtk-doc utility)</li>
+              <li><a href="api/xmlsec-examples.html">Examples</a></li>
+              <li><a href="xmlsec-man.html">xmlsec utility man page</a></li>
+              <li><a href="http://www.aleksey.com/pipermail/xmlsec">Mailing
+list archive</a></li>
             </ul>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/download.html b/docs/download.html
index 6687858..6ce4215 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -39,7 +39,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -47,15 +47,11 @@
       <h1>Download</h1>
       </div>
 <h2>Stable releases.</h2>
-<p>The latest stable XML Security Library version is <b>1.2.9</b>:</p>
+<p>The latest stable XML Security Library version is <b>1.2.12</b>:</p>
 <ul>
 <li>
-        <a href="http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.9.tar.gz">Sources 
-	for latest version</a> 
-	(<a href="ftp://ftp.xmlsoft.org/xmlsec/releases">XMLSoft.org</a> mirrors).
-    </li>
-    <li>Fedora 3 RPM 
-    	<a href="http://www.aleksey.com/xmlsec/download/">xmlsec1 packages</a>.
+        <a href="http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.12.tar.gz">Sources 
+	for latest version</a>.
     </li>
     <li>
 	<a href="http://www.zlatkovic.com/projects/libxml/index.html">Windows 
@@ -70,10 +66,7 @@
 	ports.	
     </li>
 </ul>
-<p>The <a href="ftp://ftp.aleksey.com/pub/xmlsec/releases/">previous releases</a>
-and <a href="ftp://ftp.aleksey.com/pub/xmlsec/snapshots/">daily snapshots</a>
-are also available (the daily snapshots are not promised to be stable or even 
-compile).</p>
+<p>The <a href="ftp://ftp.aleksey.com/pub/xmlsec/releases/">previous releases</a> are also available.</p>
 <h2>Requirements</h2>
 <p>
     The XML Security Library requires:
@@ -109,11 +102,12 @@ compile).</p>
 <p>
        The last step is optional and requires Internet connection to execute
        some tests.<br></p>
-<h2>CVS</h2>
+<h2>GIT</h2>
 <p>XML Security Library is available from the 
-<a href="http://developer.gnome.org/tools/cvs.html">Gnome CVS</a>
-(the module name is <b>xmlsec</b>). The online source browser: 
-<a href="http://cvs.gnome.org/viewcvs/">Gnome CVS base</a>
+<a href="http://live.gnome.org/Git/Developers">Gnome GIT</a>
+(the module name is <b>xmlsec</b>). The online XMLSec 
+<a href="http://git.gnome.org/cgit/xmlsec">source browser</a>
+is also available.
 </p>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/faq.html b/docs/faq.html
index 6cd7249..27fc675 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -39,394 +39,400 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
-<div align="center">
-            <h1>Frequently Asked Questions</h1>
+<div align="center">
+            <h1>Frequently Asked Questions</h1>
             </div>
-<h3>0. Where can I read more about XML Signature and XML
+<h3>0. Where can I read more about XML Signature and XML
 Encryption?</h3>
-<p>First of all, read the original specifications: <a href="http://www.w3.org/Signature/">XML Digital Signature</a> and <a href="http://www.w3.org/Encryption/">XML Encrytpion</a>. Also there <a href="related.html#books">several� books</a> available that can
+<p>First of all, read the original specifications: <a href="http://www.w3.org/Signature/">XML Digital Signature</a> and <a href="http://www.w3.org/Encryption/">XML Encrytpion</a>. Also there <a href="related.html#books">several books</a> available that can
 help you get started.<br></p>
 <h3>1. License(s).</h3>
-<h4> <a name="section_1_1"></a>1.1. Licensing Terms for
+<h4> <a name="section_1_1"></a>1.1. Licensing Terms for
 xmlsec.</h4>
-<p> XML Security Library is released under the <a href="http://www.opensource.org/licenses/mit-license.html">MIT License</a>,
+<p> XML Security Library is released under the <a href="http://www.opensource.org/licenses/mit-license.html">MIT License</a>,
 see the file Copyright in the distribution for the precise wording. </p>
-<h4> <a name="section_1_2"></a>1.2. Can I use xmlsec with
-proprietary application or
+<h4> <a name="section_1_2"></a>1.2. Can I use xmlsec with
+proprietary application or
 library? Can I use xmlsec with a GNU GPL application or library?</h4>
 <table style="text-align: left; width: 85%; margin-left: auto; margin-right: auto;" border="1" cellpadding="2" cellspacing="2"><tbody>
 <tr>
-<td style="vertical-align: top; font-weight: bold;">XML
+<td style="vertical-align: top; font-weight: bold;">XML
 Security Library module<br>
-</td>
+</td>
                   <td style="vertical-align: top; font-weight: bold;">Dependencies<br>
-</td>
-                  <td style="vertical-align: top; font-weight: bold;">Dependencies
+</td>
+                  <td style="vertical-align: top; font-weight: bold;">Dependencies
 License<br>
-</td>
-                  <td style="vertical-align: top; font-weight: bold;">Using
-with proprietary
+</td>
+                  <td style="vertical-align: top; font-weight: bold;">Using
+with proprietary
 applications/libraries<br>
-</td>
-                  <td style="vertical-align: top; font-weight: bold;">Using
-with MIT/BSD� applications/libraries <br>
-</td>
-                  <td style="vertical-align: top; font-weight: bold;">Using
-with GPL
+</td>
+                  <td style="vertical-align: top; font-weight: bold;">Using
+with MIT/BSD applications/libraries <br>
+</td>
+                  <td style="vertical-align: top; font-weight: bold;">Using
+with GPL
 applications/libraries<br>
-</td>
+</td>
                 </tr>
 <tr>
 <td style="vertical-align: top;">xmlsec-core<br>
-</td>
+</td>
                   <td style="vertical-align: top;">
-<a href="http://xmlsoft.org">LibXML2</a>/<a href="http://xmlsoft.org/XSLT">LibXSLT</a>
-                  </td>
-                  <td style="vertical-align: top;"><a href="http://www.opensource.org/licenses/mit-license.html">MIT License</a></td>
+<a href="http://xmlsoft.org">LibXML2</a>/<a href="http://xmlsoft.org/XSLT">LibXSLT</a>
+                  </td>
+                  <td style="vertical-align: top;"><a href="http://www.opensource.org/licenses/mit-license.html">MIT License</a></td>
                   <td style="vertical-align: top;">Yes.<br>
-</td>
+</td>
                   <td style="vertical-align: top;">Yes.<br>
-</td>
+</td>
                   <td style="vertical-align: top;">Yes.<br>
-</td>
+</td>
                 </tr>
 <tr>
-<td style="vertical-align: top;">xmlsec-openssl (also
-requires
+<td style="vertical-align: top;">xmlsec-openssl (also
+requires
 xmlsec-core library)<br>
-</td>
-                  <td style="vertical-align: top;"><a href="http://www.openssl.org">OpenSSL<br></a></td>
+</td>
+                  <td style="vertical-align: top;"><a href="http://www.openssl.org">OpenSSL<br></a></td>
                   <td style="vertical-align: top;">OpenSSL License<br>
-</td>
+</td>
                   <td style="vertical-align: top;">Yes.<br>
-</td>
-                  <td style="vertical-align: top;">Yes.</td>
-                  <td style="vertical-align: top;">May be. <a href="http://www.openssl.org/support/faq.cgi#LEGAL2">OpenSSL FAQ</a>�
-states that OpenSSL library is covered by a <a href="http://www.gnu.org/licenses/gpl-faq.html#WritingFSWithNFLibs">special
-GPL exception</a> thus it could be used in GPLed
-applications/libraries. However, some people think that this is not
-true (<a href="http://lists.debian.org/debian-legal/2002/debian-legal-200210/msg00173.html">one</a>
-and <a href="http://lists.debian.org/debian-legal/2002/debian-legal-200205/msg00127.html">two</a>).
-                  </td>
+</td>
+                  <td style="vertical-align: top;">Yes.</td>
+                  <td style="vertical-align: top;">May be. <a href="http://www.openssl.org/support/faq.cgi#LEGAL2">OpenSSL FAQ</a>
+states that OpenSSL library is covered by a <a href="http://www.gnu.org/licenses/gpl-faq.html#WritingFSWithNFLibs">special
+GPL exception</a> thus it could be used in GPLed
+applications/libraries. However, some people think that this is not
+true (<a href="http://lists.debian.org/debian-legal/2002/debian-legal-200210/msg00173.html">one</a>
+and <a href="http://lists.debian.org/debian-legal/2002/debian-legal-200205/msg00127.html">two</a>).
+                  </td>
                 </tr>
 <tr>
-<td style="vertical-align: top;">xmlsec-gnutls (also
-requires
-xmlsec-core library) </td>
+<td style="vertical-align: top;">xmlsec-gnutls (also
+requires
+xmlsec-core library) </td>
                   <td style="vertical-align: top;">
 <a href="http://www.gnu.org/software/gnutls/">GnuTLS</a><br>
-</td>
+</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>
+                  <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>
+</td>
                 </tr>
 <tr>
-<td style="vertical-align: top;">xmlsec-nss (also
-requires
-xmlsec-core library) </td>
+<td style="vertical-align: top;">xmlsec-nss (also
+requires
+xmlsec-core library) </td>
                   <td style="vertical-align: top;">
 <a href="http://www.mozilla.org/projects/security/pki/nss/">NSS</a><br>
-</td>
-                  <td style="vertical-align: top;">Dual licensing: <a href="http://www.opensource.org/licenses/mozilla1.0.php">Mozilla
-Public License</a> and <a href="http://www.opensource.org/licenses/gpl-license.php">GPL</a> </td>
+</td>
+                  <td style="vertical-align: top;">Dual licensing: <a href="http://www.opensource.org/licenses/mozilla1.0.php">Mozilla
+Public License</a> and <a href="http://www.opensource.org/licenses/gpl-license.php">GPL</a> </td>
                   <td style="vertical-align: top;">Yes.<br>
-</td>
-                  <td style="vertical-align: top;">Yes.</td>
-                  <td style="vertical-align: top;">Probably yes, but at
-the time I
-am writing this there are some <a href="http://bugzilla.mozilla.org/show_bug.cgi?id=217162">unresolved
+</td>
+                  <td style="vertical-align: top;">Yes.</td>
+                  <td style="vertical-align: top;">Probably yes, but at
+the time I
+am writing this there are some <a href="http://bugzilla.mozilla.org/show_bug.cgi?id=217162">unresolved
 issues</a>.<br>
-</td>
+</td>
                 </tr>
 <tr>
-<td style="vertical-align: top;">xmlsec-mscrypto
-(also requires
-xmlsec-core library) </td>
+<td style="vertical-align: top;">xmlsec-mscrypto
+(also requires
+xmlsec-core library) </td>
                   <td style="vertical-align: top;">
 <a href="http://msdn.microsoft.com/security/">MSCrypto API</a><br>
-</td>
-                  <td style="vertical-align: top;">Microsoft licensing:
-The libraries are part of MS Windows, and are also distributed with
-Internet Explorer. </td>
+</td>
+                  <td style="vertical-align: top;">Microsoft licensing:
+The libraries are part of MS Windows, and are also distributed with
+Internet Explorer. </td>
                   <td style="vertical-align: top;">Unknown.<br>
-</td>
-                  <td style="vertical-align: top;">Unknown.</td>
-                  <td style="vertical-align: top;">Unknown.</td>
+</td>
+                  <td style="vertical-align: top;">Unknown.</td>
+                  <td style="vertical-align: top;">Unknown.</td>
                 </tr>
 <tr>
-<td style="vertical-align: top;">xmlsec-mscrypto
-(also requires
-xmlsec-core library) </td>
+<td style="vertical-align: top;">xmlsec-mscrypto
+(also requires
+xmlsec-core library) </td>
                   <td style="vertical-align: top;">
 <a href="http://msdn.microsoft.com/security/">MSCrypto API</a><br>
-</td>
-                  <td style="vertical-align: top;">Microsoft licensing:
-The libraries are part of MS Windows, and are also distributed with
-Internet Explorer. </td>
+</td>
+                  <td style="vertical-align: top;">Microsoft licensing:
+The libraries are part of MS Windows, and are also distributed with
+Internet Explorer. </td>
                   <td style="vertical-align: top;">Unknown.<br>
-</td>
-                  <td style="vertical-align: top;">Unknown.</td>
-                  <td style="vertical-align: top;">Unknown.</td>
+</td>
+                  <td style="vertical-align: top;">Unknown.</td>
+                  <td style="vertical-align: top;">Unknown.</td>
                 </tr>
 </tbody></table>
-<p>If you have questions about XML Security Library
+<p>If you have questions about XML Security Library
 licensing then feel free to send these questions to the <a href="bugs.html">mailing list</a>.<br></p>
 <h3>2. Installation.</h3>
 <h4> <a name="section_2_1"></a>2.1. Where can I get xmlsec?</h4>
-<p> The original distribution comes from <a href="http://www.aleksey.com/xmlsec/">XML Security Library page</a>.
+<p> The original distribution comes from <a href="http://www.aleksey.com/xmlsec/">XML Security Library page</a>.
 Also xmlsec is available from <a href="ftp://rpmfind.net/pub/libxml/xmlsec">rpmfind.net miror</a>. </p>
 <h4> <a name="section_2_2"></a>2.2. How to compile xmlsec?</h4>
 <p> On Unix just follow the "standard": </p>
 <blockquote> <code>gunzip -c xmlsec-xxx.tar.gz | tar xvf -</code><br><code>cd xmlsec-xxxx</code><br><code>./configure --help</code><br><code>./configure [possible options] </code><br><code>make</code><br><code>make check</code><br><code>make install</code> </blockquote>
-<p> At that point you may have to rerun ldconfig or similar
-utility to update your list of installed shared libs.<br>
-On Windows the process is more complicated. Please check readme file in
+<p> At that point you may have to rerun ldconfig or similar
+utility to update your list of installed shared libs.<br>
+On Windows the process is more complicated. Please check readme file in
             <code>xmlsec-xxxx/win32</code> folder. </p>
-<h4> <a name="section_2_3"></a>2.3. What other libraries
-are
-needed to compile/install
+<h4> <a name="section_2_3"></a>2.3. What other libraries
+are
+needed to compile/install
 xmlsec?</h4>
 <p> The XML Security Library requires: </p>
 <ul>
-<li><a href="http://xmlsoft.org/downloads.html">LibXML</a></li>
+<li><a href="http://xmlsoft.org/downloads.html">LibXML</a></li>
               <li>
-<a href="http://xmlsoft.org/XSLT/downloads.html">LibXSLT</a>
-(optional)</li>
+<a href="http://xmlsoft.org/XSLT/downloads.html">LibXSLT</a>
+(optional)</li>
             </ul>
 <ul>
-<li> <a href="http://www.openssl.org/">OpenSSL</a>
-version
-0.9.7 (prefered) or version 0.9.6. </li>
+<li> <a href="http://www.openssl.org/">OpenSSL</a>
+version
+0.9.7 (prefered) or version 0.9.6. </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>
+<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.mozilla.org/projects/security/pki/nss/">NSS</a> -
-Mozilla cryptographic library. </li>
+<a href="http://www.mozilla.org/projects/security/pki/nss/">NSS</a> -
+Mozilla cryptographic library. </li>
             </ul>
-<h4> <a name="section_2_4"></a>2.4. Why does make check
-fail
+<h4> <a name="section_2_4"></a>2.4. Why does make check
+fail
 for some tests?</h4>
-<p> First of all, some tests <b>must</b> fail! Please read
-the messages printed before the tests.<br>
-If you have other failed tests then the next possible reason is that
-you use OpenSSL 0.9.6 and some xmlsec features are disabled in this
-case. Please try to upgrade to OpenSSL 0.9.7 and
-re-configure/re-compile xmlsec.<br>
-if this does not help then probably there is a bug in the xmlsec or in
-the xmlsec tests. Please submit the <a href="http://www.aleksey.com/xmlsec/bugs.html">bug report</a> and I'll
+<p> First of all, some tests <b>must</b> fail! Please read
+the messages printed before the tests.<br>
+If you have other failed tests then the next possible reason is that
+you use OpenSSL 0.9.6 and some xmlsec features are disabled in this
+case. Please try to upgrade to OpenSSL 0.9.7 and
+re-configure/re-compile xmlsec.<br>
+if this does not help then probably there is a bug in the xmlsec or in
+the xmlsec tests. Please submit the <a href="http://www.aleksey.com/xmlsec/bugs.html">bug report</a> and I'll
 try to fix it. </p>
-<h4> <a name="section_2_5"></a>2.5. I get the xmlsec
-sources
-from CVS and there is no
+<h4> <a name="section_2_5"></a>2.5. I get the xmlsec
+sources
+from CVS and there is no
 configure script. Where can I get it?</h4>
-<p> The configure (and other Makefiles) are generated. Use
-the <code>autogen.sh</code> script to regenerate the configure and
+<p> The configure (and other Makefiles) are generated. Use
+the <code>autogen.sh</code> script to regenerate the configure and
 Makefiles, like: </p>
 <blockquote> <code>./autogen.sh --prefix=/usr</code> </blockquote>
-<h4> <a name="section_2_6"></a>2.6. I do not need all
-these
-features supported by
+<h4> <a name="section_2_6"></a>2.6. I do not need all
+these
+features supported by
 xmlsec. Can I disable some of them?</h4>
-<p> Yes, you can. Please run <code>./configure --help</code>
+<p> Yes, you can. Please run <code>./configure --help</code>
 for the list of possible configuration options. </p>
-<h4> <a name="section_2_7"></a>2.7. I am compiling XMLSec
-library on Windows and it
+<h4> <a name="section_2_7"></a>2.7. I am compiling XMLSec
+library on Windows and it
 does not compile (crashes right after the launch). Can you help me?</h4>
-<p> There are several possible reasons why you might have
-problems on Windows. All of them originated in the MS C compiler/linker
-and are specific to Windows. Thanks to Igor Zlatkovic for writing these
+<p> There are several possible reasons why you might have
+problems on Windows. All of them originated in the MS C compiler/linker
+and are specific to Windows. Thanks to Igor Zlatkovic for writing these
 long explanations. </p>
 <p> <b>1) Incorrect MS C runtime libraries.</b> </p>
-<p>Windows basically has two C runtimes. The one is called
-libc.lib and can only be linked to statically. The other is called
-msvcrt.dll and can only be linked to dynamically. The first one occurs
-in its single-threaded and multithreaded variant, which gives three
-different runtimes. These three then live in their debug and release
-incarnations, which results in six C runtimes. The rule is simple:
-exactly the same runtime must be used throughout the application.
-Client code must use the same runtime as XMLSec, LibXML, LibXSLT,
-OpenSSL or any other library used.<br>
-If you downloaded XMLSec, LibXML, LibXSLT and OpenSSL binaries from
-Igor's <a href="http://www.zlatkovic.com/projects/libxml/index.html">page</a>
-then all libraries are all linked to msvcrt.dll (Multithreaded DLL; /MD
-compiler switch). The click-next click-finish wizardry from Visual
-Studio chooses the single-threaded libc.lib as the default when you
-create a new project. And this causes great problems because you
-program crashes on first IO operation, first malloc/free from different
-runtimes or something even more trivial.<br>
-Do not forget that tf you need a different runtime for some reason,
-then you MUST recompile not only XMLSec, but LibXML, LibXSLT and
+<p>Windows basically has two C runtimes. The one is called
+libc.lib and can only be linked to statically. The other is called
+msvcrt.dll and can only be linked to dynamically. The first one occurs
+in its single-threaded and multithreaded variant, which gives three
+different runtimes. These three then live in their debug and release
+incarnations, which results in six C runtimes. Worse, different versions
+of Microsoft Visual C/C++ have different runtimes (e.g. MSVC 6.0 
+runtime is not compatible with .NET 2003 runtime). The rule is simple:
+exactly the same runtime must be used throughout the application.
+Client code must use the same runtime as XMLSec, LibXML, LibXSLT,
+OpenSSL or any other library used.<br>
+If you downloaded XMLSec, LibXML, LibXSLT and OpenSSL binaries from
+Igor's <a href="http://www.zlatkovic.com/projects/libxml/index.html">page</a>
+then all libraries are all linked to msvcrt.dll (Multithreaded DLL; /MD
+compiler switch). The click-next click-finish wizardry from Visual
+Studio chooses the single-threaded libc.lib as the default when you
+create a new project. And this causes great problems because you
+program crashes on first IO operation, first malloc/free from different
+runtimes or something even more trivial.<br>
+Do not forget that tf you need a different runtime for some reason,
+then you MUST recompile not only XMLSec, but LibXML, LibXSLT and
 OpenSSL as well. </p>
 <p> <b>2) Static linking without correct defines.</b> </p>
-<p>When people link statically to XMLSec, then they must <code>#define
-XMLSEC_STATIC</code> in their source files before including any XMLSec
-header. Almost none is doing that :) This macro has no effect on Unix,
-but it is vital on Windows.<br>
-This applies to LibXML and LibXSLT as well, no matter if these are used
-directly or not. If just XMLSec is used, but everything is linked
+<p>When people link statically to XMLSec, then they must <code>#define
+XMLSEC_STATIC</code> in their source files before including any XMLSec
+header. Almost none is doing that :) This macro has no effect on Unix,
+but it is vital on Windows.<br>
+This applies to LibXML and LibXSLT as well, no matter if these are used
+directly or not. If just XMLSec is used, but everything is linked
 statically, then there must be a </p>
-<blockquote><code> #define LIBXML_STATIC<br>
-#define LIBXSLT_STATIC<br>
+<blockquote><code> #define LIBXML_STATIC<br>
+#define LIBXSLT_STATIC<br>
 #define XMLSEC_STATIC<br></code></blockquote>
-<p> before any xmlsec header is included. Even if the
-client code doesn't call into libxml at all, still this must be
-defined. XMLSec headers will include LibXML headers and they must have
-these definitions. Without them, every variable XMLSec includes from
-LibXML headers will have <code>__declspec(dllimport)</code> prepended
-and that will give headaches if static LibXML is used for linking.<br>
-This scheme makes it possible to have any combination of static and
-dynamic libraries in the resulting executable. Its cost is the need to <code>#define</code>
-apropriate macros. People would ideally define them by using the
+<p> before any xmlsec header is included. Even if the
+client code doesn't call into libxml at all, still this must be
+defined. XMLSec headers will include LibXML headers and they must have
+these definitions. Without them, every variable XMLSec includes from
+LibXML headers will have <code>__declspec(dllimport)</code> prepended
+and that will give headaches if static LibXML is used for linking.<br>
+This scheme makes it possible to have any combination of static and
+dynamic libraries in the resulting executable. Its cost is the need to <code>#define</code>
+apropriate macros. People would ideally define them by using the
 compiler's <code>/D</code> switch in projects that link statically. </p>
 <h3>3. Developing with XMLSec.</h3>
-<h4> <a name="section_3_1"></a>3.1.
-xmlSecDSigCtxValidate()
-function returned 0. Does
+<h4> <a name="section_3_1"></a>3.1.
+xmlSecDSigCtxValidate()
+function returned 0. Does
 this mean that the signature is valid?</h4>
-<b>No!</b><p> Function xmlSecDSigCtxValidate() returns 0 when there
-were no <i>processing</i> errors during signature validation (i.e. the
-document has correct syntax, all keys were found, etc.). The signature
-is valid if and only if the xmlSecDSigCtxValidate() function returns 0 <b>and</b>
-the <code>status</code> member of the <code>xmlSecDSigCtx</code>
+<b>No!</b><p> Function xmlSecDSigCtxValidate() returns 0 when there
+were no <i>processing</i> errors during signature validation (i.e. the
+document has correct syntax, all keys were found, etc.). The signature
+is valid if and only if the xmlSecDSigCtxValidate() function returns 0 <b>and</b>
+the <code>status</code> member of the <code>xmlSecDSigCtx</code>
 structure is equal to <code>xmlSecDSigStatusSucceeded</code>. </p>
-<h4> <a name="section_3_2"></a>3.2. I am trying to sign
-use a
-part of XML document using an "Id" attribute but it does not work. Do
+<h4> <a name="section_3_2"></a>3.2. I am trying to sign
+use a
+part of XML document using an "Id" attribute but it does not work. Do
 you support "Id" attributes at all?</h4>
-<p><span style="font-weight: bold;">Yes. </span>LibXML2
-and XMLSec libraries do support ID attributes. However, you have to
-tell LibXML2/XMLSec what is the name of <span style="font-weight: bold;">your </span>ID attribute. XML
-specification does not require ID attribute to have name "Id" or "id".
+<p><span style="font-weight: bold;">Yes. </span>LibXML2
+and XMLSec libraries do support ID attributes. However, you have to
+tell LibXML2/XMLSec what is the name of <span style="font-weight: bold;">your </span>ID attribute. XML
+specification does not require ID attribute to have name "Id" or "id".
 It can be anything you want! <br></p>
-<br><code>Id</code><code>Data</code><blockquote><code> <?xml version="1.0"
-encoding="UTF-8"><br>
-<Root><br>
-��<Data Id="1234"><br>
-����The data I want to sign<br>
-��</Data><br>
+<br><code>Id</code><code>Data</code><blockquote><code> <?xml version="1.0"
+encoding="UTF-8"><br>
+<Root><br>
+<Data Id="1234"><br>
+The data I want to sign<br>
+</Data><br>
 </Root><br></code></blockquote>
 <p>One can use a simple DTD: </p>
-<blockquote><code> <!DOCTYPE test [<br>
-�<!ATTLIST Data Id ID #IMPLIED><br>
+<blockquote><code> <!DOCTYPE test [<br>
+<!ATTLIST Data Id ID #IMPLIED><br>
 ]><br></code></blockquote>
-<p> The DTD might be directly included in the XML file or
-located in a standalone file. In the second case, you might load the
+<p> The DTD might be directly included in the XML file or
+located in a standalone file. In the second case, you might load the
 DTD in xmlsec command line utility with "--dtd-file" option. <br></p>
-<p>2) Use <a href="http://www.w3.org/TR/xml-id/">xml:id</a>.
-This is a new W3C Working Draft and not all XML parsers support it now
+<p>2) Use <a href="http://www.w3.org/TR/xml-id/">xml:id</a>.
+This is a new W3C Working Draft and not all XML parsers support it now
 (LibXML2 does!). <br></p>
-<p>3) Application can directly declare ID attribute to
-LibXML2/XMLSec. If you are using xmlsec command line utility see
-"--id-attr" option.� If you are writing a C/C++ application
-yourself, call�<code>xmlAddID</code> function.
-However, this approach might make you signature non-interoperable with
-other
+<p>3) Application can directly declare ID attribute to
+LibXML2/XMLSec. If you are using xmlsec command line utility see
+"--id-attr" option. If you are writing a C/C++ application
+yourself, call<code>xmlAddID</code> function.
+However, this approach might make you signature non-interoperable with
+other
 XMLDSig implementations.<br></p>
 <h4>
-<a name="section_3_3"></a>3.3.<span style="font-weight: bold;"> </span>I am trying to sign an
-XML document and I have a
+<a name="section_3_3"></a>3.3.<span style="font-weight: bold;"> </span>I am trying to sign an
+XML document and I have a
 warning about "empty nodes set". Should I worry about this?</h4>
-<p> Most likely <b>yes</b>. When it's not an error from
-specification point of view, I can hardly imagine a real world case
-that requires signing an empty nodes set (i.e. signing an empty
-string). Most likely, you have this error because you are trying to use
-ID attribute and you do not provide a DTD for the document (see <a href="faq.html#section_3_2">section 3.2</a>
-about ID
+<p> Most likely <b>yes</b>. When it's not an error from
+specification point of view, I can hardly imagine a real world case
+that requires signing an empty nodes set (i.e. signing an empty
+string). Most likely, you have this error because you are trying to use
+ID attribute and you do not provide a DTD for the document (see <a href="faq.html#section_3_2">section 3.2</a>
+about ID
 attributes).<br></p>
 <h4> </h4>
 <h4>
-<a name="section_3_4"></a>3.4. I am trying to
-sign/validate a document but
-xmlXPtrEval function can't evaluate "xpointer(id('XXXXXXX'))"
+<a name="section_3_4"></a>3.4. I am trying to
+sign/validate a document but
+xmlXPtrEval function can't evaluate "xpointer(id('XXXXXXX'))"
 expression. What's wrong?</h4>
-<p>First of all, read <a href="#section_3_2">section 3.2</a>
-about ID
-attributes.
-If you have tried to declare required ID attribute in DTD and
-you still have problems then I would guess that you are playing with
-Visa 3D protocol. This protocol tries to reference to an "id" attribute
-defined as CDATA instead of ID in the DTD (it is impossible in XML as
-described in <a href="#section_3_2">section 3.2</a>). Even worse, the
-value
-of this Visa 3D "id" attribute may start from number or contain "+" or
-"/" and this breakes <a href="http://www.w3.org/TR/REC-xml#sec-attribute-types">XML
-specification</a><a>/> again. Based on this, I have to say that Visa
-3D protocol does not use XML or XMLDSig specifications. And if you can
-then you should
-probably let Visa guys know about this problem (thought it was already
-done
-several times). </a> </p>
-<p>The only good solution for this problem is changing Visa
-3D protocol.
-However,
-it might take time. As a short term solution you can use a special
-"Visa 3D
-hack" in xmlsec. Please note, that nobody (including me) knows what
-else
-might be broken in your application if you decide to use this hack. You
-are on
-your own here because this hack makes your application to work with
-non-XML
+<p>First of all, read <a href="#section_3_2">section 3.2</a>
+about ID
+attributes.
+If you have tried to declare required ID attribute in DTD and
+you still have problems then I would guess that you are playing with
+Visa 3D protocol. This protocol tries to reference to an "id" attribute
+defined as CDATA instead of ID in the DTD (it is impossible in XML as
+described in <a href="#section_3_2">section 3.2</a>). Even worse, the
+value
+of this Visa 3D "id" attribute may start from number or contain "+" or
+"/" and this breakes <a href="http://www.w3.org/TR/REC-xml#sec-attribute-types">XML
+specification</a> again. Based on this, I have to say that Visa
+3D protocol does not use XML or XMLDSig specifications. And if you can
+then you should
+probably let Visa guys know about this problem (thought it was already
+done
+several times).</p>
+<p>The only good solution for this problem is changing Visa
+3D protocol.
+However,
+it might take time. As a short term solution you can use a special
+"Visa 3D
+hack" in xmlsec. Please note, that nobody (including me) knows what
+else
+might be broken in your application if you decide to use this hack. You
+are on
+your own here because this hack makes your application to work with
+non-XML
 and non-XMLDSig but some "Visa 3D" files. </p>
-<p>In order to process "Visa 3D" documents, you need to do
+<p>In order to process "Visa 3D" documents, you need to do
 two things: </p>
 <ul>
-<li>Register ID attributes manually (<code>xmlAddID</code>
-function or <code>--id-attr</code> option for xmlsec command line
-utility).</li>
-              <li>Enable Visa 3D hack in XML DSig context (<code>dsigCtx->flags
-|= XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</code> or <code>--enable-visa3d-hack</code>
-option for xmlsec command line utility).</li>
+<li>Register ID attributes manually (<code>xmlAddID</code>
+function or <code>--id-attr</code> option for xmlsec command line
+utility).</li>
+              <li>Enable Visa 3D hack in XML DSig context (<code>dsigCtx->flags
+|= XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</code> or <code>--enable-visa3d-hack</code>
+option for xmlsec command line utility).</li>
             </ul>
-<b>This is a hack</b><b>. You are warned!</b><br><h4>
-<a name="section_3_5"></a>3.5. I have a document signed
-with a certificate that
+<b>This is a hack</b><b>. You are warned!</b><br><p><b>UPDATE:</b> It appears that recent version (Novemeber, 2005)
+of Visa3D DTD does have this problem corrected and now "id" attribute
+is declared as ID. Just get the new DTD and everything should work
+without this hack.</p>
+<h4>
+<a name="section_3_5"></a>3.5. I have a document signed
+with a certificate that
 is now expired. Can I verify this signature?</h4>
-<p> Yes, you can. However, you need to be carefull. Most
-likely you do want to make sure that the certificate was not expired
-when the document was signed. The <a href="http://www.w3.org/Signature">XML
-Digital Signature</a> specification does not have a standard way to
-include the signature timestamp. Which means that you need to define
-where to put timestamp by yourself. Please note, that the timestamp <b>must</b>
-be signed along with the other data.<br>
-Finaly set the desired verification time in <code>certsVerificationTime</code>
+<p> Yes, you can. However, you need to be carefull. Most
+likely you do want to make sure that the certificate was not expired
+when the document was signed. The <a href="http://www.w3.org/Signature">XML
+Digital Signature</a> specification does not have a standard way to
+include the signature timestamp. Which means that you need to define
+where to put timestamp by yourself. Please note, that the timestamp <b>must</b>
+be signed along with the other data.<br>
+Finaly set the desired verification time in <code>certsVerificationTime</code>
 member of the <code>xmlSecKeyInfoCtx</code> structure. </p>
-<p> If you are using xmlsec command line utility then you
-can use <code>--verification-time <time></code> option (where <code><time></code>
-is the local system time in the "<code>YYYY-MM-DD HH:MM:SS</code>"
+<p> If you are using xmlsec command line utility then you
+can use <code>--verification-time <time></code> option (where <code><time></code>
+is the local system time in the "<code>YYYY-MM-DD HH:MM:SS</code>"
 format). </p>
-<h4> <a name="section_3_6"></a>3.6. I really like the
-XMLSec
-library but it is based
-on OpenSSL and I have to use another crypto library in my application.
+<h4> <a name="section_3_6"></a>3.6. I really like the
+XMLSec
+library but it is based
+on OpenSSL and I have to use another crypto library in my application.
 Can you write code to support my crypto library?</h4>
-<p> The XMLSec library has a very modular structure and
-there should be no problem with using another crypto library. For
-example, XMLSec already supports <a href="http://www.mozilla.org/projects/security/pki/nss/">NSS</a>,
-MSCrypto API and <a href="http://www.gnu.org/software/gnutls/gnutls.html">GnuTLS</a>.
-Check the latest release and/or the mailing list and you might find
-that your library is already supported or someone working on it.<br>
-If you are not so lucky, then you can either write some code by
+<p> The XMLSec library has a very modular structure and
+there should be no problem with using another crypto library. For
+example, XMLSec already supports <a href="http://www.mozilla.org/projects/security/pki/nss/">NSS</a>,
+MSCrypto API and <a href="http://www.gnu.org/software/gnutls/gnutls.html">GnuTLS</a>.
+Check the latest release and/or the mailing list and you might find
+that your library is already supported or someone working on it.<br>
+If you are not so lucky, then you can either write some code by
 yourself or contact me in private email to discuss possible options. </p>
-<h4> <a name="section_3_7"></a>3.7. I really like the
-XMLSec
-library but it does not
+<h4> <a name="section_3_7"></a>3.7. I really like the
+XMLSec
+library but it does not
 have cipher or transform that I need. Can you write code for me?</h4>
-<p> The XMLSec library has a very modular structure and
-there should be easy to add any cipher or other transform. Again, you
-can either write some code by yourself or try to talk to me in private
+<p> The XMLSec library has a very modular structure and
+there should be easy to add any cipher or other transform. Again, you
+can either write some code by yourself or try to talk to me in private
 email. </p>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/index.html b/docs/index.html
index 988127f..7274dae 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -39,7 +39,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -72,42 +72,43 @@
      	    see the Copyright file in the distribution  for details.<br><br></p>
 <p><b>News</b></p>
 <ul>
-<li>July 12 2005<br>
-	The new <a href="download.html">XML Security Library 1.2.9</a> release
-	includes few bug fixes and adds support for the recently released 
-	<a href="http://openssl.org">OpenSSL 0.9.8</a> including several 
-	new algorithms for <a href="xmldsig.html">xmlsec-openssl</a>:
-	<ul>
-<li>SHA224/SHA256/SHA384/SHA512</li>
-	    <li>HMAC-SHA224/SHA256/SHA384/SHA512</li>
-	    <li>RSA-MD5/RIPEMD160/SHA224/SHA256/SHA384/SHA512</li>
+<li>July 14 2009<br>
+	The new <a href="download.html">XML Security Library 1.2.12</a> release
+	includes the following changes (see ChangeLog for the complete list of changes):
+	<ul>	
+	<li>Fixed HMAC vulnerability with small values of HMAC length.</li>
+	<li>Added support for the GOST implemented by Russian Crypto Pro CSP 
+	(patch from Dennis Prochko)</li>
+	<li>Added an option to return the replaced (based on the patch from Frank Gross)</li>
+	<li>Added new function xmlSecNodeEncodeAndSetContent for encoding
+	special chars in the node content.</li>
+	<li>Added configurable Base64 line length.</li>
+	<li>Bug fixes.</li>
 	</ul>
 </li>
-<br><li>March 30 2005<br>
-	The new <a href="download.html">XML Security Library 1.2.8</a> release
-	merges OpenOffice.org changes to xmlsec-mscrypto and xmlsec-nss into
-	main xmlsec source tree.
-</li>
-<br><li>February 23 2005<br>
-	The new <a href="download.html">XML Security Library 1.2.7</a> release
-	includes several bug fixes and minor enchancements:
+<li>November 6 2007<br>
+	The new <a href="download.html">XML Security Library 1.2.11</a> release
+	includes the following changes:
 	<ul>
-<li>(core) added xmlSecSimpleKeysStoreGetKeys() function;</li>
-	<li>(core) added functions to create <X509Data/> node children
-	     in the signature template;</li>
-	<li>(core) fixed xmlSecGenerateID() function;</li>
-	<li>(core) fixed dynamic linking initialization/shutdown when custom memory 
-	    allocation functions are used;</li>
-	<li>(core) fixed encrypted text parsing and xmlParseInNodeContext() function;</li>
-	<li>(openssl) fixed parsing quoted values in the certificate subject;</li>
-	<li>(mscrypto) negative numbers support in xmlSecBnFromString()/xmlSecBnToString() functions.</li>
+<li>Mingw port (Roumen Petrov).</li>
+	<li>Better support for non micorsoft CSP's (Wouter and Ed Shallow).</li>
+	<li>Bug fixes.</li>
 	</ul>
 </li>
-
-<br><li>August 25 2004<br>
-	The new <a href="download.html">XML Security Library 1.2.6</a> 
-	fixes several minor bugs and adds support for loading keys and
-	certificates from memory.
+<li>June 12 2006<br>
+	The new <a href="download.html">XML Security Library 1.2.10</a> release
+	includes the following changes:
+	<ul>
+<li>GOST algorithms support (Dmitry Belyavsky)</li>
+	<li>Ability to disable system trusted certs in xmlsec-mscrypto 
+	(Dmitry Belyavsky)</li>
+	<li>New functions for adding X509IssuerName and X509SerialNumber 
+	nodes to the template (Dmitry Belyavsky)
+	</li>
+<li>Better packaging support for Fedora and Debian (Daniel Veillard, John Belmonte)</li>
+	<li>Cleanups from Coverity tool reports</li>
+	<li>Bug fixes</li>
+	</ul>
 </li>
 
 </ul>
diff --git a/docs/news.html b/docs/news.html
index cda5958..9e76766 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -39,7 +39,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -47,10 +47,48 @@
       <h1>XML Security Library News</h1>
       </div>
 <ul>
-<li>July 12 2005<br>
+<li>July 14 2009<br>
+	The new <a href="download.html">XML Security Library 1.2.12</a> release
+	includes the following changes (see ChangeLog for the complete list of changes):
+	<ul>	
+	<li>Fixed HMAC vulnerability with small values of HMAC length.</li>
+	<li>Added support for the GOST implemented by Russian Crypto Pro CSP 
+	(patch from Dennis Prochko)</li>
+	<li>Added an option to return the replaced (based on the patch from Frank Gross)</li>
+	<li>Added new function xmlSecNodeEncodeAndSetContent for encoding
+	special chars in the node content.</li>
+	<li>Added configurable Base64 line length.</li>
+	<li>Bug fixes.</li>
+	</ul>
+</li>
+<li>November 6 2007<br>
+	The new <a href="download.html">XML Security Library 1.2.11</a> release
+	includes the following changes:
+	<ul>
+<li>Mingw port (Roumen Petrov).</li>
+	<li>Better support for non micorsoft CSP's (Wouter and Ed Shallow).</li>
+	<li>Bug fixes.</li>
+	</ul>
+</li>
+<br><li>June 12 2006<br>
+	The new <a href="download.html">XML Security Library 1.2.10</a> release
+	includes the following changes:
+	<ul>
+<li>GOST algorithms support (Dmitry Belyavsky)</li>
+	<li>Ability to disable system trusted certs in xmlsec-mscrypto 
+	(Dmitry Belyavsky)</li>
+	<li>New functions for adding X509IssuerName and X509SerialNumber 
+	nodes to the template (Dmitry Belyavsky)
+	</li>
+<li>Better packaging support for Fedora and Debian (Daniel Veillard, John Belmonte)</li>
+	<li>Cleanups from Coverity tool reports</li>
+	<li>Bug fixes</li>
+	</ul>
+</li>
+<br><li>July 12 2005<br>
 	The new <a href="download.html">XML Security Library 1.2.9</a> release
 	includes few bug fixes and adds support for the recently released 
-	<a href="http://openssl.org">OpenSSL 0.9.8</a> including several 
+	<a href="http://www.openssl.org">OpenSSL 0.9.8</a> including several 
 	new algorithms for <a href="xmldsig.html">xmlsec-openssl</a>:
 	<ul>
 <li>SHA224/SHA256/SHA384/SHA512</li>
@@ -424,7 +462,7 @@ Online XML  Digital Signature Verifier</a>
 from           <a href="http://lists.w3.org/Archives/Public/w3c-ietf-xmldsig/2002AprJun/0006.html">
   Manoj K. Srivastava.</a><br><br>
 </li>
-          <li>March 31 2002�<br>
+          <li>March 31 2002<br>
    Some major changes and a time for new release: <a href="download.html">
  XML Security Library 0.0.2</a>
  . Now XML Security Library supports <b>all</b> MUST/SHOULD/MAY <a href="xmldsig-interop.html">
@@ -432,8 +470,7 @@ from           <a href="http://lists.w3.org/Archives/Public/w3c-ietf-xmldsig/200
    from XMLDSig standard!<br>
     - Added X509 certificates and certificate chains support<br>
     - The detailed signature generation/verification results are made available 
- to the application (see <a href="api-0.0.x/examples/example-dsig3.html">example 3</a>
-  )<br>
+ to the application<br>
    - RetrievalMethod, Manifests and <a href="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
    additional algorithms</a>
    are added<br>
diff --git a/docs/related.html b/docs/related.html
index 9bcc435..c9ac05e 100644
--- a/docs/related.html
+++ b/docs/related.html
@@ -39,124 +39,124 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
-<div align="center">
-            <h1>Related</h1>
+<div align="center">
+            <h1>Related</h1>
             </div>
 <h3>
 <a name="books"></a> Books</h3>
 <ul>
 <li>
-<a href="http://www.aleksey.com/cgi-bin/books.cgi?ASIN=0201756056">Secure
-XML: The New Syntax for Signatures and Encryption</a> Donald E. Eastlake</li>
+<a href="http://www.aleksey.com/cgi-bin/books.cgi?ASIN=0201756056">Secure
+XML: The New Syntax for Signatures and Encryption</a> Donald E. Eastlake</li>
               <li>
-<a href="http://www.aleksey.com/cgi-bin/books.cgi?ASIN=0072193999">XML
-Security</a> Blake Dournaee</li>
+<a href="http://www.aleksey.com/cgi-bin/books.cgi?ASIN=0072193999">XML
+Security</a> Blake Dournaee</li>
               <li>
-<a href="http://www.aleksey.com/cgi-bin/books.cgi?ASIN=0672326515">Securing
-Web Services with WS-Security : Demystifying WS-Security, WS-Policy,
-SAML, XML Signature, and XML Encryption</a> Jothy Rosenberg</li>
+<a href="http://www.aleksey.com/cgi-bin/books.cgi?ASIN=0672326515">Securing
+Web Services with WS-Security : Demystifying WS-Security, WS-Policy,
+SAML, XML Signature, and XML Encryption</a> Jothy Rosenberg</li>
               <li>
-<a href="http://www.aleksey.com/cgi-bin/books.cgi?ASIN=0471117099">Applied
-Cryptography: Protocols, Algorithms, and Source Code in C, Second
-Edition</a> Bruce Schneier</li>
+<a href="http://www.aleksey.com/cgi-bin/books.cgi?ASIN=0471117099">Applied
+Cryptography: Protocols, Algorithms, and Source Code in C, Second
+Edition</a> Bruce Schneier</li>
               <li>
-<a href="http://www.aleksey.com/cgi-bin/books.cgi?ASIN=0471223573">Practical
-Cryptography</a> Niels Ferguson, Bruce Schneier </li>
+<a href="http://www.aleksey.com/cgi-bin/books.cgi?ASIN=0471223573">Practical
+Cryptography</a> Niels Ferguson, Bruce Schneier </li>
               <li>
-<a href="http://www.aleksey.com/cgi-bin/books.cgi?ASIN=0471453803">Secrets
-and Lies : Digital Security in a Networked World</a> Bruce Schneier</li>
+<a href="http://www.aleksey.com/cgi-bin/books.cgi?ASIN=0471453803">Secrets
+and Lies : Digital Security in a Networked World</a> Bruce Schneier</li>
               <li>
-<a href="http://www.aleksey.com/cgi-bin/books.cgi?ASIN=0072224711">Web
-Services Security</a> Mark O'Neill</li>
+<a href="http://www.aleksey.com/cgi-bin/books.cgi?ASIN=0072224711">Web
+Services Security</a> Mark O'Neill</li>
               <li>
-<a href="http://www.aleksey.com/cgi-bin/books.cgi?ASIN=0849308224">Public
-Key Infrastructure: Building Trusted Applications and Web Services</a>
-John R. Vacca</li>
-             <li><a href="http://www.aleksey.com/cgi-bin/books.cgi">More books ...</a></li>
+<a href="http://www.aleksey.com/cgi-bin/books.cgi?ASIN=0849308224">Public
+Key Infrastructure: Building Trusted Applications and Web Services</a>
+John R. Vacca</li>
+             <li><a href="http://www.aleksey.com/cgi-bin/books.cgi">More books ...</a></li>
 </ul>
 <h3><a name="#dependencies">Dependencies</a></h3>
 <ul>
-<li> <a href="http://xmlsoft.org/">LibXML</a> - GNOME <a href="http://www.w3.org/TR/REC-xml">XML</a> library. </li>
-              <li> <a href="http://xmlsoft.org/XSLT/">LibXSLT</a> -
-GNOME <a href="http://www.w3.org/TR/xslt">XSLT</a> / <a href="http://www.exslt.org/">EXSLT</a> library.</li>
-              <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> <a href="http://www.mozilla.org/projects/security/pki/nss/">NSS</a> -
-Mozilla cryptographic library. </li>
+<li> <a href="http://xmlsoft.org/">LibXML</a> - GNOME <a href="http://www.w3.org/TR/REC-xml">XML</a> library. </li>
+              <li> <a href="http://xmlsoft.org/XSLT/">LibXSLT</a> -
+GNOME <a href="http://www.w3.org/TR/xslt">XSLT</a> / <a href="http://www.exslt.org/">EXSLT</a> library.</li>
+              <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> <a href="http://www.mozilla.org/projects/security/pki/nss/">NSS</a> -
+Mozilla cryptographic library. </li>
             </ul>
 <h3> <a name="projects"></a>Projects</h3>
 <ul>
-<li> <a href="http://www.zlatkovic.com/projects/libxml/index.html">Windows
+<li> <a href="http://www.zlatkovic.com/projects/libxml/index.html">Windows
 binaries</a> for XML Security Library from Igor Zlatkovic.<br>
-</li>
-              <li>XMLSec Library is included as part of Debian
-GNU/Linux. For more information see the <a href="http://memebeam.org/toys/DebianXmlsec">coordination page</a>. </li>
-              <li>XMLSec Library <a href="http://www.freebsd.org/cgi/cvsweb.cgi/ports/security/xmlsec/">FreeBSD</a>
-and <a href="http://www.openbsd.org/cgi-bin/cvsweb/ports/security/xmlsec/">OpenBSD</a>
-ports. </li>
+</li>
+              <li>XMLSec Library is included as part of Debian
+GNU/Linux. For more information see the <a href="http://memebeam.org/toys/DebianXmlsec">coordination page</a>. </li>
+              <li>XMLSec Library <a href="http://www.freebsd.org/cgi/cvsweb.cgi/ports/security/xmlsec/">FreeBSD</a>
+and <a href="http://www.openbsd.org/cgi-bin/cvsweb/ports/security/xmlsec/">OpenBSD</a>
+ports. </li>
               <li>
-<a href="http://pyxmlsec.labs.libre-entreprise.org/">PyXMLSec
-Library</a> - Python bindings for XMLSec Library. </li>
+<a href="http://pyxmlsec.labs.libre-entreprise.org/">PyXMLSec
+Library</a> - Python bindings for XMLSec Library. </li>
               <li>
-<a href="http://lasso.entrouvert.org/">Lasso
+<a href="http://lasso.entrouvert.org/">Lasso
 Library</a> - the <a href="http://www.projectliberty.org/">Liberty Alliance</a> 
-standards implementation.</li>
+standards implementation.</li>
               <li>
-<a href="http://glasnost.entrouvert.org/">Glasnost</a>
-- content management, electronic vote and groupware sysem. </li>
-              <li> <a href="http://www.opensaml.org/">OpenSAML</a> -
-an open source implementation of <a href="http://www.oasis-open.org/committees/security/#documents">SAML
-1.0 specification</a>. </li>
-              <li> <a href="http://krypto-projekt.fbmnd.fh-frankfurt.de/projekt/packages/index.php">PKCS11
+<a href="http://glasnost.entrouvert.org/">Glasnost</a>
+- content management, electronic vote and groupware sysem. </li>
+              <li> <a href="http://www.opensaml.org/">OpenSAML</a> -
+an open source implementation of <a href="http://www.oasis-open.org/committees/security/#documents">SAML
+1.0 specification</a>. </li>
+              <li> <a href="http://krypto-projekt.fbmnd.fh-frankfurt.de/projekt/packages/index.php">PKCS11
 support</a> for XML Security Library 0.0.X.<br>
-</li>
-              <li> <a href="http://www.bananapos.com">The BananaHead
+</li>
+              <li> <a href="http://www.bananapos.com">The BananaHead
 Point Of Sale project</a>.<br>
-</li>
+</li>
             </ul>
 <h3> <a name="specifcations"></a>Specifcations</h3>
 <ul>
-<li> <a href="http://www.w3.org/TR/xmldsig-core/">XML
-Signature Syntax and Processing Specification</a> (<a href="http://www.w3.org/Signature/Overview.html">working group</a>).</li>
-              <li> <a href="http://www.w3.org/TR/xmlenc-core/">XML
-Encryption Syntax and Processing Specification</a> (<a href="http://www.w3.org/Encryption/2001/">working group</a>).</li>
-              <li> <a href="http://www.w3.org/TR/xkms2/">XML Key
-Management Specification</a> (<a href="http://www.w3.org/2001/XKMS/">working
+<li> <a href="http://www.w3.org/TR/xmldsig-core/">XML
+Signature Syntax and Processing Specification</a> (<a href="http://www.w3.org/Signature/Overview.html">working group</a>).</li>
+              <li> <a href="http://www.w3.org/TR/xmlenc-core/">XML
+Encryption Syntax and Processing Specification</a> (<a href="http://www.w3.org/Encryption/2001/">working group</a>).</li>
+              <li> <a href="http://www.w3.org/TR/xkms2/">XML Key
+Management Specification</a> (<a href="http://www.w3.org/2001/XKMS/">working
 group</a>).<br>
-</li>
-              <li> <a href="http://www.w3.org/TR/REC-xml">Extensible
-Markup Language (XML) 1.0 Specification</a>.</li>
-              <li> <a href="http://www.w3.org/TR/REC-xml-names/">Namespaces
-in XML</a>.</li>
-              <li> <a id="xpath" href="http://www.w3.org/TR/xpath" name="xpath">XML Path Language (XPath) Version 1.0</a>.</li>
-              <li> <a href="http://www.w3.org/TR/WD-xptr">XML Pointer
-language (XPointer)</a>.</li>
+</li>
+              <li> <a href="http://www.w3.org/TR/REC-xml">Extensible
+Markup Language (XML) 1.0 Specification</a>.</li>
+              <li> <a href="http://www.w3.org/TR/REC-xml-names/">Namespaces
+in XML</a>.</li>
+              <li> <a id="xpath" href="http://www.w3.org/TR/xpath" name="xpath">XML Path Language (XPath) Version 1.0</a>.</li>
+              <li> <a href="http://www.w3.org/TR/WD-xptr">XML Pointer
+language (XPointer)</a>.</li>
             </ul>
 <h3> <a name="reading"></a>Articles</h3>
 <ul>
-<li> <a href="http://www.google.com/url?sa=U&start=1&q=http://www.nue.et-inf.uni-siegen.de/%7Egeuer-pollmann/xml_security.html&e=267">XML
-Security page</a> - Christian Geuer-Pollmann's collection of links
-about
-XML Security.</li>
-              <li> <a href="http://www-106.ibm.com/developerworks/xml/library/s-xmlsec.html/index.html">An
-Introduction to XML Encryption and XML Signature</a>.</li>
-              <li> <a href="http://www.zvon.org/">ZVON.org</a> - the
-guide to the XML galaxy.</li>
-              <li> <a href="http://www.xml.com/pub/a/2003/01/15/ends.html">Securing Web
-Services</a> by Rich Salz, XML.com.</li>
-              <li> <a href="http://www.zdnet.com.au/builder/program/development/story/0%2C2000035066%2C20270869%2C00.htm">Tools
-for securing your XML documents</a> by Brian Schaffner, Builder.com.</li>
+<li> <a href="http://www.google.com/url?sa=U&start=1&q=http://www.nue.et-inf.uni-siegen.de/%7Egeuer-pollmann/xml_security.html&e=267">XML
+Security page</a> - Christian Geuer-Pollmann's collection of links
+about
+XML Security.</li>
+              <li> <a href="http://www-106.ibm.com/developerworks/xml/library/s-xmlsec.html/index.html">An
+Introduction to XML Encryption and XML Signature</a>.</li>
+              <li> <a href="http://www.zvon.org/">ZVON.org</a> - the
+guide to the XML galaxy.</li>
+              <li> <a href="http://www.xml.com/pub/a/2003/01/15/ends.html">Securing Web
+Services</a> by Rich Salz, XML.com.</li>
+              <li> <a href="http://www.zdnet.com.au/builder/program/development/story/0%2C2000035066%2C20270869%2C00.htm">Tools
+for securing your XML documents</a> by Brian Schaffner, Builder.com.</li>
               <li>
-<a href="http://xmlbench.sourceforge.net/">XML
+<a href="http://xmlbench.sourceforge.net/">XML
 Benchmark</a>.<br>
-</li>
+</li>
             </ul>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/xmldsig-verifier.html b/docs/xmldsig-verifier.html
index a92bc12..af1626d 100644
--- a/docs/xmldsig-verifier.html
+++ b/docs/xmldsig-verifier.html
@@ -39,14 +39,13 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent"><div align="Center">              
       <h2>Online XML Digital Signature Verifer</h2>
       <div align="Left">The online XML Digital Signature Verifier is a simple
-cgi script (<a href="http://www.aleksey.com/xmlsec/api-0.0.x/examples/dsig5/xmldsigverify.c">source code</a>) 
-that demonstrates how to use XML Secuirty Library in real applications.
+cgi script that demonstrates how to use XML Secuirty Library in real applications.
 
 <h4>Copy/Paste the Signed XML Document in the input field below:</h4>
 Please note that <b>all</b> white spaces and carriage returns are <b>significant</b>.
@@ -75,7 +74,7 @@ Merlin's root CA used to sign interoperability
 tests from <a href="tests/keys-certs/merlin.pem">merlin-xmldsig-twenty-three.tar.gz</a>
 or "fake" <a href="tests/keys-certs/cacert.pem">root certificate</a> 
 (the corresponding <a href="tests/keys-certs/cakey.pem">private key</a>
-is encrypted using passphrase "1234");
+is encrypted using passphrase "secret");
 </li>
 <li>HMAC key "secret" (in hex, 73 65 63 72 65 74);
 </li>
@@ -94,12 +93,6 @@ reasons.
 <a href="tests/aleksey-xmldsig-01/enveloping-dsa-x509chain.xml">aleksey-xmldsig-01/enveloping-dsa-x509chain.xml</a>
 </li>
 <li>
-<a href="tests/aleksey-xmldsig-01/enveloping-md5-hmac-md5-64.xml">aleksey-xmldsig-01/enveloping-md5-hmac-md5-64.xml</a>
-</li>
-<li>
-<a href="tests/aleksey-xmldsig-01/enveloping-md5-hmac-md5.xml">aleksey-xmldsig-01/enveloping-md5-hmac-md5.xml</a>
-</li>
-<li>
 <a href="tests/aleksey-xmldsig-01/enveloping-ripemd160-hmac-ripemd160-64.xml">aleksey-xmldsig-01/enveloping-ripemd160-hmac-ripemd160-64.xml</a>
 </li>
 <li>
diff --git a/docs/xmldsig.html b/docs/xmldsig.html
index 3acbfbb..9b35997 100644
--- a/docs/xmldsig.html
+++ b/docs/xmldsig.html
@@ -39,7 +39,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
@@ -874,15 +874,56 @@ Key Wrap 256<br>
 </td>
                 </tr>
 </tbody></table>
+<div align="left"> <br><h4 style="text-align: center;">Other algorithms</h4>
+            <table style="width: 85%; text-align: left; margin-left: auto; margin-right: auto;" border="1" cellpadding="2" cellspacing="2"><tbody>
+<tr>
+<td style="width: 40%;" align="left" valign="top"><b>Features
+and
+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 NSS</b>
+                  </td>
+                  <td style="vertical-align: top;"> <b>XMLSec with
+MSCrypto</b> </td>
+                </tr>
+<tr>
+<td style="vertical-align: top; width: 40%;">GOST94 digests<br>
+</td>
+                  <td style="vertical-align: top;">N<br>
+</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>
+<tr>
+<td style="vertical-align: top; width: 40%;">GOST2001 signatures<br>
+</td>
+                  <td style="vertical-align: top;">N<br>
+</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>
+</tbody></table>
 <br><br><a name="dsa-sha1"></a><sup>(1)</sup> Defining <a href="http://www.w3.org/TR/xmldsig-core/#sec-DSAKeyValue"> DSA key</a>
-with
-Seed and PgenCounter is not supported.<br><p>Test vectors (from <a href="http://www.w3.org/Signature/2001/04/05-xmldsig-interop.html">IETF/W3C
+with Seed and PgenCounter is not supported.
+<br><a name="gost-mscrypto"></a><sup>(2)</sup> Requires install of a CSP 
+providing these algorithms.<br><p>Test vectors (from <a href="http://www.w3.org/Signature/2001/04/05-xmldsig-interop.html">IETF/W3C
 XML Signature WG: XML Signature Interoperability page</a>): <br><a href="http://lists.w3.org/Archives/Public/w3c-ietf-xmldsig/2002AprJun/att-0016/01-merlin-xmldsig-twenty-three.tar.gz">merlin-xmldsig-twenty-three.tar.gz</a>
             <br><a href="http://lists.w3.org/Archives/Public/w3c-ietf-xmldsig/2001AprJun/att-00%2033/01-merlin-xmldsig-sixteen.tar.gz">merlin-xmldsig-sixteen.tar.gz</a>
 (features, deprecated)<br><a href="http://lists.w3.org/Archives/Public/w3c-ietf-xmldsig/2001JanMar/att-0155/04-merlin-xmldsig-fifteen.tar.gz">merlin-xmldsig-fifteen.tar.gz</a>
 (algorithms, deprecated)<br></p>
             </div>
             </div>
+</div>
 </td></tr></table></td>
 </tr></table></body>
 </html>
diff --git a/docs/xmlenc.html b/docs/xmlenc.html
index bac3e93..b3dac53 100644
--- a/docs/xmlenc.html
+++ b/docs/xmlenc.html
@@ -39,7 +39,7 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent"><div align="center">
@@ -452,7 +452,7 @@ Wrap (256 bit keys)<br>
 <tr>
 <td style="width: 40%;" valign="top"> SHA256<br>
 </td>
-                  <td valign="top">Y�<br>
+                  <td valign="top">Y<br>
 </td>
                   <td style="vertical-align: top;">N</td>
                   <td style="vertical-align: top;">N</td>
diff --git a/docs/xmlsec-man.html b/docs/xmlsec-man.html
index 07bb38c..8ad6e3c 100644
--- a/docs/xmlsec-man.html
+++ b/docs/xmlsec-man.html
@@ -39,17 +39,17 @@
 <td width="15"></td>
 <td><a href="http://www.openssl.org/"><img src="images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
 </tr>
-<!--Sponsored links - start--><!--Sponsored links - end-->
+<!--Links - start--><!--Links - end-->
 </table>
 </td>
 <td valign="top"><table width="100%" valign="top"><tr><td valign="top" align="left" id="xmlsecContent">
 <h1>XMLSEC1</h1>
 <p> Section: User Commands (1)<br>Updated: July 2005<br><a href="#index">Index</a> <a href="http://localhost/cgi-bin/man/man2html">Return to Main Contents</a></p>
 <hr>
-<a name="lbAB">�</a><h2>NAME</h2>
-<p>  xmlsec1 - sign, verify, encrypt and decrypt XML documents <a name="lbAC">�</a> </p>
+<a name="lbAB"></a><h2>NAME</h2>
+<p>  xmlsec1 - sign, verify, encrypt and decrypt XML documents <a name="lbAC"></a> </p>
 <h2>SYNOPSIS</h2>
-<b>xmlsec</b><i><command> </i><p>[<i><options></i>] [<i><file></i>] <a name="lbAD">�</a> </p>
+<b>xmlsec</b><i><command> </i><p>[<i><options></i>] [<i><file></i>] <a name="lbAD"></a> </p>
 <h2>DESCRIPTION</h2>
 <p>  xmlsec is a command line tool for signing, verifying, encrypting and decrypting XML documents. The allowed <command> values are: </p>
 <dl compact>
@@ -75,7 +75,7 @@
 <dt><b>--decrypt</b></dt>
 <dd> decrypt data from XML document </dd>
 </dl>
-<a name="lbAE">�</a><h2>OPTIONS</h2>
+<a name="lbAE"></a><h2>OPTIONS</h2>
 <dl compact>
 <dt> <b>--ignore-manifests</b> <dt></dt>
 </dt>
@@ -266,15 +266,15 @@
 <dd> <dd>print help information about the command </dd>
 </dd>
 </dl>
-<a name="lbAF">�</a><h2>AUTHOR</h2>
-<p>  Written by Aleksey Sanin <<a href="mailto:aleksey at aleksey.com">aleksey at aleksey.com</a>>. <a name="lbAG">�</a> </p>
+<a name="lbAF"></a><h2>AUTHOR</h2>
+<p>  Written by Aleksey Sanin <<a href="mailto:aleksey at aleksey.com">aleksey at aleksey.com</a>>. <a name="lbAG"></a> </p>
 <h2>REPORTING BUGS</h2>
-<p>  Report bugs to <a href="http://www.aleksey.com/xmlsec/bugs.html">http://www.aleksey.com/xmlsec/bugs.html</a> <a name="lbAH">�</a> </p>
+<p>  Report bugs to <a href="http://www.aleksey.com/xmlsec/bugs.html">http://www.aleksey.com/xmlsec/bugs.html</a> <a name="lbAH"></a> </p>
 <h2>COPYRIGHT</h2>
 <p>  Copyright � 2002-2003 Aleksey Sanin. <br>  This is free software: see the source for copying information. </p>
 <p>  </p>
 <hr>
-<a name="index">�</a><h2>Index</h2>
+<a name="index"></a><h2>Index</h2>
 <dl>
 <dt><a href="#lbAB">NAME</a></dt>
 <dd> </dd>
diff --git a/examples/Makefile.w32 b/examples/Makefile.w32
index 41eae25..ee81ab3 100644
--- a/examples/Makefile.w32
+++ b/examples/Makefile.w32
@@ -4,7 +4,7 @@
 # environment. Having done that, you can do a
 
 XMLSEC_STATIC  = yes
-XMLSEC_CRYPTO  = mscrypto
+XMLSEC_CRYPTO  = openssl
 XMLSEC_CFLAGS  =
 XMLSEC_LIBS    =
 
@@ -29,8 +29,8 @@ XMLSEC_EXAMPLES = \
 # 
 !IF "$(XMLSEC_CRYPTO)" == "openssl"
 XMLSEC_CFLAGS = $(XMLSEC_CFLAGS) /D "XMLSEC_CRYPTO_OPENSSL" /D "XMLSEC_CRYPTO=\"openssl\""
-XMLSEC_SOLIBS = libxmlsec-openssl.lib libeay32_a.lib wsock32.lib user32.lib gdi32.lib 
-XMLSEC_ALIBS  = libxmlsec-openssl_a.lib libeay32_a.lib wsock32.lib user32.lib gdi32.lib 
+XMLSEC_SOLIBS = libxmlsec-openssl.lib libeay32.lib wsock32.lib user32.lib gdi32.lib 
+XMLSEC_ALIBS  = libxmlsec-openssl_a.lib libeay32.lib wsock32.lib user32.lib gdi32.lib 
 !ENDIF
 
 !IF "$(XMLSEC_CRYPTO)" == "nss"
@@ -48,10 +48,10 @@ XMLSEC_ALIBS  = libxmlsec-mscrypto_a.lib user32.lib gdi32.lib crypt32.lib advapi
 !IF "$(XMLSEC_STATIC)" == "yes"
 XMLSEC_CFLAGS = $(XMLSEC_CFLAGS) /D "LIBXML_STATIC" /D "LIBXSLT_STATIC" /D "XMLSEC_STATIC"
 XMLSEC_LIBS   = $(XMLSEC_LIBS) $(XMLSEC_ALIBS) libxmlsec_a.lib \
-		libxml2_a.lib libxslt_a.lib libexslt_a.lib iconv_a.lib
+		libxml2_a.lib libxslt_a.lib libexslt_a.lib 
 !ELSE
 XMLSEC_LIBS   = $(XMLSEC_LIBS) $(XMLSEC_SOLIBS) libxmlsec.lib libxml2.lib \
-		libxslt.lib libexslt.lib iconv.lib
+		libxslt.lib libexslt.lib
 !ENDIF
 
 # The preprocessor and its options.
diff --git a/include/Makefile.in b/include/Makefile.in
index fdec126..215f5ca 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -120,12 +120,17 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAN2HTML = @MAN2HTML@
 MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
+MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
+MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
 MV = @MV@
 NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
+NSPR_PACKAGE = @NSPR_PACKAGE@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_CRYPTO_LIB = @NSS_CRYPTO_LIB@
 NSS_LIBS = @NSS_LIBS@
 NSS_MIN_VERSION = @NSS_MIN_VERSION@
+NSS_PACKAGE = @NSS_PACKAGE@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_CRYPTO_LIB = @OPENSSL_CRYPTO_LIB@
@@ -143,6 +148,8 @@ PKG_CONFIG_ENABLED = @PKG_CONFIG_ENABLED@
 RANLIB = @RANLIB@
 RM = @RM@
 SET_MAKE = @SET_MAKE@
+SHAREDLIB_HACK_FALSE = @SHAREDLIB_HACK_FALSE@
+SHAREDLIB_HACK_TRUE = @SHAREDLIB_HACK_TRUE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TAR = @TAR@
@@ -155,6 +162,7 @@ XMLSEC_CORE_LIBS = @XMLSEC_CORE_LIBS@
 XMLSEC_CRYPTO = @XMLSEC_CRYPTO@
 XMLSEC_CRYPTO_CFLAGS = @XMLSEC_CRYPTO_CFLAGS@
 XMLSEC_CRYPTO_DISABLED_LIST = @XMLSEC_CRYPTO_DISABLED_LIST@
+XMLSEC_CRYPTO_EXTRA_LDFLAGS = @XMLSEC_CRYPTO_EXTRA_LDFLAGS@
 XMLSEC_CRYPTO_LIB = @XMLSEC_CRYPTO_LIB@
 XMLSEC_CRYPTO_LIBS = @XMLSEC_CRYPTO_LIBS@
 XMLSEC_CRYPTO_LIST = @XMLSEC_CRYPTO_LIST@
@@ -163,6 +171,7 @@ XMLSEC_DEFINES = @XMLSEC_DEFINES@
 XMLSEC_DL_INCLUDES = @XMLSEC_DL_INCLUDES@
 XMLSEC_DL_LIBS = @XMLSEC_DL_LIBS@
 XMLSEC_DOCDIR = @XMLSEC_DOCDIR@
+XMLSEC_EXTRA_LDFLAGS = @XMLSEC_EXTRA_LDFLAGS@
 XMLSEC_GNUTLS_CFLAGS = @XMLSEC_GNUTLS_CFLAGS@
 XMLSEC_GNUTLS_LIBS = @XMLSEC_GNUTLS_LIBS@
 XMLSEC_LIBDIR = @XMLSEC_LIBDIR@
@@ -185,6 +194,9 @@ XMLSEC_NO_DSA_TRUE = @XMLSEC_NO_DSA_TRUE@
 XMLSEC_NO_GNUTLS = @XMLSEC_NO_GNUTLS@
 XMLSEC_NO_GNUTLS_FALSE = @XMLSEC_NO_GNUTLS_FALSE@
 XMLSEC_NO_GNUTLS_TRUE = @XMLSEC_NO_GNUTLS_TRUE@
+XMLSEC_NO_GOST = @XMLSEC_NO_GOST@
+XMLSEC_NO_GOST_FALSE = @XMLSEC_NO_GOST_FALSE@
+XMLSEC_NO_GOST_TRUE = @XMLSEC_NO_GOST_TRUE@
 XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
 XMLSEC_NO_HMAC_FALSE = @XMLSEC_NO_HMAC_FALSE@
 XMLSEC_NO_HMAC_TRUE = @XMLSEC_NO_HMAC_TRUE@
@@ -192,6 +204,9 @@ XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
 XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
 XMLSEC_NO_MD5_FALSE = @XMLSEC_NO_MD5_FALSE@
 XMLSEC_NO_MD5_TRUE = @XMLSEC_NO_MD5_TRUE@
+XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
+XMLSEC_NO_MSCRYPTO_FALSE = @XMLSEC_NO_MSCRYPTO_FALSE@
+XMLSEC_NO_MSCRYPTO_TRUE = @XMLSEC_NO_MSCRYPTO_TRUE@
 XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
 XMLSEC_NO_NSS_FALSE = @XMLSEC_NO_NSS_FALSE@
 XMLSEC_NO_NSS_TRUE = @XMLSEC_NO_NSS_TRUE@
diff --git a/include/xmlsec/Makefile.in b/include/xmlsec/Makefile.in
index 2912789..bbcee75 100644
--- a/include/xmlsec/Makefile.in
+++ b/include/xmlsec/Makefile.in
@@ -131,12 +131,17 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAN2HTML = @MAN2HTML@
 MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
+MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
+MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
 MV = @MV@
 NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
+NSPR_PACKAGE = @NSPR_PACKAGE@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_CRYPTO_LIB = @NSS_CRYPTO_LIB@
 NSS_LIBS = @NSS_LIBS@
 NSS_MIN_VERSION = @NSS_MIN_VERSION@
+NSS_PACKAGE = @NSS_PACKAGE@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_CRYPTO_LIB = @OPENSSL_CRYPTO_LIB@
@@ -154,6 +159,8 @@ PKG_CONFIG_ENABLED = @PKG_CONFIG_ENABLED@
 RANLIB = @RANLIB@
 RM = @RM@
 SET_MAKE = @SET_MAKE@
+SHAREDLIB_HACK_FALSE = @SHAREDLIB_HACK_FALSE@
+SHAREDLIB_HACK_TRUE = @SHAREDLIB_HACK_TRUE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TAR = @TAR@
@@ -166,6 +173,7 @@ XMLSEC_CORE_LIBS = @XMLSEC_CORE_LIBS@
 XMLSEC_CRYPTO = @XMLSEC_CRYPTO@
 XMLSEC_CRYPTO_CFLAGS = @XMLSEC_CRYPTO_CFLAGS@
 XMLSEC_CRYPTO_DISABLED_LIST = @XMLSEC_CRYPTO_DISABLED_LIST@
+XMLSEC_CRYPTO_EXTRA_LDFLAGS = @XMLSEC_CRYPTO_EXTRA_LDFLAGS@
 XMLSEC_CRYPTO_LIB = @XMLSEC_CRYPTO_LIB@
 XMLSEC_CRYPTO_LIBS = @XMLSEC_CRYPTO_LIBS@
 XMLSEC_CRYPTO_LIST = @XMLSEC_CRYPTO_LIST@
@@ -174,6 +182,7 @@ XMLSEC_DEFINES = @XMLSEC_DEFINES@
 XMLSEC_DL_INCLUDES = @XMLSEC_DL_INCLUDES@
 XMLSEC_DL_LIBS = @XMLSEC_DL_LIBS@
 XMLSEC_DOCDIR = @XMLSEC_DOCDIR@
+XMLSEC_EXTRA_LDFLAGS = @XMLSEC_EXTRA_LDFLAGS@
 XMLSEC_GNUTLS_CFLAGS = @XMLSEC_GNUTLS_CFLAGS@
 XMLSEC_GNUTLS_LIBS = @XMLSEC_GNUTLS_LIBS@
 XMLSEC_LIBDIR = @XMLSEC_LIBDIR@
@@ -196,6 +205,9 @@ XMLSEC_NO_DSA_TRUE = @XMLSEC_NO_DSA_TRUE@
 XMLSEC_NO_GNUTLS = @XMLSEC_NO_GNUTLS@
 XMLSEC_NO_GNUTLS_FALSE = @XMLSEC_NO_GNUTLS_FALSE@
 XMLSEC_NO_GNUTLS_TRUE = @XMLSEC_NO_GNUTLS_TRUE@
+XMLSEC_NO_GOST = @XMLSEC_NO_GOST@
+XMLSEC_NO_GOST_FALSE = @XMLSEC_NO_GOST_FALSE@
+XMLSEC_NO_GOST_TRUE = @XMLSEC_NO_GOST_TRUE@
 XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
 XMLSEC_NO_HMAC_FALSE = @XMLSEC_NO_HMAC_FALSE@
 XMLSEC_NO_HMAC_TRUE = @XMLSEC_NO_HMAC_TRUE@
@@ -203,6 +215,9 @@ XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
 XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
 XMLSEC_NO_MD5_FALSE = @XMLSEC_NO_MD5_FALSE@
 XMLSEC_NO_MD5_TRUE = @XMLSEC_NO_MD5_TRUE@
+XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
+XMLSEC_NO_MSCRYPTO_FALSE = @XMLSEC_NO_MSCRYPTO_FALSE@
+XMLSEC_NO_MSCRYPTO_TRUE = @XMLSEC_NO_MSCRYPTO_TRUE@
 XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
 XMLSEC_NO_NSS_FALSE = @XMLSEC_NO_NSS_FALSE@
 XMLSEC_NO_NSS_TRUE = @XMLSEC_NO_NSS_TRUE@
diff --git a/include/xmlsec/app.h b/include/xmlsec/app.h
index 571cfe9..d958392 100644
--- a/include/xmlsec/app.h
+++ b/include/xmlsec/app.h
@@ -66,6 +66,13 @@ XMLSEC_EXPORT xmlSecKeyDataId			xmlSecKeyDataDesGetKlass	(void);
 #define xmlSecKeyDataDsaId			xmlSecKeyDataDsaGetKlass()
 XMLSEC_EXPORT xmlSecKeyDataId			xmlSecKeyDataDsaGetKlass	(void);		
 /** 
+ * xmlSecKeyDataGost2001Id:
+ * 
+ * The GOST2001 key klass.
+ */
+#define xmlSecKeyDataGost2001Id			xmlSecKeyDataGost2001GetKlass()
+XMLSEC_EXPORT xmlSecKeyDataId			xmlSecKeyDataGost2001GetKlass	(void);		
+/** 
  * xmlSecKeyDataHmacId:
  * 
  * The DHMAC key klass.
@@ -177,6 +184,14 @@ XMLSEC_EXPORT xmlSecTransformId			xmlSecTransformKWDes3GetKlass	(void);
 XMLSEC_EXPORT xmlSecTransformId			xmlSecTransformDsaSha1GetKlass	(void);	
 
 /**
+ * xmlSecTransformGost2001GostR3411_94Id:
+ * 
+ * The GOST2001-GOSTR3411_94 signature transform klass.
+ */
+#define xmlSecTransformGost2001GostR3411_94Id		xmlSecTransformGost2001GostR3411_94GetKlass()
+XMLSEC_EXPORT xmlSecTransformId			xmlSecTransformGost2001GostR3411_94GetKlass	(void);	
+
+/**
  * xmlSecTransformHmacMd5Id:
  * 
  * The HMAC with MD5 signature transform klass.
@@ -304,6 +319,13 @@ XMLSEC_EXPORT xmlSecTransformId			xmlSecTransformRsaPkcs1GetKlass	(void);
 #define xmlSecTransformRsaOaepId		xmlSecTransformRsaOaepGetKlass()
 XMLSEC_EXPORT xmlSecTransformId			xmlSecTransformRsaOaepGetKlass	(void);	
 /**
+ * xmlSecTransformGostR3411_94Id:
+ * 
+ * The GOSTR3411_94 digest transform klass.
+ */
+#define xmlSecTransformGostR3411_94Id			xmlSecTransformGostR3411_94GetKlass()
+XMLSEC_EXPORT xmlSecTransformId			xmlSecTransformGostR3411_94GetKlass	(void);
+/**
  * xmlSecTransformSha1Id:
  * 
  * The SHA1 digest transform klass.
diff --git a/include/xmlsec/base64.h b/include/xmlsec/base64.h
index 3cdcbb9..444a566 100644
--- a/include/xmlsec/base64.h
+++ b/include/xmlsec/base64.h
@@ -27,6 +27,10 @@ extern "C" {
  */
 #define XMLSEC_BASE64_LINESIZE				64
 
+XMLSEC_EXPORT int		xmlSecBase64GetDefaultLineSize	();
+XMLSEC_EXPORT void		xmlSecBase64SetDefaultLineSize	(int columns);
+
+
 /**
  * Base64 Context
  */
diff --git a/include/xmlsec/exports.h b/include/xmlsec/exports.h
index 5a65789..41d0a7e 100644
--- a/include/xmlsec/exports.h
+++ b/include/xmlsec/exports.h
@@ -19,7 +19,7 @@ extern "C" {
    Windows platform with MSVC compiler. */
 
 #if !defined XMLSEC_EXPORT
-#  if defined _MSC_VER
+#  if defined(_WIN32)
      /* if we compile libxmlsec itself: */
 #    if defined(IN_XMLSEC)
 #      if !defined(XMLSEC_STATIC)
@@ -29,11 +29,20 @@ extern "C" {
 #      endif
      /* if a client program includes this file: */
 #    else
+#if 1
+       /* gcc fail by initialisation of global variable with error
+          (as example in .../openssl/ciphers.c):
+            "initializer element is not constant"
+          To avoid this we shouldn't use __declspec(dllimport).
+          This will enable auto-import feature. */
+#      define XMLSEC_EXPORT
+#else
 #      if !defined(XMLSEC_STATIC)
 #        define XMLSEC_EXPORT __declspec(dllimport) 
 #      else
 #        define XMLSEC_EXPORT 
 #      endif
+#endif
 #    endif
    /* This holds on all other platforms/compilers, which are easier to
       handle in regard to this. */
@@ -43,7 +52,7 @@ extern "C" {
 #endif
 
 #if !defined XMLSEC_CRYPTO_EXPORT
-#  if defined _MSC_VER
+#  if defined(_WIN32)
      /* if we compile libxmlsec itself: */
 #    if defined(IN_XMLSEC_CRYPTO)
 #      if !defined(XMLSEC_STATIC)
@@ -67,7 +76,7 @@ extern "C" {
 #endif
 
 #if !defined XMLSEC_EXPORT_VAR
-#  if defined _MSC_VER
+#  if defined(_WIN32)
      /* if we compile libxmlsec itself: */
 #    if defined(IN_XMLSEC)
 #      if !defined(XMLSEC_STATIC)
diff --git a/include/xmlsec/gnutls/Makefile.in b/include/xmlsec/gnutls/Makefile.in
index beedfe5..79c9c19 100644
--- a/include/xmlsec/gnutls/Makefile.in
+++ b/include/xmlsec/gnutls/Makefile.in
@@ -124,12 +124,17 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAN2HTML = @MAN2HTML@
 MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
+MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
+MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
 MV = @MV@
 NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
+NSPR_PACKAGE = @NSPR_PACKAGE@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_CRYPTO_LIB = @NSS_CRYPTO_LIB@
 NSS_LIBS = @NSS_LIBS@
 NSS_MIN_VERSION = @NSS_MIN_VERSION@
+NSS_PACKAGE = @NSS_PACKAGE@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_CRYPTO_LIB = @OPENSSL_CRYPTO_LIB@
@@ -147,6 +152,8 @@ PKG_CONFIG_ENABLED = @PKG_CONFIG_ENABLED@
 RANLIB = @RANLIB@
 RM = @RM@
 SET_MAKE = @SET_MAKE@
+SHAREDLIB_HACK_FALSE = @SHAREDLIB_HACK_FALSE@
+SHAREDLIB_HACK_TRUE = @SHAREDLIB_HACK_TRUE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TAR = @TAR@
@@ -159,6 +166,7 @@ XMLSEC_CORE_LIBS = @XMLSEC_CORE_LIBS@
 XMLSEC_CRYPTO = @XMLSEC_CRYPTO@
 XMLSEC_CRYPTO_CFLAGS = @XMLSEC_CRYPTO_CFLAGS@
 XMLSEC_CRYPTO_DISABLED_LIST = @XMLSEC_CRYPTO_DISABLED_LIST@
+XMLSEC_CRYPTO_EXTRA_LDFLAGS = @XMLSEC_CRYPTO_EXTRA_LDFLAGS@
 XMLSEC_CRYPTO_LIB = @XMLSEC_CRYPTO_LIB@
 XMLSEC_CRYPTO_LIBS = @XMLSEC_CRYPTO_LIBS@
 XMLSEC_CRYPTO_LIST = @XMLSEC_CRYPTO_LIST@
@@ -167,6 +175,7 @@ XMLSEC_DEFINES = @XMLSEC_DEFINES@
 XMLSEC_DL_INCLUDES = @XMLSEC_DL_INCLUDES@
 XMLSEC_DL_LIBS = @XMLSEC_DL_LIBS@
 XMLSEC_DOCDIR = @XMLSEC_DOCDIR@
+XMLSEC_EXTRA_LDFLAGS = @XMLSEC_EXTRA_LDFLAGS@
 XMLSEC_GNUTLS_CFLAGS = @XMLSEC_GNUTLS_CFLAGS@
 XMLSEC_GNUTLS_LIBS = @XMLSEC_GNUTLS_LIBS@
 XMLSEC_LIBDIR = @XMLSEC_LIBDIR@
@@ -189,6 +198,9 @@ XMLSEC_NO_DSA_TRUE = @XMLSEC_NO_DSA_TRUE@
 XMLSEC_NO_GNUTLS = @XMLSEC_NO_GNUTLS@
 XMLSEC_NO_GNUTLS_FALSE = @XMLSEC_NO_GNUTLS_FALSE@
 XMLSEC_NO_GNUTLS_TRUE = @XMLSEC_NO_GNUTLS_TRUE@
+XMLSEC_NO_GOST = @XMLSEC_NO_GOST@
+XMLSEC_NO_GOST_FALSE = @XMLSEC_NO_GOST_FALSE@
+XMLSEC_NO_GOST_TRUE = @XMLSEC_NO_GOST_TRUE@
 XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
 XMLSEC_NO_HMAC_FALSE = @XMLSEC_NO_HMAC_FALSE@
 XMLSEC_NO_HMAC_TRUE = @XMLSEC_NO_HMAC_TRUE@
@@ -196,6 +208,9 @@ XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
 XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
 XMLSEC_NO_MD5_FALSE = @XMLSEC_NO_MD5_FALSE@
 XMLSEC_NO_MD5_TRUE = @XMLSEC_NO_MD5_TRUE@
+XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
+XMLSEC_NO_MSCRYPTO_FALSE = @XMLSEC_NO_MSCRYPTO_FALSE@
+XMLSEC_NO_MSCRYPTO_TRUE = @XMLSEC_NO_MSCRYPTO_TRUE@
 XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
 XMLSEC_NO_NSS_FALSE = @XMLSEC_NO_NSS_FALSE@
 XMLSEC_NO_NSS_TRUE = @XMLSEC_NO_NSS_TRUE@
diff --git a/include/xmlsec/gnutls/crypto.h b/include/xmlsec/gnutls/crypto.h
index dd80436..f7fbbad 100644
--- a/include/xmlsec/gnutls/crypto.h
+++ b/include/xmlsec/gnutls/crypto.h
@@ -113,6 +113,10 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformDes3CbcGetKlass(void
  *
  *******************************************************************/
 #ifndef XMLSEC_NO_HMAC
+
+XMLSEC_CRYPTO_EXPORT int               xmlSecGnuTLSHmacGetMinOutputLength();
+XMLSEC_CRYPTO_EXPORT void              xmlSecGnuTLSHmacSetMinOutputLength(int min_length);
+
 /** 
  * xmlSecGnuTLSKeyDataHmacId:
  * 
diff --git a/include/xmlsec/gnutls/.cvsignore b/include/xmlsec/mscrypto/.cvsignore
similarity index 100%
rename from include/xmlsec/gnutls/.cvsignore
rename to include/xmlsec/mscrypto/.cvsignore
diff --git a/include/xmlsec/mscrypto/Makefile.am b/include/xmlsec/mscrypto/Makefile.am
new file mode 100644
index 0000000..18dff94
--- /dev/null
+++ b/include/xmlsec/mscrypto/Makefile.am
@@ -0,0 +1,16 @@
+NULL =
+
+xmlsecmscryptoincdir = $(includedir)/xmlsec1/xmlsec/mscrypto
+
+xmlsecmscryptoinc_HEADERS = \
+app.h \
+certkeys.h \
+crypto.h \
+keysstore.h \
+symbols.h \
+x509.h \
+$(NULL)
+
+install-exec-hook:
+	$(mkinstalldirs) $(DESTDIR)$(xmlsecmscryptoincdir)
+
diff --git a/include/xmlsec/nss/Makefile.in b/include/xmlsec/mscrypto/Makefile.in
similarity index 88%
copy from include/xmlsec/nss/Makefile.in
copy to include/xmlsec/mscrypto/Makefile.in
index 048f47d..86361d7 100644
--- a/include/xmlsec/nss/Makefile.in
+++ b/include/xmlsec/mscrypto/Makefile.in
@@ -36,9 +36,9 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = include/xmlsec/nss
+subdir = include/xmlsec/mscrypto
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(xmlsecnssinc_HEADERS)
+	$(xmlsecmscryptoinc_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -54,9 +54,9 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(xmlsecnssincdir)"
-xmlsecnssincHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(xmlsecnssinc_HEADERS)
+am__installdirs = "$(DESTDIR)$(xmlsecmscryptoincdir)"
+xmlsecmscryptoincHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(xmlsecmscryptoinc_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -124,12 +124,17 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAN2HTML = @MAN2HTML@
 MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
+MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
+MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
 MV = @MV@
 NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
+NSPR_PACKAGE = @NSPR_PACKAGE@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_CRYPTO_LIB = @NSS_CRYPTO_LIB@
 NSS_LIBS = @NSS_LIBS@
 NSS_MIN_VERSION = @NSS_MIN_VERSION@
+NSS_PACKAGE = @NSS_PACKAGE@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_CRYPTO_LIB = @OPENSSL_CRYPTO_LIB@
@@ -147,6 +152,8 @@ PKG_CONFIG_ENABLED = @PKG_CONFIG_ENABLED@
 RANLIB = @RANLIB@
 RM = @RM@
 SET_MAKE = @SET_MAKE@
+SHAREDLIB_HACK_FALSE = @SHAREDLIB_HACK_FALSE@
+SHAREDLIB_HACK_TRUE = @SHAREDLIB_HACK_TRUE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TAR = @TAR@
@@ -159,6 +166,7 @@ XMLSEC_CORE_LIBS = @XMLSEC_CORE_LIBS@
 XMLSEC_CRYPTO = @XMLSEC_CRYPTO@
 XMLSEC_CRYPTO_CFLAGS = @XMLSEC_CRYPTO_CFLAGS@
 XMLSEC_CRYPTO_DISABLED_LIST = @XMLSEC_CRYPTO_DISABLED_LIST@
+XMLSEC_CRYPTO_EXTRA_LDFLAGS = @XMLSEC_CRYPTO_EXTRA_LDFLAGS@
 XMLSEC_CRYPTO_LIB = @XMLSEC_CRYPTO_LIB@
 XMLSEC_CRYPTO_LIBS = @XMLSEC_CRYPTO_LIBS@
 XMLSEC_CRYPTO_LIST = @XMLSEC_CRYPTO_LIST@
@@ -167,6 +175,7 @@ XMLSEC_DEFINES = @XMLSEC_DEFINES@
 XMLSEC_DL_INCLUDES = @XMLSEC_DL_INCLUDES@
 XMLSEC_DL_LIBS = @XMLSEC_DL_LIBS@
 XMLSEC_DOCDIR = @XMLSEC_DOCDIR@
+XMLSEC_EXTRA_LDFLAGS = @XMLSEC_EXTRA_LDFLAGS@
 XMLSEC_GNUTLS_CFLAGS = @XMLSEC_GNUTLS_CFLAGS@
 XMLSEC_GNUTLS_LIBS = @XMLSEC_GNUTLS_LIBS@
 XMLSEC_LIBDIR = @XMLSEC_LIBDIR@
@@ -189,6 +198,9 @@ XMLSEC_NO_DSA_TRUE = @XMLSEC_NO_DSA_TRUE@
 XMLSEC_NO_GNUTLS = @XMLSEC_NO_GNUTLS@
 XMLSEC_NO_GNUTLS_FALSE = @XMLSEC_NO_GNUTLS_FALSE@
 XMLSEC_NO_GNUTLS_TRUE = @XMLSEC_NO_GNUTLS_TRUE@
+XMLSEC_NO_GOST = @XMLSEC_NO_GOST@
+XMLSEC_NO_GOST_FALSE = @XMLSEC_NO_GOST_FALSE@
+XMLSEC_NO_GOST_TRUE = @XMLSEC_NO_GOST_TRUE@
 XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
 XMLSEC_NO_HMAC_FALSE = @XMLSEC_NO_HMAC_FALSE@
 XMLSEC_NO_HMAC_TRUE = @XMLSEC_NO_HMAC_TRUE@
@@ -196,6 +208,9 @@ XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
 XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
 XMLSEC_NO_MD5_FALSE = @XMLSEC_NO_MD5_FALSE@
 XMLSEC_NO_MD5_TRUE = @XMLSEC_NO_MD5_TRUE@
+XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
+XMLSEC_NO_MSCRYPTO_FALSE = @XMLSEC_NO_MSCRYPTO_FALSE@
+XMLSEC_NO_MSCRYPTO_TRUE = @XMLSEC_NO_MSCRYPTO_TRUE@
 XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
 XMLSEC_NO_NSS_FALSE = @XMLSEC_NO_NSS_FALSE@
 XMLSEC_NO_NSS_TRUE = @XMLSEC_NO_NSS_TRUE@
@@ -291,14 +306,13 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 NULL = 
-xmlsecnssincdir = $(includedir)/xmlsec1/xmlsec/nss
-xmlsecnssinc_HEADERS = \
+xmlsecmscryptoincdir = $(includedir)/xmlsec1/xmlsec/mscrypto
+xmlsecmscryptoinc_HEADERS = \
 app.h \
+certkeys.h \
 crypto.h \
-symbols.h \
-bignum.h \
 keysstore.h \
-pkikeys.h \
+symbols.h \
 x509.h \
 $(NULL)
 
@@ -314,9 +328,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/xmlsec/nss/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/xmlsec/mscrypto/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  include/xmlsec/nss/Makefile
+	  $(AUTOMAKE) --gnu  include/xmlsec/mscrypto/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -344,22 +358,22 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
-install-xmlsecnssincHEADERS: $(xmlsecnssinc_HEADERS)
+install-xmlsecmscryptoincHEADERS: $(xmlsecmscryptoinc_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(xmlsecnssincdir)" || $(mkdir_p) "$(DESTDIR)$(xmlsecnssincdir)"
-	@list='$(xmlsecnssinc_HEADERS)'; for p in $$list; do \
+	test -z "$(xmlsecmscryptoincdir)" || $(mkdir_p) "$(DESTDIR)$(xmlsecmscryptoincdir)"
+	@list='$(xmlsecmscryptoinc_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(xmlsecnssincHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(xmlsecnssincdir)/$$f'"; \
-	  $(xmlsecnssincHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(xmlsecnssincdir)/$$f"; \
+	  echo " $(xmlsecmscryptoincHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(xmlsecmscryptoincdir)/$$f'"; \
+	  $(xmlsecmscryptoincHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(xmlsecmscryptoincdir)/$$f"; \
 	done
 
-uninstall-xmlsecnssincHEADERS:
+uninstall-xmlsecmscryptoincHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(xmlsecnssinc_HEADERS)'; for p in $$list; do \
+	@list='$(xmlsecmscryptoinc_HEADERS)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(xmlsecnssincdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(xmlsecnssincdir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(xmlsecmscryptoincdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(xmlsecmscryptoincdir)/$$f"; \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -441,7 +455,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(HEADERS)
 installdirs:
-	for dir in "$(DESTDIR)$(xmlsecnssincdir)"; do \
+	for dir in "$(DESTDIR)$(xmlsecmscryptoincdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -487,7 +501,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-xmlsecnssincHEADERS
+install-data-am: install-xmlsecmscryptoincHEADERS
 
 install-exec-am:
 	@$(NORMAL_INSTALL)
@@ -515,7 +529,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-xmlsecnssincHEADERS
+uninstall-am: uninstall-info-am uninstall-xmlsecmscryptoincHEADERS
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
@@ -523,15 +537,15 @@ uninstall-am: uninstall-info-am uninstall-xmlsecnssincHEADERS
 	html-am info info-am install install-am install-data \
 	install-data-am install-exec install-exec-am install-exec-hook \
 	install-info install-info-am install-man install-strip \
-	install-xmlsecnssincHEADERS installcheck installcheck-am \
+	install-xmlsecmscryptoincHEADERS installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am tags uninstall uninstall-am uninstall-info-am \
-	uninstall-xmlsecnssincHEADERS
+	uninstall-xmlsecmscryptoincHEADERS
 
 
 install-exec-hook:
-	$(mkinstalldirs) $(DESTDIR)$(xmlsecnssincdir)
+	$(mkinstalldirs) $(DESTDIR)$(xmlsecmscryptoincdir)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/include/xmlsec/mscrypto/certkeys.h b/include/xmlsec/mscrypto/certkeys.h
index ad76ee3..4ae8524 100644
--- a/include/xmlsec/mscrypto/certkeys.h
+++ b/include/xmlsec/mscrypto/certkeys.h
@@ -23,6 +23,7 @@ extern "C" {
 XMLSEC_CRYPTO_EXPORT PCCERT_CONTEXT 	xmlSecMSCryptoKeyDataGetCert	(xmlSecKeyDataPtr data);
 XMLSEC_CRYPTO_EXPORT HCRYPTKEY 		xmlSecMSCryptoKeyDataGetKey	(xmlSecKeyDataPtr data, 
 									 xmlSecKeyDataType type);
+XMLSEC_CRYPTO_EXPORT HCRYPTKEY	xmlSecMSCryptoKeyDataGetDecryptKey(xmlSecKeyDataPtr data);
 XMLSEC_CRYPTO_EXPORT PCCERT_CONTEXT 	xmlSecMSCryptoCertDup		(PCCERT_CONTEXT pCert);
 XMLSEC_CRYPTO_EXPORT xmlSecKeyDataPtr 	xmlSecMSCryptoCertAdopt		(PCCERT_CONTEXT pCert, xmlSecKeyDataType type);
 
diff --git a/include/xmlsec/mscrypto/crypto.h b/include/xmlsec/mscrypto/crypto.h
index 8071d94..28d792a 100644
--- a/include/xmlsec/mscrypto/crypto.h
+++ b/include/xmlsec/mscrypto/crypto.h
@@ -80,6 +80,33 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecMSCryptoTransformDsaSha1GetKlass(vo
 
 /********************************************************************
  *
+ * GOST2001 transform
+ *
+ *******************************************************************/
+#ifndef XMLSEC_NO_GOST
+
+/**
+ * xmlSecMSCryptoKeyDataGost2001Id:
+ * 
+ * The GOST2001 key klass.
+ */
+#define xmlSecMSCryptoKeyDataGost2001Id \
+	xmlSecMSCryptoKeyDataGost2001GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId 	xmlSecMSCryptoKeyDataGost2001GetKlass	(void);
+
+/**
+ * xmlSecMSCryptoTransformGost2001GostR3411_94Id:
+ * 
+ * The GOST2001 GOSTR3411_94 signature transform klass.
+ */
+#define xmlSecMSCryptoTransformGost2001GostR3411_94Id \
+	xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass(void);
+
+#endif /* XMLSEC_NO_GOST */
+
+/********************************************************************
+ *
  * RSA transforms
  *
  *******************************************************************/
@@ -145,6 +172,23 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecMSCryptoTransformSha1GetKlass(void)
 
 /********************************************************************
  *
+ * GOSTR3411_94 transform
+ *
+ *******************************************************************/
+#ifndef XMLSEC_NO_GOST
+
+/**
+ * xmlSecMSCryptoTransformGostR3411_94Id:
+ * 
+ * The GOSTR3411_94 digest transform klass.
+ */
+#define xmlSecMSCryptoTransformGostR3411_94Id \
+	xmlSecMSCryptoTransformGostR3411_94GetKlass()
+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecMSCryptoTransformGostR3411_94GetKlass(void);
+#endif /* XMLSEC_NO_GOST */
+
+/********************************************************************
+ *
  * AES transforms
  *
  *******************************************************************/
diff --git a/include/xmlsec/mscrypto/symbols.h b/include/xmlsec/mscrypto/symbols.h
index 5a60f68..2f8ceb4 100644
--- a/include/xmlsec/mscrypto/symbols.h
+++ b/include/xmlsec/mscrypto/symbols.h
@@ -36,10 +36,11 @@ extern "C" {
 #define xmlSecKeyDataAesId			xmlSecMSCryptoKeyDataAesId
 #define xmlSecKeyDataDesId			xmlSecMSCryptoKeyDataDesId
 #define xmlSecKeyDataDsaId			xmlSecMSCryptoKeyDataDsaId
+#define xmlSecKeyDataGost2001Id     xmlSecMSCryptoKeyDataGost2001Id
 #define xmlSecKeyDataHmacId			xmlSecMSCryptoKeyDataHmacId
 #define xmlSecKeyDataRsaId			xmlSecMSCryptoKeyDataRsaId
 #define xmlSecKeyDataX509Id			xmlSecMSCryptoKeyDataX509Id
-#define xmlSecKeyDataRawX509CertId		xmlSecMSCryptoKeyDataRawX509CertId
+#define xmlSecKeyDataRawX509CertId  xmlSecMSCryptoKeyDataRawX509CertId
 
 /**
  * Key data store ids
@@ -58,6 +59,7 @@ extern "C" {
 #define xmlSecTransformDes3CbcId		xmlSecMSCryptoTransformDes3CbcId
 #define xmlSecTransformKWDes3Id			xmlSecMSCryptoTransformKWDes3Id
 #define xmlSecTransformDsaSha1Id		xmlSecMSCryptoTransformDsaSha1Id
+#define xmlSecTransformGost2001GostR3411_94Id		xmlSecMSCryptoTransformGost2001GostR3411_94Id
 #define xmlSecTransformHmacMd5Id		xmlSecMSCryptoTransformHmacMd5Id
 #define xmlSecTransformHmacRipemd160Id		xmlSecMSCryptoTransformHmacRipemd160Id
 #define xmlSecTransformHmacSha1Id		xmlSecMSCryptoTransformHmacSha1Id
@@ -66,6 +68,7 @@ extern "C" {
 #define xmlSecTransformRsaPkcs1Id		xmlSecMSCryptoTransformRsaPkcs1Id
 #define xmlSecTransformRsaOaepId		xmlSecMSCryptoTransformRsaOaepId
 #define xmlSecTransformSha1Id			xmlSecMSCryptoTransformSha1Id
+#define xmlSecTransformGostR3411_94Id			xmlSecMSCryptoTransformGostR3411_94Id
 
 /**
  * High level routines form xmlsec command line utility
diff --git a/include/xmlsec/mscrypto/x509.h b/include/xmlsec/mscrypto/x509.h
index 1c8b9be..4dd72d0 100644
--- a/include/xmlsec/mscrypto/x509.h
+++ b/include/xmlsec/mscrypto/x509.h
@@ -95,6 +95,10 @@ XMLSEC_CRYPTO_EXPORT int		xmlSecMSCryptoX509StoreAdoptUntrustedStore (
 										HCERTSTORE untrustedStore
 								) ;
 
+XMLSEC_CRYPTO_EXPORT void       xmlSecMSCryptoX509StoreEnableSystemTrustedCerts (
+                                        xmlSecKeyDataStorePtr store, 
+                                        int val
+                                ) ;
 
 #endif /* XMLSEC_NO_X509 */
 
diff --git a/include/xmlsec/nss/Makefile.in b/include/xmlsec/nss/Makefile.in
index 048f47d..f29f1b0 100644
--- a/include/xmlsec/nss/Makefile.in
+++ b/include/xmlsec/nss/Makefile.in
@@ -124,12 +124,17 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAN2HTML = @MAN2HTML@
 MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
+MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
+MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
 MV = @MV@
 NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
+NSPR_PACKAGE = @NSPR_PACKAGE@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_CRYPTO_LIB = @NSS_CRYPTO_LIB@
 NSS_LIBS = @NSS_LIBS@
 NSS_MIN_VERSION = @NSS_MIN_VERSION@
+NSS_PACKAGE = @NSS_PACKAGE@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_CRYPTO_LIB = @OPENSSL_CRYPTO_LIB@
@@ -147,6 +152,8 @@ PKG_CONFIG_ENABLED = @PKG_CONFIG_ENABLED@
 RANLIB = @RANLIB@
 RM = @RM@
 SET_MAKE = @SET_MAKE@
+SHAREDLIB_HACK_FALSE = @SHAREDLIB_HACK_FALSE@
+SHAREDLIB_HACK_TRUE = @SHAREDLIB_HACK_TRUE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TAR = @TAR@
@@ -159,6 +166,7 @@ XMLSEC_CORE_LIBS = @XMLSEC_CORE_LIBS@
 XMLSEC_CRYPTO = @XMLSEC_CRYPTO@
 XMLSEC_CRYPTO_CFLAGS = @XMLSEC_CRYPTO_CFLAGS@
 XMLSEC_CRYPTO_DISABLED_LIST = @XMLSEC_CRYPTO_DISABLED_LIST@
+XMLSEC_CRYPTO_EXTRA_LDFLAGS = @XMLSEC_CRYPTO_EXTRA_LDFLAGS@
 XMLSEC_CRYPTO_LIB = @XMLSEC_CRYPTO_LIB@
 XMLSEC_CRYPTO_LIBS = @XMLSEC_CRYPTO_LIBS@
 XMLSEC_CRYPTO_LIST = @XMLSEC_CRYPTO_LIST@
@@ -167,6 +175,7 @@ XMLSEC_DEFINES = @XMLSEC_DEFINES@
 XMLSEC_DL_INCLUDES = @XMLSEC_DL_INCLUDES@
 XMLSEC_DL_LIBS = @XMLSEC_DL_LIBS@
 XMLSEC_DOCDIR = @XMLSEC_DOCDIR@
+XMLSEC_EXTRA_LDFLAGS = @XMLSEC_EXTRA_LDFLAGS@
 XMLSEC_GNUTLS_CFLAGS = @XMLSEC_GNUTLS_CFLAGS@
 XMLSEC_GNUTLS_LIBS = @XMLSEC_GNUTLS_LIBS@
 XMLSEC_LIBDIR = @XMLSEC_LIBDIR@
@@ -189,6 +198,9 @@ XMLSEC_NO_DSA_TRUE = @XMLSEC_NO_DSA_TRUE@
 XMLSEC_NO_GNUTLS = @XMLSEC_NO_GNUTLS@
 XMLSEC_NO_GNUTLS_FALSE = @XMLSEC_NO_GNUTLS_FALSE@
 XMLSEC_NO_GNUTLS_TRUE = @XMLSEC_NO_GNUTLS_TRUE@
+XMLSEC_NO_GOST = @XMLSEC_NO_GOST@
+XMLSEC_NO_GOST_FALSE = @XMLSEC_NO_GOST_FALSE@
+XMLSEC_NO_GOST_TRUE = @XMLSEC_NO_GOST_TRUE@
 XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
 XMLSEC_NO_HMAC_FALSE = @XMLSEC_NO_HMAC_FALSE@
 XMLSEC_NO_HMAC_TRUE = @XMLSEC_NO_HMAC_TRUE@
@@ -196,6 +208,9 @@ XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
 XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
 XMLSEC_NO_MD5_FALSE = @XMLSEC_NO_MD5_FALSE@
 XMLSEC_NO_MD5_TRUE = @XMLSEC_NO_MD5_TRUE@
+XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
+XMLSEC_NO_MSCRYPTO_FALSE = @XMLSEC_NO_MSCRYPTO_FALSE@
+XMLSEC_NO_MSCRYPTO_TRUE = @XMLSEC_NO_MSCRYPTO_TRUE@
 XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
 XMLSEC_NO_NSS_FALSE = @XMLSEC_NO_NSS_FALSE@
 XMLSEC_NO_NSS_TRUE = @XMLSEC_NO_NSS_TRUE@
diff --git a/include/xmlsec/nss/crypto.h b/include/xmlsec/nss/crypto.h
index f1cd44e..381ee1f 100644
--- a/include/xmlsec/nss/crypto.h
+++ b/include/xmlsec/nss/crypto.h
@@ -191,6 +191,10 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecNssTransformDsaSha1GetKlass(void);
  *
  *******************************************************************/
 #ifndef XMLSEC_NO_HMAC
+
+XMLSEC_CRYPTO_EXPORT int               xmlSecNssHmacGetMinOutputLength();
+XMLSEC_CRYPTO_EXPORT void              xmlSecNssHmacSetMinOutputLength(int min_length);
+
 /** 
  * xmlSecNssKeyDataHmacId:
  * 
diff --git a/include/xmlsec/openssl/Makefile.in b/include/xmlsec/openssl/Makefile.in
index fd8a74b..49eaeea 100644
--- a/include/xmlsec/openssl/Makefile.in
+++ b/include/xmlsec/openssl/Makefile.in
@@ -124,12 +124,17 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAN2HTML = @MAN2HTML@
 MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
+MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
+MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
 MV = @MV@
 NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
+NSPR_PACKAGE = @NSPR_PACKAGE@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_CRYPTO_LIB = @NSS_CRYPTO_LIB@
 NSS_LIBS = @NSS_LIBS@
 NSS_MIN_VERSION = @NSS_MIN_VERSION@
+NSS_PACKAGE = @NSS_PACKAGE@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_CRYPTO_LIB = @OPENSSL_CRYPTO_LIB@
@@ -147,6 +152,8 @@ PKG_CONFIG_ENABLED = @PKG_CONFIG_ENABLED@
 RANLIB = @RANLIB@
 RM = @RM@
 SET_MAKE = @SET_MAKE@
+SHAREDLIB_HACK_FALSE = @SHAREDLIB_HACK_FALSE@
+SHAREDLIB_HACK_TRUE = @SHAREDLIB_HACK_TRUE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TAR = @TAR@
@@ -159,6 +166,7 @@ XMLSEC_CORE_LIBS = @XMLSEC_CORE_LIBS@
 XMLSEC_CRYPTO = @XMLSEC_CRYPTO@
 XMLSEC_CRYPTO_CFLAGS = @XMLSEC_CRYPTO_CFLAGS@
 XMLSEC_CRYPTO_DISABLED_LIST = @XMLSEC_CRYPTO_DISABLED_LIST@
+XMLSEC_CRYPTO_EXTRA_LDFLAGS = @XMLSEC_CRYPTO_EXTRA_LDFLAGS@
 XMLSEC_CRYPTO_LIB = @XMLSEC_CRYPTO_LIB@
 XMLSEC_CRYPTO_LIBS = @XMLSEC_CRYPTO_LIBS@
 XMLSEC_CRYPTO_LIST = @XMLSEC_CRYPTO_LIST@
@@ -167,6 +175,7 @@ XMLSEC_DEFINES = @XMLSEC_DEFINES@
 XMLSEC_DL_INCLUDES = @XMLSEC_DL_INCLUDES@
 XMLSEC_DL_LIBS = @XMLSEC_DL_LIBS@
 XMLSEC_DOCDIR = @XMLSEC_DOCDIR@
+XMLSEC_EXTRA_LDFLAGS = @XMLSEC_EXTRA_LDFLAGS@
 XMLSEC_GNUTLS_CFLAGS = @XMLSEC_GNUTLS_CFLAGS@
 XMLSEC_GNUTLS_LIBS = @XMLSEC_GNUTLS_LIBS@
 XMLSEC_LIBDIR = @XMLSEC_LIBDIR@
@@ -189,6 +198,9 @@ XMLSEC_NO_DSA_TRUE = @XMLSEC_NO_DSA_TRUE@
 XMLSEC_NO_GNUTLS = @XMLSEC_NO_GNUTLS@
 XMLSEC_NO_GNUTLS_FALSE = @XMLSEC_NO_GNUTLS_FALSE@
 XMLSEC_NO_GNUTLS_TRUE = @XMLSEC_NO_GNUTLS_TRUE@
+XMLSEC_NO_GOST = @XMLSEC_NO_GOST@
+XMLSEC_NO_GOST_FALSE = @XMLSEC_NO_GOST_FALSE@
+XMLSEC_NO_GOST_TRUE = @XMLSEC_NO_GOST_TRUE@
 XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
 XMLSEC_NO_HMAC_FALSE = @XMLSEC_NO_HMAC_FALSE@
 XMLSEC_NO_HMAC_TRUE = @XMLSEC_NO_HMAC_TRUE@
@@ -196,6 +208,9 @@ XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
 XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
 XMLSEC_NO_MD5_FALSE = @XMLSEC_NO_MD5_FALSE@
 XMLSEC_NO_MD5_TRUE = @XMLSEC_NO_MD5_TRUE@
+XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
+XMLSEC_NO_MSCRYPTO_FALSE = @XMLSEC_NO_MSCRYPTO_FALSE@
+XMLSEC_NO_MSCRYPTO_TRUE = @XMLSEC_NO_MSCRYPTO_TRUE@
 XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
 XMLSEC_NO_NSS_FALSE = @XMLSEC_NO_NSS_FALSE@
 XMLSEC_NO_NSS_TRUE = @XMLSEC_NO_NSS_TRUE@
diff --git a/include/xmlsec/openssl/app.h b/include/xmlsec/openssl/app.h
index a67252e..d781af2 100644
--- a/include/xmlsec/openssl/app.h
+++ b/include/xmlsec/openssl/app.h
@@ -55,6 +55,9 @@ XMLSEC_CRYPTO_EXPORT int		xmlSecOpenSSLAppKeysMngrCertLoadBIO(xmlSecKeysMngrPtr
 
 XMLSEC_CRYPTO_EXPORT int		xmlSecOpenSSLAppKeysMngrAddCertsPath(xmlSecKeysMngrPtr mngr, 
 									 const char *path);
+XMLSEC_CRYPTO_EXPORT int                xmlSecOpenSSLAppKeysMngrAddCertsFile(xmlSecKeysMngrPtr mngr,
+                                                                         const char *file);
+
 #endif /* XMLSEC_NO_X509 */
 
 
diff --git a/include/xmlsec/openssl/crypto.h b/include/xmlsec/openssl/crypto.h
index 2274e35..3b50b40 100644
--- a/include/xmlsec/openssl/crypto.h
+++ b/include/xmlsec/openssl/crypto.h
@@ -200,6 +200,10 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecOpenSSLTransformDsaSha1GetKlass(voi
  *
  *******************************************************************/
 #ifndef XMLSEC_NO_HMAC
+
+XMLSEC_CRYPTO_EXPORT int               xmlSecOpenSSLHmacGetMinOutputLength();
+XMLSEC_CRYPTO_EXPORT void              xmlSecOpenSSLHmacSetMinOutputLength(int min_length);
+
 /** 
  * xmlSecOpenSSLKeyDataHmacId:
  * 
diff --git a/include/xmlsec/openssl/x509.h b/include/xmlsec/openssl/x509.h
index f3de33d..ce0b4d0 100644
--- a/include/xmlsec/openssl/x509.h
+++ b/include/xmlsec/openssl/x509.h
@@ -93,8 +93,13 @@ XMLSEC_CRYPTO_EXPORT X509* 		xmlSecOpenSSLX509StoreVerify	(xmlSecKeyDataStorePtr
 XMLSEC_CRYPTO_EXPORT int		xmlSecOpenSSLX509StoreAdoptCert	(xmlSecKeyDataStorePtr store,
 									 X509* cert,
 									 xmlSecKeyDataType type);
+XMLSEC_CRYPTO_EXPORT int		xmlSecOpenSSLX509StoreAdoptCrl	(xmlSecKeyDataStorePtr store,
+									 X509_CRL* crl);
 XMLSEC_CRYPTO_EXPORT int		xmlSecOpenSSLX509StoreAddCertsPath(xmlSecKeyDataStorePtr store,
 									 const char* path);
+XMLSEC_CRYPTO_EXPORT int                xmlSecOpenSSLX509StoreAddCertsFile(xmlSecKeyDataStorePtr store,
+                                                                         const char* file);
+
 #endif /* XMLSEC_NO_X509 */
 
 #ifdef __cplusplus
diff --git a/include/xmlsec/private.h b/include/xmlsec/private.h
index 2cf3aa9..f14199d 100644
--- a/include/xmlsec/private.h
+++ b/include/xmlsec/private.h
@@ -403,6 +403,7 @@ struct _xmlSecCryptoDLFunctions {
     xmlSecCryptoKeyDataGetKlassMethod		 keyDataAesGetKlass;
     xmlSecCryptoKeyDataGetKlassMethod		 keyDataDesGetKlass;
     xmlSecCryptoKeyDataGetKlassMethod		 keyDataDsaGetKlass;
+    xmlSecCryptoKeyDataGetKlassMethod		 keyDataGost2001GetKlass;
     xmlSecCryptoKeyDataGetKlassMethod		 keyDataHmacGetKlass;
     xmlSecCryptoKeyDataGetKlassMethod		 keyDataRsaGetKlass;
     xmlSecCryptoKeyDataGetKlassMethod		 keyDataX509GetKlass;
@@ -425,6 +426,7 @@ struct _xmlSecCryptoDLFunctions {
     xmlSecCryptoTransformGetKlassMethod		 transformDes3CbcGetKlass;
     xmlSecCryptoTransformGetKlassMethod		 transformKWDes3GetKlass;
     xmlSecCryptoTransformGetKlassMethod		 transformDsaSha1GetKlass;
+    xmlSecCryptoTransformGetKlassMethod		 transformGost2001GostR3411_94GetKlass;
     xmlSecCryptoTransformGetKlassMethod		 transformHmacMd5GetKlass;
     xmlSecCryptoTransformGetKlassMethod		 transformHmacRipemd160GetKlass;
     xmlSecCryptoTransformGetKlassMethod		 transformHmacSha1GetKlass;
@@ -443,6 +445,7 @@ struct _xmlSecCryptoDLFunctions {
     xmlSecCryptoTransformGetKlassMethod		 transformRsaSha512GetKlass;
     xmlSecCryptoTransformGetKlassMethod		 transformRsaPkcs1GetKlass;
     xmlSecCryptoTransformGetKlassMethod		 transformRsaOaepGetKlass;
+    xmlSecCryptoTransformGetKlassMethod		 transformGostR3411_94GetKlass;
     xmlSecCryptoTransformGetKlassMethod		 transformSha1GetKlass;
     xmlSecCryptoTransformGetKlassMethod		 transformSha224GetKlass;
     xmlSecCryptoTransformGetKlassMethod		 transformSha256GetKlass;
diff --git a/include/xmlsec/private/Makefile.in b/include/xmlsec/private/Makefile.in
index 7850c51..f99597a 100644
--- a/include/xmlsec/private/Makefile.in
+++ b/include/xmlsec/private/Makefile.in
@@ -124,12 +124,17 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAN2HTML = @MAN2HTML@
 MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
+MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
+MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
 MV = @MV@
 NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
+NSPR_PACKAGE = @NSPR_PACKAGE@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_CRYPTO_LIB = @NSS_CRYPTO_LIB@
 NSS_LIBS = @NSS_LIBS@
 NSS_MIN_VERSION = @NSS_MIN_VERSION@
+NSS_PACKAGE = @NSS_PACKAGE@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_CRYPTO_LIB = @OPENSSL_CRYPTO_LIB@
@@ -147,6 +152,8 @@ PKG_CONFIG_ENABLED = @PKG_CONFIG_ENABLED@
 RANLIB = @RANLIB@
 RM = @RM@
 SET_MAKE = @SET_MAKE@
+SHAREDLIB_HACK_FALSE = @SHAREDLIB_HACK_FALSE@
+SHAREDLIB_HACK_TRUE = @SHAREDLIB_HACK_TRUE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TAR = @TAR@
@@ -159,6 +166,7 @@ XMLSEC_CORE_LIBS = @XMLSEC_CORE_LIBS@
 XMLSEC_CRYPTO = @XMLSEC_CRYPTO@
 XMLSEC_CRYPTO_CFLAGS = @XMLSEC_CRYPTO_CFLAGS@
 XMLSEC_CRYPTO_DISABLED_LIST = @XMLSEC_CRYPTO_DISABLED_LIST@
+XMLSEC_CRYPTO_EXTRA_LDFLAGS = @XMLSEC_CRYPTO_EXTRA_LDFLAGS@
 XMLSEC_CRYPTO_LIB = @XMLSEC_CRYPTO_LIB@
 XMLSEC_CRYPTO_LIBS = @XMLSEC_CRYPTO_LIBS@
 XMLSEC_CRYPTO_LIST = @XMLSEC_CRYPTO_LIST@
@@ -167,6 +175,7 @@ XMLSEC_DEFINES = @XMLSEC_DEFINES@
 XMLSEC_DL_INCLUDES = @XMLSEC_DL_INCLUDES@
 XMLSEC_DL_LIBS = @XMLSEC_DL_LIBS@
 XMLSEC_DOCDIR = @XMLSEC_DOCDIR@
+XMLSEC_EXTRA_LDFLAGS = @XMLSEC_EXTRA_LDFLAGS@
 XMLSEC_GNUTLS_CFLAGS = @XMLSEC_GNUTLS_CFLAGS@
 XMLSEC_GNUTLS_LIBS = @XMLSEC_GNUTLS_LIBS@
 XMLSEC_LIBDIR = @XMLSEC_LIBDIR@
@@ -189,6 +198,9 @@ XMLSEC_NO_DSA_TRUE = @XMLSEC_NO_DSA_TRUE@
 XMLSEC_NO_GNUTLS = @XMLSEC_NO_GNUTLS@
 XMLSEC_NO_GNUTLS_FALSE = @XMLSEC_NO_GNUTLS_FALSE@
 XMLSEC_NO_GNUTLS_TRUE = @XMLSEC_NO_GNUTLS_TRUE@
+XMLSEC_NO_GOST = @XMLSEC_NO_GOST@
+XMLSEC_NO_GOST_FALSE = @XMLSEC_NO_GOST_FALSE@
+XMLSEC_NO_GOST_TRUE = @XMLSEC_NO_GOST_TRUE@
 XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
 XMLSEC_NO_HMAC_FALSE = @XMLSEC_NO_HMAC_FALSE@
 XMLSEC_NO_HMAC_TRUE = @XMLSEC_NO_HMAC_TRUE@
@@ -196,6 +208,9 @@ XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
 XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
 XMLSEC_NO_MD5_FALSE = @XMLSEC_NO_MD5_FALSE@
 XMLSEC_NO_MD5_TRUE = @XMLSEC_NO_MD5_TRUE@
+XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
+XMLSEC_NO_MSCRYPTO_FALSE = @XMLSEC_NO_MSCRYPTO_FALSE@
+XMLSEC_NO_MSCRYPTO_TRUE = @XMLSEC_NO_MSCRYPTO_TRUE@
 XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
 XMLSEC_NO_NSS_FALSE = @XMLSEC_NO_NSS_FALSE@
 XMLSEC_NO_NSS_TRUE = @XMLSEC_NO_NSS_TRUE@
diff --git a/include/xmlsec/strings.h b/include/xmlsec/strings.h
index 0574bab..50f8c20 100644
--- a/include/xmlsec/strings.h
+++ b/include/xmlsec/strings.h
@@ -314,6 +314,18 @@ XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefDsaSha1[];
 
 /*************************************************************************
  *
+ * GOST2001 strings
+ *
+ ************************************************************************/
+XMLSEC_EXPORT_VAR const xmlChar xmlSecNameGOST2001KeyValue[];
+XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeGOST2001KeyValue[];
+XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefGOST2001KeyValue[];
+
+XMLSEC_EXPORT_VAR const xmlChar xmlSecNameGost2001GostR3411_94[];
+XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefGost2001GostR3411_94[];
+
+/*************************************************************************
+ *
  * EncryptedKey
  *
  ************************************************************************/
@@ -451,6 +463,14 @@ XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeRsaOAEPparams[];
 
 /*************************************************************************
  *
+ * GOSTR3411_94 strings
+ *
+ ************************************************************************/
+XMLSEC_EXPORT_VAR const xmlChar xmlSecNameGostR3411_94[];
+XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefGostR3411_94[];
+
+/*************************************************************************
+ *
  * SHA1 strings
  *
  ************************************************************************/
diff --git a/include/xmlsec/templates.h b/include/xmlsec/templates.h
index e20288f..11d1c2c 100644
--- a/include/xmlsec/templates.h
+++ b/include/xmlsec/templates.h
@@ -29,6 +29,11 @@ XMLSEC_EXPORT xmlNodePtr xmlSecTmplSignatureCreate		(xmlDocPtr doc,
 								 xmlSecTransformId c14nMethodId,
 								 xmlSecTransformId signMethodId,
 								 const xmlChar *id);
+XMLSEC_EXPORT xmlNodePtr xmlSecTmplSignatureCreateNsPref       (xmlDocPtr doc,
+                                                                xmlSecTransformId c14nMethodId,
+                                                                xmlSecTransformId signMethodId,
+                                                                const xmlChar *id,
+                                                                const xmlChar *nsPrefix);
 XMLSEC_EXPORT xmlNodePtr xmlSecTmplSignatureEnsureKeyInfo	(xmlNodePtr signNode,
 								 const xmlChar *id);
 XMLSEC_EXPORT xmlNodePtr xmlSecTmplSignatureAddReference	(xmlNodePtr signNode,
@@ -117,6 +122,8 @@ XMLSEC_EXPORT xmlNodePtr xmlSecTmplKeyInfoAddEncryptedKey	(xmlNodePtr keyInfoNod
  *
  **********************************************************************/ 
 XMLSEC_EXPORT xmlNodePtr xmlSecTmplX509DataAddIssuerSerial	(xmlNodePtr x509DataNode);
+XMLSEC_EXPORT xmlNodePtr xmlSecTmplX509IssuerSerialAddIssuerName(xmlNodePtr x509IssuerSerialNode, const xmlChar* issuerName);
+XMLSEC_EXPORT xmlNodePtr xmlSecTmplX509IssuerSerialAddSerialNumber(xmlNodePtr x509IssuerSerialNode, const xmlChar* serial);
 XMLSEC_EXPORT xmlNodePtr xmlSecTmplX509DataAddSubjectName	(xmlNodePtr x509DataNode);
 XMLSEC_EXPORT xmlNodePtr xmlSecTmplX509DataAddSKI		(xmlNodePtr x509DataNode);
 XMLSEC_EXPORT xmlNodePtr xmlSecTmplX509DataAddCertificate	(xmlNodePtr x509DataNode);
diff --git a/include/xmlsec/version.h b/include/xmlsec/version.h
index cbb9b9f..535c6c9 100644
--- a/include/xmlsec/version.h
+++ b/include/xmlsec/version.h
@@ -21,7 +21,7 @@ extern "C" {
  * The library version string in the format
  * "<major-number>.<minor-number>.<sub-minor-number>".
  */
-#define XMLSEC_VERSION			"1.2.9"
+#define XMLSEC_VERSION			"1.2.12"
 
 /**
  * XMLSEC_VERSION_MAJOR:
@@ -42,7 +42,7 @@ extern "C" {
  *
  * The library sub-minor version number.
  */
-#define XMLSEC_VERSION_SUBMINOR		9
+#define XMLSEC_VERSION_SUBMINOR		12
 
 /**
  * XMLSEC_VERSION_INFO:
@@ -50,7 +50,7 @@ extern "C" {
  * The library version info string in the format
  * "<major-number>+<minor-number>:<sub-minor-number>:<minor-number>".
  */
-#define XMLSEC_VERSION_INFO		"3:9:2"
+#define XMLSEC_VERSION_INFO		"3:12:2"
 
 
 #ifdef __cplusplus
diff --git a/include/xmlsec/xmlenc.h b/include/xmlsec/xmlenc.h
index 382bb25..dc6805a 100644
--- a/include/xmlsec/xmlenc.h
+++ b/include/xmlsec/xmlenc.h
@@ -41,6 +41,14 @@ typedef enum {
     xmlEncCtxModeEncryptedKey
 } xmlEncCtxMode;
 
+
+/**
+ * XMLSEC_ENC_RETURN_REPLACED_NODE:
+ *
+ * If this flag is set, then the replaced node will be returned in the replacedNodeList
+ */
+#define XMLSEC_ENC_RETURN_REPLACED_NODE			0x00000001
+
 /** 
  * xmlSecEncCtx:
  * @userData:			the pointer to user data (xmlsec and xmlsec-crypto libraries
@@ -61,6 +69,7 @@ typedef enum {
  * @resultReplaced:		the flag: if set then resulted <enc:EncryptedData/>
  *				or <enc:EncryptedKey/> node is added to the document.
  * @encMethod:			the pointer to encryption transform.
+ * @replacedNodeList: the first node of the list of replaced nodes depending on the nodeReplacementMode
  * @id:				the ID attribute of <enc:EncryptedData/>
  *				or <enc:EncryptedKey/> node.
  * @type:			the Type attribute of <enc:EncryptedData/>
@@ -76,7 +85,6 @@ typedef enum {
  * @encMethodNode:		the pointer to <enc:EncryptionMethod/> node.
  * @keyInfoNode:		the pointer to <enc:KeyInfo/> node.
  * @cipherValueNode:		the pointer to <enc:CipherValue/> node.
- * @reserved0:			reserved for the future.
  * @reserved1:			reserved for the future.
  * 
  * XML Encrypiton context.
@@ -99,7 +107,7 @@ struct _xmlSecEncCtx {
     int				resultBase64Encoded;
     int				resultReplaced;
     xmlSecTransformPtr		encMethod;
-
+		
     /* attributes from EncryptedData or EncryptedKey */    
     xmlChar*			id;
     xmlChar*			type;
@@ -113,10 +121,9 @@ struct _xmlSecEncCtx {
     xmlNodePtr			encMethodNode;
     xmlNodePtr			keyInfoNode;
     xmlNodePtr			cipherValueNode;
-    
-    /* reserved for future */
-    void*			reserved0;
-    void*			reserved1;
+        
+    xmlNodePtr			replacedNodeList; /* the pointer to the replaced node */
+    void*			reserved1;	  /* reserved for future */
 };
 
 XMLSEC_EXPORT xmlSecEncCtxPtr	xmlSecEncCtxCreate		(xmlSecKeysMngrPtr keysMngr);
diff --git a/include/xmlsec/xmltree.h b/include/xmlsec/xmltree.h
index d2b3a81..7e4117b 100644
--- a/include/xmlsec/xmltree.h
+++ b/include/xmlsec/xmltree.h
@@ -56,12 +56,27 @@ XMLSEC_EXPORT xmlNodePtr	xmlSecAddPrevSibling	(xmlNodePtr node,
 
 XMLSEC_EXPORT int		xmlSecReplaceNode	(xmlNodePtr node,
 						         xmlNodePtr newNode);
+XMLSEC_EXPORT int		xmlSecReplaceNodeAndReturn
+							(xmlNodePtr node,
+						         xmlNodePtr newNode,
+						         xmlNodePtr* replaced);
 XMLSEC_EXPORT int		xmlSecReplaceContent	(xmlNodePtr node,
 							 xmlNodePtr newNode);
+XMLSEC_EXPORT int		xmlSecReplaceContentAndReturn
+							(xmlNodePtr node,
+							 xmlNodePtr newNode,
+							 xmlNodePtr* replaced);
 XMLSEC_EXPORT int		xmlSecReplaceNodeBuffer	(xmlNodePtr node,
 							 const xmlSecByte *buffer, 
 							 xmlSecSize size);
-
+XMLSEC_EXPORT int		xmlSecReplaceNodeBufferAndReturn
+							(xmlNodePtr node,
+							 const xmlSecByte *buffer, 
+							 xmlSecSize size,
+							 xmlNodePtr* replaced);
+XMLSEC_EXPORT int		xmlSecNodeEncodeAndSetContent
+							(xmlNodePtr node,
+							 const xmlChar *buffer);
 XMLSEC_EXPORT void		xmlSecAddIDs		(xmlDocPtr doc,
 							 xmlNodePtr cur,
 							 const xmlChar** ids);
diff --git a/man/Makefile.in b/man/Makefile.in
index 624b328..fb7292a 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -115,12 +115,17 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAN2HTML = @MAN2HTML@
 MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
+MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
+MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
 MV = @MV@
 NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
+NSPR_PACKAGE = @NSPR_PACKAGE@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_CRYPTO_LIB = @NSS_CRYPTO_LIB@
 NSS_LIBS = @NSS_LIBS@
 NSS_MIN_VERSION = @NSS_MIN_VERSION@
+NSS_PACKAGE = @NSS_PACKAGE@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_CRYPTO_LIB = @OPENSSL_CRYPTO_LIB@
@@ -138,6 +143,8 @@ PKG_CONFIG_ENABLED = @PKG_CONFIG_ENABLED@
 RANLIB = @RANLIB@
 RM = @RM@
 SET_MAKE = @SET_MAKE@
+SHAREDLIB_HACK_FALSE = @SHAREDLIB_HACK_FALSE@
+SHAREDLIB_HACK_TRUE = @SHAREDLIB_HACK_TRUE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TAR = @TAR@
@@ -150,6 +157,7 @@ XMLSEC_CORE_LIBS = @XMLSEC_CORE_LIBS@
 XMLSEC_CRYPTO = @XMLSEC_CRYPTO@
 XMLSEC_CRYPTO_CFLAGS = @XMLSEC_CRYPTO_CFLAGS@
 XMLSEC_CRYPTO_DISABLED_LIST = @XMLSEC_CRYPTO_DISABLED_LIST@
+XMLSEC_CRYPTO_EXTRA_LDFLAGS = @XMLSEC_CRYPTO_EXTRA_LDFLAGS@
 XMLSEC_CRYPTO_LIB = @XMLSEC_CRYPTO_LIB@
 XMLSEC_CRYPTO_LIBS = @XMLSEC_CRYPTO_LIBS@
 XMLSEC_CRYPTO_LIST = @XMLSEC_CRYPTO_LIST@
@@ -158,6 +166,7 @@ XMLSEC_DEFINES = @XMLSEC_DEFINES@
 XMLSEC_DL_INCLUDES = @XMLSEC_DL_INCLUDES@
 XMLSEC_DL_LIBS = @XMLSEC_DL_LIBS@
 XMLSEC_DOCDIR = @XMLSEC_DOCDIR@
+XMLSEC_EXTRA_LDFLAGS = @XMLSEC_EXTRA_LDFLAGS@
 XMLSEC_GNUTLS_CFLAGS = @XMLSEC_GNUTLS_CFLAGS@
 XMLSEC_GNUTLS_LIBS = @XMLSEC_GNUTLS_LIBS@
 XMLSEC_LIBDIR = @XMLSEC_LIBDIR@
@@ -180,6 +189,9 @@ XMLSEC_NO_DSA_TRUE = @XMLSEC_NO_DSA_TRUE@
 XMLSEC_NO_GNUTLS = @XMLSEC_NO_GNUTLS@
 XMLSEC_NO_GNUTLS_FALSE = @XMLSEC_NO_GNUTLS_FALSE@
 XMLSEC_NO_GNUTLS_TRUE = @XMLSEC_NO_GNUTLS_TRUE@
+XMLSEC_NO_GOST = @XMLSEC_NO_GOST@
+XMLSEC_NO_GOST_FALSE = @XMLSEC_NO_GOST_FALSE@
+XMLSEC_NO_GOST_TRUE = @XMLSEC_NO_GOST_TRUE@
 XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
 XMLSEC_NO_HMAC_FALSE = @XMLSEC_NO_HMAC_FALSE@
 XMLSEC_NO_HMAC_TRUE = @XMLSEC_NO_HMAC_TRUE@
@@ -187,6 +199,9 @@ XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
 XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
 XMLSEC_NO_MD5_FALSE = @XMLSEC_NO_MD5_FALSE@
 XMLSEC_NO_MD5_TRUE = @XMLSEC_NO_MD5_TRUE@
+XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
+XMLSEC_NO_MSCRYPTO_FALSE = @XMLSEC_NO_MSCRYPTO_FALSE@
+XMLSEC_NO_MSCRYPTO_TRUE = @XMLSEC_NO_MSCRYPTO_TRUE@
 XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
 XMLSEC_NO_NSS_FALSE = @XMLSEC_NO_NSS_FALSE@
 XMLSEC_NO_NSS_TRUE = @XMLSEC_NO_NSS_TRUE@
diff --git a/mkinstalldirs b/mkinstalldirs
index e111b2b..d0fd194 100755
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -4,7 +4,7 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id: mkinstalldirs,v 1.5 2003/02/14 01:40:46 aleksey Exp $
+# $Id$
 
 errstatus=0
 
diff --git a/scripts/build_release.sh b/scripts/build_release.sh
index abea290..8c2a76c 100755
--- a/scripts/build_release.sh
+++ b/scripts/build_release.sh
@@ -1,27 +1,22 @@
 #!/bin/sh 
 
+# config
 cur_pwd=`pwd`
 today=`date +%F-%T`
-module=xmlsec
-branch=
-cvs_root=:pserver:aleksey at cvs.gnome.org:/cvs/gnome
+
+git_uri=git://git.gnome.org/xmlsec
 rpm_root=/usr/src/redhat
 build_root="$rpm_root/BUILD/xmlsec-build-area-$today"
-remote_root=aleksey at ftp.aleksey.com:/var/ftp/pub/xmlsec/releases
 
 echo "Creating build area $build_root"
 rm -rf "$build_root"
 mkdir -p "$build_root"
 cd "$build_root"
 
-if test "z$branch" != "z"; then 
-    echo "Cheking out module $module from branch $branch"
-    cvs -d $cvs_root -z3 co -P -r $branch $module > /dev/null
-else
-    echo "Cheking out module $module from tip"
-    cvs -d $cvs_root -z3 co -P $module > /dev/null
-fi
+echo "Checking out the module $svn_module"
+git clone $git_uri
 cd xmlsec
+find . -name ".git" | xargs rm -r
 
 ./autogen.sh --prefix=/usr --sysconfdir=/etc
 make rpm-release
@@ -33,3 +28,4 @@ mv $tar_file $rpm_root/SOURCES
 echo "Cleanup"
 cd "$cur_pwd"
 rm -rf "$build_root"
+
diff --git a/scripts/push_release.sh b/scripts/push_release.sh
index 13be6f6..162c31a 100755
--- a/scripts/push_release.sh
+++ b/scripts/push_release.sh
@@ -1,29 +1,30 @@
 #!/bin/sh 
 
+# input
 version=$1
-module=xmlsec1
-build_root=/tmp
+
+# config
+svn_module=xmlsec
+svn_uri=svn+ssh://aleksey@svn.gnome.org/svn/$svn_module/trunk
+svn_branch_uri=svn+ssh://aleksey@svn.gnome.org/svn/$svn_module/branches/$version
+
+rpm_name=xmlsec1
 rpm_root=/usr/src/redhat
 remote_root=aleksey at ftp.aleksey.com:/var/ftp/pub/xmlsec/releases
 build_target=i386
 
 echo "Uploading to aleksey.com"
-scp $rpm_root/SOURCES/$module-$version.tar.gz \
-    $rpm_root/SRPMS/$module-$version-*.src.rpm \
-    $rpm_root/RPMS/$build_target/$module-$version-*.$build_target.rpm \
-    $rpm_root/RPMS/$build_target/$module-devel-$version-*.$build_target.rpm \
-    $rpm_root/RPMS/$build_target/$module-openssl-$version-*.$build_target.rpm \
-    $rpm_root/RPMS/$build_target/$module-openssl-devel-$version-*.$build_target.rpm \
-    $rpm_root/RPMS/$build_target/$module-nss-$version-*.$build_target.rpm \
-    $rpm_root/RPMS/$build_target/$module-nss-devel-$version-*.$build_target.rpm \
+scp $rpm_root/SOURCES/$rpm_name-$version.tar.gz \
+    $rpm_root/SRPMS/$rpm_name-$version-*.src.rpm \
+    $rpm_root/RPMS/$build_target/$rpm_name-$version-*.$build_target.rpm \
+    $rpm_root/RPMS/$build_target/$rpm_name-devel-$version-*.$build_target.rpm \
+    $rpm_root/RPMS/$build_target/$rpm_name-openssl-$version-*.$build_target.rpm \
+    $rpm_root/RPMS/$build_target/$rpm_name-openssl-devel-$version-*.$build_target.rpm \
+    $rpm_root/RPMS/$build_target/$rpm_name-nss-$version-*.$build_target.rpm \
+    $rpm_root/RPMS/$build_target/$rpm_name-nss-devel-$version-*.$build_target.rpm \
     $remote_root
 
-#echo "Uploading to redhat.com"
-#ncftpput incoming.redhat.com /libc6 \
-#    $rpm_root/SRPMS/$module-$version-*.src.rpm \
-#    $rpm_root/RPMS/$build_target/$module-$version-*.$build_target.rpm \
-#    $rpm_root/RPMS/$build_target/$module-devel-$version-*.$build_target.rpm \
-#    $rpm_root/RPMS/$build_target/$module-openssl-$version-*.$build_target.rpm \
-#    $rpm_root/RPMS/$build_target/$module-openssl-devel-$version-*.$build_target.rpm \
-#    $rpm_root/RPMS/$build_target/$module-nss-$version-*.$build_target.rpm \
-#    $rpm_root/RPMS/$build_target/$module-nss-devel-$version-*.$build_target.rpm
+
+echo "Creating SVN branch $version"
+svn copy $svn_uri $svn_branch_uri -m"creating release $version branch"
+
diff --git a/src/Makefile.am b/src/Makefile.am
index bda1548..5dd901e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = . $(XMLSEC_CRYPTO_LIST)
 
 INCLUDES = \
 	-DPACKAGE=\"@PACKAGE@\" \
-	-I$(top_srcdir) \
+	-I../include \
 	-I$(top_srcdir)/include \
 	$(XMLSEC_DEFINES) \
 	$(LIBXSLT_CFLAGS) \
@@ -62,8 +62,9 @@ libxmlsec1_la_LIBADD = \
 	$(LIBXML_LIBS) \
 	$(XMLSEC_DL_LIBS) \
 	$(NULL)
-        
+
 libxmlsec1_la_LDFLAGS = \
+	@XMLSEC_EXTRA_LDFLAGS@ \
 	-version-info @XMLSEC_VERSION_INFO@ \
 	$(NULL)
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 947c25f..c7da652 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -165,12 +165,17 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAN2HTML = @MAN2HTML@
 MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
+MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
+MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
 MV = @MV@
 NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
+NSPR_PACKAGE = @NSPR_PACKAGE@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_CRYPTO_LIB = @NSS_CRYPTO_LIB@
 NSS_LIBS = @NSS_LIBS@
 NSS_MIN_VERSION = @NSS_MIN_VERSION@
+NSS_PACKAGE = @NSS_PACKAGE@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_CRYPTO_LIB = @OPENSSL_CRYPTO_LIB@
@@ -188,6 +193,8 @@ PKG_CONFIG_ENABLED = @PKG_CONFIG_ENABLED@
 RANLIB = @RANLIB@
 RM = @RM@
 SET_MAKE = @SET_MAKE@
+SHAREDLIB_HACK_FALSE = @SHAREDLIB_HACK_FALSE@
+SHAREDLIB_HACK_TRUE = @SHAREDLIB_HACK_TRUE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TAR = @TAR@
@@ -200,6 +207,7 @@ XMLSEC_CORE_LIBS = @XMLSEC_CORE_LIBS@
 XMLSEC_CRYPTO = @XMLSEC_CRYPTO@
 XMLSEC_CRYPTO_CFLAGS = @XMLSEC_CRYPTO_CFLAGS@
 XMLSEC_CRYPTO_DISABLED_LIST = @XMLSEC_CRYPTO_DISABLED_LIST@
+XMLSEC_CRYPTO_EXTRA_LDFLAGS = @XMLSEC_CRYPTO_EXTRA_LDFLAGS@
 XMLSEC_CRYPTO_LIB = @XMLSEC_CRYPTO_LIB@
 XMLSEC_CRYPTO_LIBS = @XMLSEC_CRYPTO_LIBS@
 XMLSEC_CRYPTO_LIST = @XMLSEC_CRYPTO_LIST@
@@ -208,6 +216,7 @@ XMLSEC_DEFINES = @XMLSEC_DEFINES@
 XMLSEC_DL_INCLUDES = @XMLSEC_DL_INCLUDES@
 XMLSEC_DL_LIBS = @XMLSEC_DL_LIBS@
 XMLSEC_DOCDIR = @XMLSEC_DOCDIR@
+XMLSEC_EXTRA_LDFLAGS = @XMLSEC_EXTRA_LDFLAGS@
 XMLSEC_GNUTLS_CFLAGS = @XMLSEC_GNUTLS_CFLAGS@
 XMLSEC_GNUTLS_LIBS = @XMLSEC_GNUTLS_LIBS@
 XMLSEC_LIBDIR = @XMLSEC_LIBDIR@
@@ -230,6 +239,9 @@ XMLSEC_NO_DSA_TRUE = @XMLSEC_NO_DSA_TRUE@
 XMLSEC_NO_GNUTLS = @XMLSEC_NO_GNUTLS@
 XMLSEC_NO_GNUTLS_FALSE = @XMLSEC_NO_GNUTLS_FALSE@
 XMLSEC_NO_GNUTLS_TRUE = @XMLSEC_NO_GNUTLS_TRUE@
+XMLSEC_NO_GOST = @XMLSEC_NO_GOST@
+XMLSEC_NO_GOST_FALSE = @XMLSEC_NO_GOST_FALSE@
+XMLSEC_NO_GOST_TRUE = @XMLSEC_NO_GOST_TRUE@
 XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
 XMLSEC_NO_HMAC_FALSE = @XMLSEC_NO_HMAC_FALSE@
 XMLSEC_NO_HMAC_TRUE = @XMLSEC_NO_HMAC_TRUE@
@@ -237,6 +249,9 @@ XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
 XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
 XMLSEC_NO_MD5_FALSE = @XMLSEC_NO_MD5_FALSE@
 XMLSEC_NO_MD5_TRUE = @XMLSEC_NO_MD5_TRUE@
+XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
+XMLSEC_NO_MSCRYPTO_FALSE = @XMLSEC_NO_MSCRYPTO_FALSE@
+XMLSEC_NO_MSCRYPTO_TRUE = @XMLSEC_NO_MSCRYPTO_TRUE@
 XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
 XMLSEC_NO_NSS_FALSE = @XMLSEC_NO_NSS_FALSE@
 XMLSEC_NO_NSS_TRUE = @XMLSEC_NO_NSS_TRUE@
@@ -335,7 +350,7 @@ NULL =
 SUBDIRS = . $(XMLSEC_CRYPTO_LIST)
 INCLUDES = \
 	-DPACKAGE=\"@PACKAGE@\" \
-	-I$(top_srcdir) \
+	-I../include \
 	-I$(top_srcdir)/include \
 	$(XMLSEC_DEFINES) \
 	$(LIBXSLT_CFLAGS) \
@@ -395,6 +410,7 @@ libxmlsec1_la_LIBADD = \
 	$(NULL)
 
 libxmlsec1_la_LDFLAGS = \
+	@XMLSEC_EXTRA_LDFLAGS@ \
 	-version-info @XMLSEC_VERSION_INFO@ \
 	$(NULL)
 
diff --git a/src/app.c b/src/app.c
index c1865f4..e125a63 100644
--- a/src/app.c
+++ b/src/app.c
@@ -174,6 +174,29 @@ xmlSecKeyDataDsaGetKlass(void) {
 }
 
 /** 
+ * xmlSecKeyDataGost2001GetKlass:
+ * 
+ * The GOST2001 key data klass.
+ *
+ * Returns 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).
+ */
+xmlSecKeyDataId	
+xmlSecKeyDataGost2001GetKlass(void) {
+    if((xmlSecCryptoDLGetFunctions() == NULL) || (xmlSecCryptoDLGetFunctions()->keyDataGost2001GetKlass == NULL)) {
+	xmlSecError(XMLSEC_ERRORS_HERE,
+		    NULL,
+		    "keyDataGost2001Id",
+		    XMLSEC_ERRORS_R_NOT_IMPLEMENTED,
+		    XMLSEC_ERRORS_NO_MESSAGE);
+        return(xmlSecKeyDataIdUnknown);
+    }
+    
+    return(xmlSecCryptoDLGetFunctions()->keyDataGost2001GetKlass());
+}
+
+/** 
  * xmlSecKeyDataHmacGetKlass:
  * 
  * The HMAC key data klass.
@@ -506,6 +529,29 @@ xmlSecTransformDsaSha1GetKlass(void) {
 }
 
 /** 
+ * xmlSecTransformGost2001GostR3411_94GetKlass:
+ * 
+ * The GOST2001-GOSTR3411_94 signature transform klass.
+ *
+ * Returns 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).
+ */
+xmlSecTransformId 
+xmlSecTransformGost2001GostR3411_94GetKlass(void) {	
+    if((xmlSecCryptoDLGetFunctions() == NULL) || (xmlSecCryptoDLGetFunctions()->transformGost2001GostR3411_94GetKlass == NULL)) {
+	xmlSecError(XMLSEC_ERRORS_HERE,
+		    NULL,
+		    "transformGost2001GostR3411_94Id",
+		    XMLSEC_ERRORS_R_NOT_IMPLEMENTED,
+		    XMLSEC_ERRORS_NO_MESSAGE);
+        return(xmlSecTransformIdUnknown);
+    }
+    
+    return(xmlSecCryptoDLGetFunctions()->transformGost2001GostR3411_94GetKlass());
+}
+
+/** 
  * xmlSecTransformHmacMd5GetKlass:
  *
  * The HMAC-MD5 transform klass.
@@ -920,6 +966,30 @@ xmlSecTransformRsaOaepGetKlass(void) {
 }
 
 /** 
+ * xmlSecTransformGostR3411_94GetKlass:
+ *
+ * GOSTR3411_94 digest transform klass.
+ *
+ * Returns 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).
+ */
+xmlSecTransformId 
+xmlSecTransformGostR3411_94GetKlass(void) {
+    if((xmlSecCryptoDLGetFunctions() == NULL) || (xmlSecCryptoDLGetFunctions()->transformGostR3411_94GetKlass == NULL)) {
+	xmlSecError(XMLSEC_ERRORS_HERE,
+		    NULL,
+		    "transformGostR3411_94Id",
+		    XMLSEC_ERRORS_R_NOT_IMPLEMENTED,
+		    XMLSEC_ERRORS_NO_MESSAGE);
+        return(xmlSecTransformIdUnknown);
+    }
+    
+    return(xmlSecCryptoDLGetFunctions()->transformGostR3411_94GetKlass());
+}
+
+
+/** 
  * xmlSecTransformSha1GetKlass:
  *
  * SHA-1 digest transform klass.
diff --git a/src/base64.c b/src/base64.c
index dc5aa8e..fbe307f 100644
--- a/src/base64.c
+++ b/src/base64.c
@@ -108,6 +108,31 @@ static int			xmlSecBase64CtxDecode		(xmlSecBase64CtxPtr ctx,
 								 xmlSecSize* outBufResSize);
 static int			xmlSecBase64CtxDecodeIsFinished	(xmlSecBase64CtxPtr ctx);
 
+
+static int g_xmlsec_base64_default_line_size = XMLSEC_BASE64_LINESIZE;
+
+/**
+ * xmlSecBase64GetDefaultLineSize:
+ *
+ * Returns the current default line size.
+ */
+int
+xmlSecBase64GetDefaultLineSize()
+{
+    return g_xmlsec_base64_default_line_size;
+}
+
+/**
+ * xmlSecBase64SetDefaultLineSize:
+ *
+ * Sets the current default line size.
+ */
+void
+xmlSecBase64SetDefaultLineSize(int columns)
+{
+    g_xmlsec_base64_default_line_size = columns;
+}
+
 /**
  * xmlSecBase64CtxCreate:
  * @encode:		the encode/decode flag (1 - encode, 0 - decode) 
@@ -843,7 +868,7 @@ xmlSecBase64Initialize(xmlSecTransformPtr transform) {
     xmlSecAssert2(ctx != NULL, -1);
 
     transform->operation = xmlSecTransformOperationDecode;
-    ret = xmlSecBase64CtxInitialize(ctx, 0, XMLSEC_BASE64_LINESIZE);
+    ret = xmlSecBase64CtxInitialize(ctx, 0, xmlSecBase64GetDefaultLineSize());
     if(ret < 0) {
 	xmlSecError(XMLSEC_ERRORS_HERE,
 		    xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
diff --git a/src/bn.c b/src/bn.c
index 8c16ba3..c8d0762 100644
--- a/src/bn.c
+++ b/src/bn.c
@@ -949,7 +949,7 @@ xmlSecBnSetNodeValue(xmlSecBnPtr bn, xmlNodePtr cur, xmlSecBnFormat format, int
 
     switch(format) {
     case xmlSecBnBase64:
-	ret = xmlSecBufferBase64NodeContentWrite(bn, cur, XMLSEC_BASE64_LINESIZE);
+	ret = xmlSecBufferBase64NodeContentWrite(bn, cur, xmlSecBase64GetDefaultLineSize());
 	if(ret < 0) {
 	    xmlSecError(XMLSEC_ERRORS_HERE,
 			NULL,
diff --git a/src/dl.c b/src/dl.c
index c20dd1a..0de7b33 100644
--- a/src/dl.c
+++ b/src/dl.c
@@ -587,6 +587,14 @@ xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms(struct _xmlSecCryptoDLFuncti
 		    XMLSEC_ERRORS_NO_MESSAGE);
 	return(-1);
     }
+    if((functions->keyDataGost2001GetKlass != NULL) && (xmlSecKeyDataIdsRegister(functions->keyDataGost2001GetKlass()) < 0)) {
+	xmlSecError(XMLSEC_ERRORS_HERE,
+		    xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(functions->keyDataGost2001GetKlass())),
+		    "xmlSecKeyDataIdsRegister",
+		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
+		    XMLSEC_ERRORS_NO_MESSAGE);
+	return(-1);
+    }
     if((functions->keyDataHmacGetKlass != NULL) && (xmlSecKeyDataIdsRegister(functions->keyDataHmacGetKlass()) < 0)) {
 	xmlSecError(XMLSEC_ERRORS_HERE,
 		    xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(functions->keyDataHmacGetKlass())),
@@ -696,6 +704,15 @@ xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms(struct _xmlSecCryptoDLFuncti
 	return(-1);
     }    
 
+    if((functions->transformGost2001GostR3411_94GetKlass != NULL) && xmlSecTransformIdsRegister(functions->transformGost2001GostR3411_94GetKlass()) < 0) {
+	xmlSecError(XMLSEC_ERRORS_HERE,
+		    xmlSecErrorsSafeString(xmlSecTransformKlassGetName(functions->transformGost2001GostR3411_94GetKlass())),
+		    "xmlSecTransformIdsRegister",
+		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
+		    XMLSEC_ERRORS_NO_MESSAGE);
+	return(-1);
+    }    
+
     if((functions->transformDsaSha1GetKlass != NULL) && xmlSecTransformIdsRegister(functions->transformDsaSha1GetKlass()) < 0) {
 	xmlSecError(XMLSEC_ERRORS_HERE,
 		    xmlSecErrorsSafeString(xmlSecTransformKlassGetName(functions->transformDsaSha1GetKlass())),
@@ -867,6 +884,15 @@ xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms(struct _xmlSecCryptoDLFuncti
 	return(-1);
     }    
 
+    if((functions->transformGostR3411_94GetKlass != NULL) && xmlSecTransformIdsRegister(functions->transformGostR3411_94GetKlass()) < 0) {
+	xmlSecError(XMLSEC_ERRORS_HERE,
+		    xmlSecErrorsSafeString(xmlSecTransformKlassGetName(functions->transformGostR3411_94GetKlass())),
+		    "xmlSecTransformIdsRegister",
+		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
+		    XMLSEC_ERRORS_NO_MESSAGE);
+	return(-1);
+    }    
+
     if((functions->transformSha1GetKlass != NULL) && xmlSecTransformIdsRegister(functions->transformSha1GetKlass()) < 0) {
 	xmlSecError(XMLSEC_ERRORS_HERE,
 		    xmlSecErrorsSafeString(xmlSecTransformKlassGetName(functions->transformSha1GetKlass())),
diff --git a/src/gnutls/Makefile.am b/src/gnutls/Makefile.am
index da7f29c..7d639a3 100644
--- a/src/gnutls/Makefile.am
+++ b/src/gnutls/Makefile.am
@@ -1,13 +1,16 @@
 NULL =
 
 EXTRA_DIST = \
-	globals.h \
 	README \
 	$(NULL)
 
-INCLUDES = \
+lib_LTLIBRARIES = \
+	libxmlsec1-gnutls.la \
+	$(NULL)
+
+libxmlsec1_gnutls_la_CPPFLAGS = \
 	-DPACKAGE=\"@PACKAGE@\" \
-	-I$(top_srcdir) \
+	-I../../include \
 	-I$(top_srcdir)/include \
 	$(XMLSEC_DEFINES) \
 	$(GNUTLS_CFLAGS) \
@@ -15,10 +18,6 @@ INCLUDES = \
 	$(LIBXML_CFLAGS) \
 	$(NULL)
 
-lib_LTLIBRARIES = \
-	libxmlsec1-gnutls.la \
-	$(NULL)
-
 libxmlsec1_gnutls_la_SOURCES =\
 	app.c \
 	ciphers.c \
@@ -26,15 +25,24 @@ libxmlsec1_gnutls_la_SOURCES =\
 	digests.c \
 	hmac.c \
 	symkeys.c \
+	globals.h \
 	$(NULL)
 
+if SHAREDLIB_HACK
+libxmlsec1_gnutls_la_SOURCES += ../strings.c
+endif
+
 libxmlsec1_gnutls_la_LIBADD = \
 	../libxmlsec1.la \
 	$(GNUTLS_LIBS) \
 	$(LIBXSLT_LIBS) \
 	$(LIBXML_LIBS) \
 	$(NULL)
-        
+
+libxmlsec1_gnutls_la_DEPENDENCIES = \
+	$(NULL)
+
 libxmlsec1_gnutls_la_LDFLAGS = \
+	@XMLSEC_CRYPTO_EXTRA_LDFLAGS@ \
 	-version-info @XMLSEC_VERSION_INFO@ \
 	$(NULL)
diff --git a/src/gnutls/Makefile.in b/src/gnutls/Makefile.in
index d84a303..28f49c2 100644
--- a/src/gnutls/Makefile.in
+++ b/src/gnutls/Makefile.in
@@ -38,6 +38,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+ at SHAREDLIB_HACK_TRUE@am__append_1 = ../strings.c
 subdir = src/gnutls
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -57,12 +58,15 @@ am__installdirs = "$(DESTDIR)$(libdir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libxmlsec1_gnutls_la_DEPENDENCIES = ../libxmlsec1.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am__libxmlsec1_gnutls_la_SOURCES_DIST = app.c ciphers.c crypto.c \
+	digests.c hmac.c symkeys.c globals.h ../strings.c
 am__objects_1 =
-am_libxmlsec1_gnutls_la_OBJECTS = app.lo ciphers.lo crypto.lo \
-	digests.lo hmac.lo symkeys.lo $(am__objects_1)
+ at SHAREDLIB_HACK_TRUE@am__objects_2 = libxmlsec1_gnutls_la-strings.lo
+am_libxmlsec1_gnutls_la_OBJECTS = libxmlsec1_gnutls_la-app.lo \
+	libxmlsec1_gnutls_la-ciphers.lo libxmlsec1_gnutls_la-crypto.lo \
+	libxmlsec1_gnutls_la-digests.lo libxmlsec1_gnutls_la-hmac.lo \
+	libxmlsec1_gnutls_la-symkeys.lo $(am__objects_1) \
+	$(am__objects_2)
 libxmlsec1_gnutls_la_OBJECTS = $(am_libxmlsec1_gnutls_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -76,7 +80,7 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libxmlsec1_gnutls_la_SOURCES)
-DIST_SOURCES = $(libxmlsec1_gnutls_la_SOURCES)
+DIST_SOURCES = $(am__libxmlsec1_gnutls_la_SOURCES_DIST)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -144,12 +148,17 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAN2HTML = @MAN2HTML@
 MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
+MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
+MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
 MV = @MV@
 NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
+NSPR_PACKAGE = @NSPR_PACKAGE@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_CRYPTO_LIB = @NSS_CRYPTO_LIB@
 NSS_LIBS = @NSS_LIBS@
 NSS_MIN_VERSION = @NSS_MIN_VERSION@
+NSS_PACKAGE = @NSS_PACKAGE@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_CRYPTO_LIB = @OPENSSL_CRYPTO_LIB@
@@ -167,6 +176,8 @@ PKG_CONFIG_ENABLED = @PKG_CONFIG_ENABLED@
 RANLIB = @RANLIB@
 RM = @RM@
 SET_MAKE = @SET_MAKE@
+SHAREDLIB_HACK_FALSE = @SHAREDLIB_HACK_FALSE@
+SHAREDLIB_HACK_TRUE = @SHAREDLIB_HACK_TRUE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TAR = @TAR@
@@ -179,6 +190,7 @@ XMLSEC_CORE_LIBS = @XMLSEC_CORE_LIBS@
 XMLSEC_CRYPTO = @XMLSEC_CRYPTO@
 XMLSEC_CRYPTO_CFLAGS = @XMLSEC_CRYPTO_CFLAGS@
 XMLSEC_CRYPTO_DISABLED_LIST = @XMLSEC_CRYPTO_DISABLED_LIST@
+XMLSEC_CRYPTO_EXTRA_LDFLAGS = @XMLSEC_CRYPTO_EXTRA_LDFLAGS@
 XMLSEC_CRYPTO_LIB = @XMLSEC_CRYPTO_LIB@
 XMLSEC_CRYPTO_LIBS = @XMLSEC_CRYPTO_LIBS@
 XMLSEC_CRYPTO_LIST = @XMLSEC_CRYPTO_LIST@
@@ -187,6 +199,7 @@ XMLSEC_DEFINES = @XMLSEC_DEFINES@
 XMLSEC_DL_INCLUDES = @XMLSEC_DL_INCLUDES@
 XMLSEC_DL_LIBS = @XMLSEC_DL_LIBS@
 XMLSEC_DOCDIR = @XMLSEC_DOCDIR@
+XMLSEC_EXTRA_LDFLAGS = @XMLSEC_EXTRA_LDFLAGS@
 XMLSEC_GNUTLS_CFLAGS = @XMLSEC_GNUTLS_CFLAGS@
 XMLSEC_GNUTLS_LIBS = @XMLSEC_GNUTLS_LIBS@
 XMLSEC_LIBDIR = @XMLSEC_LIBDIR@
@@ -209,6 +222,9 @@ XMLSEC_NO_DSA_TRUE = @XMLSEC_NO_DSA_TRUE@
 XMLSEC_NO_GNUTLS = @XMLSEC_NO_GNUTLS@
 XMLSEC_NO_GNUTLS_FALSE = @XMLSEC_NO_GNUTLS_FALSE@
 XMLSEC_NO_GNUTLS_TRUE = @XMLSEC_NO_GNUTLS_TRUE@
+XMLSEC_NO_GOST = @XMLSEC_NO_GOST@
+XMLSEC_NO_GOST_FALSE = @XMLSEC_NO_GOST_FALSE@
+XMLSEC_NO_GOST_TRUE = @XMLSEC_NO_GOST_TRUE@
 XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
 XMLSEC_NO_HMAC_FALSE = @XMLSEC_NO_HMAC_FALSE@
 XMLSEC_NO_HMAC_TRUE = @XMLSEC_NO_HMAC_TRUE@
@@ -216,6 +232,9 @@ XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
 XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
 XMLSEC_NO_MD5_FALSE = @XMLSEC_NO_MD5_FALSE@
 XMLSEC_NO_MD5_TRUE = @XMLSEC_NO_MD5_TRUE@
+XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
+XMLSEC_NO_MSCRYPTO_FALSE = @XMLSEC_NO_MSCRYPTO_FALSE@
+XMLSEC_NO_MSCRYPTO_TRUE = @XMLSEC_NO_MSCRYPTO_TRUE@
 XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
 XMLSEC_NO_NSS_FALSE = @XMLSEC_NO_NSS_FALSE@
 XMLSEC_NO_NSS_TRUE = @XMLSEC_NO_NSS_TRUE@
@@ -312,13 +331,16 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 NULL = 
 EXTRA_DIST = \
-	globals.h \
 	README \
 	$(NULL)
 
-INCLUDES = \
+lib_LTLIBRARIES = \
+	libxmlsec1-gnutls.la \
+	$(NULL)
+
+libxmlsec1_gnutls_la_CPPFLAGS = \
 	-DPACKAGE=\"@PACKAGE@\" \
-	-I$(top_srcdir) \
+	-I../../include \
 	-I$(top_srcdir)/include \
 	$(XMLSEC_DEFINES) \
 	$(GNUTLS_CFLAGS) \
@@ -326,19 +348,8 @@ INCLUDES = \
 	$(LIBXML_CFLAGS) \
 	$(NULL)
 
-lib_LTLIBRARIES = \
-	libxmlsec1-gnutls.la \
-	$(NULL)
-
-libxmlsec1_gnutls_la_SOURCES = \
-	app.c \
-	ciphers.c \
-	crypto.c \
-	digests.c \
-	hmac.c \
-	symkeys.c \
-	$(NULL)
-
+libxmlsec1_gnutls_la_SOURCES = app.c ciphers.c crypto.c digests.c \
+	hmac.c symkeys.c globals.h $(NULL) $(am__append_1)
 libxmlsec1_gnutls_la_LIBADD = \
 	../libxmlsec1.la \
 	$(GNUTLS_LIBS) \
@@ -346,7 +357,11 @@ libxmlsec1_gnutls_la_LIBADD = \
 	$(LIBXML_LIBS) \
 	$(NULL)
 
+libxmlsec1_gnutls_la_DEPENDENCIES = \
+	$(NULL)
+
 libxmlsec1_gnutls_la_LDFLAGS = \
+	@XMLSEC_CRYPTO_EXTRA_LDFLAGS@ \
 	-version-info @XMLSEC_VERSION_INFO@ \
 	$(NULL)
 
@@ -419,12 +434,13 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/app.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ciphers.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/crypto.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/digests.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hmac.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/symkeys.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_gnutls_la-app.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_gnutls_la-ciphers.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_gnutls_la-crypto.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_gnutls_la-digests.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_gnutls_la-hmac.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_gnutls_la-strings.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_gnutls_la-symkeys.Plo at am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -447,6 +463,55 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+libxmlsec1_gnutls_la-app.lo: app.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_gnutls_la-app.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_gnutls_la-app.Tpo" -c -o libxmlsec1_gnutls_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_gnutls_la-app.Tpo" "$(DEPDIR)/libxmlsec1_gnutls_la-app.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_gnutls_la-app.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='app.c' object='libxmlsec1_gnutls_la-app.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_gnutls_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c
+
+libxmlsec1_gnutls_la-ciphers.lo: ciphers.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_gnutls_la-ciphers.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_gnutls_la-ciphers.Tpo" -c -o libxmlsec1_gnutls_la-ciphers.lo `test -f 'ciphers.c' || echo '$(srcdir)/'`ciphers.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_gnutls_la-ciphers.Tpo" "$(DEPDIR)/libxmlsec1_gnutls_la-ciphers.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_gnutls_la-ciphers.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ciphers.c' object='libxmlsec1_gnutls_la-ciphers.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_gnutls_la-ciphers.lo `test -f 'ciphers.c' || echo '$(srcdir)/'`ciphers.c
+
+libxmlsec1_gnutls_la-crypto.lo: crypto.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_gnutls_la-crypto.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_gnutls_la-crypto.Tpo" -c -o libxmlsec1_gnutls_la-crypto.lo `test -f 'crypto.c' || echo '$(srcdir)/'`crypto.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_gnutls_la-crypto.Tpo" "$(DEPDIR)/libxmlsec1_gnutls_la-crypto.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_gnutls_la-crypto.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='crypto.c' object='libxmlsec1_gnutls_la-crypto.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_gnutls_la-crypto.lo `test -f 'crypto.c' || echo '$(srcdir)/'`crypto.c
+
+libxmlsec1_gnutls_la-digests.lo: digests.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_gnutls_la-digests.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_gnutls_la-digests.Tpo" -c -o libxmlsec1_gnutls_la-digests.lo `test -f 'digests.c' || echo '$(srcdir)/'`digests.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_gnutls_la-digests.Tpo" "$(DEPDIR)/libxmlsec1_gnutls_la-digests.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_gnutls_la-digests.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='digests.c' object='libxmlsec1_gnutls_la-digests.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_gnutls_la-digests.lo `test -f 'digests.c' || echo '$(srcdir)/'`digests.c
+
+libxmlsec1_gnutls_la-hmac.lo: hmac.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_gnutls_la-hmac.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_gnutls_la-hmac.Tpo" -c -o libxmlsec1_gnutls_la-hmac.lo `test -f 'hmac.c' || echo '$(srcdir)/'`hmac.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_gnutls_la-hmac.Tpo" "$(DEPDIR)/libxmlsec1_gnutls_la-hmac.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_gnutls_la-hmac.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hmac.c' object='libxmlsec1_gnutls_la-hmac.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_gnutls_la-hmac.lo `test -f 'hmac.c' || echo '$(srcdir)/'`hmac.c
+
+libxmlsec1_gnutls_la-symkeys.lo: symkeys.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_gnutls_la-symkeys.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_gnutls_la-symkeys.Tpo" -c -o libxmlsec1_gnutls_la-symkeys.lo `test -f 'symkeys.c' || echo '$(srcdir)/'`symkeys.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_gnutls_la-symkeys.Tpo" "$(DEPDIR)/libxmlsec1_gnutls_la-symkeys.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_gnutls_la-symkeys.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='symkeys.c' object='libxmlsec1_gnutls_la-symkeys.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_gnutls_la-symkeys.lo `test -f 'symkeys.c' || echo '$(srcdir)/'`symkeys.c
+
+libxmlsec1_gnutls_la-strings.lo: ../strings.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_gnutls_la-strings.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_gnutls_la-strings.Tpo" -c -o libxmlsec1_gnutls_la-strings.lo `test -f '../strings.c' || echo '$(srcdir)/'`../strings.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_gnutls_la-strings.Tpo" "$(DEPDIR)/libxmlsec1_gnutls_la-strings.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_gnutls_la-strings.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../strings.c' object='libxmlsec1_gnutls_la-strings.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_gnutls_la-strings.lo `test -f '../strings.c' || echo '$(srcdir)/'`../strings.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/src/gnutls/hmac.c b/src/gnutls/hmac.c
index 1119110..300c929 100644
--- a/src/gnutls/hmac.c
+++ b/src/gnutls/hmac.c
@@ -23,10 +23,40 @@
 #include <xmlsec/gnutls/app.h>
 #include <xmlsec/gnutls/crypto.h>
 
+#define XMLSEC_GNUTLS_MIN_HMAC_SIZE		40
 #define XMLSEC_GNUTLS_MAX_HMAC_SIZE		128
 
 /**************************************************************************
  *
+ * Configuration
+ *
+ *****************************************************************************/
+static int g_xmlsec_gnutls_hmac_min_length = XMLSEC_GNUTLS_MIN_HMAC_SIZE;
+
+/**
+ * xmlSecGnuTLSHmacGetMinOutputLength: 
+ * 
+ * Returns the min HMAC output length
+ */
+int xmlSecGnuTLSHmacGetMinOutputLength()
+{
+    return g_xmlsec_gnutls_hmac_min_length;
+}
+
+/**
+ * xmlSecGnuTLSHmacSetMinOutputLength: 
+ *
+ * @min_length: the new min length 
+ * 
+ * Sets the min HMAC output length
+ */
+void xmlSecGnuTLSHmacSetMinOutputLength(int min_length)
+{
+    g_xmlsec_gnutls_hmac_min_length = min_length;
+}
+
+/**************************************************************************
+ *
  * Internal GNUTLS HMAC CTX
  *
  *****************************************************************************/
@@ -178,7 +208,20 @@ xmlSecGnuTLSHmacNodeRead(xmlSecTransformPtr transform, xmlNodePtr node, xmlSecTr
 	    ctx->dgstSize = atoi((char*)content);	    
 	    xmlFree(content);
 	}
-	/* todo: error if dgstSize == 0 ?*/
+	
+	/* Ensure that HMAC length is greater than min specified.
+	   Otherwise, an attacker can set this lenght to 0 or very 
+	   small value
+	*/
+	if(ctx->dgstSize < xmlSecGnuTLSHmacGetMinOutputLength()) {
+ 	   xmlSecError(XMLSEC_ERRORS_HERE,
+		    xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
+		    xmlSecNodeHMACOutputLength,
+		    XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE,
+		    "HMAC output length is too small");
+	   return(-1);
+	}
+
 	cur = xmlSecGetNextElementNode(cur->next);
     }
     
diff --git a/src/keyinfo.c b/src/keyinfo.c
index 0a821a7..6d0962a 100644
--- a/src/keyinfo.c
+++ b/src/keyinfo.c
@@ -277,7 +277,7 @@ xmlSecKeyInfoCtxInitialize(xmlSecKeyInfoCtxPtr keyInfoCtx, xmlSecKeysMngrPtr key
     
     memset(keyInfoCtx, 0, sizeof(xmlSecKeyInfoCtx));
     keyInfoCtx->keysMngr = keysMngr;
-    keyInfoCtx->base64LineSize = XMLSEC_BASE64_LINESIZE;    
+    keyInfoCtx->base64LineSize = xmlSecBase64GetDefaultLineSize();    
     ret = xmlSecPtrListInitialize(&(keyInfoCtx->enabledKeyData), xmlSecKeyDataIdListId);
     if(ret < 0) {
 	xmlSecError(XMLSEC_ERRORS_HERE,
@@ -779,8 +779,7 @@ xmlSecKeyDataNameXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key, xmlNodePtr node,
 
     name = xmlSecKeyGetName(key);
     if(name != NULL) {
-	/* TODO: encode the key name */
-	xmlNodeSetContent(node, name);
+	    xmlSecNodeEncodeAndSetContent(node, name);
     }
     return(0);
 }
diff --git a/src/gnutls/.cvsignore b/src/mscrypto/.cvsignore
similarity index 68%
rename from src/gnutls/.cvsignore
rename to src/mscrypto/.cvsignore
index 40b3ad6..e14e401 100644
--- a/src/gnutls/.cvsignore
+++ b/src/mscrypto/.cvsignore
@@ -1,5 +1,7 @@
 Makefile
 Makefile.in
 .deps
+*.lo
 .libs
-*.o
+*.la
+core
diff --git a/src/mscrypto/Makefile.am b/src/mscrypto/Makefile.am
new file mode 100644
index 0000000..318af51
--- /dev/null
+++ b/src/mscrypto/Makefile.am
@@ -0,0 +1,58 @@
+NULL =
+
+EXTRA_DIST = \
+	mingw-crypt32.def \
+	README \
+	$(NULL)
+
+lib_LTLIBRARIES = \
+	libxmlsec1-mscrypto.la \
+	$(NULL)
+
+libxmlsec1_mscrypto_la_CPPFLAGS = \
+	-DPACKAGE=\"@PACKAGE@\" \
+	-I../../include \
+	-I$(top_srcdir)/include \
+	$(XMLSEC_DEFINES) \
+	$(MSCRYPTO_CFLAGS) \
+	$(LIBXSLT_CFLAGS) \
+	$(LIBXML_CFLAGS) \
+	$(NULL)
+
+libxmlsec1_mscrypto_la_SOURCES =\
+	app.c \
+	certkeys.c \
+	ciphers.c \
+	crypto.c \
+	digests.c \
+	keysstore.c \
+	kt_rsa.c \
+	signatures.c \
+	symkeys.c \
+	x509.c \
+	x509vfy.c \
+	csp_calg.h \
+	csp_oid.h \
+	globals.h \
+	xmlsec-mingw.h \
+	$(NULL)
+
+if SHAREDLIB_HACK
+libxmlsec1_mscrypto_la_SOURCES += ../strings.c
+endif
+
+libxmlsec1_mscrypto_la_LIBADD = \
+	../libxmlsec1.la \
+	$(MSCRYPTO_LIBS) \
+	$(LIBXSLT_LIBS) \
+	$(LIBXML_LIBS) \
+	$(NULL)
+
+libxmlsec1_mscrypto_la_DEPENDENCIES = \
+	mingw-crypt32.def \
+	$(NULL)
+
+libxmlsec1_mscrypto_la_LDFLAGS = \
+	@XMLSEC_CRYPTO_EXTRA_LDFLAGS@ \
+	-version-info @XMLSEC_VERSION_INFO@ \
+	$(NULL)
diff --git a/src/nss/Makefile.in b/src/mscrypto/Makefile.in
similarity index 53%
copy from src/nss/Makefile.in
copy to src/mscrypto/Makefile.in
index d19caf2..8043f78 100644
--- a/src/nss/Makefile.in
+++ b/src/mscrypto/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-SOURCES = $(libxmlsec1_nss_la_SOURCES)
+SOURCES = $(libxmlsec1_mscrypto_la_SOURCES)
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -38,7 +38,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = src/nss
+ at SHAREDLIB_HACK_TRUE@am__append_1 = ../strings.c
+subdir = src/mscrypto
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -57,15 +58,26 @@ am__installdirs = "$(DESTDIR)$(libdir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libxmlsec1_nss_la_DEPENDENCIES = ../libxmlsec1.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am__libxmlsec1_mscrypto_la_SOURCES_DIST = app.c certkeys.c ciphers.c \
+	crypto.c digests.c keysstore.c kt_rsa.c signatures.c symkeys.c \
+	x509.c x509vfy.c csp_calg.h csp_oid.h globals.h xmlsec-mingw.h \
+	../strings.c
 am__objects_1 =
-am_libxmlsec1_nss_la_OBJECTS = app.lo bignum.lo ciphers.lo crypto.lo \
-	digests.lo hmac.lo pkikeys.lo signatures.lo symkeys.lo x509.lo \
-	x509vfy.lo keysstore.lo keytrans.lo kw_des.lo kw_aes.lo \
-	$(am__objects_1)
-libxmlsec1_nss_la_OBJECTS = $(am_libxmlsec1_nss_la_OBJECTS)
+ at SHAREDLIB_HACK_TRUE@am__objects_2 =  \
+ at SHAREDLIB_HACK_TRUE@	libxmlsec1_mscrypto_la-strings.lo
+am_libxmlsec1_mscrypto_la_OBJECTS = libxmlsec1_mscrypto_la-app.lo \
+	libxmlsec1_mscrypto_la-certkeys.lo \
+	libxmlsec1_mscrypto_la-ciphers.lo \
+	libxmlsec1_mscrypto_la-crypto.lo \
+	libxmlsec1_mscrypto_la-digests.lo \
+	libxmlsec1_mscrypto_la-keysstore.lo \
+	libxmlsec1_mscrypto_la-kt_rsa.lo \
+	libxmlsec1_mscrypto_la-signatures.lo \
+	libxmlsec1_mscrypto_la-symkeys.lo \
+	libxmlsec1_mscrypto_la-x509.lo \
+	libxmlsec1_mscrypto_la-x509vfy.lo $(am__objects_1) \
+	$(am__objects_2)
+libxmlsec1_mscrypto_la_OBJECTS = $(am_libxmlsec1_mscrypto_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -77,8 +89,8 @@ LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
 CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libxmlsec1_nss_la_SOURCES)
-DIST_SOURCES = $(libxmlsec1_nss_la_SOURCES)
+SOURCES = $(libxmlsec1_mscrypto_la_SOURCES)
+DIST_SOURCES = $(am__libxmlsec1_mscrypto_la_SOURCES_DIST)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -146,12 +158,17 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAN2HTML = @MAN2HTML@
 MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
+MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
+MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
 MV = @MV@
 NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
+NSPR_PACKAGE = @NSPR_PACKAGE@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_CRYPTO_LIB = @NSS_CRYPTO_LIB@
 NSS_LIBS = @NSS_LIBS@
 NSS_MIN_VERSION = @NSS_MIN_VERSION@
+NSS_PACKAGE = @NSS_PACKAGE@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_CRYPTO_LIB = @OPENSSL_CRYPTO_LIB@
@@ -169,6 +186,8 @@ PKG_CONFIG_ENABLED = @PKG_CONFIG_ENABLED@
 RANLIB = @RANLIB@
 RM = @RM@
 SET_MAKE = @SET_MAKE@
+SHAREDLIB_HACK_FALSE = @SHAREDLIB_HACK_FALSE@
+SHAREDLIB_HACK_TRUE = @SHAREDLIB_HACK_TRUE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TAR = @TAR@
@@ -181,6 +200,7 @@ XMLSEC_CORE_LIBS = @XMLSEC_CORE_LIBS@
 XMLSEC_CRYPTO = @XMLSEC_CRYPTO@
 XMLSEC_CRYPTO_CFLAGS = @XMLSEC_CRYPTO_CFLAGS@
 XMLSEC_CRYPTO_DISABLED_LIST = @XMLSEC_CRYPTO_DISABLED_LIST@
+XMLSEC_CRYPTO_EXTRA_LDFLAGS = @XMLSEC_CRYPTO_EXTRA_LDFLAGS@
 XMLSEC_CRYPTO_LIB = @XMLSEC_CRYPTO_LIB@
 XMLSEC_CRYPTO_LIBS = @XMLSEC_CRYPTO_LIBS@
 XMLSEC_CRYPTO_LIST = @XMLSEC_CRYPTO_LIST@
@@ -189,6 +209,7 @@ XMLSEC_DEFINES = @XMLSEC_DEFINES@
 XMLSEC_DL_INCLUDES = @XMLSEC_DL_INCLUDES@
 XMLSEC_DL_LIBS = @XMLSEC_DL_LIBS@
 XMLSEC_DOCDIR = @XMLSEC_DOCDIR@
+XMLSEC_EXTRA_LDFLAGS = @XMLSEC_EXTRA_LDFLAGS@
 XMLSEC_GNUTLS_CFLAGS = @XMLSEC_GNUTLS_CFLAGS@
 XMLSEC_GNUTLS_LIBS = @XMLSEC_GNUTLS_LIBS@
 XMLSEC_LIBDIR = @XMLSEC_LIBDIR@
@@ -211,6 +232,9 @@ XMLSEC_NO_DSA_TRUE = @XMLSEC_NO_DSA_TRUE@
 XMLSEC_NO_GNUTLS = @XMLSEC_NO_GNUTLS@
 XMLSEC_NO_GNUTLS_FALSE = @XMLSEC_NO_GNUTLS_FALSE@
 XMLSEC_NO_GNUTLS_TRUE = @XMLSEC_NO_GNUTLS_TRUE@
+XMLSEC_NO_GOST = @XMLSEC_NO_GOST@
+XMLSEC_NO_GOST_FALSE = @XMLSEC_NO_GOST_FALSE@
+XMLSEC_NO_GOST_TRUE = @XMLSEC_NO_GOST_TRUE@
 XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
 XMLSEC_NO_HMAC_FALSE = @XMLSEC_NO_HMAC_FALSE@
 XMLSEC_NO_HMAC_TRUE = @XMLSEC_NO_HMAC_TRUE@
@@ -218,6 +242,9 @@ XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
 XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
 XMLSEC_NO_MD5_FALSE = @XMLSEC_NO_MD5_FALSE@
 XMLSEC_NO_MD5_TRUE = @XMLSEC_NO_MD5_TRUE@
+XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
+XMLSEC_NO_MSCRYPTO_FALSE = @XMLSEC_NO_MSCRYPTO_FALSE@
+XMLSEC_NO_MSCRYPTO_TRUE = @XMLSEC_NO_MSCRYPTO_TRUE@
 XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
 XMLSEC_NO_NSS_FALSE = @XMLSEC_NO_NSS_FALSE@
 XMLSEC_NO_NSS_TRUE = @XMLSEC_NO_NSS_TRUE@
@@ -314,50 +341,41 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 NULL = 
 EXTRA_DIST = \
-	globals.h \
+	mingw-crypt32.def \
 	README \
 	$(NULL)
 
-INCLUDES = \
+lib_LTLIBRARIES = \
+	libxmlsec1-mscrypto.la \
+	$(NULL)
+
+libxmlsec1_mscrypto_la_CPPFLAGS = \
 	-DPACKAGE=\"@PACKAGE@\" \
-	-I$(top_srcdir) \
+	-I../../include \
 	-I$(top_srcdir)/include \
 	$(XMLSEC_DEFINES) \
-	$(NSS_CFLAGS) \
+	$(MSCRYPTO_CFLAGS) \
 	$(LIBXSLT_CFLAGS) \
 	$(LIBXML_CFLAGS) \
 	$(NULL)
 
-lib_LTLIBRARIES = \
-	libxmlsec1-nss.la \
-	$(NULL)
-
-libxmlsec1_nss_la_SOURCES = \
-	app.c \
-	bignum.c \
-	ciphers.c \
-	crypto.c \
-	digests.c \
-	hmac.c \
-	pkikeys.c \
-	signatures.c \
-	symkeys.c \
-	x509.c \
-	x509vfy.c \
-	keysstore.c \
-	keytrans.c \
-	kw_des.c \
-	kw_aes.c \
-	$(NULL)
-
-libxmlsec1_nss_la_LIBADD = \
+libxmlsec1_mscrypto_la_SOURCES = app.c certkeys.c ciphers.c crypto.c \
+	digests.c keysstore.c kt_rsa.c signatures.c symkeys.c x509.c \
+	x509vfy.c csp_calg.h csp_oid.h globals.h xmlsec-mingw.h \
+	$(NULL) $(am__append_1)
+libxmlsec1_mscrypto_la_LIBADD = \
 	../libxmlsec1.la \
-	$(NSS_LIBS) \
+	$(MSCRYPTO_LIBS) \
 	$(LIBXSLT_LIBS) \
 	$(LIBXML_LIBS) \
 	$(NULL)
 
-libxmlsec1_nss_la_LDFLAGS = \
+libxmlsec1_mscrypto_la_DEPENDENCIES = \
+	mingw-crypt32.def \
+	$(NULL)
+
+libxmlsec1_mscrypto_la_LDFLAGS = \
+	@XMLSEC_CRYPTO_EXTRA_LDFLAGS@ \
 	-version-info @XMLSEC_VERSION_INFO@ \
 	$(NULL)
 
@@ -374,9 +392,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/nss/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/mscrypto/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/nss/Makefile
+	  $(AUTOMAKE) --gnu  src/mscrypto/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -421,8 +439,8 @@ clean-libLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libxmlsec1-nss.la: $(libxmlsec1_nss_la_OBJECTS) $(libxmlsec1_nss_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libxmlsec1_nss_la_LDFLAGS) $(libxmlsec1_nss_la_OBJECTS) $(libxmlsec1_nss_la_LIBADD) $(LIBS)
+libxmlsec1-mscrypto.la: $(libxmlsec1_mscrypto_la_OBJECTS) $(libxmlsec1_mscrypto_la_DEPENDENCIES) 
+	$(LINK) -rpath $(libdir) $(libxmlsec1_mscrypto_la_LDFLAGS) $(libxmlsec1_mscrypto_la_OBJECTS) $(libxmlsec1_mscrypto_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -430,21 +448,18 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/app.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/bignum.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ciphers.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/crypto.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/digests.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hmac.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/keysstore.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/keytrans.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kw_aes.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kw_des.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pkikeys.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/signatures.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/symkeys.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/x509.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/x509vfy.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_mscrypto_la-app.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_mscrypto_la-ciphers.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_mscrypto_la-crypto.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_mscrypto_la-digests.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_mscrypto_la-keysstore.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_mscrypto_la-kt_rsa.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_mscrypto_la-signatures.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_mscrypto_la-strings.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_mscrypto_la-symkeys.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_mscrypto_la-x509.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_mscrypto_la-x509vfy.Plo at am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -467,6 +482,90 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+libxmlsec1_mscrypto_la-app.lo: app.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-app.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_mscrypto_la-app.Tpo" -c -o libxmlsec1_mscrypto_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_mscrypto_la-app.Tpo" "$(DEPDIR)/libxmlsec1_mscrypto_la-app.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_mscrypto_la-app.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='app.c' object='libxmlsec1_mscrypto_la-app.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c
+
+libxmlsec1_mscrypto_la-certkeys.lo: certkeys.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-certkeys.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Tpo" -c -o libxmlsec1_mscrypto_la-certkeys.lo `test -f 'certkeys.c' || echo '$(srcdir)/'`certkeys.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Tpo" "$(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='certkeys.c' object='libxmlsec1_mscrypto_la-certkeys.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-certkeys.lo `test -f 'certkeys.c' || echo '$(srcdir)/'`certkeys.c
+
+libxmlsec1_mscrypto_la-ciphers.lo: ciphers.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-ciphers.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_mscrypto_la-ciphers.Tpo" -c -o libxmlsec1_mscrypto_la-ciphers.lo `test -f 'ciphers.c' || echo '$(srcdir)/'`ciphers.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_mscrypto_la-ciphers.Tpo" "$(DEPDIR)/libxmlsec1_mscrypto_la-ciphers.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_mscrypto_la-ciphers.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ciphers.c' object='libxmlsec1_mscrypto_la-ciphers.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-ciphers.lo `test -f 'ciphers.c' || echo '$(srcdir)/'`ciphers.c
+
+libxmlsec1_mscrypto_la-crypto.lo: crypto.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-crypto.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_mscrypto_la-crypto.Tpo" -c -o libxmlsec1_mscrypto_la-crypto.lo `test -f 'crypto.c' || echo '$(srcdir)/'`crypto.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_mscrypto_la-crypto.Tpo" "$(DEPDIR)/libxmlsec1_mscrypto_la-crypto.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_mscrypto_la-crypto.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='crypto.c' object='libxmlsec1_mscrypto_la-crypto.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-crypto.lo `test -f 'crypto.c' || echo '$(srcdir)/'`crypto.c
+
+libxmlsec1_mscrypto_la-digests.lo: digests.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-digests.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_mscrypto_la-digests.Tpo" -c -o libxmlsec1_mscrypto_la-digests.lo `test -f 'digests.c' || echo '$(srcdir)/'`digests.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_mscrypto_la-digests.Tpo" "$(DEPDIR)/libxmlsec1_mscrypto_la-digests.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_mscrypto_la-digests.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='digests.c' object='libxmlsec1_mscrypto_la-digests.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-digests.lo `test -f 'digests.c' || echo '$(srcdir)/'`digests.c
+
+libxmlsec1_mscrypto_la-keysstore.lo: keysstore.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-keysstore.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_mscrypto_la-keysstore.Tpo" -c -o libxmlsec1_mscrypto_la-keysstore.lo `test -f 'keysstore.c' || echo '$(srcdir)/'`keysstore.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_mscrypto_la-keysstore.Tpo" "$(DEPDIR)/libxmlsec1_mscrypto_la-keysstore.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_mscrypto_la-keysstore.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='keysstore.c' object='libxmlsec1_mscrypto_la-keysstore.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-keysstore.lo `test -f 'keysstore.c' || echo '$(srcdir)/'`keysstore.c
+
+libxmlsec1_mscrypto_la-kt_rsa.lo: kt_rsa.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-kt_rsa.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_mscrypto_la-kt_rsa.Tpo" -c -o libxmlsec1_mscrypto_la-kt_rsa.lo `test -f 'kt_rsa.c' || echo '$(srcdir)/'`kt_rsa.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_mscrypto_la-kt_rsa.Tpo" "$(DEPDIR)/libxmlsec1_mscrypto_la-kt_rsa.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_mscrypto_la-kt_rsa.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='kt_rsa.c' object='libxmlsec1_mscrypto_la-kt_rsa.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-kt_rsa.lo `test -f 'kt_rsa.c' || echo '$(srcdir)/'`kt_rsa.c
+
+libxmlsec1_mscrypto_la-signatures.lo: signatures.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-signatures.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_mscrypto_la-signatures.Tpo" -c -o libxmlsec1_mscrypto_la-signatures.lo `test -f 'signatures.c' || echo '$(srcdir)/'`signatures.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_mscrypto_la-signatures.Tpo" "$(DEPDIR)/libxmlsec1_mscrypto_la-signatures.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_mscrypto_la-signatures.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='signatures.c' object='libxmlsec1_mscrypto_la-signatures.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-signatures.lo `test -f 'signatures.c' || echo '$(srcdir)/'`signatures.c
+
+libxmlsec1_mscrypto_la-symkeys.lo: symkeys.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-symkeys.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_mscrypto_la-symkeys.Tpo" -c -o libxmlsec1_mscrypto_la-symkeys.lo `test -f 'symkeys.c' || echo '$(srcdir)/'`symkeys.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_mscrypto_la-symkeys.Tpo" "$(DEPDIR)/libxmlsec1_mscrypto_la-symkeys.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_mscrypto_la-symkeys.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='symkeys.c' object='libxmlsec1_mscrypto_la-symkeys.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-symkeys.lo `test -f 'symkeys.c' || echo '$(srcdir)/'`symkeys.c
+
+libxmlsec1_mscrypto_la-x509.lo: x509.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-x509.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_mscrypto_la-x509.Tpo" -c -o libxmlsec1_mscrypto_la-x509.lo `test -f 'x509.c' || echo '$(srcdir)/'`x509.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_mscrypto_la-x509.Tpo" "$(DEPDIR)/libxmlsec1_mscrypto_la-x509.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_mscrypto_la-x509.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='x509.c' object='libxmlsec1_mscrypto_la-x509.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-x509.lo `test -f 'x509.c' || echo '$(srcdir)/'`x509.c
+
+libxmlsec1_mscrypto_la-x509vfy.lo: x509vfy.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-x509vfy.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_mscrypto_la-x509vfy.Tpo" -c -o libxmlsec1_mscrypto_la-x509vfy.lo `test -f 'x509vfy.c' || echo '$(srcdir)/'`x509vfy.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_mscrypto_la-x509vfy.Tpo" "$(DEPDIR)/libxmlsec1_mscrypto_la-x509vfy.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_mscrypto_la-x509vfy.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='x509vfy.c' object='libxmlsec1_mscrypto_la-x509vfy.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-x509vfy.lo `test -f 'x509vfy.c' || echo '$(srcdir)/'`x509vfy.c
+
+libxmlsec1_mscrypto_la-strings.lo: ../strings.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-strings.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_mscrypto_la-strings.Tpo" -c -o libxmlsec1_mscrypto_la-strings.lo `test -f '../strings.c' || echo '$(srcdir)/'`../strings.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_mscrypto_la-strings.Tpo" "$(DEPDIR)/libxmlsec1_mscrypto_la-strings.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_mscrypto_la-strings.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../strings.c' object='libxmlsec1_mscrypto_la-strings.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-strings.lo `test -f '../strings.c' || echo '$(srcdir)/'`../strings.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/src/mscrypto/app.c b/src/mscrypto/app.c
index e0dcc14..186bc23 100644
--- a/src/mscrypto/app.c
+++ b/src/mscrypto/app.c
@@ -25,6 +25,10 @@
 #include <xmlsec/mscrypto/keysstore.h>
 #include <xmlsec/mscrypto/x509.h>
 
+#if defined(__MINGW32__)
+#  include "xmlsec-mingw.h"
+#endif
+
 /* I don't see any other way then to use a global var to get the 
  * config info to the mscrypto keysstore :(  WK 
  */
@@ -559,8 +563,6 @@ xmlSecMSCryptoAppPkcs12LoadMemory(const xmlSecByte* data,
     xmlSecKeyDataPtr x509Data = NULL;
     xmlSecKeyDataPtr keyData = NULL;
     xmlSecKeyPtr key = NULL;
-    DWORD dwData, dwDataLen;
-    BOOL bres;
 
     xmlSecAssert2(data != NULL, NULL);
     xmlSecAssert2(dataSize > 1, NULL);
@@ -575,7 +577,7 @@ xmlSecMSCryptoAppPkcs12LoadMemory(const xmlSecByte* data,
 		    NULL,
 		    "PFXIsPFXBlob",
 		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-		    "size=%d",
+		    "size=%ld",
 		    pfx.cbData);
 	goto done;
     }
@@ -646,7 +648,18 @@ xmlSecMSCryptoAppPkcs12LoadMemory(const xmlSecByte* data,
 
 	/* Find the certificate that has the private key */
 	if((TRUE == CertGetCertificateContextProperty(pCert, CERT_KEY_SPEC_PROP_ID, &dwData, &dwDataLen)) && (dwData > 0)) {
-	    keyData = xmlSecMSCryptoCertAdopt(pCert, xmlSecKeyDataTypePrivate | xmlSecKeyDataTypePublic);
+	    tmpcert = CertDuplicateCertificateContext(pCert);
+	    if(tmpcert == NULL) {
+		xmlSecError(XMLSEC_ERRORS_HERE,
+			    NULL,
+			    "CertDuplicateCertificateContext",
+			    XMLSEC_ERRORS_R_CRYPTO_FAILED,
+			    "data=%s",
+			    xmlSecErrorsSafeString(xmlSecKeyDataGetName(x509Data)));
+		goto done;
+	    }
+
+	    keyData = xmlSecMSCryptoCertAdopt(tmpcert, xmlSecKeyDataTypePrivate | xmlSecKeyDataTypePublic);
 	    if(keyData == NULL) {
 		xmlSecError(XMLSEC_ERRORS_HERE,
 			    NULL,
@@ -655,6 +668,7 @@ xmlSecMSCryptoAppPkcs12LoadMemory(const xmlSecByte* data,
 			    XMLSEC_ERRORS_NO_MESSAGE);
 		goto done;
 	    }
+        tmpcert = NULL;
 	
 	    tmpcert = CertDuplicateCertificateContext(pCert);
 	    if(tmpcert == NULL) {
@@ -918,36 +932,36 @@ xmlSecMSCryptoAppKeysMngrCertLoadMemory(xmlSecKeysMngrPtr mngr, const xmlSecByte
  *
  * Returns 0 on success or a negative value if an error occurs.
  */
-int 
-xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore(xmlSecKeysMngrPtr mngr, HCERTSTORE keyStore)
-{
-	xmlSecKeyDataStorePtr x509Store ;
-
-	xmlSecAssert2( mngr != NULL, -1 ) ;
-	xmlSecAssert2( keyStore != NULL, -1 ) ;
-
-    x509Store = xmlSecKeysMngrGetDataStore( mngr, xmlSecMSCryptoX509StoreId) ;
-	if( x509Store == NULL ) {
-		xmlSecError( XMLSEC_ERRORS_HERE ,
-			NULL ,
-			"xmlSecKeysMngrGetDataStore" ,
-			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-			XMLSEC_ERRORS_NO_MESSAGE ) ;
-		return(-1) ;
-	}
-
-	if( xmlSecMSCryptoX509StoreAdoptKeyStore( x509Store, keyStore ) < 0 ) {
-		xmlSecError( XMLSEC_ERRORS_HERE ,
-			xmlSecErrorsSafeString( xmlSecKeyDataStoreGetName( x509Store ) ) ,
-			"xmlSecMSCryptoX509StoreAdoptKeyStore" ,
-			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-			XMLSEC_ERRORS_NO_MESSAGE ) ;
-		return(-1) ;
-	}
-
-	return (0) ;
-}
-
+int 
+xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore(xmlSecKeysMngrPtr mngr, HCERTSTORE keyStore)
+{
+	xmlSecKeyDataStorePtr x509Store ;
+
+	xmlSecAssert2( mngr != NULL, -1 ) ;
+	xmlSecAssert2( keyStore != NULL, -1 ) ;
+
+    x509Store = xmlSecKeysMngrGetDataStore( mngr, xmlSecMSCryptoX509StoreId) ;
+	if( x509Store == NULL ) {
+		xmlSecError( XMLSEC_ERRORS_HERE ,
+			NULL ,
+			"xmlSecKeysMngrGetDataStore" ,
+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
+			XMLSEC_ERRORS_NO_MESSAGE ) ;
+		return(-1) ;
+	}
+
+	if( xmlSecMSCryptoX509StoreAdoptKeyStore( x509Store, keyStore ) < 0 ) {
+		xmlSecError( XMLSEC_ERRORS_HERE ,
+			xmlSecErrorsSafeString( xmlSecKeyDataStoreGetName( x509Store ) ) ,
+			"xmlSecMSCryptoX509StoreAdoptKeyStore" ,
+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
+			XMLSEC_ERRORS_NO_MESSAGE ) ;
+		return(-1) ;
+	}
+
+	return (0) ;
+}
+
 /** 
  * xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore: 
  * @mngr: 		        the keys manager.
@@ -957,36 +971,36 @@ xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore(xmlSecKeysMngrPtr mngr, HCERTSTORE
  *
  * Returns 0 on success or a negative value if an error occurs.
  */
-int
-xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore(xmlSecKeysMngrPtr mngr, HCERTSTORE trustedStore)
-{
-	xmlSecKeyDataStorePtr x509Store ;
-
-	xmlSecAssert2( mngr != NULL, -1 ) ;
-	xmlSecAssert2( trustedStore != NULL, -1 ) ;
-
-    x509Store = xmlSecKeysMngrGetDataStore( mngr, xmlSecMSCryptoX509StoreId ) ;
-	if( x509Store == NULL ) {
-		xmlSecError( XMLSEC_ERRORS_HERE ,
-			NULL ,
-			"xmlSecKeysMngrGetDataStore" ,
-			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-			XMLSEC_ERRORS_NO_MESSAGE ) ;
-		return(-1) ;
-	}
-
-	if( xmlSecMSCryptoX509StoreAdoptTrustedStore( x509Store, trustedStore ) < 0 ) {
-		xmlSecError( XMLSEC_ERRORS_HERE ,
-			xmlSecErrorsSafeString( xmlSecKeyDataStoreGetName( x509Store ) ) ,
-			"xmlSecMSCryptoX509StoreAdoptKeyStore" ,
-			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-			XMLSEC_ERRORS_NO_MESSAGE ) ;
-		return(-1) ;
-	}
-
-	return(0);
-}
-
+int
+xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore(xmlSecKeysMngrPtr mngr, HCERTSTORE trustedStore)
+{
+	xmlSecKeyDataStorePtr x509Store ;
+
+	xmlSecAssert2( mngr != NULL, -1 ) ;
+	xmlSecAssert2( trustedStore != NULL, -1 ) ;
+
+    x509Store = xmlSecKeysMngrGetDataStore( mngr, xmlSecMSCryptoX509StoreId ) ;
+	if( x509Store == NULL ) {
+		xmlSecError( XMLSEC_ERRORS_HERE ,
+			NULL ,
+			"xmlSecKeysMngrGetDataStore" ,
+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
+			XMLSEC_ERRORS_NO_MESSAGE ) ;
+		return(-1) ;
+	}
+
+	if( xmlSecMSCryptoX509StoreAdoptTrustedStore( x509Store, trustedStore ) < 0 ) {
+		xmlSecError( XMLSEC_ERRORS_HERE ,
+			xmlSecErrorsSafeString( xmlSecKeyDataStoreGetName( x509Store ) ) ,
+			"xmlSecMSCryptoX509StoreAdoptKeyStore" ,
+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
+			XMLSEC_ERRORS_NO_MESSAGE ) ;
+		return(-1) ;
+	}
+
+	return(0);
+}
+
 /** 
  * xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore: 
  * @mngr: 		        the keys manager.
@@ -996,35 +1010,35 @@ xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore(xmlSecKeysMngrPtr mngr, HCERTS
  *
  * Returns 0 on success or a negative value if an error occurs.
  */
-int
-xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore(xmlSecKeysMngrPtr mngr, HCERTSTORE untrustedStore)
-{
-	xmlSecKeyDataStorePtr x509Store ;
-
-	xmlSecAssert2( mngr != NULL, -1 ) ;
-	xmlSecAssert2( untrustedStore != NULL, -1 ) ;
-
-    x509Store = xmlSecKeysMngrGetDataStore( mngr, xmlSecMSCryptoX509StoreId);
-	if( x509Store == NULL ) {
-		xmlSecError( XMLSEC_ERRORS_HERE ,
-			NULL ,
-			"xmlSecKeysMngrGetDataStore" ,
-			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-			XMLSEC_ERRORS_NO_MESSAGE ) ;
-		return(-1);
-	}
-
-	if( xmlSecMSCryptoX509StoreAdoptUntrustedStore( x509Store, untrustedStore ) < 0) {
-		xmlSecError( XMLSEC_ERRORS_HERE ,
-			xmlSecErrorsSafeString( xmlSecKeyDataStoreGetName( x509Store ) ) ,
-			"xmlSecMSCryptoX509StoreAdoptKeyStore" ,
-			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-			XMLSEC_ERRORS_NO_MESSAGE ) ;
-		return(-1);
-	}
-
-	return(0) ;
-}
+int
+xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore(xmlSecKeysMngrPtr mngr, HCERTSTORE untrustedStore)
+{
+	xmlSecKeyDataStorePtr x509Store ;
+
+	xmlSecAssert2( mngr != NULL, -1 ) ;
+	xmlSecAssert2( untrustedStore != NULL, -1 ) ;
+
+    x509Store = xmlSecKeysMngrGetDataStore( mngr, xmlSecMSCryptoX509StoreId);
+	if( x509Store == NULL ) {
+		xmlSecError( XMLSEC_ERRORS_HERE ,
+			NULL ,
+			"xmlSecKeysMngrGetDataStore" ,
+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
+			XMLSEC_ERRORS_NO_MESSAGE ) ;
+		return(-1);
+	}
+
+	if( xmlSecMSCryptoX509StoreAdoptUntrustedStore( x509Store, untrustedStore ) < 0) {
+		xmlSecError( XMLSEC_ERRORS_HERE ,
+			xmlSecErrorsSafeString( xmlSecKeyDataStoreGetName( x509Store ) ) ,
+			"xmlSecMSCryptoX509StoreAdoptKeyStore" ,
+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
+			XMLSEC_ERRORS_NO_MESSAGE ) ;
+		return(-1);
+	}
+
+	return(0) ;
+}
 
 #endif /* XMLSEC_NO_X509 */
 
@@ -1215,15 +1229,15 @@ xmlSecMSCryptoAppDefaultKeysMngrSave(xmlSecKeysMngrPtr mngr, const char* filenam
  * 
  * Returns 0 on success or a negative value otherwise.
  */ 
-int
-xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad(xmlSecKeysMngrPtr mngr, HCRYPTKEY hKey) {
-    xmlSecAssert2(mngr != NULL, -1);
-    xmlSecAssert2(hKey != 0, -1);
-
-    /* TODO */
-    return(0);
-}
-
+int
+xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad(xmlSecKeysMngrPtr mngr, HCRYPTKEY hKey) {
+    xmlSecAssert2(mngr != NULL, -1);
+    xmlSecAssert2(hKey != 0, -1);
+
+    /* TODO */
+    return(0);
+}
+
 /**
  * xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad:
  * @mngr: 		the pointer to keys manager.
@@ -1233,15 +1247,15 @@ xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad(xmlSecKeysMngrPtr mngr, HCRYPTKEY
  * 
  * Returns 0 on success or a negative value otherwise.
  */ 
-int 
-xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad(xmlSecKeysMngrPtr mngr, HCRYPTKEY hKey) {
-    xmlSecAssert2(mngr != NULL, -1);
-    xmlSecAssert2(hKey != 0, -1);
-
-    /* TODO */
-    return(0);
-}
-
+int 
+xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad(xmlSecKeysMngrPtr mngr, HCRYPTKEY hKey) {
+    xmlSecAssert2(mngr != NULL, -1);
+    xmlSecAssert2(hKey != 0, -1);
+
+    /* TODO */
+    return(0);
+}
+
 /**
  * xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad:
  * @mngr: 		the pointer to keys manager.
@@ -1251,13 +1265,13 @@ xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad(xmlSecKeysMngrPtr mngr, HCRYPTKEY
  * 
  * Returns 0 on success or a negative value otherwise.
  */ 
-int 
+int 
 xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad(xmlSecKeysMngrPtr mngr, HCRYPTKEY hKey) {
-    xmlSecAssert2(mngr != NULL, -1);
-    xmlSecAssert2(hKey != 0, -1);
-
-    /* TODO */
-    return(0);
+    xmlSecAssert2(mngr != NULL, -1);
+    xmlSecAssert2(hKey != 0, -1);
+
+    /* TODO */
+    return(0);
 }
 
 /**
diff --git a/src/mscrypto/certkeys.c b/src/mscrypto/certkeys.c
index ba8a6cc..6ca9980 100644
--- a/src/mscrypto/certkeys.c
+++ b/src/mscrypto/certkeys.c
@@ -14,6 +14,11 @@
 #include <windows.h>
 #include <wincrypt.h>
 
+#ifndef XMLSEC_NO_GOST
+#include "csp_oid.h"
+#include "csp_calg.h"
+#endif
+
 #include <xmlsec/xmlsec.h>
 #include <xmlsec/xmltree.h>
 #include <xmlsec/keys.h>
@@ -24,6 +29,18 @@
 
 #include <xmlsec/mscrypto/certkeys.h>
 #include <xmlsec/mscrypto/crypto.h>
+#include <xmlsec/mscrypto/x509.h>
+
+#if defined(__MINGW32__)
+#  include "xmlsec-mingw.h"
+#endif
+
+// GOST CSP don't support keys duplicating, so we use NT4 analogs for these...
+#ifndef XMLSEC_NO_GOST
+#ifndef XMLSEC_MSCRYPTO_NT4
+#define XMLSEC_MSCRYPTO_NT4
+#endif
+#endif
 
 #define XMLSEC_CONTAINER_NAME "xmlsec-key-container"
 
@@ -427,7 +444,7 @@ xmlSecMSCryptoKeyDataAdoptCert(xmlSecKeyDataPtr data, PCCERT_CONTEXT pCert, xmlS
         BOOL fCallerFreeProv = FALSE;
 
         if (!CryptAcquireCertificatePrivateKey(pCert, 
-					       CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, 
+					       CRYPT_ACQUIRE_COMPARE_KEY_FLAG, 
 					       NULL, 
 					       &hProv, 
 					       &(ctx->dwKeySpec), 
@@ -539,6 +556,28 @@ xmlSecMSCryptoKeyDataGetKey(xmlSecKeyDataPtr data, xmlSecKeyDataType type) {
     return(xmlSecMSCryptoKeyDataCtxGetKey(ctx));
 }
 
+HCRYPTKEY
+xmlSecMSCryptoKeyDataGetDecryptKey(xmlSecKeyDataPtr data) {
+	xmlSecMSCryptoKeyDataCtxPtr ctx;
+	HCRYPTKEY hKey;
+
+	xmlSecAssert2(xmlSecKeyDataIsValid(data), 0);
+	xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecMSCryptoKeyDataSize), 0);
+
+	ctx = xmlSecMSCryptoKeyDataGetCtx(data);
+	xmlSecAssert2(ctx != NULL, 0);
+
+	if( !CryptGetUserKey(xmlSecMSCryptoKeyDataCtxGetProvider(ctx), AT_KEYEXCHANGE, &(hKey))) {
+		xmlSecError(XMLSEC_ERRORS_HERE,
+			NULL,
+			"CryptGetUserKey",
+			XMLSEC_ERRORS_R_CRYPTO_FAILED,
+			XMLSEC_ERRORS_NO_MESSAGE);
+		return(0);
+	}
+	return (hKey);
+}
+
 /**
  * xmlSecMSCryptoKeyDataGetCert:
  * @data:		the key data to retrieve certificate from.
@@ -665,9 +704,9 @@ xmlSecMSCryptoKeyDataFinalize(xmlSecKeyDataPtr data) {
     ctx = xmlSecMSCryptoKeyDataGetCtx(data);
     xmlSecAssert(ctx != NULL);
     
-    xmlSecMSCryptoKeyDataCtxDestroyProvider(ctx);
     xmlSecMSCryptoKeyDataCtxDestroyKey(ctx);
     xmlSecMSCryptoKeyDataCtxDestroyCert(ctx);
+    xmlSecMSCryptoKeyDataCtxDestroyProvider(ctx);
 
     memset(ctx, 0, sizeof(xmlSecMSCryptoKeyDataCtx));
 }
@@ -796,6 +835,22 @@ xmlSecMSCryptoCertAdopt(PCCERT_CONTEXT pCert, xmlSecKeyDataType type) {
     }
 #endif /* XMLSEC_NO_DSA */	
 
+#ifndef XMLSEC_NO_GOST
+    if (!strcmp(pCert->pCertInfo->SubjectPublicKeyInfo.Algorithm.pszObjId,  szOID_MAGPRO_PUBKEY_SIGN_R3410_2001_CP) ||
+        !strcmp(pCert->pCertInfo->SubjectPublicKeyInfo.Algorithm.pszObjId,  szOID_MAGPRO_PUBKEY_SIGN_R3410_2001) ||
+    	  !strcmp(pCert->pCertInfo->SubjectPublicKeyInfo.Algorithm.pszObjId,  szOID_MAGPRO_PUBKEY_SIGN_R3410_94_CP)) {
+	data = xmlSecKeyDataCreate(xmlSecMSCryptoKeyDataGost2001Id);
+	if(data == NULL) {
+		xmlSecError(XMLSEC_ERRORS_HERE,
+	    		    NULL,
+			    "xmlSecKeyDataCreate",
+			    XMLSEC_ERRORS_R_XMLSEC_FAILED,
+			    "xmlSecMSCryptoKeyDataGost2001Id");
+		return(NULL);	    
+	}
+    }
+#endif /* XMLSEC_NO_GOST*/	
+
     if (NULL == data) {
     	xmlSecError(XMLSEC_ERRORS_HERE,
 		    NULL,
@@ -1254,7 +1309,7 @@ xmlSecMSCryptoKeyDataRsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
 		    xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
 		    "xmlSecBufferInitialize",
 		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
-		    "size=%d", dwBlobLen);
+		    "size=%ld", dwBlobLen);
 	return(-1);
     }
 
@@ -1273,7 +1328,7 @@ xmlSecMSCryptoKeyDataRsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
 		    xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
 		    NULL,
 		    XMLSEC_ERRORS_R_INVALID_DATA,
-		    "blobLen=%d", dwBlobLen);
+		    "blobLen=%ld", dwBlobLen);
 	xmlSecBufferFinalize(&buf);
 	return(-1);
     }
@@ -1306,7 +1361,7 @@ xmlSecMSCryptoKeyDataRsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
 		    NULL,
 		    "CryptExportKey",
 		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-		    "pubKey->magic=0x%08x", pubKey->magic);
+		    "pubKey->magic=0x%08lx", pubKey->magic);
 	xmlSecBufferFinalize(&buf);
 	return(-1);
     }
@@ -1317,7 +1372,7 @@ xmlSecMSCryptoKeyDataRsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
 		    xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
 		    NULL,
 		    XMLSEC_ERRORS_R_INVALID_DATA,
-		    "blobLen=%d; modulusLen=%d", dwBlobLen, modulusLen);
+		    "blobLen=%ld; modulusLen=%d", dwBlobLen, modulusLen);
 	xmlSecBufferFinalize(&buf);
 	return(-1);
     }
@@ -2110,7 +2165,7 @@ xmlSecMSCryptoKeyDataDsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
 		    xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
 		    "xmlSecBufferInitialize",
 		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
-		    "size=%d", dwBlobLen);
+		    "size=%ld", dwBlobLen);
 	return(-1);
     }
 
@@ -2129,7 +2184,7 @@ xmlSecMSCryptoKeyDataDsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
 		    xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
 		    NULL,
 		    XMLSEC_ERRORS_R_INVALID_DATA,
-		    "blobLen=%d", dwBlobLen);
+		    "blobLen=%ld", dwBlobLen);
 	xmlSecBufferFinalize(&buf);
 	return(-1);
     }
@@ -2162,7 +2217,7 @@ xmlSecMSCryptoKeyDataDsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
 		    NULL,
 		    "CryptExportKey",
 		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-		    "pubKey->magic=0x%08x", pubKey->magic);
+		    "pubKey->magic=0x%08lx", pubKey->magic);
 	xmlSecBufferFinalize(&buf);
 	return(-1);
     }
@@ -2174,7 +2229,7 @@ xmlSecMSCryptoKeyDataDsaXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
 		    xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
 		    NULL,
 		    XMLSEC_ERRORS_R_INVALID_DATA,
-		    "blobLen=%d; keyLen=%d", dwBlobLen, keyLen);
+		    "blobLen=%ld; keyLen=%d", dwBlobLen, keyLen);
 	xmlSecBufferFinalize(&buf);
 	return(-1);
     }
@@ -2408,3 +2463,162 @@ xmlSecMSCryptoKeyDataDsaDebugXmlDump(xmlSecKeyDataPtr data, FILE* output) {
 #endif /* XMLSEC_NO_DSA */
 
 
+#ifndef XMLSEC_NO_GOST
+/**************************************************************************
+ *
+ * GOST2001 xml key representation processing. Contain errors.
+ *
+ *************************************************************************/
+static int		xmlSecMSCryptoKeyDataGost2001Initialize(xmlSecKeyDataPtr data);
+static int		xmlSecMSCryptoKeyDataGost2001Duplicate(xmlSecKeyDataPtr dst,
+							 xmlSecKeyDataPtr src);
+static void		xmlSecMSCryptoKeyDataGost2001Finalize(xmlSecKeyDataPtr data);
+static int		xmlSecMSCryptoKeyDataGost2001XmlRead	(xmlSecKeyDataId id,
+							 xmlSecKeyPtr key,
+							 xmlNodePtr node,
+							 xmlSecKeyInfoCtxPtr keyInfoCtx);
+static int		xmlSecMSCryptoKeyDataGost2001XmlWrite(xmlSecKeyDataId id,
+							 xmlSecKeyPtr key,
+							 xmlNodePtr node,
+							 xmlSecKeyInfoCtxPtr keyInfoCtx);
+static int		xmlSecMSCryptoKeyDataGost2001Generate(xmlSecKeyDataPtr data,
+							 xmlSecSize sizeBits,
+							 xmlSecKeyDataType type);
+
+static xmlSecKeyDataType xmlSecMSCryptoKeyDataGost2001GetType(xmlSecKeyDataPtr data);
+static xmlSecSize	 xmlSecMSCryptoKeyDataGost2001GetSize(xmlSecKeyDataPtr data);
+static void		 xmlSecMSCryptoKeyDataGost2001DebugDump(xmlSecKeyDataPtr data,
+							 FILE* output);
+static void		xmlSecMSCryptoKeyDataGost2001DebugXmlDump(xmlSecKeyDataPtr data,
+							 FILE* output);
+
+static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataGost2001Klass = {
+    sizeof(xmlSecKeyDataKlass),
+    xmlSecMSCryptoKeyDataSize,
+
+    /* data */
+    xmlSecNameGOST2001KeyValue,
+    xmlSecKeyDataUsageKeyValueNode | xmlSecKeyDataUsageRetrievalMethodNodeXml, 
+					/* xmlSecKeyDataUsage usage; */
+    xmlSecHrefGOST2001KeyValue,		/* const xmlChar* href; */
+    xmlSecNodeGOST2001KeyValue,		/* const xmlChar* dataNodeName; */
+    xmlSecDSigNs,			/* const xmlChar* dataNodeNs; */
+    
+    /* constructors/destructor */
+    xmlSecMSCryptoKeyDataGost2001Initialize,	/* xmlSecKeyDataInitializeMethod initialize; */
+    xmlSecMSCryptoKeyDataGost2001Duplicate,	/* xmlSecKeyDataDuplicateMethod duplicate; */
+    xmlSecMSCryptoKeyDataGost2001Finalize,	/* xmlSecKeyDataFinalizeMethod finalize; */
+    NULL, /* xmlSecMSCryptoKeyDataGost2001Generate,*/	/* xmlSecKeyDataGenerateMethod generate; */
+    
+    /* get info */
+    xmlSecMSCryptoKeyDataGost2001GetType, 	/* xmlSecKeyDataGetTypeMethod getType; */
+    xmlSecMSCryptoKeyDataGost2001GetSize,	/* xmlSecKeyDataGetSizeMethod getSize; */
+    NULL,				/* xmlSecKeyDataGetIdentifier getIdentifier; */    
+
+    /* read/write */
+    NULL,	/* xmlSecKeyDataXmlReadMethod xmlRead; */
+    NULL,	/* xmlSecKeyDataXmlWriteMethod xmlWrite; */
+    NULL,				/* xmlSecKeyDataBinReadMethod binRead; */
+    NULL,				/* xmlSecKeyDataBinWriteMethod binWrite; */
+
+    /* debug */
+    xmlSecMSCryptoKeyDataGost2001DebugDump,	/* xmlSecKeyDataDebugDumpMethod debugDump; */
+    xmlSecMSCryptoKeyDataGost2001DebugXmlDump,/* xmlSecKeyDataDebugDumpMethod debugXmlDump; */
+
+    /* reserved for the future */
+    NULL,				/* void* reserved0; */
+    NULL,				/* void* reserved1; */
+};
+
+/**
+ * xmlSecMSCryptoKeyDataGost2001GetKlass:
+ * 
+ * The GOST2001 key data klass.
+ *
+ * Returns pointer to GOST2001 key data klass.
+ */
+xmlSecKeyDataId 
+xmlSecMSCryptoKeyDataGost2001GetKlass(void) {
+    return(&xmlSecMSCryptoKeyDataGost2001Klass);
+}
+
+
+static int
+xmlSecMSCryptoKeyDataGost2001Initialize(xmlSecKeyDataPtr data) {
+    xmlSecMSCryptoKeyDataCtxPtr ctx;
+    HCRYPTPROV tmp_ctx = 0;
+
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecMSCryptoKeyDataGost2001Id), xmlSecKeyDataTypeUnknown);
+
+    xmlSecMSCryptoKeyDataInitialize(data);
+
+    ctx = xmlSecMSCryptoKeyDataGetCtx(data);
+    xmlSecAssert2(ctx != NULL, -1);
+
+    /* GOST Algorithm is provided by several CSP's, so we try to find any installed */
+    if (CryptAcquireContext(&tmp_ctx, NULL, NULL, PROV_MAGPRO_GOST, CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) {
+      ctx->providerName = "MagPro CSP";
+      ctx->providerType = PROV_MAGPRO_GOST;
+    } else {
+      if (CryptAcquireContext(&tmp_ctx, NULL, NULL, PROV_CRYPTOPRO_GOST, CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) {
+        ctx->providerName = "CryptoPro CSP";
+        ctx->providerType = PROV_CRYPTOPRO_GOST;
+      } else {
+    	  xmlSecError(XMLSEC_ERRORS_HERE,
+		      xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
+		      "xmlSecMSCryptoKeyDataGost2001Initialize",
+		      XMLSEC_ERRORS_R_XMLSEC_FAILED,
+		      XMLSEC_ERRORS_NO_MESSAGE);
+		    return -1;
+     }
+    }
+    CryptReleaseContext(tmp_ctx, 0);
+    return(0);
+}
+
+static int
+xmlSecMSCryptoKeyDataGost2001Duplicate(xmlSecKeyDataPtr dst, xmlSecKeyDataPtr src) {
+    xmlSecAssert2(xmlSecKeyDataCheckId(dst, xmlSecMSCryptoKeyDataGost2001Id), -1);
+    xmlSecAssert2(xmlSecKeyDataCheckId(src, xmlSecMSCryptoKeyDataGost2001Id), -1);
+
+    return(xmlSecMSCryptoKeyDataDuplicate(dst, src));
+}
+
+static void
+xmlSecMSCryptoKeyDataGost2001Finalize(xmlSecKeyDataPtr data) {
+    xmlSecAssert(xmlSecKeyDataCheckId(data, xmlSecMSCryptoKeyDataGost2001Id));
+    
+    xmlSecMSCryptoKeyDataFinalize(data);
+}
+
+static xmlSecKeyDataType
+xmlSecMSCryptoKeyDataGost2001GetType(xmlSecKeyDataPtr data) {
+    return(xmlSecMSCryptoKeyDataGetType(data));
+}
+
+static xmlSecSize 
+xmlSecMSCryptoKeyDataGost2001GetSize(xmlSecKeyDataPtr data) {
+    xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecMSCryptoKeyDataGost2001Id), 0);
+
+    return xmlSecMSCryptoKeyDataGetSize(data);
+}
+
+static void 
+xmlSecMSCryptoKeyDataGost2001DebugDump(xmlSecKeyDataPtr data, FILE* output) {
+    xmlSecAssert(xmlSecKeyDataCheckId(data, xmlSecMSCryptoKeyDataGost2001Id));
+    xmlSecAssert(output != NULL);
+    
+    fprintf(output, "=== dsa key: size = %d\n", 
+	    xmlSecMSCryptoKeyDataGost2001GetSize(data));
+}
+
+static void
+xmlSecMSCryptoKeyDataGost2001DebugXmlDump(xmlSecKeyDataPtr data, FILE* output) {
+    xmlSecAssert(xmlSecKeyDataCheckId(data, xmlSecMSCryptoKeyDataGost2001Id));
+    xmlSecAssert(output != NULL);
+        
+    fprintf(output, "<GOST2001KeyValue size=\"%d\" />\n", 
+	    xmlSecMSCryptoKeyDataGost2001GetSize(data));
+}
+
+#endif /* XMLSEC_NO_GOST*/
diff --git a/src/mscrypto/ciphers.c b/src/mscrypto/ciphers.c
index f5b8f50..dea09b9 100644
--- a/src/mscrypto/ciphers.c
+++ b/src/mscrypto/ciphers.c
@@ -21,6 +21,10 @@
 
 #include <xmlsec/mscrypto/crypto.h>
 
+#if defined(__MINGW32__)
+#  include "xmlsec-mingw.h"
+#endif
+
 #ifndef MS_ENH_RSA_AES_PROV_PROTO
 #define MS_ENH_RSA_AES_PROV_PROTO "Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)"
 #endif /* MS_ENH_RSA_AES_PROV_PROTO */
@@ -252,7 +256,7 @@ xmlSecMSCryptoBlockCipherCtxUpdate(xmlSecMSCryptoBlockCipherCtxPtr ctx,
 		    xmlSecErrorsSafeString(cipherName),
 		    "CryptEn/Decrypt",
 		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
-		    "size=%d", dwCLen);
+		    "size=%ld", dwCLen);
 	return(-1);
     }
 
@@ -397,7 +401,7 @@ xmlSecMSCryptoBlockCipherCtxFinal(xmlSecMSCryptoBlockCipherCtxPtr ctx,
 		    xmlSecErrorsSafeString(cipherName),
 		    "CryptEn/Decrypt",
 		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
-		    "size=%d", dwCLen);
+		    "size=%ld", dwCLen);
 	return(-1);
     }
 
@@ -552,6 +556,22 @@ xmlSecMSCryptoBlockCipherInitialize(xmlSecTransformPtr transform) {
 
 		return(-1);
 	    }
+	} else if (dwError == NTE_BAD_KEYSET) {
+	  /* This error can indicate that a newly installed provider 
+	   * does not have a usable key container yet. It needs to be
+	   * created, and then we have to try again CryptAcquireContext.
+	   * This is also referenced in 
+	   * http://www.microsoft.com/mind/0697/crypto.asp (inituser)
+	   */
+	    if(!CryptAcquireContext(&ctx->cryptProvider, NULL, ctx->providerName,
+				    ctx->providerType, CRYPT_NEWKEYSET)) {
+	        xmlSecError(XMLSEC_ERRORS_HERE, 
+		    xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
+		    "CryptAcquireContext",
+		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
+		    XMLSEC_ERRORS_NO_MESSAGE);
+		return(-1);
+	    }
 	} else {
 	    xmlSecError(XMLSEC_ERRORS_HERE, 
 			xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
@@ -632,10 +652,7 @@ xmlSecMSCryptoBlockCipherSetKey(xmlSecTransformPtr transform, xmlSecKeyPtr key)
     xmlSecMSCryptoBlockCipherCtxPtr ctx;
     xmlSecBufferPtr buffer;
     BYTE* bufData;
-    size_t keySize;
-    HCRYPTPROV hProv = 0;
-    HCRYPTKEY hPubPrivKey = 0;
-    
+
     xmlSecAssert2(xmlSecMSCryptoBlockCipherCheckId(transform), -1);
     xmlSecAssert2((transform->operation == xmlSecTransformOperationEncrypt) || (transform->operation == xmlSecTransformOperationDecrypt), -1);
     xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecMSCryptoBlockCipherSize), -1);
@@ -1020,7 +1037,7 @@ xmlSecMSCryptoCreatePrivateExponentOneKey(HCRYPTPROV hProv, HCRYPTKEY *hPrivateK
 		    NULL,
 		    "CryptExportKey",
 		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-		    "len=%d", keyBlobLen);
+		    "len=%ld", keyBlobLen);
 	goto done;
     }
     pubKeyStruc = (PUBLICKEYSTRUC*)keyBlob;
@@ -1050,7 +1067,7 @@ xmlSecMSCryptoCreatePrivateExponentOneKey(HCRYPTPROV hProv, HCRYPTKEY *hPrivateK
 		    NULL,
 		    "CryptExportKey",
 		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-		    "rsaPubKey->magic=0x%08x", rsaPubKey->magic);
+		    "rsaPubKey->magic=0x%08lx", rsaPubKey->magic);
 	goto done;
     }
     bitLen = rsaPubKey->bitlen;
@@ -1076,7 +1093,7 @@ xmlSecMSCryptoCreatePrivateExponentOneKey(HCRYPTPROV hProv, HCRYPTKEY *hPrivateK
 		    NULL,
 		    "CryptExportKey",
 		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-		    "len=%d", keyBlobLen);
+		    "len=%ld", keyBlobLen);
 	goto done;
     }
     ptr = (BYTE*)(keyBlob + sizeof(PUBLICKEYSTRUC) + sizeof(RSAPUBKEY)); 
@@ -1208,7 +1225,7 @@ xmlSecMSCryptoImportPlainSessionBlob(HCRYPTPROV hProv, HCRYPTKEY hPrivateKey,
 		    NULL,
 		    NULL,
 		    XMLSEC_ERRORS_R_INVALID_SIZE,
-		    "dwKeyMaterial=%d;dwProvSessionKeySize=%d", 
+		    "dwKeyMaterial=%ld;dwProvSessionKeySize=%ld", 
 		    dwKeyMaterial, dwProvSessionKeySize);
 	goto done;
     }
@@ -1241,7 +1258,7 @@ xmlSecMSCryptoImportPlainSessionBlob(HCRYPTPROV hProv, HCRYPTKEY hPrivateKey,
 		    NULL,
 		    NULL,
 		    XMLSEC_ERRORS_R_INVALID_SIZE,
-		    "dwKeyMaterial=%d;dwPublicKeySize=%d", 
+		    "dwKeyMaterial=%ld;dwPublicKeySize=%ld", 
 		    dwKeyMaterial, dwPublicKeySize);
 	goto done;
     }
@@ -1281,7 +1298,7 @@ xmlSecMSCryptoImportPlainSessionBlob(HCRYPTPROV hProv, HCRYPTKEY hPrivateKey,
     /* Copy private key algorithm to buffer */
     algId		    = (ALG_ID*)(keyBlob + sizeof(PUBLICKEYSTRUC));
     (*algId)		    = dwPrivKeyAlg;
-    
+
     /* Place the key material in reverse order */
     pbPtr		    = (BYTE*)(keyBlob + sizeof(PUBLICKEYSTRUC) + sizeof(ALG_ID));
     for (n = 0; n < dwKeyMaterial; n++) {
@@ -1298,7 +1315,7 @@ xmlSecMSCryptoImportPlainSessionBlob(HCRYPTPROV hProv, HCRYPTKEY hPrivateKey,
 		    NULL,
 		    "CryptGenRandom",
 		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-		    "rndBlobSize=%d", rndBlobSize);
+		    "rndBlobSize=%ld", rndBlobSize);
 	goto done;
     }
     /* aleksey: why are we doing this? */
diff --git a/src/mscrypto/crypto.c b/src/mscrypto/crypto.c
index a8a7573..9d080db 100644
--- a/src/mscrypto/crypto.c
+++ b/src/mscrypto/crypto.c
@@ -6,6 +6,7 @@
  * 
  * Copyrigth (C) 2003 Cordys R&D BV, All rights reserved.
  * Copyright (C) 2003 Aleksey Sanin <aleksey at aleksey.com>
+ * Copyright (c) 2005-2006 Cryptocom LTD (http://www.cryptocom.ru).  
  */
 #include "globals.h"
 
@@ -23,6 +24,10 @@
 #include <xmlsec/mscrypto/crypto.h>
 #include <xmlsec/mscrypto/x509.h>
 
+#if defined(__MINGW32__)
+#  include "xmlsec-mingw.h"
+#endif
+
 static xmlSecCryptoDLFunctionsPtr gXmlSecMSCryptoFunctions = NULL;
 
 /**
@@ -69,6 +74,10 @@ xmlSecCryptoGetFunctions_mscrypto(void) {
     gXmlSecMSCryptoFunctions->keyDataDsaGetKlass 		= xmlSecMSCryptoKeyDataDsaGetKlass;
 #endif /* XMLSEC_NO_DSA */
 
+#ifndef XMLSEC_NO_GOST
+    gXmlSecMSCryptoFunctions->keyDataGost2001GetKlass 		= xmlSecMSCryptoKeyDataGost2001GetKlass;
+#endif /* XMLSEC_NO_GOST*/
+
 #ifndef XMLSEC_NO_X509
     gXmlSecMSCryptoFunctions->keyDataX509GetKlass 		= xmlSecMSCryptoKeyDataX509GetKlass;
     gXmlSecMSCryptoFunctions->keyDataRawX509CertGetKlass	= xmlSecMSCryptoKeyDataRawX509CertGetKlass;
@@ -103,10 +112,18 @@ xmlSecCryptoGetFunctions_mscrypto(void) {
     gXmlSecMSCryptoFunctions->transformDsaSha1GetKlass 		= xmlSecMSCryptoTransformDsaSha1GetKlass;
 #endif /* XMLSEC_NO_DSA */
 
+#ifndef XMLSEC_NO_GOST
+    gXmlSecMSCryptoFunctions->transformGost2001GostR3411_94GetKlass 		= xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass;
+#endif /* XMLSEC_NO_GOST */
+
 #ifndef XMLSEC_NO_SHA1    
     gXmlSecMSCryptoFunctions->transformSha1GetKlass 		= xmlSecMSCryptoTransformSha1GetKlass;
 #endif /* XMLSEC_NO_SHA1 */
 
+#ifndef XMLSEC_NO_GOST    
+    gXmlSecMSCryptoFunctions->transformGostR3411_94GetKlass 		= xmlSecMSCryptoTransformGostR3411_94GetKlass;
+#endif /* XMLSEC_NO_GOST */
+
     /**
      * High level routines form xmlsec command line utility
      */ 
@@ -330,7 +347,7 @@ xmlSecMSCryptoErrorsDefaultCallback(const char* file, int line, const char* func
 BYTE* 
 xmlSecMSCryptoCertStrToName(DWORD dwCertEncodingType, LPCTSTR pszX500, DWORD dwStrType, DWORD* len) {
     BYTE* str = NULL; 
-    LPCTSTR ppszError = NULL;
+    LPCTSTR ppszError = NULL;
 
     xmlSecAssert2(pszX500 != NULL, NULL);
     xmlSecAssert2(len != NULL, NULL);
@@ -348,7 +365,7 @@ xmlSecMSCryptoCertStrToName(DWORD dwCertEncodingType, LPCTSTR pszX500, DWORD dwS
 		    NULL,
 		    NULL,
 		    XMLSEC_ERRORS_R_MALLOC_FAILED,
-		    "len=%d", (*len));
+		    "len=%ld", (*len));
 	return(NULL);
     }
     memset(str, 0, (*len) + 1);
diff --git a/src/mscrypto/csp_calg.h b/src/mscrypto/csp_calg.h
new file mode 100755
index 0000000..139b722
--- /dev/null
+++ b/src/mscrypto/csp_calg.h
@@ -0,0 +1,92 @@
+/** 
+ * XMLSec library
+ *
+ * This is free software; see Copyright file in the source
+ * distribution for preciese wording.
+ * 
+ * Copyright (c) 2005-2006 Cryptocom LTD (http://www.cryptocom.ru).  
+ * All rights reserved.
+ */
+#ifndef CRYPTOCOM_CSP_CALG_H
+#define CRYPTOCOM_CSP_CALG_H
+
+#define ALG_TYPE_GR3410 (7 << 9)
+
+#define ALG_SID_MAGPRO_R3410_94			64
+#define ALG_SID_MAGPRO_R3410_94_EPHEM	65
+#define ALG_SID_MAGPRO_R3410_2001		66
+#define ALG_SID_MAGPRO_R3410_2001_EPHEM	67
+#define ALG_SID_MAGPRO_28147_89			68
+#define ALG_SID_GR3411					30
+#define ALG_SID_G28147					30
+
+#define ALG_SID_GR3410					30
+#define ALG_SID_DH_EX_SF				30
+#define ALG_SID_DH_EX_EPHEM				31
+#define ALG_SID_PRO_AGREEDKEY_DH		33
+#define ALG_SID_PRO_SIMMETRYKEY			34
+#define ALG_SID_GR3410EL				35
+#define ALG_SID_DH_EL_SF				36
+#define ALG_SID_DH_EL_EPHEM				37
+
+/*! \defgroup CALG_MAGPRO CALG_MAGPRO 
+ *  \brief The description of CALG_MAGPRO
+ *
+ * @{ 
+ */
+
+
+#define CALG_MAGPRO_SIGN_R3410_94       (ALG_CLASS_SIGNATURE | ALG_TYPE_GR3410 | ALG_SID_MAGPRO_R3410_94)
+
+#define CALG_MAGPRO_SIGN_R3410_2001     (ALG_CLASS_SIGNATURE | ALG_TYPE_GR3410 | ALG_SID_MAGPRO_R3410_2001)
+
+#define CALG_MAGPRO_DH_R3410_94         (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_MAGPRO_R3410_94)
+
+#define CALG_MAGPRO_DH_R3410_2001       (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_MAGPRO_R3410_2001)
+
+#define CALG_MAGPRO_DH_R3410_94_EPHEM   (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_MAGPRO_R3410_94_EPHEM)
+
+#define CALG_MAGPRO_DH_R3410_2001_EPHEM (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_MAGPRO_R3410_2001_EPHEM)
+
+#define CALG_MAGPRO_HASH_R3411_94       (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_GR3411)
+
+#define CALG_MAGPRO_HASH_28147_89       (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MAGPRO_28147_89)
+
+#define CALG_MAGPRO_ENCR_28147_89       (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_G28147)
+
+#define CALG_GR3410						(ALG_CLASS_SIGNATURE | ALG_TYPE_GR3410 | ALG_SID_GR3410)
+
+#define CALG_GR3410EL					(ALG_CLASS_SIGNATURE | ALG_TYPE_GR3410 | ALG_SID_GR3410EL)
+
+#define CALG_DH_EX_SF					(ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_DH_EX_SF)
+
+#define CALG_DH_EX_EPHEM				(ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_DH_EX_EPHEM)
+
+#define CALG_DH_EL_SF					(ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_DH_EL_SF)
+
+#define CALG_DH_EL_EPHEM				(ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_DH_EL_EPHEM)
+
+/*! @} */
+/*! \defgroup PROV_TYPE PROV_TYPE 
+ *  \brief The description of PROV_MAGPRO_GOST
+ *
+ * @{ 
+ */
+
+#define PROV_MAGPRO_GOST 501
+
+#define PROV_CRYPTOPRO_GOST 75
+
+/*! @} */
+/*! \defgroup PP_MAGPRO PP_MAGPRO 
+ *
+ * @{ 
+ */
+
+#define PP_RNGTYPE			201
+#define PP_RNGSHARED		202
+#define PP_SETUP_UI			203
+
+/*! @} */
+
+#endif //CRYPTOCOM_CSP_CALG_H
diff --git a/src/mscrypto/csp_oid.h b/src/mscrypto/csp_oid.h
new file mode 100755
index 0000000..d3cd19e
--- /dev/null
+++ b/src/mscrypto/csp_oid.h
@@ -0,0 +1,114 @@
+/** 
+ * XMLSec library
+ *
+ * This is free software; see Copyright file in the source
+ * distribution for preciese wording.
+ * 
+ * Copyright (c) 2005-2006 Cryptocom LTD (http://www.cryptocom.ru).  
+ * All rights reserved.
+ */
+#ifndef CRYPTOCOM_OIDS_csp_H
+#define CRYPTOCOM_OIDS_csp_H
+/* Autogenerated from master.oid by oid2h.tcl */
+
+/*! \defgroup szOID_MAGPRO szOID_MAGPRO 
+ *  \brief The OIDs supported by MagPro CSP
+ *
+ * @{ 
+ */
+
+/*! GOST 34.10-94 Diffie-Hellman algorithm Cryptocom LTD */
+#define szOID_MAGPRO_DH_R3410_94 "1.2.643.2.9.1.3.1"
+
+/*! GOST 34.10-2001 Diffie-Hellman algorithm Cryptocom LTD */
+#define szOID_MAGPRO_DH_R3410_2001 "1.2.643.2.9.1.3.2"
+
+/*  */
+#define szOID_MAGPRO_DH_R3410_94_EPHEM "1.2.643.2.9.1.3.1"
+
+/*  */
+#define szOID_MAGPRO_DH_R3410_2001_EPHEM "1.2.643.2.9.1.3.2"
+
+/*! GOST 34.10/11-94 digital signature algorithm Cryptocom LTD with digest */
+#define szOID_MAGPRO_SIGN_R3410_94 "1.2.643.2.9.1.3.3"
+
+/*! GOST 34.10-2001 digital signature algorithm with digest */
+#define szOID_MAGPRO_SIGN_R3410_2001 "1.2.643.2.9.1.3.4"
+
+/*! GOST 28147-89 MAC algorithm Cryptocom LTD */
+#define szOID_MAGPRO_HASH_28147_89 "1.2.643.2.9.1.4.1"
+
+#define szOID_MAGPRO_PUBKEY_DH_R3410_94 "1.2.643.2.9.1.5.1"
+
+#define szOID_MAGPRO_PUBKEY_DH_R3410_2001 "1.2.643.2.9.1.5.2"
+
+/*! GOST 34.10/11-94 digital signature algorithm Cryptocom LTD */
+#define szOID_MAGPRO_PUBKEY_SIGN_R3410_94 "1.2.643.2.9.1.5.3"
+
+/*! GOST 34.10-2001 digital signature algorithm */
+#define szOID_MAGPRO_PUBKEY_SIGN_R3410_2001 "1.2.643.2.9.1.5.4"
+
+/*! GOST 28147-89 encryption parameters */
+#define szOID_MAGPRO_PARAM_ENCR_28147_89 "1.2.643.2.9.1.6.1"
+
+/*! GOST 34.10-2001 public key parameters */
+#define szOID_MAGPRO_PARAM_PK_CC_01 "1.2.643.2.9.1.8.1"
+
+/*! GOST 28147-89 symmetric cipher Cryptocom LTD */
+#define szOID_MAGPRO_ENCR_28147_89 "1.2.643.2.2.21"
+
+/*! GOST 34.10-2001 digital signature algorithm CryptoPro LTD */
+#define szOID_MAGPRO_SIGN_R3410_2001_CP "1.2.643.2.2.3"
+
+/*! GOST 34.10/11-94 digital signature algorithm CryptoPro LTD */
+#define szOID_MAGPRO_SIGN_R3410_94_CP "1.2.643.2.2.4"
+
+/*! GOST 34.11-94 digest algorithm Cryptocom LTD */
+#define szOID_MAGPRO_HASH_R3411_94 "1.2.643.2.2.9"
+
+/*! GOST 34.10-2001 digital signature algorithm CryptoPro LTD public key */
+#define szOID_MAGPRO_PUBKEY_SIGN_R3410_2001_CP "1.2.643.2.2.19"
+
+/*! GOST 34.10/11-94 digital signature algorithm CryptoPro LTD public key */
+#define szOID_MAGPRO_PUBKEY_SIGN_R3410_94_CP "1.2.643.2.2.20"
+
+/*! GostR3411-94-CryptoProParamSet */
+#define szOID_MAGPRO_PARAM_HASH_3411_94 "1.2.643.2.2.30.1"
+
+/*! GostR3410-94-CryptoPro-A-ParamSet */
+#define szOID_MAGPRO_PARAM_PK_CC_94 "1.2.643.2.2.32.2"
+
+
+#define szOID_CP_PARAM_R3411_94_DEF "1.2.643.2.2.30.1"	
+#define szOID_CP_PARAM_R3411_94_1	"1.2.643.2.2.30.2"
+#define szOID_CP_PARAM_R3411_94_2	"1.2.643.2.2.30.3"
+#define szOID_CP_PARAM_R3411_94_3	"1.2.643.2.2.30.4"
+
+#define szOID_CP_PARAM_28147_89_DEF "1.2.643.2.2.31.1"	
+#define szOID_CP_PARAM_28147_89_1	"1.2.643.2.2.31.2"	
+#define szOID_CP_PARAM_28147_89_2	"1.2.643.2.2.31.3" 	
+#define szOID_CP_PARAM_28147_89_3	"1.2.643.2.2.31.4"	
+#define szOID_CP_PARAM_28147_89_4	"1.2.643.2.2.31.5"
+#define szOID_CP_PARAM_28147_89_5	"1.2.643.2.2.31.6"
+#define szOID_CP_PARAM_28147_89_6	"1.2.643.2.2.31.7"
+
+/* OID for Signature 1024*/
+#define szOID_CP_PARAM_PK_R3410_94_DEF  "1.2.643.2.2.32.2" 	/*VerbaO*/
+#define szOID_CP_PARAM_PK_R3410_94_S1   "1.2.643.2.2.32.3" 
+#define szOID_CP_PARAM_PK_R3410_94_S2   "1.2.643.2.2.32.4" 
+#define szOID_CP_PARAM_PK_R3410_94_S3   "1.2.643.2.2.32.5" 
+/* OID for DH 1024*/
+#define szOID_CP_PARAM_PK_R3410_94_E1   "1.2.643.2.2.33.1" 
+#define szOID_CP_PARAM_PK_R3410_94_E2   "1.2.643.2.2.33.2" 
+#define szOID_CP_PARAM_PK_R3410_94_E3   "1.2.643.2.2.33.3" 
+
+#define szOID_CP_PARAM_PK_R3410_2001_DEF "1.2.643.2.2.35.1"	
+#define szOID_CP_PARAM_PK_R3410_2001_S0	 "1.2.643.2.2.35.2"	
+#define szOID_CP_PARAM_PK_R3410_2001_S1	 "1.2.643.2.2.35.3"	
+#define szOID_CP_PARAM_PK_R3410_2001_E0	 "1.2.643.2.2.36.0"	
+#define szOID_CP_PARAM_PK_R3410_2001_E1	 "1.2.643.2.2.36.1"	
+
+
+/*! @} */
+
+#endif
diff --git a/src/mscrypto/digests.c b/src/mscrypto/digests.c
index f636810..1a0b0c9 100644
--- a/src/mscrypto/digests.c
+++ b/src/mscrypto/digests.c
@@ -5,12 +5,16 @@
  * distribution for preciese wording.
  * 
  * Copyrigth (C) 2003 Cordys R&D BV, All rights reserved.
+ * Copyright (c) 2005-2006 Cryptocom LTD (http://www.cryptocom.ru).  
  */
 #include "globals.h"
 
 #include <string.h>
 #include <windows.h>
 #include <wincrypt.h>
+#ifndef XMLSEC_NO_GOST
+#include "csp_calg.h"
+#endif
 
 #include <xmlsec/xmlsec.h>
 #include <xmlsec/keys.h>
@@ -63,6 +67,12 @@ xmlSecMSCryptoDigestCheckId(xmlSecTransformPtr transform) {
     }
 #endif /* XMLSEC_NO_SHA1 */    
     
+#ifndef XMLSEC_NO_GOST
+    if(xmlSecTransformCheckId(transform, xmlSecMSCryptoTransformGostR3411_94Id)) {
+	return(1);
+    }
+#endif /* XMLSEC_NO_GOST*/    
+    
     return(0);
 }
 
@@ -85,6 +95,25 @@ xmlSecMSCryptoDigestInitialize(xmlSecTransformPtr transform) {
     } else 
 #endif /* XMLSEC_NO_SHA1 */    
 
+#ifndef XMLSEC_NO_GOST
+    if(xmlSecTransformCheckId(transform, xmlSecMSCryptoTransformGostR3411_94Id)) {
+		ctx->alg_id = CALG_MAGPRO_HASH_R3411_94;
+
+    /* TODO: Check what provider is best suited here.... */
+    if (!CryptAcquireContext(&ctx->provider, NULL, 0, PROV_MAGPRO_GOST, CRYPT_VERIFYCONTEXT)) {
+      if (!CryptAcquireContext(&ctx->provider, NULL, 0, PROV_CRYPTOPRO_GOST, CRYPT_VERIFYCONTEXT)) {
+	xmlSecError(XMLSEC_ERRORS_HERE, 
+		    xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
+		    NULL,
+		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
+		    XMLSEC_ERRORS_NO_MESSAGE);
+	return(-1);
+    }
+    }
+    return(0);
+    } else 
+#endif /* XMLSEC_NO_GOST*/    
+
     {
 	xmlSecError(XMLSEC_ERRORS_HERE, 
 		    xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
@@ -96,12 +125,14 @@ xmlSecMSCryptoDigestInitialize(xmlSecTransformPtr transform) {
 
     /* TODO: Check what provider is best suited here.... */
     if (!CryptAcquireContext(&ctx->provider, NULL, MS_STRONG_PROV, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
-	xmlSecError(XMLSEC_ERRORS_HERE, 
+    	if (!CryptAcquireContext(&ctx->provider, NULL, MS_ENHANCED_PROV,PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
+		xmlSecError(XMLSEC_ERRORS_HERE, 
 		    xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
 		    NULL,
 		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
 		    XMLSEC_ERRORS_NO_MESSAGE);
-	return(-1);
+		return(-1);
+	}
     }
 
     return(0);
@@ -336,3 +367,47 @@ xmlSecMSCryptoTransformSha1GetKlass(void) {
 }
 #endif /* XMLSEC_NO_SHA1 */
 
+#ifndef XMLSEC_NO_GOST
+/******************************************************************************
+ *
+ * GOSTR3411_94
+ *
+ *****************************************************************************/
+static xmlSecTransformKlass xmlSecMSCryptoGostR3411_94Klass = {
+    /* klass/object sizes */
+    sizeof(xmlSecTransformKlass),		/* size_t klassSize */
+    xmlSecMSCryptoDigestSize,			/* size_t objSize */
+
+    xmlSecNameGostR3411_94,				/* const xmlChar* name; */
+    xmlSecHrefGostR3411_94, 				/* const xmlChar* href; */
+    xmlSecTransformUsageDigestMethod,		/* xmlSecTransformUsage usage; */
+    xmlSecMSCryptoDigestInitialize,		/* xmlSecTransformInitializeMethod initialize; */
+    xmlSecMSCryptoDigestFinalize,		/* xmlSecTransformFinalizeMethod finalize; */
+    NULL,					/* xmlSecTransformNodeReadMethod readNode; */
+    NULL,					/* xmlSecTransformNodeWriteMethod writeNode; */
+    NULL,					/* xmlSecTransformSetKeyReqMethod setKeyReq; */
+    NULL,					/* xmlSecTransformSetKeyMethod setKey; */
+    xmlSecMSCryptoDigestVerify,			/* xmlSecTransformVerifyMethod verify; */
+    xmlSecTransformDefaultGetDataType,		/* xmlSecTransformGetDataTypeMethod getDataType; */
+    xmlSecTransformDefaultPushBin,		/* xmlSecTransformPushBinMethod pushBin; */
+    xmlSecTransformDefaultPopBin,		/* xmlSecTransformPopBinMethod popBin; */
+    NULL,					/* xmlSecTransformPushXmlMethod pushXml; */
+    NULL,					/* xmlSecTransformPopXmlMethod popXml; */
+    xmlSecMSCryptoDigestExecute,		/* xmlSecTransformExecuteMethod execute; */    
+    NULL,					/* void* reserved0; */
+    NULL,					/* void* reserved1; */
+};
+
+/** 
+ * xmlSecMSCryptoTransformGostR3411_94GetKlass:
+ *
+ * GOSTR3411_94 digest transform klass.
+ *
+ * Returns pointer to GOSTR3411_94 digest transform klass.
+ */
+xmlSecTransformId 
+xmlSecMSCryptoTransformGostR3411_94GetKlass(void) {
+    return(&xmlSecMSCryptoGostR3411_94Klass);
+}
+#endif /* XMLSEC_NO_GOST*/
+
diff --git a/src/mscrypto/keysstore.c b/src/mscrypto/keysstore.c
index cf57de7..0690a1c 100644
--- a/src/mscrypto/keysstore.c
+++ b/src/mscrypto/keysstore.c
@@ -39,6 +39,10 @@
 #include <xmlsec/mscrypto/x509.h>
 #include <xmlsec/mscrypto/certkeys.h>
 
+#if defined(__MINGW32__)
+#  include "xmlsec-mingw.h"
+#endif
+
 #define XMLSEC_MSCRYPTO_APP_DEFAULT_CERT_STORE_NAME	"MY"
 
 /****************************************************************************
@@ -304,7 +308,6 @@ xmlSecMSCryptoKeysStoreFindCert(xmlSecKeyStorePtr store, const xmlChar* name,
     const char* storeName;
     HCERTSTORE hStoreHandle = NULL;
     PCCERT_CONTEXT pCertContext = NULL;
-    int ret;
 
     xmlSecAssert2(xmlSecKeyStoreCheckId(store, xmlSecMSCryptoKeysStoreId), NULL);
     xmlSecAssert2(name != NULL, NULL);
@@ -314,7 +317,7 @@ xmlSecMSCryptoKeysStoreFindCert(xmlSecKeyStorePtr store, const xmlChar* name,
     if(storeName == NULL) {
 	storeName = XMLSEC_MSCRYPTO_APP_DEFAULT_CERT_STORE_NAME;
     }
-	    
+
     hStoreHandle = CertOpenSystemStore(0, storeName);
     if (NULL == hStoreHandle) {
 	xmlSecError(XMLSEC_ERRORS_HERE,
@@ -406,7 +409,68 @@ xmlSecMSCryptoKeysStoreFindCert(xmlSecKeyStorePtr store, const xmlChar* name,
 				NULL);
 	    xmlFree(bdata);
 	}
-    }   
+    }
+
+    /*
+     * Try ro find certificate with name="Friendly Name"
+     */
+    if (NULL == pCertContext) {
+      DWORD dwPropSize;
+      PBYTE pbFriendlyName;
+      PCCERT_CONTEXT pCertCtxIter = NULL;
+      size_t len = xmlStrlen(name) + 1;     
+      wchar_t * lpFName;
+	
+      lpFName = (wchar_t *)xmlMalloc(sizeof(wchar_t) * len);
+      if(lpFName == NULL) {
+	    xmlSecError(XMLSEC_ERRORS_HERE,
+			xmlSecErrorsSafeString(xmlSecKeyStoreGetName(store)),
+			NULL,
+			XMLSEC_ERRORS_R_MALLOC_FAILED,
+		    	XMLSEC_ERRORS_NO_MESSAGE);
+	    CertCloseStore(hStoreHandle, 0);
+	    return(NULL);
+      }
+      MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, name, -1, lpFName, len);
+      
+      while (pCertCtxIter = CertEnumCertificatesInStore(hStoreHandle, pCertCtxIter)) {
+	if (TRUE != CertGetCertificateContextProperty(pCertCtxIter,
+						      CERT_FRIENDLY_NAME_PROP_ID,
+						      NULL,
+						      &dwPropSize)) {
+	  continue;
+	}
+
+	pbFriendlyName = xmlMalloc(dwPropSize);
+	if(pbFriendlyName == NULL) {
+	    xmlSecError(XMLSEC_ERRORS_HERE,
+			xmlSecErrorsSafeString(xmlSecKeyStoreGetName(store)),
+			NULL,
+			XMLSEC_ERRORS_R_MALLOC_FAILED,
+		    	XMLSEC_ERRORS_NO_MESSAGE);
+	    xmlFree(lpFName);
+	    CertCloseStore(hStoreHandle, 0);
+	    return(NULL);
+	}
+	if (TRUE != CertGetCertificateContextProperty(pCertCtxIter,
+						      CERT_FRIENDLY_NAME_PROP_ID,
+						      pbFriendlyName,
+						      &dwPropSize)) {
+	  xmlFree(pbFriendlyName);
+	  continue;
+	}
+
+	/* Compare FriendlyName to name */
+	if (!wcscmp(lpFName, (const wchar_t *)pbFriendlyName)) {
+	  pCertContext = pCertCtxIter;
+	  xmlFree(pbFriendlyName);
+	  break;
+	}
+	xmlFree(pbFriendlyName);
+      }
+
+      xmlFree(lpFName);
+    }
 
     /* We could do the following here: 
      * It would be nice if we could locate the cert with issuer name and
diff --git a/src/mscrypto/kt_rsa.c b/src/mscrypto/kt_rsa.c
index c4f0499..d66f94c 100644
--- a/src/mscrypto/kt_rsa.c
+++ b/src/mscrypto/kt_rsa.c
@@ -239,7 +239,6 @@ xmlSecMSCryptoRsaPkcs1Process(xmlSecTransformPtr transform, xmlSecTransformCtxPt
     xmlSecSize inSize, outSize;
     xmlSecSize keySize;
     int ret;
-    unsigned int outlen;
     HCRYPTKEY hKey = 0;
     DWORD dwInLen;
     DWORD dwBufLen;
@@ -364,7 +363,7 @@ xmlSecMSCryptoRsaPkcs1Process(xmlSecTransformPtr transform, xmlSecTransformCtxPt
 	    outBuf[i] = inBuf[inSize - (i + 1)];
 	}
 
-	if (0 == (hKey = xmlSecMSCryptoKeyDataGetKey(ctx->data, xmlSecKeyDataTypePrivate))) {
+	if (0 == (hKey = xmlSecMSCryptoKeyDataGetDecryptKey(ctx->data))) {
 	    xmlSecError(XMLSEC_ERRORS_HERE,
                         NULL,
                         "xmlSecMSCryptoKeyDataGetKey",
diff --git a/src/mscrypto/mingw-crypt32.def b/src/mscrypto/mingw-crypt32.def
new file mode 100644
index 0000000..0857d55
--- /dev/null
+++ b/src/mscrypto/mingw-crypt32.def
@@ -0,0 +1,32 @@
+IMPORTS
+  CertAddCertificateContextToStore at 16		= crypt32.CertAddCertificateContextToStore
+  CertAddCRLContextToStore at 16			= crypt32.CertAddCRLContextToStore
+  CertAddStoreToCollection at 16			= crypt32.CertAddStoreToCollection
+  CertCloseStore at 8				= crypt32.CertCloseStore
+  CertCompareCertificateName at 12			= crypt32.CertCompareCertificateName
+  CertCreateCertificateContext at 12		= crypt32.CertCreateCertificateContext
+  CertCreateCRLContext at 12			= crypt32.CertCreateCRLContext
+  CertDuplicateCertificateContext at 4		= crypt32.CertDuplicateCertificateContext
+  CertDuplicateCRLContext at 4			= crypt32.CertDuplicateCRLContext
+  CertEnumCertificatesInStore at 8			= crypt32.CertEnumCertificatesInStore
+  CertEnumCRLsInStore at 8				= crypt32.CertEnumCRLsInStore
+  CertFindCertificateInCRL at 20			= crypt32.CertFindCertificateInCRL
+  CertFindCertificateInStore at 24			= crypt32.CertFindCertificateInStore
+  CertFindExtension at 12				= crypt32.CertFindExtension
+  CertFreeCertificateChain at 4			= crypt32.CertFreeCertificateChain
+  CertFreeCertificateContext at 4			= crypt32.CertFreeCertificateContext
+  CertFreeCRLContext at 4				= crypt32.CertFreeCRLContext
+  CertGetCertificateChain at 32			= crypt32.CertGetCertificateChain
+  CertGetCertificateContextProperty at 16		= crypt32.CertGetCertificateContextProperty
+  CertGetNameStringA at 24				= crypt32.CertGetNameStringA
+  CertGetPublicKeyLength at 8			= crypt32.CertGetPublicKeyLength
+  CertNameToStrA at 20				= crypt32.CertNameToStrA
+  CertOpenStore at 20				= crypt32.CertOpenStore
+  CertOpenSystemStoreA at 8			= crypt32.CertOpenSystemStoreA
+  CertStrToNameA at 28				= crypt32.CertStrToNameA
+  CertVerifySubjectCertificateContext at 12	= crypt32.CertVerifySubjectCertificateContext
+  CryptAcquireCertificatePrivateKey at 24		= crypt32.CryptAcquireCertificatePrivateKey
+  CryptImportPublicKeyInfo at 16			= crypt32.CryptImportPublicKeyInfo
+  PFXImportCertStore at 12				= crypt32.PFXImportCertStore
+  PFXIsPFXBlob at 4				= crypt32.PFXIsPFXBlob
+  PFXVerifyPassword at 12				= crypt32.PFXVerifyPassword
diff --git a/src/mscrypto/signatures.c b/src/mscrypto/signatures.c
index 71486b3..1ab0358 100644
--- a/src/mscrypto/signatures.c
+++ b/src/mscrypto/signatures.c
@@ -6,6 +6,7 @@
  * 
  * Copyrigth (C) 2003 Cordys R&D BV, All rights reserved.
  * Copyright (C) 2003 Aleksey Sanin <aleksey at aleksey.com>
+ * Copyright (c) 2005-2006 Cryptocom LTD (http://www.cryptocom.ru).  
  */
 #include "globals.h"
 
@@ -13,6 +14,9 @@
 
 #include <windows.h>
 #include <wincrypt.h>
+#ifndef XMLSEC_NO_GOST
+#include "csp_calg.h"
+#endif
 
 #include <xmlsec/xmlsec.h>
 #include <xmlsec/keys.h>
@@ -22,6 +26,15 @@
 #include <xmlsec/mscrypto/crypto.h>
 #include <xmlsec/mscrypto/symbols.h>
 #include <xmlsec/mscrypto/certkeys.h>
+#include <xmlsec/mscrypto/x509.h>
+
+/*FIXME: include header files*/
+extern HCRYPTPROV xmlSecMSCryptoKeyDataGetMSCryptoProvider(xmlSecKeyDataPtr data);
+extern DWORD xmlSecMSCryptoKeyDataGetMSCryptoKeySpec(xmlSecKeyDataPtr data);
+
+#if defined(__MINGW32__)
+#  include "xmlsec-mingw.h"
+#endif
 
 /**************************************************************************
  *
@@ -53,7 +66,7 @@ struct _xmlSecMSCryptoSignatureCtx {
 static int	xmlSecMSCryptoSignatureCheckId		(xmlSecTransformPtr transform);
 static int	xmlSecMSCryptoSignatureInitialize	(xmlSecTransformPtr transform);
 static void	xmlSecMSCryptoSignatureFinalize		(xmlSecTransformPtr transform);
-static int	xmlSecMSCryptopSignatureSetKeyReq	(xmlSecTransformPtr transform, 
+static int	xmlSecMSCryptoSignatureSetKeyReq	(xmlSecTransformPtr transform, 
 							 xmlSecKeyReqPtr keyReq);
 static int	xmlSecMSCryptoSignatureSetKey		(xmlSecTransformPtr transform,
 							 xmlSecKeyPtr key);
@@ -74,6 +87,12 @@ static int xmlSecMSCryptoSignatureCheckId(xmlSecTransformPtr transform) {
     }
 #endif /* XMLSEC_NO_DSA */
 
+#ifndef XMLSEC_NO_GOST
+    if(xmlSecTransformCheckId(transform, xmlSecMSCryptoTransformGost2001GostR3411_94Id)) {
+	return(1);
+    }
+#endif /* XMLSEC_NO_GOST*/
+
 #ifndef XMLSEC_NO_RSA
     if(xmlSecTransformCheckId(transform, xmlSecMSCryptoTransformRsaSha1Id)) {
 	return(1);
@@ -101,6 +120,13 @@ static int xmlSecMSCryptoSignatureInitialize(xmlSecTransformPtr transform) {
     } else 
 #endif /* XMLSEC_NO_RSA */
 
+#ifndef XMLSEC_NO_GOST
+    if(xmlSecTransformCheckId(transform, xmlSecMSCryptoTransformGost2001GostR3411_94Id)) {
+	ctx->digestAlgId    = CALG_MAGPRO_HASH_R3411_94;
+	ctx->keyId	    = xmlSecMSCryptoKeyDataGost2001Id;
+    } else 
+#endif /* XMLSEC_NO_GOST*/
+
 #ifndef XMLSEC_NO_DSA
     if(xmlSecTransformCheckId(transform, xmlSecMSCryptoTransformDsaSha1Id)) {
 	ctx->digestAlgId    = CALG_SHA1;
@@ -144,7 +170,6 @@ static void xmlSecMSCryptoSignatureFinalize(xmlSecTransformPtr transform) {
 static int xmlSecMSCryptoSignatureSetKey(xmlSecTransformPtr transform, xmlSecKeyPtr key) {
     xmlSecMSCryptoSignatureCtxPtr ctx;
     xmlSecKeyDataPtr value;
-    PCCERT_CONTEXT pCert;
 
     xmlSecAssert2(xmlSecMSCryptoSignatureCheckId(transform), -1);
     xmlSecAssert2((transform->operation == xmlSecTransformOperationSign) || (transform->operation == xmlSecTransformOperationVerify), -1);
@@ -243,6 +268,14 @@ static int xmlSecMSCryptoSignatureVerify(xmlSecTransformPtr transform,
     	    *l-- = *j++;
 	    *m-- = *k++;
 	}
+#ifndef XMLSEC_NO_GOST
+    } else if (xmlSecTransformCheckId(transform, xmlSecMSCryptoTransformGost2001GostR3411_94Id)) {
+	j = (BYTE *)data;
+	l = tmpBuf + dataSize - 1;
+	while (l >= tmpBuf) {
+	    *l-- = *j++;
+	}
+#endif /*ndef XMLSEC_NO_GOST*/
     } else if (xmlSecTransformCheckId(transform, xmlSecMSCryptoTransformRsaSha1Id)) {
 	j = (BYTE *)data;
 	l = tmpBuf + dataSize - 1;
@@ -304,7 +337,6 @@ static int
 xmlSecMSCryptoSignatureExecute(xmlSecTransformPtr transform, int last, xmlSecTransformCtxPtr transformCtx) {
     xmlSecMSCryptoSignatureCtxPtr ctx;
     HCRYPTPROV hProv;
-    HCRYPTKEY hKey;
     DWORD dwKeySpec;
     xmlSecBufferPtr in, out;
     xmlSecSize inSize, outSize;
@@ -439,6 +471,15 @@ xmlSecMSCryptoSignatureExecute(xmlSecTransformPtr transform, int last, xmlSecTra
 		    *m-- = *i++;
 		    *n-- = *j++;
 		}
+#ifndef XMLSEC_NO_GOST
+    } else if (xmlSecTransformCheckId(transform, xmlSecMSCryptoTransformGost2001GostR3411_94Id)) {
+		i = tmpBuf;
+		j = outBuf + dwSigLen - 1;
+
+		while (j >= outBuf) {
+		    *j-- = *i++;
+		}
+#endif /*ndef XMLSEC_NO_GOST*/
 	    } else if (xmlSecTransformCheckId(transform, xmlSecMSCryptoTransformRsaSha1Id)) {
 		i = tmpBuf;
 		j = outBuf + dwSigLen - 1;
@@ -572,3 +613,51 @@ xmlSecMSCryptoTransformDsaSha1GetKlass(void) {
 
 #endif /* XMLSEC_NO_DSA */
 
+#ifndef XMLSEC_NO_GOST
+/****************************************************************************
+ *
+ * GOST2001-GOSTR3411_94 signature transform
+ *
+ ***************************************************************************/
+
+static xmlSecTransformKlass xmlSecMSCryptoGost2001GostR3411_94Klass = {
+    /* klass/object sizes */
+    sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
+    xmlSecMSCryptoSignatureSize,	        /* xmlSecSize objSize */
+
+    xmlSecNameGost2001GostR3411_94,				/* const xmlChar* name; */
+    xmlSecHrefGost2001GostR3411_94, 				/* const xmlChar* href; */
+    xmlSecTransformUsageSignatureMethod,	/* xmlSecTransformUsage usage; */
+    
+    xmlSecMSCryptoSignatureInitialize,	        /* xmlSecTransformInitializeMethod initialize; */
+    xmlSecMSCryptoSignatureFinalize,		/* xmlSecTransformFinalizeMethod finalize; */
+    NULL,					/* xmlSecTransformNodeReadMethod readNode; */
+    NULL,					/* xmlSecTransformNodeWriteMethod writeNode; */
+    xmlSecMSCryptoSignatureSetKeyReq,		/* xmlSecTransformSetKeyReqMethod setKeyReq; */
+    xmlSecMSCryptoSignatureSetKey,		/* xmlSecTransformSetKeyMethod setKey; */
+    xmlSecMSCryptoSignatureVerify,		/* xmlSecTransformVerifyMethod verify; */
+    xmlSecTransformDefaultGetDataType,		/* xmlSecTransformGetDataTypeMethod getDataType; */
+    xmlSecTransformDefaultPushBin,		/* xmlSecTransformPushBinMethod pushBin; */
+    xmlSecTransformDefaultPopBin,		/* xmlSecTransformPopBinMethod popBin; */
+    NULL,					/* xmlSecTransformPushXmlMethod pushXml; */
+    NULL,					/* xmlSecTransformPopXmlMethod popXml; */
+    xmlSecMSCryptoSignatureExecute,		/* xmlSecTransformExecuteMethod execute; */
+    
+    NULL,					/* void* reserved0; */
+    NULL,					/* void* reserved1; */
+};
+
+/**
+ * xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass:
+ * 
+ * The GOST2001-GOSTR3411_94 signature transform klass.
+ *
+ * Returns GOST2001-GOSTR3411_94 signature transform klass.
+ */
+xmlSecTransformId 
+xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass(void) {
+    return(&xmlSecMSCryptoGost2001GostR3411_94Klass);
+}
+
+#endif /* XMLSEC_NO_GOST*/
+
diff --git a/src/mscrypto/x509.c b/src/mscrypto/x509.c
index 4807f37..c7dc4ba 100644
--- a/src/mscrypto/x509.c
+++ b/src/mscrypto/x509.c
@@ -41,6 +41,10 @@
 #include <xmlsec/mscrypto/x509.h>
 #include <xmlsec/mscrypto/certkeys.h>
 
+#if defined(__MINGW32__)
+#  include "xmlsec-mingw.h"
+#endif
+
 
 /*************************************************************************
  *
@@ -84,7 +88,6 @@ static int		xmlSecMSCryptoKeyDataX509VerifyAndExtractKey(xmlSecKeyDataPtr data,
 								xmlSecKeyPtr key,
 								xmlSecKeyInfoCtxPtr keyInfoCtx);
 
-static xmlSecKeyDataPtr	xmlSecMSCryptoX509CertGetKey		(PCCERT_CONTEXT cert);
 static PCCERT_CONTEXT	xmlSecMSCryptoX509CertDerRead		(const xmlSecByte* buf, 
 								 xmlSecSize size);
 static PCCERT_CONTEXT	xmlSecMSCryptoX509CertBase64DerRead	(xmlChar* buf);
@@ -367,6 +370,7 @@ xmlSecMSCryptoKeyDataX509AdoptCert(xmlSecKeyDataPtr data, PCCERT_CONTEXT cert) {
 		    XMLSEC_ERRORS_NO_MESSAGE);
 	return(-1);	
     }
+    CertFreeCertificateContext(cert);
     ctx->numCerts++;
       
     return(0);
@@ -1161,7 +1165,7 @@ xmlSecMSCryptoX509SubjectNameNodeWrite(PCCERT_CONTEXT cert, xmlNodePtr node, xml
 	xmlFree(buf);
 	return(-1);
     }
-    xmlNodeSetContent(cur, buf);
+    xmlSecNodeEncodeAndSetContent(cur, buf);
     xmlFree(buf);
     return(0);
 }
@@ -1263,9 +1267,6 @@ xmlSecMSCryptoX509IssuerSerialNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, x
 
     cert = xmlSecMSCryptoX509StoreFindCert(x509Store, NULL, issuerName, issuerSerial, NULL, keyInfoCtx);
     if(cert == NULL){
-	xmlFree(issuerSerial);
-	xmlFree(issuerName);
-
 	if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT) != 0) {
 	    xmlSecError(XMLSEC_ERRORS_HERE,
 			xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
@@ -1274,8 +1275,13 @@ xmlSecMSCryptoX509IssuerSerialNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, x
 			"issuerName=%s;issuerSerial=%s",
 			xmlSecErrorsSafeString(issuerName), 
 			xmlSecErrorsSafeString(issuerSerial));
+	    xmlFree(issuerSerial);
+	    xmlFree(issuerName);
 	    return(-1);
 	}
+
+	xmlFree(issuerSerial);
+	xmlFree(issuerName);
 	return(0);    
     }
 
@@ -1354,7 +1360,7 @@ xmlSecMSCryptoX509IssuerSerialNodeWrite(PCCERT_CONTEXT cert,
 		    XMLSEC_ERRORS_NO_MESSAGE);
 	return(-1);
     }
-    xmlNodeSetContent(issuerNameNode, buf);
+    xmlSecNodeEncodeAndSetContent(issuerNameNode, buf);
     xmlFree(buf);
 
     ret = xmlSecMSCryptoASN1IntegerWrite(issuerNumberNode, &(cert->pCertInfo->SerialNumber));
@@ -1469,7 +1475,7 @@ xmlSecMSCryptoX509SKINodeWrite(PCCERT_CONTEXT cert, xmlNodePtr node, xmlSecKeyIn
 	xmlFree(buf);
 	return(-1);
     }
-    xmlNodeSetContent(cur, buf);
+    xmlSecNodeEncodeAndSetContent(cur, buf);
     xmlFree(buf);
 
     return(0);
@@ -1610,44 +1616,44 @@ xmlSecMSCryptoKeyDataX509VerifyAndExtractKey(xmlSecKeyDataPtr data, xmlSecKeyPtr
 			        XMLSEC_ERRORS_NO_MESSAGE);
 		    return(-1);
 	    }
-
-		/* search key according to KeyReq */
-		pCert = CertDuplicateCertificateContext( ctx->keyCert ) ;
-		if( pCert == NULL ) {
-			xmlSecError( XMLSEC_ERRORS_HERE,
-		    	xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
-				"CertDuplicateCertificateContext",
-				XMLSEC_ERRORS_R_CRYPTO_FAILED,
-				XMLSEC_ERRORS_NO_MESSAGE);
-
-			return(-1);
-		}
-
-		if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePrivate ) == xmlSecKeyDataTypePrivate ) {
-			keyValue = xmlSecMSCryptoCertAdopt( pCert, xmlSecKeyDataTypePrivate ) ;
-			if(keyValue == NULL) {
-				xmlSecError(XMLSEC_ERRORS_HERE,
-						xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
-						"xmlSecMSCryptoCertAdopt",
-						XMLSEC_ERRORS_R_XMLSEC_FAILED,
-						XMLSEC_ERRORS_NO_MESSAGE);
-				CertFreeCertificateContext( pCert ) ;
-				return(-1);
-			}
-			pCert = NULL ;
-		} else if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePublic ) == xmlSecKeyDataTypePublic ) {
-			keyValue = xmlSecMSCryptoCertAdopt( pCert, xmlSecKeyDataTypePublic ) ;
-			if(keyValue == NULL) {
-				xmlSecError(XMLSEC_ERRORS_HERE,
-						xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
-						"xmlSecMSCryptoCertAdopt",
-						XMLSEC_ERRORS_R_XMLSEC_FAILED,
-						XMLSEC_ERRORS_NO_MESSAGE);
-				CertFreeCertificateContext( pCert ) ;
-				return(-1);
-			}
-			pCert = NULL ;
-		}
+
+		/* search key according to KeyReq */
+		pCert = CertDuplicateCertificateContext( ctx->keyCert ) ;
+		if( pCert == NULL ) {
+			xmlSecError( XMLSEC_ERRORS_HERE,
+		    	xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
+				"CertDuplicateCertificateContext",
+				XMLSEC_ERRORS_R_CRYPTO_FAILED,
+				XMLSEC_ERRORS_NO_MESSAGE);
+
+			return(-1);
+		}
+
+		if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePrivate ) == xmlSecKeyDataTypePrivate ) {
+			keyValue = xmlSecMSCryptoCertAdopt( pCert, xmlSecKeyDataTypePrivate ) ;
+			if(keyValue == NULL) {
+				xmlSecError(XMLSEC_ERRORS_HERE,
+						xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
+						"xmlSecMSCryptoCertAdopt",
+						XMLSEC_ERRORS_R_XMLSEC_FAILED,
+						XMLSEC_ERRORS_NO_MESSAGE);
+				CertFreeCertificateContext( pCert ) ;
+				return(-1);
+			}
+			pCert = NULL ;
+		} else if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePublic ) == xmlSecKeyDataTypePublic ) {
+			keyValue = xmlSecMSCryptoCertAdopt( pCert, xmlSecKeyDataTypePublic ) ;
+			if(keyValue == NULL) {
+				xmlSecError(XMLSEC_ERRORS_HERE,
+						xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
+						"xmlSecMSCryptoCertAdopt",
+						XMLSEC_ERRORS_R_XMLSEC_FAILED,
+						XMLSEC_ERRORS_NO_MESSAGE);
+				CertFreeCertificateContext( pCert ) ;
+				return(-1);
+			}
+			pCert = NULL ;
+		}
 
 	    /* verify that the key matches our expectations */
 	    if(xmlSecKeyReqMatchKeyValue(&(keyInfoCtx->keyReq), keyValue) != 1) {
@@ -1712,44 +1718,17 @@ xmlSecMSCryptoX509CertGetTime(FILETIME t, time_t* res) {
     result = (result) << 32;
     result |= t.dwLowDateTime;
     result /= 10000;    /* Convert from 100 nano-sec periods to seconds. */
+#if defined(__MINGW32__)
+    result -= 11644473600000ULL;  /* Convert from Windows epoch to Unix epoch */
+#else
     result -= 11644473600000;  /* Convert from Windows epoch to Unix epoch */
+#endif
 
     (*res) = (time_t)result;
 
     return(0);
 }
 
-static xmlSecKeyDataPtr	
-xmlSecMSCryptoX509CertGetKey(PCCERT_CONTEXT cert) {
-    xmlSecKeyDataPtr data;
-    PCCERT_CONTEXT pCert = NULL;
-
-    xmlSecAssert2(cert != NULL, NULL);
-
-    pCert = CertDuplicateCertificateContext(cert);
-    if(pCert == NULL) {
-	xmlSecError(XMLSEC_ERRORS_HERE,
-		    NULL,
-		    "CertDuplicateCertificateContext",
-		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-		    XMLSEC_ERRORS_NO_MESSAGE);
-	return(NULL);
-    }    
-
-    data = xmlSecMSCryptoCertAdopt(pCert, xmlSecKeyDataTypePublic);
-    if(data == NULL) {
-	xmlSecError(XMLSEC_ERRORS_HERE,
-		    NULL,
-		    "xmlSecMSCryptoCertAdopt",
-		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
-		    XMLSEC_ERRORS_NO_MESSAGE);
-	CertFreeCertificateContext(pCert);
-	return(NULL);	    
-    }    
-
-    return(data);
-}
-
 static PCCERT_CONTEXT
 xmlSecMSCryptoX509CertBase64DerRead(xmlChar* buf) {
     int ret;
@@ -1967,44 +1946,13 @@ xmlSecMSCryptoX509NameWrite(PCERT_NAME_BLOB nm) {
     return(res);
 }
 
-static BOOL 
-IsHexDigit(char c) {
-    switch (c) {
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	case '0':
-	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	    return TRUE;
-	    break;
-	default:
-	    return FALSE;
-    }
-}
+
 
 static int
 xmlSecMSCryptoASN1IntegerWrite(xmlNodePtr node, PCRYPT_INTEGER_BLOB num) {
     xmlSecBn bn;
-    xmlChar* res;
     int ret;
-    
+
     xmlSecAssert2(node != NULL, -1);
     xmlSecAssert2(num != NULL, -1);
 
@@ -2014,7 +1962,7 @@ xmlSecMSCryptoASN1IntegerWrite(xmlNodePtr node, PCRYPT_INTEGER_BLOB num) {
 		    NULL,
 		    "xmlSecBnInitialize",
 		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
-		    "size=%d", num->cbData + 1);
+		    "size=%ld", num->cbData + 1);
 	return(-1);
     }
 
@@ -2051,7 +1999,6 @@ xmlSecMSCryptoASN1IntegerWrite(xmlNodePtr node, PCRYPT_INTEGER_BLOB num) {
 static xmlChar*
 xmlSecMSCryptoX509SKIWrite(PCCERT_CONTEXT cert) {
     xmlChar *res = NULL;
-    DWORD id = 0;
     DWORD dwSize;
     BYTE *bSKI = NULL;
     PCERT_EXTENSION pCertExt;
diff --git a/src/mscrypto/x509vfy.c b/src/mscrypto/x509vfy.c
index 40babda..673bb9e 100644
--- a/src/mscrypto/x509vfy.c
+++ b/src/mscrypto/x509vfy.c
@@ -34,17 +34,22 @@
 #include <xmlsec/mscrypto/crypto.h>
 #include <xmlsec/mscrypto/x509.h>
 
+#if defined(__MINGW32__)
+#  include "xmlsec-mingw.h"
+#endif
+
 /**************************************************************************
  *
  * Internal MSCRYPTO X509 store CTX
  *
  *************************************************************************/
-typedef struct _xmlSecMSCryptoX509StoreCtx	xmlSecMSCryptoX509StoreCtx, 
-						*xmlSecMSCryptoX509StoreCtxPtr;
+typedef struct _xmlSecMSCryptoX509StoreCtx    xmlSecMSCryptoX509StoreCtx, 
+                        *xmlSecMSCryptoX509StoreCtxPtr;
 struct _xmlSecMSCryptoX509StoreCtx {
     HCERTSTORE trusted;
     HCERTSTORE untrusted;
-};	    
+    int        dont_use_system_trusted_certs;
+};        
 
 /****************************************************************************
  *
@@ -55,42 +60,34 @@ struct _xmlSecMSCryptoX509StoreCtx {
  ***************************************************************************/
 #define xmlSecMSCryptoX509StoreGetCtx(store) \
     ((xmlSecMSCryptoX509StoreCtxPtr)(((xmlSecByte*)(store)) + \
-				    sizeof(xmlSecKeyDataStoreKlass)))
-#define xmlSecMSCryptoX509StoreSize	\
+                    sizeof(xmlSecKeyDataStoreKlass)))
+#define xmlSecMSCryptoX509StoreSize    \
     (sizeof(xmlSecKeyDataStoreKlass) + sizeof(xmlSecMSCryptoX509StoreCtx))
  
-static int		xmlSecMSCryptoX509StoreInitialize(xmlSecKeyDataStorePtr store);
-static void		xmlSecMSCryptoX509StoreFinalize	(xmlSecKeyDataStorePtr store);
-static int 		xmlSecMSCryptoX509NameStringRead(xmlSecByte **str, 
-							 int *strLen, 
-							 xmlSecByte *res, 
-							 int resLen,
-							 xmlSecByte delim, 
-							 int ingoreTrailingSpaces);
-static xmlSecByte * 	xmlSecMSCryptoX509NameRead	(xmlSecByte *str, 
-							 int len);
+static int         xmlSecMSCryptoX509StoreInitialize    (xmlSecKeyDataStorePtr store);
+static void        xmlSecMSCryptoX509StoreFinalize      (xmlSecKeyDataStorePtr store);
 
 static xmlSecKeyDataStoreKlass xmlSecMSCryptoX509StoreKlass = {
     sizeof(xmlSecKeyDataStoreKlass),
     xmlSecMSCryptoX509StoreSize,
 
     /* data */
-    xmlSecNameX509Store,			/* const xmlChar* name; */ 
+    xmlSecNameX509Store,                    /* const xmlChar* name; */ 
         
     /* constructors/destructor */
-    xmlSecMSCryptoX509StoreInitialize,		/* xmlSecKeyDataStoreInitializeMethod initialize; */
-    xmlSecMSCryptoX509StoreFinalize,		/* xmlSecKeyDataStoreFinalizeMethod finalize; */
+    xmlSecMSCryptoX509StoreInitialize,      /* xmlSecKeyDataStoreInitializeMethod initialize; */
+    xmlSecMSCryptoX509StoreFinalize,        /* xmlSecKeyDataStoreFinalizeMethod finalize; */
 
     /* reserved for the future */
-    NULL,					/* void* reserved0; */
-    NULL,					/* void* reserved1; */
+    NULL,                    /* void* reserved0; */
+    NULL,                    /* void* reserved1; */
 };
 
 static PCCERT_CONTEXT xmlSecMSCryptoX509FindCert(HCERTSTORE store,
-						 xmlChar *subjectName,
-						 xmlChar *issuerName,
-						 xmlChar *issuerSerial,
-						 xmlChar *ski);
+                         xmlChar *subjectName,
+                         xmlChar *issuerName,
+                         xmlChar *issuerSerial,
+                         xmlChar *ski);
 
 
 /** 
@@ -107,12 +104,12 @@ xmlSecMSCryptoX509StoreGetKlass(void) {
 
 /**
  * xmlSecMSCryptoX509StoreFindCert:
- * @store:		the pointer to X509 key data store klass.
- * @subjectName:	the desired certificate name.
- * @issuerName:		the desired certificate issuer name.
- * @issuerSerial:	the desired certificate issuer serial number.
- * @ski:		the desired certificate SKI.
- * @keyInfoCtx:		the pointer to <dsig:KeyInfo/> element processing context.
+ * @store:          the pointer to X509 key data store klass.
+ * @subjectName:    the desired certificate name.
+ * @issuerName:     the desired certificate issuer name.
+ * @issuerSerial:   the desired certificate issuer serial number.
+ * @ski:            the desired certificate SKI.
+ * @keyInfoCtx:     the pointer to <dsig:KeyInfo/> element processing context.
  *
  * Searches @store for a certificate that matches given criteria.
  *
@@ -122,8 +119,8 @@ xmlSecMSCryptoX509StoreGetKlass(void) {
 
 PCCERT_CONTEXT
 xmlSecMSCryptoX509StoreFindCert(xmlSecKeyDataStorePtr store, xmlChar *subjectName,
-				xmlChar *issuerName, xmlChar *issuerSerial,
-				xmlChar *ski, xmlSecKeyInfoCtx* keyInfoCtx) {
+                xmlChar *issuerName, xmlChar *issuerSerial,
+                xmlChar *ski, xmlSecKeyInfoCtx* keyInfoCtx) {
     xmlSecMSCryptoX509StoreCtxPtr ctx;
     PCCERT_CONTEXT pCert = NULL;
     
@@ -154,24 +151,26 @@ xmlSecMSCryptoUnixTimeToFileTime(time_t t, LPFILETIME pft) {
 
     xmlSecAssert(pft != NULL);
 
+#if defined( __MINGW32__)
+    ll = Int32x32To64(t, 10000000) + 116444736000000000ULL;
+#else
     ll = Int32x32To64(t, 10000000) + 116444736000000000;
+#endif
     pft->dwLowDateTime = (DWORD)ll;
     pft->dwHighDateTime = ll >> 32;
 }
 
 static BOOL
 xmlSecMSCrypoVerifyCertTime(PCCERT_CONTEXT pCert, LPFILETIME pft) {
-    LONG res;
-
     xmlSecAssert2(pCert != NULL, FALSE);
     xmlSecAssert2(pCert->pCertInfo != NULL, FALSE);
     xmlSecAssert2(pft != NULL, FALSE);
 
     if(1 == CompareFileTime(&(pCert->pCertInfo->NotBefore), pft)) {
-	return (FALSE);
+        return (FALSE);
     }
     if(-1 == CompareFileTime(&(pCert->pCertInfo->NotAfter), pft)) {
-	return (FALSE);
+        return (FALSE);
     }
  
     return (TRUE);
@@ -186,14 +185,14 @@ xmlSecMSCryptoCheckRevocation(HCERTSTORE hStore, PCCERT_CONTEXT pCert) {
     xmlSecAssert2(hStore != NULL, FALSE);
     
     while((pCrl = CertEnumCRLsInStore(hStore, pCrl)) != NULL) {
-	if (CertFindCertificateInCRL(pCert, pCrl, 0, NULL, &pCrlEntry) && (pCrlEntry != NULL)) {
-	    xmlSecError(XMLSEC_ERRORS_HERE,
-			NULL,
-			"CertFindCertificateInCRL",
-			XMLSEC_ERRORS_R_CERT_VERIFY_FAILED,
-			"cert found in crl list");
-	    return(FALSE);
-	}
+        if (CertFindCertificateInCRL(pCert, pCrl, 0, NULL, &pCrlEntry) && (pCrlEntry != NULL)) {
+            xmlSecError(XMLSEC_ERRORS_HERE,
+                NULL,
+                "CertFindCertificateInCRL",
+                XMLSEC_ERRORS_R_CERT_VERIFY_FAILED,
+                "cert found in crl list");
+            return(FALSE);
+        }
     }
 
     return(TRUE);
@@ -212,12 +211,12 @@ xmlSecMSCryptoX509StoreCertError(xmlSecKeyDataStorePtr store, PCCERT_CONTEXT cer
     dwSize = CertGetNameString(cert, CERT_NAME_RDN_TYPE, 0, NULL, NULL, 0);
     subject = xmlMalloc(dwSize + 1);
     if(subject == NULL) {
-    	xmlSecError(XMLSEC_ERRORS_HERE,
-		    NULL,
-		    NULL,
-		    XMLSEC_ERRORS_R_MALLOC_FAILED,
-		    XMLSEC_ERRORS_NO_MESSAGE);
-	return;
+        xmlSecError(XMLSEC_ERRORS_HERE,
+            NULL,
+            NULL,
+            XMLSEC_ERRORS_R_MALLOC_FAILED,
+            XMLSEC_ERRORS_NO_MESSAGE);
+        return;
     }
     memset(subject, 0, dwSize + 1);
     if(dwSize > 0) {
@@ -226,170 +225,302 @@ xmlSecMSCryptoX509StoreCertError(xmlSecKeyDataStorePtr store, PCCERT_CONTEXT cer
 
     /* print error */
     if (flags & CERT_STORE_SIGNATURE_FLAG) {
-	xmlSecError(XMLSEC_ERRORS_HERE,
-		    xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
-		    xmlSecErrorsSafeString(subject),
-		    XMLSEC_ERRORS_R_CERT_VERIFY_FAILED,
-		    "signature");
+        xmlSecError(XMLSEC_ERRORS_HERE,
+                xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+                xmlSecErrorsSafeString(subject),
+                XMLSEC_ERRORS_R_CERT_VERIFY_FAILED,
+                "signature");
     } else if (flags & CERT_STORE_TIME_VALIDITY_FLAG) {
-	xmlSecError(XMLSEC_ERRORS_HERE,
-		    xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
-		    xmlSecErrorsSafeString(subject),
-		    XMLSEC_ERRORS_R_CERT_HAS_EXPIRED,
-		    XMLSEC_ERRORS_NO_MESSAGE);
+        xmlSecError(XMLSEC_ERRORS_HERE,
+                xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+                xmlSecErrorsSafeString(subject),
+                XMLSEC_ERRORS_R_CERT_HAS_EXPIRED,
+                XMLSEC_ERRORS_NO_MESSAGE);
     } else if (flags & CERT_STORE_REVOCATION_FLAG) {
-	if (flags & CERT_STORE_NO_CRL_FLAG) {
-	    xmlSecError(XMLSEC_ERRORS_HERE,
-			xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
-			xmlSecErrorsSafeString(subject),
-			XMLSEC_ERRORS_R_CERT_REVOKED,
-			"no crl");
-	} else {
-	    xmlSecError(XMLSEC_ERRORS_HERE,
-			xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
-			xmlSecErrorsSafeString(subject),
-			XMLSEC_ERRORS_R_CERT_REVOKED,
-			XMLSEC_ERRORS_NO_MESSAGE);
-	}
+        if (flags & CERT_STORE_NO_CRL_FLAG) {
+            xmlSecError(XMLSEC_ERRORS_HERE,
+                xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+                xmlSecErrorsSafeString(subject),
+                XMLSEC_ERRORS_R_CERT_REVOKED,
+                "no crl");
+        } else {
+            xmlSecError(XMLSEC_ERRORS_HERE,
+                xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+                xmlSecErrorsSafeString(subject),
+                XMLSEC_ERRORS_R_CERT_REVOKED,
+                XMLSEC_ERRORS_NO_MESSAGE);
+        }
     } else {
-	xmlSecError(XMLSEC_ERRORS_HERE,
-		    xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
-		    xmlSecErrorsSafeString(subject),
-		    XMLSEC_ERRORS_R_CERT_VERIFY_FAILED,
-		    XMLSEC_ERRORS_NO_MESSAGE);
+        xmlSecError(XMLSEC_ERRORS_HERE,
+                xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+                xmlSecErrorsSafeString(subject),
+                XMLSEC_ERRORS_R_CERT_VERIFY_FAILED,
+                XMLSEC_ERRORS_NO_MESSAGE);
     }
     xmlFree(subject);
 }
 
+/**
+ @cert: the certificate we check
+ @pfTime: pointer to FILETIME that we are interested in
+ @store_untrusted: untrusted certificates added via API
+ @store_doc: untrusted certificates/CRLs extracted from a document
+ */
+static BOOL 
+xmlSecBuildChainUsingWinapi (PCCERT_CONTEXT cert, LPFILETIME pfTime,
+		HCERTSTORE store_untrusted, HCERTSTORE store_doc)
+{
+	PCCERT_CHAIN_CONTEXT     pChainContext = NULL;
+	CERT_CHAIN_PARA          chainPara;
+	BOOL rc = FALSE;
+	HCERTSTORE store_add = NULL;
+
+    /* Initialize data structures. */
+
+	memset(&chainPara, 0, sizeof(CERT_CHAIN_PARA));
+	chainPara.cbSize = sizeof(CERT_CHAIN_PARA);
+
+	/* Create additional store for CertGetCertificateChain() */
+	store_add = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, 0, NULL);
+	if (!store_add) {
+		xmlSecError(XMLSEC_ERRORS_HERE,
+					"chain additional collection store",
+					"CertOpenStore",
+					XMLSEC_ERRORS_R_CRYPTO_FAILED,
+					XMLSEC_ERRORS_NO_MESSAGE);
+		goto end;
+	}
+	if (!CertAddStoreToCollection(store_add, store_doc, 0, 0)) {
+		xmlSecError(XMLSEC_ERRORS_HERE,
+					"adding document store",
+					"CertAddStoreToCollection",
+					XMLSEC_ERRORS_R_CRYPTO_FAILED,
+					XMLSEC_ERRORS_NO_MESSAGE);
+		goto end;
+	}
+	if (!CertAddStoreToCollection(store_add, store_untrusted, 0, 0)) {
+		xmlSecError(XMLSEC_ERRORS_HERE,
+					"adding untrusted store",
+					"CertAddStoreToCollection",
+					XMLSEC_ERRORS_R_CRYPTO_FAILED,
+					XMLSEC_ERRORS_NO_MESSAGE);
+		goto end;
+	}
+
+    /* Build a chain using CertGetCertificateChain
+     and the certificate retrieved. */
+    if(!CertGetCertificateChain(
+                NULL,                  /* use the default chain engine */
+				cert,
+                pfTime,
+				store_add,
+				&chainPara,
+				CERT_CHAIN_REVOCATION_CHECK_CHAIN,
+                NULL,
+                &pChainContext))
+    {
+        xmlSecError(XMLSEC_ERRORS_HERE,
+		    "building certificate chain, checking root",
+		    "CertGetCertificateChain",
+		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
+		    XMLSEC_ERRORS_NO_MESSAGE);
+		goto end;
+	}
+	if (pChainContext->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN) {
+		CertFreeCertificateChain(pChainContext); pChainContext = NULL;
+		if(!CertGetCertificateChain(
+			   NULL,                  /* use the default chain engine */
+			   cert,
+			   pfTime,
+			   store_add,
+			   &chainPara,
+			   CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT,
+            NULL,
+			   &pChainContext))
+		{
+			xmlSecError(XMLSEC_ERRORS_HERE,
+						"building certificate chain, excluding root",
+						"CertGetCertificateChain",
+						XMLSEC_ERRORS_R_CRYPTO_FAILED,
+            XMLSEC_ERRORS_NO_MESSAGE);
+			goto end;
+		}
+    }
+
+	if (pChainContext->TrustStatus.dwErrorStatus == CERT_TRUST_NO_ERROR)
+		rc = TRUE;
+
+end:
+	if (pChainContext) CertFreeCertificateChain(pChainContext);
+	if (store_add) CertCloseStore(store_add, 0);
+	return (rc);
+}
+
+/**
+ @cert: the certificate we check
+ @pfTime: pointer to FILETIME that we are interested in
+ @store_trusted: trusted certificates added via API
+ @store_untrusted: untrusted certificates added via API
+ @certs: untrusted certificates/CRLs extracted from a document
+ @store: pointer to store klass passed to error functions
+ */
 static BOOL
-xmlSecMSCryptoX509StoreConstructCertsChain(xmlSecKeyDataStorePtr store, PCCERT_CONTEXT cert, HCERTSTORE certs, 
-			      xmlSecKeyInfoCtx* keyInfoCtx) {
-    xmlSecMSCryptoX509StoreCtxPtr ctx;
+xmlSecMSCryptoBuildCertChainManually (PCCERT_CONTEXT cert, LPFILETIME pfTime,
+	HCERTSTORE store_trusted, HCERTSTORE store_untrusted, HCERTSTORE certs,
+	xmlSecKeyDataStorePtr store) {
     PCCERT_CONTEXT issuerCert = NULL;
-    FILETIME fTime;
     DWORD flags;
-    
-    xmlSecAssert2(xmlSecKeyDataStoreCheckId(store, xmlSecMSCryptoX509StoreId), FALSE);
-    xmlSecAssert2(cert != NULL, FALSE);
-    xmlSecAssert2(cert->pCertInfo != NULL, FALSE);
-    xmlSecAssert2(certs != NULL, FALSE);
-    xmlSecAssert2(keyInfoCtx != NULL, FALSE);
 
-    ctx = xmlSecMSCryptoX509StoreGetCtx(store);
-    xmlSecAssert2(ctx != NULL, FALSE);
-    xmlSecAssert2(ctx->trusted != NULL, FALSE);
-    xmlSecAssert2(ctx->untrusted != NULL, FALSE);
+    if (!xmlSecMSCrypoVerifyCertTime(cert, pfTime)) {
+        xmlSecMSCryptoX509StoreCertError(store, cert, CERT_STORE_TIME_VALIDITY_FLAG);
+        return(FALSE);
+    }
 
-    if(keyInfoCtx->certsVerificationTime > 0) {
-	    /* convert the time to FILETIME */
-    	xmlSecMSCryptoUnixTimeToFileTime(keyInfoCtx->certsVerificationTime, &fTime);
-    } else {
-	    /* Defaults to current time */
-	    GetSystemTimeAsFileTime(&fTime);
+    if (!xmlSecMSCryptoCheckRevocation(certs, cert)) {
+        return(FALSE);
     }
 
-    if (!xmlSecMSCrypoVerifyCertTime(cert, &fTime)) {
-    	xmlSecMSCryptoX509StoreCertError(store, cert, CERT_STORE_TIME_VALIDITY_FLAG);
-	    return(FALSE);
+    /**
+     * Try to find the cert in the trusted cert store. We will trust
+     * the certificate in the trusted store.
+     */
+    issuerCert = CertFindCertificateInStore(store_trusted, 
+                X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
+                0,
+                CERT_FIND_SUBJECT_NAME,
+                &(cert->pCertInfo->Subject),
+                NULL);
+    if( issuerCert != NULL) {
+        /* We have found the trusted cert, so return true */
+	    /* todo: do we want to verify the trusted cert's revocation? we must,
+		 * I think */
+        CertFreeCertificateContext( issuerCert ) ;
+        return( TRUE ) ;
     }
 
-    if (!xmlSecMSCryptoCheckRevocation(certs, cert)) {
-    	return(FALSE);
-    }
-
-    /**
-     * Try to find the cert in the trusted cert store. We will trust
-     * the certificate in the trusted store.
-	 */
-    issuerCert = CertFindCertificateInStore(ctx->trusted, 
-			    X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
-			    0,
-			    CERT_FIND_SUBJECT_NAME,
-			    &(cert->pCertInfo->Subject),
-			    NULL);
-    if( issuerCert != NULL) {
-		/* We have found the trusted cert, so return true */
-		CertFreeCertificateContext( issuerCert ) ;
-		return( TRUE ) ;
-    }
-
-    /* Check whether the certificate is self signed certificate */
-    if(CertCompareCertificateName(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, &(cert->pCertInfo->Subject), &(cert->pCertInfo->Issuer))) {
+    /* Check whether the certificate is self signed certificate */
+    if(CertCompareCertificateName(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, &(cert->pCertInfo->Subject), &(cert->pCertInfo->Issuer))) {
         return(FALSE);
-    }
+    }
 
     /* try to find issuer cert in the trusted cert in the store */
-    issuerCert = CertFindCertificateInStore(ctx->trusted, 
-			    X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
-			    0,
-			    CERT_FIND_SUBJECT_NAME,
-			    &(cert->pCertInfo->Issuer),
-			    NULL);
+    issuerCert = CertFindCertificateInStore(store_trusted, 
+                X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
+                0,
+                CERT_FIND_SUBJECT_NAME,
+                &(cert->pCertInfo->Issuer),
+                NULL);
     if(issuerCert != NULL) {
         flags = CERT_STORE_REVOCATION_FLAG | CERT_STORE_SIGNATURE_FLAG;
-	    if(!CertVerifySubjectCertificateContext(cert, issuerCert, &flags)) {
-	        xmlSecMSCryptoX509StoreCertError(store, issuerCert, flags);
-	        CertFreeCertificateContext(issuerCert);
-	        return(FALSE);
+        if(!CertVerifySubjectCertificateContext(cert, issuerCert, &flags)) {
+            xmlSecMSCryptoX509StoreCertError(store, issuerCert, flags);
+            CertFreeCertificateContext(issuerCert);
+            return(FALSE);
         }
-	    /* todo: do we want to verify the trusted cert? */
-	    CertFreeCertificateContext(issuerCert);
-	    return(TRUE);
+	    /* todo: do we want to verify the trusted cert? we must check
+		 * revocation, I think */
+        CertFreeCertificateContext(issuerCert);
+        return(TRUE);
     }
 
     /* try the untrusted certs in the chain */
     issuerCert = CertFindCertificateInStore(certs, 
-			    X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
-			    0,
-			    CERT_FIND_SUBJECT_NAME,
-			    &(cert->pCertInfo->Issuer),
-			    NULL);
+                X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
+                0,
+                CERT_FIND_SUBJECT_NAME,
+                &(cert->pCertInfo->Issuer),
+                NULL);
     if(issuerCert != NULL) {
         flags = CERT_STORE_REVOCATION_FLAG | CERT_STORE_SIGNATURE_FLAG;
-	    if(!CertVerifySubjectCertificateContext(cert, issuerCert, &flags)) {
-	        xmlSecMSCryptoX509StoreCertError(store, issuerCert, flags);
-	        CertFreeCertificateContext(issuerCert);
-	        return(FALSE);
+        if(!CertVerifySubjectCertificateContext(cert, issuerCert, &flags)) {
+            xmlSecMSCryptoX509StoreCertError(store, issuerCert, flags);
+            CertFreeCertificateContext(issuerCert);
+            return(FALSE);
         }
-    	if(!xmlSecMSCryptoX509StoreConstructCertsChain(store, issuerCert, certs, keyInfoCtx)) {
-	        xmlSecMSCryptoX509StoreCertError(store, issuerCert, flags);
-	        CertFreeCertificateContext(issuerCert);
-	        return(FALSE);
-	    }
-	    CertFreeCertificateContext(issuerCert);
-	    return(TRUE);
+    	if(!xmlSecMSCryptoBuildCertChainManually(issuerCert, pfTime, store_trusted, store_untrusted, certs, store)) {
+            xmlSecMSCryptoX509StoreCertError(store, issuerCert, flags);
+            CertFreeCertificateContext(issuerCert);
+            return(FALSE);
+        }
+        CertFreeCertificateContext(issuerCert);
+        return(TRUE);
     }
 
     /* try the untrusted certs in the store */
-    issuerCert = CertFindCertificateInStore(ctx->untrusted, 
-			    X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
-			    0,
-			    CERT_FIND_SUBJECT_NAME,
-			    &(cert->pCertInfo->Issuer),
-			    NULL);
+    issuerCert = CertFindCertificateInStore(store_untrusted, 
+                X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
+                0,
+                CERT_FIND_SUBJECT_NAME,
+                &(cert->pCertInfo->Issuer),
+                NULL);
     if(issuerCert != NULL) {
         flags = CERT_STORE_REVOCATION_FLAG | CERT_STORE_SIGNATURE_FLAG;
-	    if(!CertVerifySubjectCertificateContext(cert, issuerCert, &flags)) {
-	        xmlSecMSCryptoX509StoreCertError(store, issuerCert, flags);
-	        CertFreeCertificateContext(issuerCert);
-	        return(FALSE);
+        if(!CertVerifySubjectCertificateContext(cert, issuerCert, &flags)) {
+            xmlSecMSCryptoX509StoreCertError(store, issuerCert, flags);
+            CertFreeCertificateContext(issuerCert);
+            return(FALSE);
+        }
+    	if(!xmlSecMSCryptoBuildCertChainManually(issuerCert, pfTime, store_trusted, store_untrusted, certs, store)) {
+            CertFreeCertificateContext(issuerCert);
+            return(FALSE);
         }
-	    if(!xmlSecMSCryptoX509StoreConstructCertsChain(store, issuerCert, certs, keyInfoCtx)) {
-	        CertFreeCertificateContext(issuerCert);
-	        return(FALSE);
-	    }
-    	CertFreeCertificateContext(issuerCert);
-	    return(TRUE);
+        CertFreeCertificateContext(issuerCert);
+        return(TRUE);
     }
 
     return(FALSE);
 }
 
+static BOOL
+xmlSecMSCryptoX509StoreConstructCertsChain(xmlSecKeyDataStorePtr store, PCCERT_CONTEXT cert, HCERTSTORE certs, 
+			      xmlSecKeyInfoCtx* keyInfoCtx) {
+    xmlSecMSCryptoX509StoreCtxPtr ctx;
+    PCCERT_CONTEXT tempCert = NULL;
+    FILETIME fTime;
+    BOOL res = FALSE;
+    
+    xmlSecAssert2(xmlSecKeyDataStoreCheckId(store, xmlSecMSCryptoX509StoreId), FALSE);
+    xmlSecAssert2(cert != NULL, FALSE);
+    xmlSecAssert2(cert->pCertInfo != NULL, FALSE);
+    xmlSecAssert2(certs != NULL, FALSE);
+    xmlSecAssert2(keyInfoCtx != NULL, FALSE);
+
+    ctx = xmlSecMSCryptoX509StoreGetCtx(store);
+    xmlSecAssert2(ctx != NULL, FALSE);
+    xmlSecAssert2(ctx->trusted != NULL, FALSE);
+    xmlSecAssert2(ctx->untrusted != NULL, FALSE);
+
+    if(keyInfoCtx->certsVerificationTime > 0) {
+	    /* convert the time to FILETIME */
+    	xmlSecMSCryptoUnixTimeToFileTime(keyInfoCtx->certsVerificationTime, &fTime);
+    } else {
+	    /* Defaults to current time */
+	    GetSystemTimeAsFileTime(&fTime);
+    }
+
+    /* try the certificates in the keys manager */
+    if(!res) {
+    	tempCert = CertEnumCertificatesInStore(ctx->trusted, NULL);
+	    if(tempCert) {
+		    CertFreeCertificateContext(tempCert);
+            res = xmlSecMSCryptoBuildCertChainManually(cert, &fTime, ctx->trusted, ctx->untrusted, certs, store);
+        }
+    }
+
+    /* try the certificates in the system */
+    if(!res && !ctx->dont_use_system_trusted_certs) {
+		res = xmlSecBuildChainUsingWinapi(cert, &fTime, ctx->untrusted, certs);
+	}
+
+    /* done */
+    return res;
+}
+
 /**
  * xmlSecMSCryptoX509StoreVerify:
- * @store:		the pointer to X509 certificate context store klass.
- * @certs:		the untrusted certificates stack.
- * @keyInfoCtx:		the pointer to <dsig:KeyInfo/> element processing context.
+ * @store:        the pointer to X509 certificate context store klass.
+ * @certs:        the untrusted certificates stack.
+ * @keyInfoCtx:        the pointer to <dsig:KeyInfo/> element processing context.
  *
  * Verifies @certs list.
  *
@@ -397,7 +528,7 @@ xmlSecMSCryptoX509StoreConstructCertsChain(xmlSecKeyDataStorePtr store, PCCERT_C
  */ 
 PCCERT_CONTEXT
 xmlSecMSCryptoX509StoreVerify(xmlSecKeyDataStorePtr store, HCERTSTORE certs,
-			      xmlSecKeyInfoCtx* keyInfoCtx) {
+                  xmlSecKeyInfoCtx* keyInfoCtx) {
     PCCERT_CONTEXT cert = NULL;
 
     xmlSecAssert2(xmlSecKeyDataStoreCheckId(store, xmlSecMSCryptoX509StoreId), NULL);
@@ -405,32 +536,32 @@ xmlSecMSCryptoX509StoreVerify(xmlSecKeyDataStorePtr store, HCERTSTORE certs,
     xmlSecAssert2(keyInfoCtx != NULL, NULL);
 
     while((cert = CertEnumCertificatesInStore(certs, cert)) != NULL){
-	    PCCERT_CONTEXT nextCert = NULL;
+        PCCERT_CONTEXT nextCert = NULL;
         unsigned char selected = 1;
         
-	    xmlSecAssert2(cert->pCertInfo != NULL, NULL);
+        xmlSecAssert2(cert->pCertInfo != NULL, NULL);
 
-	    /* if cert is the issuer of any other cert in the list, then it is 
- 	     * to be skipped except a case of a celf-signed cert*/
+        /* if cert is the issuer of any other cert in the list, then it is 
+          * to be skipped except a case of a celf-signed cert*/
         do {
             nextCert = CertFindCertificateInStore(certs,
-				    X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
-				    0,
-				    CERT_FIND_ISSUER_NAME,
-				    &(cert->pCertInfo->Subject),
-				    nextCert);
-            if((nextCert != NULL) && !CertCompareCertificateName(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 
-                                        &(nextCert->pCertInfo->Subject), &(nextCert->pCertInfo->Issuer))) {
-                selected = 0;
+                    X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
+                    0,
+                    CERT_FIND_ISSUER_NAME,
+                    &(cert->pCertInfo->Subject),
+                    nextCert);
+            if((nextCert != NULL) && !CertCompareCertificateName(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 
+                                        &(nextCert->pCertInfo->Subject), &(nextCert->pCertInfo->Issuer))) {
+                selected = 0;
             }    
         } while((selected == 1) && (nextCert != NULL));
         if(nextCert != NULL) {
-	        CertFreeCertificateContext(nextCert);	            
-	    }
+            CertFreeCertificateContext(nextCert);                
+        }
 
-	    if((selected == 1) && xmlSecMSCryptoX509StoreConstructCertsChain(store, cert, certs, keyInfoCtx)) {
-	        return(cert);
-	    }
+        if((selected == 1) && xmlSecMSCryptoX509StoreConstructCertsChain(store, cert, certs, keyInfoCtx)) {
+            return(cert);
+        }
     }
 
     return (NULL);
@@ -450,7 +581,6 @@ int
 xmlSecMSCryptoX509StoreAdoptCert(xmlSecKeyDataStorePtr store, PCCERT_CONTEXT pCert, xmlSecKeyDataType type) {
     xmlSecMSCryptoX509StoreCtxPtr ctx;
     HCERTSTORE certStore;
-    int ret;
 
     xmlSecAssert2(xmlSecKeyDataStoreCheckId(store, xmlSecMSCryptoX509StoreId), -1);
     xmlSecAssert2(pCert != NULL, -1);
@@ -461,30 +591,30 @@ xmlSecMSCryptoX509StoreAdoptCert(xmlSecKeyDataStorePtr store, PCCERT_CONTEXT pCe
     xmlSecAssert2(ctx->untrusted != NULL, -1);
 
     if(type == xmlSecKeyDataTypeTrusted) {
-	certStore = ctx->trusted;
+        certStore = ctx->trusted;
     } else if(type == xmlSecKeyDataTypeNone) {
-	certStore = ctx->untrusted;
+        certStore = ctx->untrusted;
     } else {
-	xmlSecError(XMLSEC_ERRORS_HERE,
-		    xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
-		    NULL,
-		    XMLSEC_ERRORS_R_INVALID_TYPE,
-		    "type=%d", type);
-	return(-1);
+        xmlSecError(XMLSEC_ERRORS_HERE,
+                xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+                NULL,
+                XMLSEC_ERRORS_R_INVALID_TYPE,
+                "type=%d", type);
+        return(-1);
     }
-    
+
     /* TODO: The context to be added here is not duplicated first, 
     * hopefully this will not lead to errors when closing teh store 
     * and freeing the mem for all the context in the store.
     */
     xmlSecAssert2(certStore != NULL, -1);
     if (!CertAddCertificateContextToStore(certStore, pCert, CERT_STORE_ADD_ALWAYS, NULL)) {
-	xmlSecError(XMLSEC_ERRORS_HERE,
-		    xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
-		    "CertAddCertificateContextToStore",
-		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-		    XMLSEC_ERRORS_NO_MESSAGE);
-	return(-1);
+        xmlSecError(XMLSEC_ERRORS_HERE,
+                xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+                "CertAddCertificateContextToStore",
+                XMLSEC_ERRORS_R_CRYPTO_FAILED,
+                XMLSEC_ERRORS_NO_MESSAGE);
+        return(-1);
     }
 
     return(0);
@@ -500,10 +630,9 @@ xmlSecMSCryptoX509StoreAdoptCert(xmlSecKeyDataStorePtr store, PCCERT_CONTEXT pCe
  *
  * Returns 0 on success or a negative value if an error occurs.
  */
-int	
+int    
 xmlSecMSCryptoX509StoreAdoptKeyStore (xmlSecKeyDataStorePtr store, HCERTSTORE keyStore) {
     xmlSecMSCryptoX509StoreCtxPtr ctx;
-    int ret;
 
     xmlSecAssert2(xmlSecKeyDataStoreCheckId(store, xmlSecMSCryptoX509StoreId), -1);
     xmlSecAssert2( keyStore != NULL, -1);
@@ -512,14 +641,14 @@ xmlSecMSCryptoX509StoreAdoptKeyStore (xmlSecKeyDataStorePtr store, HCERTSTORE ke
     xmlSecAssert2(ctx != NULL, -1);
     xmlSecAssert2(ctx->trusted != NULL, -1);
 
-	if(!CertAddStoreToCollection ( ctx->trusted , keyStore , CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG , 2)) {
-		xmlSecError(XMLSEC_ERRORS_HERE,
-		    xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
-		    "CertAddStoreToCollection",
-		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-		    XMLSEC_ERRORS_NO_MESSAGE);
-		return(-1);
-	}
+    if(!CertAddStoreToCollection ( ctx->trusted , keyStore , CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG , 2)) {
+        xmlSecError(XMLSEC_ERRORS_HERE,
+            xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+            "CertAddStoreToCollection",
+            XMLSEC_ERRORS_R_CRYPTO_FAILED,
+            XMLSEC_ERRORS_NO_MESSAGE);
+        return(-1);
+    }
 
     return(0);
 }
@@ -536,7 +665,6 @@ xmlSecMSCryptoX509StoreAdoptKeyStore (xmlSecKeyDataStorePtr store, HCERTSTORE ke
 int
 xmlSecMSCryptoX509StoreAdoptTrustedStore (xmlSecKeyDataStorePtr store, HCERTSTORE trustedStore) {
     xmlSecMSCryptoX509StoreCtxPtr ctx;
-    int ret;
 
     xmlSecAssert2(xmlSecKeyDataStoreCheckId(store, xmlSecMSCryptoX509StoreId), -1);
     xmlSecAssert2( trustedStore != NULL, -1);
@@ -545,14 +673,14 @@ xmlSecMSCryptoX509StoreAdoptTrustedStore (xmlSecKeyDataStorePtr store, HCERTSTOR
     xmlSecAssert2(ctx != NULL, -1);
     xmlSecAssert2(ctx->trusted != NULL, -1);
 
-	if( !CertAddStoreToCollection ( ctx->trusted , trustedStore , CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG , 3 ) ) {
-		xmlSecError(XMLSEC_ERRORS_HERE,
-		    xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
-		    "CertAddStoreToCollection",
-		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-		    XMLSEC_ERRORS_NO_MESSAGE);
-		return(-1);
-	}
+    if( !CertAddStoreToCollection ( ctx->trusted , trustedStore , CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG , 3 ) ) {
+        xmlSecError(XMLSEC_ERRORS_HERE,
+            xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+            "CertAddStoreToCollection",
+            XMLSEC_ERRORS_R_CRYPTO_FAILED,
+            XMLSEC_ERRORS_NO_MESSAGE);
+        return(-1);
+    }
 
     return(0);
 }
@@ -569,7 +697,6 @@ xmlSecMSCryptoX509StoreAdoptTrustedStore (xmlSecKeyDataStorePtr store, HCERTSTOR
 int
 xmlSecMSCryptoX509StoreAdoptUntrustedStore (xmlSecKeyDataStorePtr store, HCERTSTORE untrustedStore) {
     xmlSecMSCryptoX509StoreCtxPtr ctx;
-    int ret;
 
     xmlSecAssert2(xmlSecKeyDataStoreCheckId(store, xmlSecMSCryptoX509StoreId), -1);
     xmlSecAssert2( untrustedStore != NULL, -1);
@@ -578,24 +705,44 @@ xmlSecMSCryptoX509StoreAdoptUntrustedStore (xmlSecKeyDataStorePtr store, HCERTST
     xmlSecAssert2(ctx != NULL, -1);
     xmlSecAssert2(ctx->untrusted != NULL, -1);
 
-	if( !CertAddStoreToCollection ( ctx->untrusted , untrustedStore , CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG , 2 ) ) {
-		xmlSecError(XMLSEC_ERRORS_HERE,
-		    xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
-		    "CertAddStoreToCollection",
-		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-		    XMLSEC_ERRORS_NO_MESSAGE);
-		return(-1);
-	}
+    if( !CertAddStoreToCollection ( ctx->untrusted , untrustedStore , CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG , 2 ) ) {
+        xmlSecError(XMLSEC_ERRORS_HERE,
+            xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+            "CertAddStoreToCollection",
+            XMLSEC_ERRORS_R_CRYPTO_FAILED,
+            XMLSEC_ERRORS_NO_MESSAGE);
+        return(-1);
+    }
 
-	return(0);
+    return(0);
 }
 
+/** 
+ * xmlSecMSCryptoX509StoreEnableSystemTrustedCerts: 
+ * @store:              the pointer to X509 key data store klass.
+ * @val:                the enable/disable flag
+ *
+ * Enables/disables the system trusted certs.
+ */
+void
+xmlSecMSCryptoX509StoreEnableSystemTrustedCerts (xmlSecKeyDataStorePtr store, int val) {
+    xmlSecMSCryptoX509StoreCtxPtr ctx;
+    
+    xmlSecAssert(xmlSecKeyDataStoreCheckId(store, xmlSecMSCryptoX509StoreId));
+    
+    ctx = xmlSecMSCryptoX509StoreGetCtx(store);
+    xmlSecAssert(ctx != NULL);
+    xmlSecAssert(ctx->untrusted != NULL);
+    
+    /* it is other way around to make default value 0 mimic old behaiviour */
+    ctx->dont_use_system_trusted_certs = !val;
+}
 
 static int
 xmlSecMSCryptoX509StoreInitialize(xmlSecKeyDataStorePtr store) {
     xmlSecMSCryptoX509StoreCtxPtr ctx;
-	HCERTSTORE hTrustedMemStore ;
-	HCERTSTORE hUntrustedMemStore ;
+    HCERTSTORE hTrustedMemStore ;
+    HCERTSTORE hUntrustedMemStore ;
 
     xmlSecAssert2(xmlSecKeyDataStoreCheckId(store, xmlSecMSCryptoX509StoreId), -1);
 
@@ -606,101 +753,101 @@ xmlSecMSCryptoX509StoreInitialize(xmlSecKeyDataStorePtr store) {
 
     /* create trusted certs store collection */
     ctx->trusted = CertOpenStore(CERT_STORE_PROV_COLLECTION,
-			       0,
-			       0,
-			       0,
-			       NULL);
+                   0,
+                   0,
+                   0,
+                   NULL);
     if(ctx->trusted == NULL) {
-	    xmlSecError(XMLSEC_ERRORS_HERE,
-		        xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
-		        "CertOpenStore",
-		        XMLSEC_ERRORS_R_CRYPTO_FAILED,
-		        XMLSEC_ERRORS_NO_MESSAGE);
-	    return(-1);
+        xmlSecError(XMLSEC_ERRORS_HERE,
+                xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+                "CertOpenStore",
+                XMLSEC_ERRORS_R_CRYPTO_FAILED,
+                XMLSEC_ERRORS_NO_MESSAGE);
+        return(-1);
     }
 
     /* create trusted certs store */
     hTrustedMemStore = CertOpenStore(CERT_STORE_PROV_MEMORY,
-			       X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
-			       0,
-			       CERT_STORE_CREATE_NEW_FLAG,
-			       NULL);
+                   X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
+                   0,
+                   CERT_STORE_CREATE_NEW_FLAG,
+                   NULL);
     if(hTrustedMemStore == NULL) {
-	    xmlSecError(XMLSEC_ERRORS_HERE,
-		        xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
-		        "CertOpenStore",
-		        XMLSEC_ERRORS_R_CRYPTO_FAILED,
-		        XMLSEC_ERRORS_NO_MESSAGE);
-	    CertCloseStore(ctx->trusted, CERT_CLOSE_STORE_FORCE_FLAG);
-	    ctx->trusted = NULL ;
-	    return(-1);
-    }
-
-	/* add the memory trusted certs store to trusted certs store collection */
-	if( !CertAddStoreToCollection( ctx->trusted, hTrustedMemStore, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 1 ) ) {
-	    xmlSecError(XMLSEC_ERRORS_HERE,
-		        xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
-		        "CertAddStoreToCollection",
-		        XMLSEC_ERRORS_R_CRYPTO_FAILED,
-		        XMLSEC_ERRORS_NO_MESSAGE);
-	    CertCloseStore(ctx->trusted, CERT_CLOSE_STORE_FORCE_FLAG);
-	    CertCloseStore(hTrustedMemStore, CERT_CLOSE_STORE_CHECK_FLAG);
-	    ctx->trusted = NULL ;
-    	return(-1);
-	}
-	CertCloseStore(hTrustedMemStore, CERT_CLOSE_STORE_CHECK_FLAG);
+        xmlSecError(XMLSEC_ERRORS_HERE,
+                xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+                "CertOpenStore",
+                XMLSEC_ERRORS_R_CRYPTO_FAILED,
+                XMLSEC_ERRORS_NO_MESSAGE);
+        CertCloseStore(ctx->trusted, CERT_CLOSE_STORE_FORCE_FLAG);
+        ctx->trusted = NULL ;
+        return(-1);
+    }
+
+    /* add the memory trusted certs store to trusted certs store collection */
+    if( !CertAddStoreToCollection( ctx->trusted, hTrustedMemStore, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 1 ) ) {
+        xmlSecError(XMLSEC_ERRORS_HERE,
+                xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+                "CertAddStoreToCollection",
+                XMLSEC_ERRORS_R_CRYPTO_FAILED,
+                XMLSEC_ERRORS_NO_MESSAGE);
+        CertCloseStore(ctx->trusted, CERT_CLOSE_STORE_FORCE_FLAG);
+        CertCloseStore(hTrustedMemStore, CERT_CLOSE_STORE_CHECK_FLAG);
+        ctx->trusted = NULL ;
+        return(-1);
+    }
+    CertCloseStore(hTrustedMemStore, CERT_CLOSE_STORE_CHECK_FLAG);
 
     /* create untrusted certs store collection */
     ctx->untrusted = CertOpenStore(CERT_STORE_PROV_COLLECTION,
-			       0,
-			       0,
-			       0,
-			       NULL);
+                   0,
+                   0,
+                   0,
+                   NULL);
     if(ctx->untrusted == NULL) {
-	    xmlSecError(XMLSEC_ERRORS_HERE,
-		        xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
-		        "CertOpenStore",
-		        XMLSEC_ERRORS_R_CRYPTO_FAILED,
-		        XMLSEC_ERRORS_NO_MESSAGE);
-	    CertCloseStore(ctx->trusted, CERT_CLOSE_STORE_FORCE_FLAG);
-	    ctx->trusted = NULL ;
-	    return(-1);
-	}
+        xmlSecError(XMLSEC_ERRORS_HERE,
+                xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+                "CertOpenStore",
+                XMLSEC_ERRORS_R_CRYPTO_FAILED,
+                XMLSEC_ERRORS_NO_MESSAGE);
+        CertCloseStore(ctx->trusted, CERT_CLOSE_STORE_FORCE_FLAG);
+        ctx->trusted = NULL ;
+        return(-1);
+    }
 
     /* create untrusted certs store */
     hUntrustedMemStore = CertOpenStore(CERT_STORE_PROV_MEMORY,
-			       X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
-			       0,
-			       CERT_STORE_CREATE_NEW_FLAG,
-			       NULL);
+                   X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
+                   0,
+                   CERT_STORE_CREATE_NEW_FLAG,
+                   NULL);
     if(hUntrustedMemStore == NULL) {
-	    xmlSecError(XMLSEC_ERRORS_HERE,
-		        xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
-		        "CertOpenStore",
-		        XMLSEC_ERRORS_R_CRYPTO_FAILED,
-		        XMLSEC_ERRORS_NO_MESSAGE);
-	    CertCloseStore(ctx->trusted, CERT_CLOSE_STORE_FORCE_FLAG);
-	    CertCloseStore(ctx->untrusted, CERT_CLOSE_STORE_FORCE_FLAG);
-	    ctx->trusted = NULL ;
-	    ctx->untrusted = NULL ;
-	    return(-1);
-    }
-
-	/* add the memory trusted certs store to untrusted certs store collection */
-	if( !CertAddStoreToCollection( ctx->untrusted, hUntrustedMemStore, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 1 ) ) {
-	    xmlSecError(XMLSEC_ERRORS_HERE,
-		        xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
-		        "CertAddStoreToCollection",
-		        XMLSEC_ERRORS_R_CRYPTO_FAILED,
-		        XMLSEC_ERRORS_NO_MESSAGE);
-	    CertCloseStore(ctx->untrusted, CERT_CLOSE_STORE_FORCE_FLAG);
-	    CertCloseStore(ctx->trusted, CERT_CLOSE_STORE_FORCE_FLAG);
-	    CertCloseStore(hUntrustedMemStore, CERT_CLOSE_STORE_CHECK_FLAG);
-	    ctx->trusted = NULL ;
-	    ctx->untrusted = NULL ;
-    	return(-1);
-	}
-	CertCloseStore(hUntrustedMemStore, CERT_CLOSE_STORE_CHECK_FLAG);
+        xmlSecError(XMLSEC_ERRORS_HERE,
+                xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+                "CertOpenStore",
+                XMLSEC_ERRORS_R_CRYPTO_FAILED,
+                XMLSEC_ERRORS_NO_MESSAGE);
+        CertCloseStore(ctx->trusted, CERT_CLOSE_STORE_FORCE_FLAG);
+        CertCloseStore(ctx->untrusted, CERT_CLOSE_STORE_FORCE_FLAG);
+        ctx->trusted = NULL ;
+        ctx->untrusted = NULL ;
+        return(-1);
+    }
+
+    /* add the memory trusted certs store to untrusted certs store collection */
+    if( !CertAddStoreToCollection( ctx->untrusted, hUntrustedMemStore, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 1 ) ) {
+        xmlSecError(XMLSEC_ERRORS_HERE,
+                xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+                "CertAddStoreToCollection",
+                XMLSEC_ERRORS_R_CRYPTO_FAILED,
+                XMLSEC_ERRORS_NO_MESSAGE);
+        CertCloseStore(ctx->untrusted, CERT_CLOSE_STORE_FORCE_FLAG);
+        CertCloseStore(ctx->trusted, CERT_CLOSE_STORE_FORCE_FLAG);
+        CertCloseStore(hUntrustedMemStore, CERT_CLOSE_STORE_CHECK_FLAG);
+        ctx->trusted = NULL ;
+        ctx->untrusted = NULL ;
+        return(-1);
+    }
+    CertCloseStore(hUntrustedMemStore, CERT_CLOSE_STORE_CHECK_FLAG);
 
     return(0);    
 }
@@ -714,10 +861,10 @@ xmlSecMSCryptoX509StoreFinalize(xmlSecKeyDataStorePtr store) {
     xmlSecAssert(ctx != NULL);
 
     if (ctx->trusted) {
-	CertCloseStore(ctx->trusted, CERT_CLOSE_STORE_FORCE_FLAG);
+        CertCloseStore(ctx->trusted, CERT_CLOSE_STORE_FORCE_FLAG);
     }
     if (ctx->untrusted) {
-	CertCloseStore(ctx->untrusted, CERT_CLOSE_STORE_FORCE_FLAG);
+        CertCloseStore(ctx->untrusted, CERT_CLOSE_STORE_FORCE_FLAG);
     }
 
     memset(ctx, 0, sizeof(xmlSecMSCryptoX509StoreCtx));
@@ -732,154 +879,153 @@ xmlSecMSCryptoX509StoreFinalize(xmlSecKeyDataStorePtr store) {
 /**
  * xmlSecMSCryptoX509FindCert:
  */
-static PCCERT_CONTEXT		
+static PCCERT_CONTEXT        
 xmlSecMSCryptoX509FindCert(HCERTSTORE store, xmlChar *subjectName, xmlChar *issuerName, 
-			   xmlChar *issuerSerial, xmlChar *ski) {
-    xmlSecMSCryptoX509StoreCtxPtr ctx;
+               xmlChar *issuerSerial, xmlChar *ski) {
     PCCERT_CONTEXT pCert = NULL;
     int ret;
 
     xmlSecAssert2(store != 0, NULL);
 
     if((pCert == NULL) && (NULL != subjectName)) {
-	CERT_NAME_BLOB cnb;
-	BYTE *cName; 
-	DWORD cNameLen;
-
-	cName = xmlSecMSCryptoCertStrToName(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
-					   subjectName,
-					   CERT_OID_NAME_STR | CERT_NAME_STR_REVERSE_FLAG,
-					   &cNameLen);
-	if(cName == NULL) {
-	    xmlSecError(XMLSEC_ERRORS_HERE,
-			NULL,
-			"xmlSecMSCryptoCertStrToName",
-			XMLSEC_ERRORS_R_XMLSEC_FAILED,
-			XMLSEC_ERRORS_NO_MESSAGE);
-	    return (NULL);
-	}
-	cnb.pbData = cName;
-	cnb.cbData = cNameLen;
-	pCert = CertFindCertificateInStore(store, 
-					   PKCS_7_ASN_ENCODING | X509_ASN_ENCODING,
-					   0,
-					   CERT_FIND_SUBJECT_NAME,
-					   &cnb,
-					   NULL);
-	xmlFree(cName);
+        CERT_NAME_BLOB cnb;
+        BYTE *cName; 
+        DWORD cNameLen;
+
+        cName = xmlSecMSCryptoCertStrToName(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
+                        subjectName,
+                        CERT_OID_NAME_STR | CERT_NAME_STR_REVERSE_FLAG,
+                        &cNameLen);
+        if(cName == NULL) {
+            xmlSecError(XMLSEC_ERRORS_HERE,
+                NULL,
+                "xmlSecMSCryptoCertStrToName",
+                XMLSEC_ERRORS_R_XMLSEC_FAILED,
+                XMLSEC_ERRORS_NO_MESSAGE);
+            return (NULL);
+        }
+        cnb.pbData = cName;
+        cnb.cbData = cNameLen;
+        pCert = CertFindCertificateInStore(store, 
+                        PKCS_7_ASN_ENCODING | X509_ASN_ENCODING,
+                        0,
+                        CERT_FIND_SUBJECT_NAME,
+                        &cnb,
+                        NULL);
+        xmlFree(cName);
     }
 
     if((pCert == NULL) && (NULL != issuerName) && (NULL != issuerSerial)) {
-	xmlSecBn issuerSerialBn;	
-    xmlChar * p;
-    CERT_INFO certInfo;
-	CERT_NAME_BLOB cnb;
-    BYTE *cName = NULL; 
-	DWORD cNameLen = 0;	
-    
-    /* aleksey: for some unknown to me reasons, mscrypto wants Email
-     * instead of emailAddress. This code is not bullet proof and may 
-     * produce incorrect results if someone has "emailAddress=" string
-     * in one of the fields, but it is best I can suggest to fix this problem.
-     * Also see xmlSecMSCryptoX509NameWrite function.
-     */
-    while( (p = (xmlChar*)xmlStrstr(issuerName, BAD_CAST "emailAddress=")) != NULL) {
-        memcpy(p, "       Email=", 13);
-    }
+        xmlSecBn issuerSerialBn;    
+        xmlChar * p;
+        CERT_INFO certInfo;
+        CERT_NAME_BLOB cnb;
+        BYTE *cName = NULL; 
+        DWORD cNameLen = 0;    
+
+        /* aleksey: for some unknown to me reasons, mscrypto wants Email
+        * instead of emailAddress. This code is not bullet proof and may 
+        * produce incorrect results if someone has "emailAddress=" string
+        * in one of the fields, but it is best I can suggest to fix this problem.
+        * Also see xmlSecMSCryptoX509NameWrite function.
+        */
+        while( (p = (xmlChar*)xmlStrstr(issuerName, BAD_CAST "emailAddress=")) != NULL) {
+            memcpy(p, "       Email=", 13);
+        }
 
 
 
-    /* get issuer name */
-	cName = xmlSecMSCryptoCertStrToName(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
-					   issuerName,
-					   CERT_NAME_STR_ENABLE_UTF8_UNICODE_FLAG | CERT_X500_NAME_STR | CERT_NAME_STR_REVERSE_FLAG,
-					   &cNameLen);
-	if(cName == NULL) {
-	    xmlSecError(XMLSEC_ERRORS_HERE,
-			NULL,
-			"xmlSecMSCryptoCertStrToName",
-			XMLSEC_ERRORS_R_XMLSEC_FAILED,
-			XMLSEC_ERRORS_NO_MESSAGE);
-	    return (NULL);
-	}
-	cnb.pbData = cName;
-	cnb.cbData = cNameLen;
-
-    /* get serial number */
-	ret = xmlSecBnInitialize(&issuerSerialBn, 0);
-	if(ret < 0) {
-	    xmlSecError(XMLSEC_ERRORS_HERE,
-			NULL,
-			"xmlSecBnInitialize",
-			XMLSEC_ERRORS_R_XMLSEC_FAILED,
-			XMLSEC_ERRORS_NO_MESSAGE);
-    	xmlFree(cName);
-	    return(NULL);
-	}
+        /* get issuer name */
+        cName = xmlSecMSCryptoCertStrToName(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
+                        issuerName,
+                        CERT_NAME_STR_ENABLE_UTF8_UNICODE_FLAG | CERT_X500_NAME_STR | CERT_NAME_STR_REVERSE_FLAG,
+                        &cNameLen);
+        if(cName == NULL) {
+            xmlSecError(XMLSEC_ERRORS_HERE,
+                NULL,
+                "xmlSecMSCryptoCertStrToName",
+                XMLSEC_ERRORS_R_XMLSEC_FAILED,
+                XMLSEC_ERRORS_NO_MESSAGE);
+            return (NULL);
+        }
+        cnb.pbData = cName;
+        cnb.cbData = cNameLen;
 
-	ret = xmlSecBnFromDecString(&issuerSerialBn, issuerSerial);
-	if(ret < 0) {
-	    xmlSecError(XMLSEC_ERRORS_HERE,
-			NULL,
-			"xmlSecBnInitialize",
-			XMLSEC_ERRORS_R_XMLSEC_FAILED,
-			XMLSEC_ERRORS_NO_MESSAGE);
-	    xmlSecBnFinalize(&issuerSerialBn);
-		xmlFree(cName);
-        return(NULL);
-	}
+        /* get serial number */
+        ret = xmlSecBnInitialize(&issuerSerialBn, 0);
+        if(ret < 0) {
+            xmlSecError(XMLSEC_ERRORS_HERE,
+                NULL,
+                "xmlSecBnInitialize",
+                XMLSEC_ERRORS_R_XMLSEC_FAILED,
+                XMLSEC_ERRORS_NO_MESSAGE);
+            xmlFree(cName);
+            return(NULL);
+        }
 
-	/* I have no clue why at a sudden a swap is needed to 
-     * convert from lsb... This code is purely based upon 
-	 * trial and error :( WK
-	 */
-    ret = xmlSecBnReverse(&issuerSerialBn);
-	if(ret < 0) {
-	    xmlSecError(XMLSEC_ERRORS_HERE,
-			NULL,
-			"xmlSecBnReverse",
-			XMLSEC_ERRORS_R_XMLSEC_FAILED,
-			XMLSEC_ERRORS_NO_MESSAGE);
-	    xmlSecBnFinalize(&issuerSerialBn);
-		xmlFree(cName);
-        return(NULL);
-	}
+        ret = xmlSecBnFromDecString(&issuerSerialBn, issuerSerial);
+        if(ret < 0) {
+            xmlSecError(XMLSEC_ERRORS_HERE,
+                NULL,
+                "xmlSecBnInitialize",
+                XMLSEC_ERRORS_R_XMLSEC_FAILED,
+                XMLSEC_ERRORS_NO_MESSAGE);
+            xmlSecBnFinalize(&issuerSerialBn);
+            xmlFree(cName);
+            return(NULL);
+        }
 
-    certInfo.Issuer.cbData = cnb.cbData ;
-	certInfo.Issuer.pbData = cnb.pbData ;
-	certInfo.SerialNumber.cbData = xmlSecBnGetSize( &issuerSerialBn ) ;
-    certInfo.SerialNumber.pbData = xmlSecBnGetData( &issuerSerialBn ) ;
-
-    pCert = CertFindCertificateInStore(
-                    store,
-                    X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
-                    0,
-                    CERT_FIND_SUBJECT_CERT,
-                    &certInfo,
-                    NULL
-            ) ;
+        /* I have no clue why at a sudden a swap is needed to 
+        * convert from lsb... This code is purely based upon 
+        * trial and error :( WK
+        */
+        ret = xmlSecBnReverse(&issuerSerialBn);
+        if(ret < 0) {
+            xmlSecError(XMLSEC_ERRORS_HERE,
+                NULL,
+                "xmlSecBnReverse",
+                XMLSEC_ERRORS_R_XMLSEC_FAILED,
+                XMLSEC_ERRORS_NO_MESSAGE);
+            xmlSecBnFinalize(&issuerSerialBn);
+            xmlFree(cName);
+            return(NULL);
+        }
 
-    xmlFree(cName);
-	xmlSecBnFinalize(&issuerSerialBn);
+        certInfo.Issuer.cbData = cnb.cbData ;
+        certInfo.Issuer.pbData = cnb.pbData ;
+        certInfo.SerialNumber.cbData = xmlSecBnGetSize( &issuerSerialBn ) ;
+        certInfo.SerialNumber.pbData = xmlSecBnGetData( &issuerSerialBn ) ;
+
+        pCert = CertFindCertificateInStore(
+                        store,
+                        X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
+                        0,
+                        CERT_FIND_SUBJECT_CERT,
+                        &certInfo,
+                        NULL
+                ) ;
+
+        xmlFree(cName);
+        xmlSecBnFinalize(&issuerSerialBn);
     }
 
     if((pCert == NULL) && (ski != NULL)) {
-	CRYPT_HASH_BLOB blob;
-	xmlChar* binSki;
-	int binSkiLen;
-
-	binSki = xmlStrdup(ski);
-	if(binSki == NULL) {
-	    xmlSecError(XMLSEC_ERRORS_HERE,
-			NULL,
-			"xmlStrdup",
-			XMLSEC_ERRORS_R_MALLOC_FAILED,
-			XMLSEC_ERRORS_NO_MESSAGE);
-	    return (NULL);
-	}
+        CRYPT_HASH_BLOB blob;
+        xmlChar* binSki;
+        int binSkiLen;
 
-	/* trick: base64 decode "in place" */
-	binSkiLen = xmlSecBase64Decode(binSki, (xmlSecByte*)binSki, xmlStrlen(binSki));
+        binSki = xmlStrdup(ski);
+        if(binSki == NULL) {
+            xmlSecError(XMLSEC_ERRORS_HERE,
+                NULL,
+                "xmlStrdup",
+                XMLSEC_ERRORS_R_MALLOC_FAILED,
+                XMLSEC_ERRORS_NO_MESSAGE);
+            return (NULL);
+        }
+
+        /* trick: base64 decode "in place" */
+        binSkiLen = xmlSecBase64Decode(binSki, (xmlSecByte*)binSki, xmlStrlen(binSki));
         if(binSkiLen < 0) {
             xmlSecError(XMLSEC_ERRORS_HERE,
                         NULL,
@@ -887,21 +1033,21 @@ xmlSecMSCryptoX509FindCert(HCERTSTORE store, xmlChar *subjectName, xmlChar *issu
                         XMLSEC_ERRORS_R_XMLSEC_FAILED,
                         "ski=%s",
                         xmlSecErrorsSafeString(ski));
-	    xmlFree(binSki);
-	    return(NULL);
+            xmlFree(binSki);
+            return(NULL);
         }
 
-	blob.pbData = binSki;
-	blob.cbData = binSkiLen;
-	pCert = CertFindCertificateInStore(store, 
-					   PKCS_7_ASN_ENCODING | X509_ASN_ENCODING,
-					   0,
-					   CERT_FIND_KEY_IDENTIFIER,
-					   &blob,
-					   NULL);
-	xmlFree(binSki);
-    }
-  
+        blob.pbData = binSki;
+        blob.cbData = binSkiLen;
+        pCert = CertFindCertificateInStore(store, 
+                        PKCS_7_ASN_ENCODING | X509_ASN_ENCODING,
+                        0,
+                        CERT_FIND_KEY_IDENTIFIER,
+                        &blob,
+                        NULL);
+        xmlFree(binSki);
+    }
+
   return(pCert);
 }
 
diff --git a/src/mscrypto/xmlsec-mingw.h b/src/mscrypto/xmlsec-mingw.h
new file mode 100644
index 0000000..85d8cc3
--- /dev/null
+++ b/src/mscrypto/xmlsec-mingw.h
@@ -0,0 +1,165 @@
+/**
+ * XMLSec library
+ *
+ * This is free software; see Copyright file in the source
+ * distribution for preciese wording.
+ * 
+ * Copyright (C) 2007 Roumen Petrov.
+ */
+
+#ifndef __XMLSEC_MSCRYPTO_XMLSEC_MINGW_H__
+#define __XMLSEC_MSCRYPTO_XMLSEC_MINGW_H__
+
+
+/*defines*/
+#ifndef CERT_CLOSE_STORE_FORCE_FLAG
+#  define CERT_CLOSE_STORE_FORCE_FLAG		1
+#endif
+
+#ifndef CERT_CLOSE_STORE_CHECK_FLAG
+#  define CERT_CLOSE_STORE_CHECK_FLAG		2
+#endif
+
+
+#ifndef CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG
+#  define CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG	1
+#endif
+
+
+#ifndef CERT_STORE_ADD_ALWAYS
+#  define CERT_STORE_ADD_ALWAYS			4
+#endif
+
+#ifndef CERT_STORE_CREATE_NEW_FLAG
+#  define CERT_STORE_CREATE_NEW_FLAG		(2<<12)
+#endif
+
+#ifndef CERT_STORE_SIGNATURE_FLAG
+#  define CERT_STORE_SIGNATURE_FLAG		1
+#endif
+
+#ifndef CERT_STORE_TIME_VALIDITY_FLAG
+#  define CERT_STORE_TIME_VALIDITY_FLAG		2
+#endif
+
+#ifndef CERT_STORE_REVOCATION_FLAG
+#  define CERT_STORE_REVOCATION_FLAG		4
+#endif
+
+#ifndef CERT_STORE_NO_CRL_FLAG
+#  define CERT_STORE_NO_CRL_FLAG		(1<<16)
+#endif
+
+
+#ifndef CERT_STORE_PROV_COLLECTION
+#  define CERT_STORE_PROV_COLLECTION		((LPCSTR) 11)
+#endif
+
+#ifndef CERT_STORE_PROV_MEMORY
+#  define CERT_STORE_PROV_MEMORY		((LPCSTR) 2)
+#endif
+
+
+#ifndef CERT_KEY_SPEC_PROP_ID
+#  define CERT_KEY_SPEC_PROP_ID			6
+#endif
+
+#ifndef CERT_FRIENDLY_NAME_PROP_ID
+#  define CERT_FRIENDLY_NAME_PROP_ID		11
+#endif
+
+#ifndef CERT_KEY_IDENTIFIER_PROP_ID
+#  define CERT_KEY_IDENTIFIER_PROP_ID		20
+#endif
+
+
+#ifndef CERT_NAME_ISSUER_FLAG
+#  define CERT_NAME_ISSUER_FLAG			1
+#endif
+
+#ifndef CERT_NAME_RDN_TYPE
+#  define CERT_NAME_RDN_TYPE			2
+#endif
+
+#ifndef CERT_NAME_STR_ENABLE_UTF8_UNICODE_FLAG
+#  define CERT_NAME_STR_ENABLE_UTF8_UNICODE_FLAG	(4<<16)
+#endif
+
+
+#ifndef CERT_CHAIN_REVOCATION_CHECK_CHAIN
+#  define CERT_CHAIN_REVOCATION_CHECK_CHAIN			(2<<28)
+#endif
+
+#ifndef CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT
+#  define CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT	(4<<28)
+#endif
+
+
+#ifndef szOID_SUBJECT_KEY_IDENTIFIER
+#  define szOID_SUBJECT_KEY_IDENTIFIER		"2.5.29.14"
+#endif
+
+
+#ifndef CRYPT_ACQUIRE_COMPARE_KEY_FLAG
+#  define CRYPT_ACQUIRE_COMPARE_KEY_FLAG	4
+#endif
+
+
+/*structures/types*/
+typedef struct _PUBKEY {
+	DWORD magic;
+	DWORD bitlen;
+} DSSPUBKEY;
+
+typedef struct _DSSSEED {
+	DWORD   counter;
+	BYTE    seed[20];
+} DSSSEED;
+
+
+typedef struct _PROV_ENUMALGS_EX {
+	ALG_ID aiAlgid;
+	DWORD dwDefaultLen;
+	DWORD dwMinLen;
+	DWORD dwMaxLen;
+	DWORD dwProtocols;
+	DWORD dwNameLen;
+	CHAR szName[20];
+	DWORD dwLongNameLen;
+	CHAR szLongName[40];
+} PROV_ENUMALGS_EX;
+
+
+/*methods(functions)*/
+DWORD		WINAPI CertGetPublicKeyLength(DWORD,PCERT_PUBLIC_KEY_INFO);
+
+BOOL		WINAPI CertStrToNameA(DWORD,LPCSTR,DWORD,void*,BYTE*,DWORD*,LPCSTR*);
+BOOL		WINAPI CertStrToNameW(DWORD,LPCWSTR,DWORD,void*,BYTE*,DWORD*,LPCWSTR*);
+#ifdef UNICODE
+#define CertStrToName  CertStrToNameW
+#else
+#define CertStrToName  CertStrToNameA
+#endif
+BOOL		WINAPI CertCompareCertificateName(DWORD,PCERT_NAME_BLOB,PCERT_NAME_BLOB);
+
+BOOL		WINAPI CertAddStoreToCollection(HCERTSTORE,HCERTSTORE,DWORD,DWORD);
+
+PCCERT_CONTEXT	WINAPI CertCreateCertificateContext(DWORD,const BYTE*,DWORD);
+BOOL		WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT,DWORD,void*,DWORD*);
+BOOL		WINAPI CertVerifySubjectCertificateContext(PCCERT_CONTEXT,PCCERT_CONTEXT,DWORD*);
+
+BOOL		WINAPI CertAddCRLContextToStore(HCERTSTORE,PCCRL_CONTEXT,DWORD,PCCRL_CONTEXT*);
+PCCRL_CONTEXT	WINAPI CertDuplicateCRLContext(PCCRL_CONTEXT);
+BOOL		WINAPI CertFreeCRLContext(PCCRL_CONTEXT);
+
+BOOL		WINAPI CertFindCertificateInCRL(PCCERT_CONTEXT,PCCRL_CONTEXT,DWORD,void*,PCRL_ENTRY*);
+PCCRL_CONTEXT	WINAPI CertEnumCRLsInStore(HCERTSTORE,PCCRL_CONTEXT);
+
+PCCRL_CONTEXT	WINAPI CertCreateCRLContext(DWORD,const BYTE*,DWORD);
+
+BOOL		WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT,DWORD,void*,HCRYPTPROV*,DWORD*,BOOL*);
+BOOL		WINAPI CryptDuplicateKey(HCRYPTKEY,DWORD*,DWORD,HCRYPTKEY*);
+BOOL		WINAPI CryptImportPublicKeyInfo(HCRYPTPROV,DWORD,PCERT_PUBLIC_KEY_INFO,HCRYPTKEY*);
+
+
+#endif /*ndef __XMLSEC_MSCRYPTO_XMLSEC_MINGW_H__*/
diff --git a/src/nss/Makefile.am b/src/nss/Makefile.am
index 6118e15..5209533 100644
--- a/src/nss/Makefile.am
+++ b/src/nss/Makefile.am
@@ -1,13 +1,16 @@
 NULL =
 
 EXTRA_DIST = \
-	globals.h \
 	README \
 	$(NULL)
 
-INCLUDES = \
+lib_LTLIBRARIES = \
+	libxmlsec1-nss.la \
+	$(NULL)
+
+libxmlsec1_nss_la_CPPFLAGS = \
 	-DPACKAGE=\"@PACKAGE@\" \
-	-I$(top_srcdir) \
+	-I../../include \
 	-I$(top_srcdir)/include \
 	$(XMLSEC_DEFINES) \
 	$(NSS_CFLAGS) \
@@ -15,10 +18,6 @@ INCLUDES = \
 	$(LIBXML_CFLAGS) \
 	$(NULL)
 
-lib_LTLIBRARIES = \
-	libxmlsec1-nss.la \
-	$(NULL)
-
 libxmlsec1_nss_la_SOURCES =\
 	app.c \
 	bignum.c \
@@ -35,16 +34,24 @@ libxmlsec1_nss_la_SOURCES =\
 	keytrans.c \
 	kw_des.c \
 	kw_aes.c \
+	globals.h \
 	$(NULL)
 
+if SHAREDLIB_HACK
+libxmlsec1_nss_la_SOURCES += ../strings.c
+endif
+
 libxmlsec1_nss_la_LIBADD = \
 	../libxmlsec1.la \
 	$(NSS_LIBS) \
 	$(LIBXSLT_LIBS) \
 	$(LIBXML_LIBS) \
 	$(NULL)
-        
+
+libxmlsec1_nss_la_DEPENDENCIES = \
+	$(NULL)
+
 libxmlsec1_nss_la_LDFLAGS = \
+	@XMLSEC_CRYPTO_EXTRA_LDFLAGS@ \
 	-version-info @XMLSEC_VERSION_INFO@ \
 	$(NULL)
-
diff --git a/src/nss/Makefile.in b/src/nss/Makefile.in
index d19caf2..8e82100 100644
--- a/src/nss/Makefile.in
+++ b/src/nss/Makefile.in
@@ -38,6 +38,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+ at SHAREDLIB_HACK_TRUE@am__append_1 = ../strings.c
 subdir = src/nss
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -57,14 +58,21 @@ am__installdirs = "$(DESTDIR)$(libdir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libxmlsec1_nss_la_DEPENDENCIES = ../libxmlsec1.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am__libxmlsec1_nss_la_SOURCES_DIST = app.c bignum.c ciphers.c crypto.c \
+	digests.c hmac.c pkikeys.c signatures.c symkeys.c x509.c \
+	x509vfy.c keysstore.c keytrans.c kw_des.c kw_aes.c globals.h \
+	../strings.c
 am__objects_1 =
-am_libxmlsec1_nss_la_OBJECTS = app.lo bignum.lo ciphers.lo crypto.lo \
-	digests.lo hmac.lo pkikeys.lo signatures.lo symkeys.lo x509.lo \
-	x509vfy.lo keysstore.lo keytrans.lo kw_des.lo kw_aes.lo \
-	$(am__objects_1)
+ at SHAREDLIB_HACK_TRUE@am__objects_2 = libxmlsec1_nss_la-strings.lo
+am_libxmlsec1_nss_la_OBJECTS = libxmlsec1_nss_la-app.lo \
+	libxmlsec1_nss_la-bignum.lo libxmlsec1_nss_la-ciphers.lo \
+	libxmlsec1_nss_la-crypto.lo libxmlsec1_nss_la-digests.lo \
+	libxmlsec1_nss_la-hmac.lo libxmlsec1_nss_la-pkikeys.lo \
+	libxmlsec1_nss_la-signatures.lo libxmlsec1_nss_la-symkeys.lo \
+	libxmlsec1_nss_la-x509.lo libxmlsec1_nss_la-x509vfy.lo \
+	libxmlsec1_nss_la-keysstore.lo libxmlsec1_nss_la-keytrans.lo \
+	libxmlsec1_nss_la-kw_des.lo libxmlsec1_nss_la-kw_aes.lo \
+	$(am__objects_1) $(am__objects_2)
 libxmlsec1_nss_la_OBJECTS = $(am_libxmlsec1_nss_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -78,7 +86,7 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libxmlsec1_nss_la_SOURCES)
-DIST_SOURCES = $(libxmlsec1_nss_la_SOURCES)
+DIST_SOURCES = $(am__libxmlsec1_nss_la_SOURCES_DIST)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -146,12 +154,17 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAN2HTML = @MAN2HTML@
 MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
+MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
+MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
 MV = @MV@
 NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
+NSPR_PACKAGE = @NSPR_PACKAGE@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_CRYPTO_LIB = @NSS_CRYPTO_LIB@
 NSS_LIBS = @NSS_LIBS@
 NSS_MIN_VERSION = @NSS_MIN_VERSION@
+NSS_PACKAGE = @NSS_PACKAGE@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_CRYPTO_LIB = @OPENSSL_CRYPTO_LIB@
@@ -169,6 +182,8 @@ PKG_CONFIG_ENABLED = @PKG_CONFIG_ENABLED@
 RANLIB = @RANLIB@
 RM = @RM@
 SET_MAKE = @SET_MAKE@
+SHAREDLIB_HACK_FALSE = @SHAREDLIB_HACK_FALSE@
+SHAREDLIB_HACK_TRUE = @SHAREDLIB_HACK_TRUE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TAR = @TAR@
@@ -181,6 +196,7 @@ XMLSEC_CORE_LIBS = @XMLSEC_CORE_LIBS@
 XMLSEC_CRYPTO = @XMLSEC_CRYPTO@
 XMLSEC_CRYPTO_CFLAGS = @XMLSEC_CRYPTO_CFLAGS@
 XMLSEC_CRYPTO_DISABLED_LIST = @XMLSEC_CRYPTO_DISABLED_LIST@
+XMLSEC_CRYPTO_EXTRA_LDFLAGS = @XMLSEC_CRYPTO_EXTRA_LDFLAGS@
 XMLSEC_CRYPTO_LIB = @XMLSEC_CRYPTO_LIB@
 XMLSEC_CRYPTO_LIBS = @XMLSEC_CRYPTO_LIBS@
 XMLSEC_CRYPTO_LIST = @XMLSEC_CRYPTO_LIST@
@@ -189,6 +205,7 @@ XMLSEC_DEFINES = @XMLSEC_DEFINES@
 XMLSEC_DL_INCLUDES = @XMLSEC_DL_INCLUDES@
 XMLSEC_DL_LIBS = @XMLSEC_DL_LIBS@
 XMLSEC_DOCDIR = @XMLSEC_DOCDIR@
+XMLSEC_EXTRA_LDFLAGS = @XMLSEC_EXTRA_LDFLAGS@
 XMLSEC_GNUTLS_CFLAGS = @XMLSEC_GNUTLS_CFLAGS@
 XMLSEC_GNUTLS_LIBS = @XMLSEC_GNUTLS_LIBS@
 XMLSEC_LIBDIR = @XMLSEC_LIBDIR@
@@ -211,6 +228,9 @@ XMLSEC_NO_DSA_TRUE = @XMLSEC_NO_DSA_TRUE@
 XMLSEC_NO_GNUTLS = @XMLSEC_NO_GNUTLS@
 XMLSEC_NO_GNUTLS_FALSE = @XMLSEC_NO_GNUTLS_FALSE@
 XMLSEC_NO_GNUTLS_TRUE = @XMLSEC_NO_GNUTLS_TRUE@
+XMLSEC_NO_GOST = @XMLSEC_NO_GOST@
+XMLSEC_NO_GOST_FALSE = @XMLSEC_NO_GOST_FALSE@
+XMLSEC_NO_GOST_TRUE = @XMLSEC_NO_GOST_TRUE@
 XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
 XMLSEC_NO_HMAC_FALSE = @XMLSEC_NO_HMAC_FALSE@
 XMLSEC_NO_HMAC_TRUE = @XMLSEC_NO_HMAC_TRUE@
@@ -218,6 +238,9 @@ XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
 XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
 XMLSEC_NO_MD5_FALSE = @XMLSEC_NO_MD5_FALSE@
 XMLSEC_NO_MD5_TRUE = @XMLSEC_NO_MD5_TRUE@
+XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
+XMLSEC_NO_MSCRYPTO_FALSE = @XMLSEC_NO_MSCRYPTO_FALSE@
+XMLSEC_NO_MSCRYPTO_TRUE = @XMLSEC_NO_MSCRYPTO_TRUE@
 XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
 XMLSEC_NO_NSS_FALSE = @XMLSEC_NO_NSS_FALSE@
 XMLSEC_NO_NSS_TRUE = @XMLSEC_NO_NSS_TRUE@
@@ -314,13 +337,16 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 NULL = 
 EXTRA_DIST = \
-	globals.h \
 	README \
 	$(NULL)
 
-INCLUDES = \
+lib_LTLIBRARIES = \
+	libxmlsec1-nss.la \
+	$(NULL)
+
+libxmlsec1_nss_la_CPPFLAGS = \
 	-DPACKAGE=\"@PACKAGE@\" \
-	-I$(top_srcdir) \
+	-I../../include \
 	-I$(top_srcdir)/include \
 	$(XMLSEC_DEFINES) \
 	$(NSS_CFLAGS) \
@@ -328,28 +354,10 @@ INCLUDES = \
 	$(LIBXML_CFLAGS) \
 	$(NULL)
 
-lib_LTLIBRARIES = \
-	libxmlsec1-nss.la \
-	$(NULL)
-
-libxmlsec1_nss_la_SOURCES = \
-	app.c \
-	bignum.c \
-	ciphers.c \
-	crypto.c \
-	digests.c \
-	hmac.c \
-	pkikeys.c \
-	signatures.c \
-	symkeys.c \
-	x509.c \
-	x509vfy.c \
-	keysstore.c \
-	keytrans.c \
-	kw_des.c \
-	kw_aes.c \
-	$(NULL)
-
+libxmlsec1_nss_la_SOURCES = app.c bignum.c ciphers.c crypto.c \
+	digests.c hmac.c pkikeys.c signatures.c symkeys.c x509.c \
+	x509vfy.c keysstore.c keytrans.c kw_des.c kw_aes.c globals.h \
+	$(NULL) $(am__append_1)
 libxmlsec1_nss_la_LIBADD = \
 	../libxmlsec1.la \
 	$(NSS_LIBS) \
@@ -357,7 +365,11 @@ libxmlsec1_nss_la_LIBADD = \
 	$(LIBXML_LIBS) \
 	$(NULL)
 
+libxmlsec1_nss_la_DEPENDENCIES = \
+	$(NULL)
+
 libxmlsec1_nss_la_LDFLAGS = \
+	@XMLSEC_CRYPTO_EXTRA_LDFLAGS@ \
 	-version-info @XMLSEC_VERSION_INFO@ \
 	$(NULL)
 
@@ -430,21 +442,22 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/app.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/bignum.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ciphers.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/crypto.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/digests.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hmac.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/keysstore.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/keytrans.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kw_aes.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kw_des.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pkikeys.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/signatures.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/symkeys.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/x509.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/x509vfy.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_nss_la-app.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_nss_la-bignum.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_nss_la-ciphers.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_nss_la-crypto.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_nss_la-digests.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_nss_la-hmac.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_nss_la-keysstore.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_nss_la-keytrans.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_nss_la-kw_aes.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_nss_la-kw_des.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_nss_la-pkikeys.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_nss_la-signatures.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_nss_la-strings.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_nss_la-symkeys.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_nss_la-x509.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_nss_la-x509vfy.Plo at am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -467,6 +480,118 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+libxmlsec1_nss_la-app.lo: app.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-app.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-app.Tpo" -c -o libxmlsec1_nss_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_nss_la-app.Tpo" "$(DEPDIR)/libxmlsec1_nss_la-app.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_nss_la-app.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='app.c' object='libxmlsec1_nss_la-app.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c
+
+libxmlsec1_nss_la-bignum.lo: bignum.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-bignum.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-bignum.Tpo" -c -o libxmlsec1_nss_la-bignum.lo `test -f 'bignum.c' || echo '$(srcdir)/'`bignum.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_nss_la-bignum.Tpo" "$(DEPDIR)/libxmlsec1_nss_la-bignum.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_nss_la-bignum.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bignum.c' object='libxmlsec1_nss_la-bignum.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-bignum.lo `test -f 'bignum.c' || echo '$(srcdir)/'`bignum.c
+
+libxmlsec1_nss_la-ciphers.lo: ciphers.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-ciphers.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-ciphers.Tpo" -c -o libxmlsec1_nss_la-ciphers.lo `test -f 'ciphers.c' || echo '$(srcdir)/'`ciphers.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_nss_la-ciphers.Tpo" "$(DEPDIR)/libxmlsec1_nss_la-ciphers.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_nss_la-ciphers.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ciphers.c' object='libxmlsec1_nss_la-ciphers.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-ciphers.lo `test -f 'ciphers.c' || echo '$(srcdir)/'`ciphers.c
+
+libxmlsec1_nss_la-crypto.lo: crypto.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-crypto.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-crypto.Tpo" -c -o libxmlsec1_nss_la-crypto.lo `test -f 'crypto.c' || echo '$(srcdir)/'`crypto.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_nss_la-crypto.Tpo" "$(DEPDIR)/libxmlsec1_nss_la-crypto.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_nss_la-crypto.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='crypto.c' object='libxmlsec1_nss_la-crypto.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-crypto.lo `test -f 'crypto.c' || echo '$(srcdir)/'`crypto.c
+
+libxmlsec1_nss_la-digests.lo: digests.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-digests.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-digests.Tpo" -c -o libxmlsec1_nss_la-digests.lo `test -f 'digests.c' || echo '$(srcdir)/'`digests.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_nss_la-digests.Tpo" "$(DEPDIR)/libxmlsec1_nss_la-digests.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_nss_la-digests.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='digests.c' object='libxmlsec1_nss_la-digests.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-digests.lo `test -f 'digests.c' || echo '$(srcdir)/'`digests.c
+
+libxmlsec1_nss_la-hmac.lo: hmac.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-hmac.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-hmac.Tpo" -c -o libxmlsec1_nss_la-hmac.lo `test -f 'hmac.c' || echo '$(srcdir)/'`hmac.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_nss_la-hmac.Tpo" "$(DEPDIR)/libxmlsec1_nss_la-hmac.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_nss_la-hmac.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hmac.c' object='libxmlsec1_nss_la-hmac.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-hmac.lo `test -f 'hmac.c' || echo '$(srcdir)/'`hmac.c
+
+libxmlsec1_nss_la-pkikeys.lo: pkikeys.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-pkikeys.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-pkikeys.Tpo" -c -o libxmlsec1_nss_la-pkikeys.lo `test -f 'pkikeys.c' || echo '$(srcdir)/'`pkikeys.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_nss_la-pkikeys.Tpo" "$(DEPDIR)/libxmlsec1_nss_la-pkikeys.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_nss_la-pkikeys.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pkikeys.c' object='libxmlsec1_nss_la-pkikeys.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-pkikeys.lo `test -f 'pkikeys.c' || echo '$(srcdir)/'`pkikeys.c
+
+libxmlsec1_nss_la-signatures.lo: signatures.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-signatures.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-signatures.Tpo" -c -o libxmlsec1_nss_la-signatures.lo `test -f 'signatures.c' || echo '$(srcdir)/'`signatures.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_nss_la-signatures.Tpo" "$(DEPDIR)/libxmlsec1_nss_la-signatures.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_nss_la-signatures.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='signatures.c' object='libxmlsec1_nss_la-signatures.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-signatures.lo `test -f 'signatures.c' || echo '$(srcdir)/'`signatures.c
+
+libxmlsec1_nss_la-symkeys.lo: symkeys.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-symkeys.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-symkeys.Tpo" -c -o libxmlsec1_nss_la-symkeys.lo `test -f 'symkeys.c' || echo '$(srcdir)/'`symkeys.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_nss_la-symkeys.Tpo" "$(DEPDIR)/libxmlsec1_nss_la-symkeys.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_nss_la-symkeys.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='symkeys.c' object='libxmlsec1_nss_la-symkeys.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-symkeys.lo `test -f 'symkeys.c' || echo '$(srcdir)/'`symkeys.c
+
+libxmlsec1_nss_la-x509.lo: x509.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-x509.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-x509.Tpo" -c -o libxmlsec1_nss_la-x509.lo `test -f 'x509.c' || echo '$(srcdir)/'`x509.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_nss_la-x509.Tpo" "$(DEPDIR)/libxmlsec1_nss_la-x509.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_nss_la-x509.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='x509.c' object='libxmlsec1_nss_la-x509.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-x509.lo `test -f 'x509.c' || echo '$(srcdir)/'`x509.c
+
+libxmlsec1_nss_la-x509vfy.lo: x509vfy.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-x509vfy.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-x509vfy.Tpo" -c -o libxmlsec1_nss_la-x509vfy.lo `test -f 'x509vfy.c' || echo '$(srcdir)/'`x509vfy.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_nss_la-x509vfy.Tpo" "$(DEPDIR)/libxmlsec1_nss_la-x509vfy.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_nss_la-x509vfy.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='x509vfy.c' object='libxmlsec1_nss_la-x509vfy.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-x509vfy.lo `test -f 'x509vfy.c' || echo '$(srcdir)/'`x509vfy.c
+
+libxmlsec1_nss_la-keysstore.lo: keysstore.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-keysstore.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-keysstore.Tpo" -c -o libxmlsec1_nss_la-keysstore.lo `test -f 'keysstore.c' || echo '$(srcdir)/'`keysstore.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_nss_la-keysstore.Tpo" "$(DEPDIR)/libxmlsec1_nss_la-keysstore.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_nss_la-keysstore.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='keysstore.c' object='libxmlsec1_nss_la-keysstore.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-keysstore.lo `test -f 'keysstore.c' || echo '$(srcdir)/'`keysstore.c
+
+libxmlsec1_nss_la-keytrans.lo: keytrans.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-keytrans.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-keytrans.Tpo" -c -o libxmlsec1_nss_la-keytrans.lo `test -f 'keytrans.c' || echo '$(srcdir)/'`keytrans.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_nss_la-keytrans.Tpo" "$(DEPDIR)/libxmlsec1_nss_la-keytrans.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_nss_la-keytrans.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='keytrans.c' object='libxmlsec1_nss_la-keytrans.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-keytrans.lo `test -f 'keytrans.c' || echo '$(srcdir)/'`keytrans.c
+
+libxmlsec1_nss_la-kw_des.lo: kw_des.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-kw_des.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-kw_des.Tpo" -c -o libxmlsec1_nss_la-kw_des.lo `test -f 'kw_des.c' || echo '$(srcdir)/'`kw_des.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_nss_la-kw_des.Tpo" "$(DEPDIR)/libxmlsec1_nss_la-kw_des.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_nss_la-kw_des.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='kw_des.c' object='libxmlsec1_nss_la-kw_des.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-kw_des.lo `test -f 'kw_des.c' || echo '$(srcdir)/'`kw_des.c
+
+libxmlsec1_nss_la-kw_aes.lo: kw_aes.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-kw_aes.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-kw_aes.Tpo" -c -o libxmlsec1_nss_la-kw_aes.lo `test -f 'kw_aes.c' || echo '$(srcdir)/'`kw_aes.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_nss_la-kw_aes.Tpo" "$(DEPDIR)/libxmlsec1_nss_la-kw_aes.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_nss_la-kw_aes.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='kw_aes.c' object='libxmlsec1_nss_la-kw_aes.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-kw_aes.lo `test -f 'kw_aes.c' || echo '$(srcdir)/'`kw_aes.c
+
+libxmlsec1_nss_la-strings.lo: ../strings.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-strings.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-strings.Tpo" -c -o libxmlsec1_nss_la-strings.lo `test -f '../strings.c' || echo '$(srcdir)/'`../strings.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_nss_la-strings.Tpo" "$(DEPDIR)/libxmlsec1_nss_la-strings.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_nss_la-strings.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../strings.c' object='libxmlsec1_nss_la-strings.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-strings.lo `test -f '../strings.c' || echo '$(srcdir)/'`../strings.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/src/nss/app.c b/src/nss/app.c
index af2ced5..6404516 100644
--- a/src/nss/app.c
+++ b/src/nss/app.c
@@ -437,7 +437,6 @@ xmlSecNssAppDerKeyLoadSECItem(SECItem* secItem) {
     SECKEYPublicKey *pubkey = NULL;
     SECKEYPrivateKey *privkey = NULL;
     CERTSubjectPublicKeyInfo *spki = NULL;
-    SECKEYEncryptedPrivateKeyInfo *epki = NULL;
     SECItem nickname;
     PK11SlotInfo *slot = NULL;
     SECStatus status;
@@ -547,9 +546,6 @@ done:
     if(spki != NULL) {
 	SECKEY_DestroySubjectPublicKeyInfo(spki);
     }
-    if(epki != NULL) {
-	SECKEY_DestroyEncryptedPrivateKeyInfo(epki, PR_TRUE);
-    }
     return (retval);
 }
 
diff --git a/src/nss/bignum.c b/src/nss/bignum.c
index b9e0d6b..e0bbc38 100644
--- a/src/nss/bignum.c
+++ b/src/nss/bignum.c
@@ -142,7 +142,7 @@ xmlSecNssNodeSetBigNumValue(xmlNodePtr cur, const SECItem *a, int addLineBreaks)
 	xmlNodeSetContent(cur, xmlSecStringEmpty);
     }
     
-    ret = xmlSecBufferBase64NodeContentWrite(&buf, cur, XMLSEC_BASE64_LINESIZE);
+    ret = xmlSecBufferBase64NodeContentWrite(&buf, cur, xmlSecBase64GetDefaultLineSize());
     if(ret < 0) {
 	xmlSecError(XMLSEC_ERRORS_HERE,
 		    NULL,
diff --git a/src/nss/hmac.c b/src/nss/hmac.c
index f67ec9d..0080a8f 100644
--- a/src/nss/hmac.c
+++ b/src/nss/hmac.c
@@ -26,10 +26,40 @@
 #include <xmlsec/nss/app.h>
 #include <xmlsec/nss/crypto.h>
 
+#define XMLSEC_NSS_MIN_HMAC_SIZE		40
 #define XMLSEC_NSS_MAX_HMAC_SIZE		128
 
 /**************************************************************************
  *
+ * Configuration
+ *
+ *****************************************************************************/
+static int g_xmlsec_nss_hmac_min_length = XMLSEC_NSS_MIN_HMAC_SIZE;
+
+/**
+ * xmlSecNssHmacGetMinOutputLength: 
+ * 
+ * Returns the min HMAC output length
+ */
+int xmlSecNssHmacGetMinOutputLength()
+{
+    return g_xmlsec_nss_hmac_min_length;
+}
+
+/**
+ * xmlSecNssHmacSetMinOutputLength: 
+ *
+ * @min_length: the new min length 
+ * 
+ * Sets the min HMAC output length
+ */
+void xmlSecNssHmacSetMinOutputLength(int min_length)
+{
+    g_xmlsec_nss_hmac_min_length = min_length;
+}
+
+/**************************************************************************
+ *
  * Internal NSS HMAC CTX
  *
  *****************************************************************************/
@@ -162,7 +192,20 @@ xmlSecNssHmacNodeRead(xmlSecTransformPtr transform, xmlNodePtr node, xmlSecTrans
 	    ctx->dgstSize = atoi((char*)content);	    
 	    xmlFree(content);
 	}
-	/* todo: error if dgstSize == 0 ?*/
+
+	/* Ensure that HMAC length is greater than min specified.
+	   Otherwise, an attacker can set this lenght to 0 or very 
+	   small value
+	*/
+	if(ctx->dgstSize < xmlSecNssHmacGetMinOutputLength()) {
+ 	   xmlSecError(XMLSEC_ERRORS_HERE,
+		    xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
+		    xmlSecNodeHMACOutputLength,
+		    XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE,
+		    "HMAC output length is too small");
+	   return(-1);
+	}
+
 	cur = xmlSecGetNextElementNode(cur->next);
     }
     
diff --git a/src/nss/keysstore.c b/src/nss/keysstore.c
index 915b6d6..d0bd9e6 100644
--- a/src/nss/keysstore.c
+++ b/src/nss/keysstore.c
@@ -481,25 +481,5 @@ done:
 	xmlSecKeyDestroy(key);
     }
 
-    /* now that we have a key, make sure it is valid and let the simple
-     * store adopt it */
-    if (retval) {
-	if (xmlSecKeyIsValid(retval)) {
-	    ret = xmlSecSimpleKeysStoreAdoptKey(*ss, retval);
-	    if (ret < 0) {
-		xmlSecError(XMLSEC_ERRORS_HERE,
-			    xmlSecErrorsSafeString(xmlSecKeyStoreGetName(store)),
-			    "xmlSecSimpleKeysStoreAdoptKey",
-			    XMLSEC_ERRORS_R_XMLSEC_FAILED,
-			    XMLSEC_ERRORS_NO_MESSAGE);
-		xmlSecKeyDestroy(retval);
-		retval = NULL;
-	    }
-        } else {
-	    xmlSecKeyDestroy(retval);
-	    retval = NULL;
-	}
-    }
-
     return (retval);
 }
diff --git a/src/nss/pkikeys.c b/src/nss/pkikeys.c
index 92de6b3..eb1f84a 100644
--- a/src/nss/pkikeys.c
+++ b/src/nss/pkikeys.c
@@ -1507,7 +1507,7 @@ xmlSecNssKeyDataRsaGetType(xmlSecKeyDataPtr data) {
     
     ctx = xmlSecNssPKIKeyDataGetCtx(data);
     xmlSecAssert2(ctx != NULL, -1);
-    xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == rsaKey, -1);
+    xmlSecAssert2(ctx->pubkey == NULL || SECKEY_GetPublicKeyType(ctx->pubkey) == rsaKey, -1);
     if (ctx->privkey != NULL) {
 	return(xmlSecKeyDataTypePrivate | xmlSecKeyDataTypePublic);
     } else {
diff --git a/src/nss/x509.c b/src/nss/x509.c
index dd3b58b..c5aa7c1 100644
--- a/src/nss/x509.c
+++ b/src/nss/x509.c
@@ -1137,7 +1137,6 @@ xmlSecNssX509SubjectNameNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecK
 
     cert = xmlSecNssX509StoreFindCert(x509Store, subject, NULL, NULL, NULL, keyInfoCtx);
     if(cert == NULL){
-	xmlFree(subject);
 
 	if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT) != 0) {
 	    xmlSecError(XMLSEC_ERRORS_HERE,
@@ -1146,8 +1145,11 @@ xmlSecNssX509SubjectNameNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecK
 			XMLSEC_ERRORS_R_CERT_NOT_FOUND,
 			"subject=%s", 
 			xmlSecErrorsSafeString(subject));
+	    xmlFree(subject);
 	    return(-1);
 	}
+
+	xmlFree(subject);
 	return(0);
     }
 
@@ -1196,7 +1198,7 @@ xmlSecNssX509SubjectNameNodeWrite(CERTCertificate* cert, xmlNodePtr node, xmlSec
 	xmlFree(buf);
 	return(-1);
     }
-    xmlNodeSetContent(cur, buf);
+    xmlSecNodeEncodeAndSetContent(cur, buf);
     xmlFree(buf);
     return(0);
 }
@@ -1298,9 +1300,6 @@ xmlSecNssX509IssuerSerialNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSec
 
     cert = xmlSecNssX509StoreFindCert(x509Store, NULL, issuerName, issuerSerial, NULL, keyInfoCtx);
     if(cert == NULL){
-	xmlFree(issuerSerial);
-	xmlFree(issuerName);
-
 	if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT) != 0) {
 	    xmlSecError(XMLSEC_ERRORS_HERE,
 		        xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
@@ -1309,8 +1308,13 @@ xmlSecNssX509IssuerSerialNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSec
 			"issuerName=%s;issuerSerial=%s",
 		        xmlSecErrorsSafeString(issuerName), 
 			xmlSecErrorsSafeString(issuerSerial));
+	    xmlFree(issuerSerial);
+	    xmlFree(issuerName);
 	    return(-1);
 	}
+
+	xmlFree(issuerSerial);
+	xmlFree(issuerName);
 	return(0);    
     }
 
@@ -1386,7 +1390,7 @@ xmlSecNssX509IssuerSerialNodeWrite(CERTCertificate* cert, xmlNodePtr node, xmlSe
 		    XMLSEC_ERRORS_NO_MESSAGE);
 	return(-1);
     }
-    xmlNodeSetContent(issuerNameNode, buf);
+    xmlSecNodeEncodeAndSetContent(issuerNameNode, buf);
     xmlFree(buf);
 
     buf = xmlSecNssASN1IntegerWrite(&(cert->serialNumber));
@@ -1504,7 +1508,7 @@ xmlSecNssX509SKINodeWrite(CERTCertificate* cert, xmlNodePtr node, xmlSecKeyInfoC
 	xmlFree(buf);
 	return(-1);
     }
-    xmlNodeSetContent(cur, buf);
+    xmlSecNodeEncodeAndSetContent(cur, buf);
     xmlFree(buf);
 
     return(0);
diff --git a/src/openssl/Makefile.am b/src/openssl/Makefile.am
index bba00df..db2cd43 100644
--- a/src/openssl/Makefile.am
+++ b/src/openssl/Makefile.am
@@ -1,13 +1,16 @@
 NULL =
 
 EXTRA_DIST = \
-	globals.h \
 	README \
 	$(NULL)
 
-INCLUDES = \
+lib_LTLIBRARIES = \
+	libxmlsec1-openssl.la \
+	$(NULL)
+
+libxmlsec1_openssl_la_CPPFLAGS = \
 	-DPACKAGE=\"@PACKAGE@\" \
-	-I$(top_srcdir) \
+	-I../../include \
 	-I$(top_srcdir)/include \
 	$(XMLSEC_DEFINES) \
 	$(OPENSSL_CFLAGS) \
@@ -15,10 +18,6 @@ INCLUDES = \
 	$(LIBXML_CFLAGS) \
 	$(NULL)
 
-lib_LTLIBRARIES = \
-	libxmlsec1-openssl.la \
-	$(NULL)
-
 libxmlsec1_openssl_la_SOURCES =\
 	app.c \
 	bn.c \
@@ -34,15 +33,24 @@ libxmlsec1_openssl_la_SOURCES =\
 	symkeys.c \
 	x509.c \
 	x509vfy.c \
+	globals.h \
 	$(NULL)
 
+if SHAREDLIB_HACK
+libxmlsec1_openssl_la_SOURCES += ../strings.c
+endif
+
 libxmlsec1_openssl_la_LIBADD = \
 	../libxmlsec1.la \
 	$(OPENSSL_LIBS) \
 	$(LIBXSLT_LIBS) \
 	$(LIBXML_LIBS) \
 	$(NULL)
-        
+
+libxmlsec1_openssl_la_DEPENDENCIES = \
+	$(NULL)
+
 libxmlsec1_openssl_la_LDFLAGS = \
+	@XMLSEC_CRYPTO_EXTRA_LDFLAGS@ \
 	-version-info @XMLSEC_VERSION_INFO@ \
 	$(NULL)
diff --git a/src/openssl/Makefile.in b/src/openssl/Makefile.in
index df0dd76..0ddb17e 100644
--- a/src/openssl/Makefile.in
+++ b/src/openssl/Makefile.in
@@ -38,6 +38,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+ at SHAREDLIB_HACK_TRUE@am__append_1 = ../strings.c
 subdir = src/openssl
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -57,13 +58,22 @@ am__installdirs = "$(DESTDIR)$(libdir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libxmlsec1_openssl_la_DEPENDENCIES = ../libxmlsec1.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am__libxmlsec1_openssl_la_SOURCES_DIST = app.c bn.c ciphers.c crypto.c \
+	digests.c evp.c hmac.c kw_aes.c kw_des.c kt_rsa.c signatures.c \
+	symkeys.c x509.c x509vfy.c globals.h ../strings.c
 am__objects_1 =
-am_libxmlsec1_openssl_la_OBJECTS = app.lo bn.lo ciphers.lo crypto.lo \
-	digests.lo evp.lo hmac.lo kw_aes.lo kw_des.lo kt_rsa.lo \
-	signatures.lo symkeys.lo x509.lo x509vfy.lo $(am__objects_1)
+ at SHAREDLIB_HACK_TRUE@am__objects_2 = libxmlsec1_openssl_la-strings.lo
+am_libxmlsec1_openssl_la_OBJECTS = libxmlsec1_openssl_la-app.lo \
+	libxmlsec1_openssl_la-bn.lo libxmlsec1_openssl_la-ciphers.lo \
+	libxmlsec1_openssl_la-crypto.lo \
+	libxmlsec1_openssl_la-digests.lo libxmlsec1_openssl_la-evp.lo \
+	libxmlsec1_openssl_la-hmac.lo libxmlsec1_openssl_la-kw_aes.lo \
+	libxmlsec1_openssl_la-kw_des.lo \
+	libxmlsec1_openssl_la-kt_rsa.lo \
+	libxmlsec1_openssl_la-signatures.lo \
+	libxmlsec1_openssl_la-symkeys.lo libxmlsec1_openssl_la-x509.lo \
+	libxmlsec1_openssl_la-x509vfy.lo $(am__objects_1) \
+	$(am__objects_2)
 libxmlsec1_openssl_la_OBJECTS = $(am_libxmlsec1_openssl_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -77,7 +87,7 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libxmlsec1_openssl_la_SOURCES)
-DIST_SOURCES = $(libxmlsec1_openssl_la_SOURCES)
+DIST_SOURCES = $(am__libxmlsec1_openssl_la_SOURCES_DIST)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -145,12 +155,17 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAN2HTML = @MAN2HTML@
 MOZILLA_MIN_VERSION = @MOZILLA_MIN_VERSION@
+MSCRYPTO_CFLAGS = @MSCRYPTO_CFLAGS@
+MSCRYPTO_CRYPTO_LIB = @MSCRYPTO_CRYPTO_LIB@
+MSCRYPTO_LIBS = @MSCRYPTO_LIBS@
 MV = @MV@
 NSPR_MIN_VERSION = @NSPR_MIN_VERSION@
+NSPR_PACKAGE = @NSPR_PACKAGE@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_CRYPTO_LIB = @NSS_CRYPTO_LIB@
 NSS_LIBS = @NSS_LIBS@
 NSS_MIN_VERSION = @NSS_MIN_VERSION@
+NSS_PACKAGE = @NSS_PACKAGE@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_CRYPTO_LIB = @OPENSSL_CRYPTO_LIB@
@@ -168,6 +183,8 @@ PKG_CONFIG_ENABLED = @PKG_CONFIG_ENABLED@
 RANLIB = @RANLIB@
 RM = @RM@
 SET_MAKE = @SET_MAKE@
+SHAREDLIB_HACK_FALSE = @SHAREDLIB_HACK_FALSE@
+SHAREDLIB_HACK_TRUE = @SHAREDLIB_HACK_TRUE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TAR = @TAR@
@@ -180,6 +197,7 @@ XMLSEC_CORE_LIBS = @XMLSEC_CORE_LIBS@
 XMLSEC_CRYPTO = @XMLSEC_CRYPTO@
 XMLSEC_CRYPTO_CFLAGS = @XMLSEC_CRYPTO_CFLAGS@
 XMLSEC_CRYPTO_DISABLED_LIST = @XMLSEC_CRYPTO_DISABLED_LIST@
+XMLSEC_CRYPTO_EXTRA_LDFLAGS = @XMLSEC_CRYPTO_EXTRA_LDFLAGS@
 XMLSEC_CRYPTO_LIB = @XMLSEC_CRYPTO_LIB@
 XMLSEC_CRYPTO_LIBS = @XMLSEC_CRYPTO_LIBS@
 XMLSEC_CRYPTO_LIST = @XMLSEC_CRYPTO_LIST@
@@ -188,6 +206,7 @@ XMLSEC_DEFINES = @XMLSEC_DEFINES@
 XMLSEC_DL_INCLUDES = @XMLSEC_DL_INCLUDES@
 XMLSEC_DL_LIBS = @XMLSEC_DL_LIBS@
 XMLSEC_DOCDIR = @XMLSEC_DOCDIR@
+XMLSEC_EXTRA_LDFLAGS = @XMLSEC_EXTRA_LDFLAGS@
 XMLSEC_GNUTLS_CFLAGS = @XMLSEC_GNUTLS_CFLAGS@
 XMLSEC_GNUTLS_LIBS = @XMLSEC_GNUTLS_LIBS@
 XMLSEC_LIBDIR = @XMLSEC_LIBDIR@
@@ -210,6 +229,9 @@ XMLSEC_NO_DSA_TRUE = @XMLSEC_NO_DSA_TRUE@
 XMLSEC_NO_GNUTLS = @XMLSEC_NO_GNUTLS@
 XMLSEC_NO_GNUTLS_FALSE = @XMLSEC_NO_GNUTLS_FALSE@
 XMLSEC_NO_GNUTLS_TRUE = @XMLSEC_NO_GNUTLS_TRUE@
+XMLSEC_NO_GOST = @XMLSEC_NO_GOST@
+XMLSEC_NO_GOST_FALSE = @XMLSEC_NO_GOST_FALSE@
+XMLSEC_NO_GOST_TRUE = @XMLSEC_NO_GOST_TRUE@
 XMLSEC_NO_HMAC = @XMLSEC_NO_HMAC@
 XMLSEC_NO_HMAC_FALSE = @XMLSEC_NO_HMAC_FALSE@
 XMLSEC_NO_HMAC_TRUE = @XMLSEC_NO_HMAC_TRUE@
@@ -217,6 +239,9 @@ XMLSEC_NO_LIBXSLT = @XMLSEC_NO_LIBXSLT@
 XMLSEC_NO_MD5 = @XMLSEC_NO_MD5@
 XMLSEC_NO_MD5_FALSE = @XMLSEC_NO_MD5_FALSE@
 XMLSEC_NO_MD5_TRUE = @XMLSEC_NO_MD5_TRUE@
+XMLSEC_NO_MSCRYPTO = @XMLSEC_NO_MSCRYPTO@
+XMLSEC_NO_MSCRYPTO_FALSE = @XMLSEC_NO_MSCRYPTO_FALSE@
+XMLSEC_NO_MSCRYPTO_TRUE = @XMLSEC_NO_MSCRYPTO_TRUE@
 XMLSEC_NO_NSS = @XMLSEC_NO_NSS@
 XMLSEC_NO_NSS_FALSE = @XMLSEC_NO_NSS_FALSE@
 XMLSEC_NO_NSS_TRUE = @XMLSEC_NO_NSS_TRUE@
@@ -313,13 +338,16 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 NULL = 
 EXTRA_DIST = \
-	globals.h \
 	README \
 	$(NULL)
 
-INCLUDES = \
+lib_LTLIBRARIES = \
+	libxmlsec1-openssl.la \
+	$(NULL)
+
+libxmlsec1_openssl_la_CPPFLAGS = \
 	-DPACKAGE=\"@PACKAGE@\" \
-	-I$(top_srcdir) \
+	-I../../include \
 	-I$(top_srcdir)/include \
 	$(XMLSEC_DEFINES) \
 	$(OPENSSL_CFLAGS) \
@@ -327,27 +355,9 @@ INCLUDES = \
 	$(LIBXML_CFLAGS) \
 	$(NULL)
 
-lib_LTLIBRARIES = \
-	libxmlsec1-openssl.la \
-	$(NULL)
-
-libxmlsec1_openssl_la_SOURCES = \
-	app.c \
-	bn.c \
-	ciphers.c \
-	crypto.c \
-	digests.c \
-	evp.c \
-	hmac.c \
-	kw_aes.c \
-	kw_des.c \
-	kt_rsa.c \
-	signatures.c \
-	symkeys.c \
-	x509.c \
-	x509vfy.c \
-	$(NULL)
-
+libxmlsec1_openssl_la_SOURCES = app.c bn.c ciphers.c crypto.c \
+	digests.c evp.c hmac.c kw_aes.c kw_des.c kt_rsa.c signatures.c \
+	symkeys.c x509.c x509vfy.c globals.h $(NULL) $(am__append_1)
 libxmlsec1_openssl_la_LIBADD = \
 	../libxmlsec1.la \
 	$(OPENSSL_LIBS) \
@@ -355,7 +365,11 @@ libxmlsec1_openssl_la_LIBADD = \
 	$(LIBXML_LIBS) \
 	$(NULL)
 
+libxmlsec1_openssl_la_DEPENDENCIES = \
+	$(NULL)
+
 libxmlsec1_openssl_la_LDFLAGS = \
+	@XMLSEC_CRYPTO_EXTRA_LDFLAGS@ \
 	-version-info @XMLSEC_VERSION_INFO@ \
 	$(NULL)
 
@@ -428,20 +442,21 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/app.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/bn.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ciphers.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/crypto.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/digests.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evp.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hmac.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kt_rsa.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kw_aes.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kw_des.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/signatures.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/symkeys.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/x509.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/x509vfy.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_openssl_la-app.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_openssl_la-bn.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_openssl_la-ciphers.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_openssl_la-crypto.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_openssl_la-digests.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_openssl_la-evp.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_openssl_la-hmac.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_openssl_la-kt_rsa.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_openssl_la-kw_aes.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_openssl_la-kw_des.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_openssl_la-signatures.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_openssl_la-strings.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_openssl_la-symkeys.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_openssl_la-x509.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxmlsec1_openssl_la-x509vfy.Plo at am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -464,6 +479,111 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+libxmlsec1_openssl_la-app.lo: app.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_openssl_la-app.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_openssl_la-app.Tpo" -c -o libxmlsec1_openssl_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_openssl_la-app.Tpo" "$(DEPDIR)/libxmlsec1_openssl_la-app.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_openssl_la-app.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='app.c' object='libxmlsec1_openssl_la-app.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_openssl_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c
+
+libxmlsec1_openssl_la-bn.lo: bn.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_openssl_la-bn.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_openssl_la-bn.Tpo" -c -o libxmlsec1_openssl_la-bn.lo `test -f 'bn.c' || echo '$(srcdir)/'`bn.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_openssl_la-bn.Tpo" "$(DEPDIR)/libxmlsec1_openssl_la-bn.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_openssl_la-bn.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bn.c' object='libxmlsec1_openssl_la-bn.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_openssl_la-bn.lo `test -f 'bn.c' || echo '$(srcdir)/'`bn.c
+
+libxmlsec1_openssl_la-ciphers.lo: ciphers.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_openssl_la-ciphers.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_openssl_la-ciphers.Tpo" -c -o libxmlsec1_openssl_la-ciphers.lo `test -f 'ciphers.c' || echo '$(srcdir)/'`ciphers.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_openssl_la-ciphers.Tpo" "$(DEPDIR)/libxmlsec1_openssl_la-ciphers.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_openssl_la-ciphers.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ciphers.c' object='libxmlsec1_openssl_la-ciphers.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_openssl_la-ciphers.lo `test -f 'ciphers.c' || echo '$(srcdir)/'`ciphers.c
+
+libxmlsec1_openssl_la-crypto.lo: crypto.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_openssl_la-crypto.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_openssl_la-crypto.Tpo" -c -o libxmlsec1_openssl_la-crypto.lo `test -f 'crypto.c' || echo '$(srcdir)/'`crypto.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_openssl_la-crypto.Tpo" "$(DEPDIR)/libxmlsec1_openssl_la-crypto.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_openssl_la-crypto.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='crypto.c' object='libxmlsec1_openssl_la-crypto.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_openssl_la-crypto.lo `test -f 'crypto.c' || echo '$(srcdir)/'`crypto.c
+
+libxmlsec1_openssl_la-digests.lo: digests.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_openssl_la-digests.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_openssl_la-digests.Tpo" -c -o libxmlsec1_openssl_la-digests.lo `test -f 'digests.c' || echo '$(srcdir)/'`digests.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_openssl_la-digests.Tpo" "$(DEPDIR)/libxmlsec1_openssl_la-digests.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_openssl_la-digests.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='digests.c' object='libxmlsec1_openssl_la-digests.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_openssl_la-digests.lo `test -f 'digests.c' || echo '$(srcdir)/'`digests.c
+
+libxmlsec1_openssl_la-evp.lo: evp.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_openssl_la-evp.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_openssl_la-evp.Tpo" -c -o libxmlsec1_openssl_la-evp.lo `test -f 'evp.c' || echo '$(srcdir)/'`evp.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_openssl_la-evp.Tpo" "$(DEPDIR)/libxmlsec1_openssl_la-evp.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_openssl_la-evp.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='evp.c' object='libxmlsec1_openssl_la-evp.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_openssl_la-evp.lo `test -f 'evp.c' || echo '$(srcdir)/'`evp.c
+
+libxmlsec1_openssl_la-hmac.lo: hmac.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_openssl_la-hmac.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_openssl_la-hmac.Tpo" -c -o libxmlsec1_openssl_la-hmac.lo `test -f 'hmac.c' || echo '$(srcdir)/'`hmac.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_openssl_la-hmac.Tpo" "$(DEPDIR)/libxmlsec1_openssl_la-hmac.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_openssl_la-hmac.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hmac.c' object='libxmlsec1_openssl_la-hmac.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_openssl_la-hmac.lo `test -f 'hmac.c' || echo '$(srcdir)/'`hmac.c
+
+libxmlsec1_openssl_la-kw_aes.lo: kw_aes.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_openssl_la-kw_aes.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_openssl_la-kw_aes.Tpo" -c -o libxmlsec1_openssl_la-kw_aes.lo `test -f 'kw_aes.c' || echo '$(srcdir)/'`kw_aes.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_openssl_la-kw_aes.Tpo" "$(DEPDIR)/libxmlsec1_openssl_la-kw_aes.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_openssl_la-kw_aes.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='kw_aes.c' object='libxmlsec1_openssl_la-kw_aes.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_openssl_la-kw_aes.lo `test -f 'kw_aes.c' || echo '$(srcdir)/'`kw_aes.c
+
+libxmlsec1_openssl_la-kw_des.lo: kw_des.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_openssl_la-kw_des.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_openssl_la-kw_des.Tpo" -c -o libxmlsec1_openssl_la-kw_des.lo `test -f 'kw_des.c' || echo '$(srcdir)/'`kw_des.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_openssl_la-kw_des.Tpo" "$(DEPDIR)/libxmlsec1_openssl_la-kw_des.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_openssl_la-kw_des.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='kw_des.c' object='libxmlsec1_openssl_la-kw_des.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_openssl_la-kw_des.lo `test -f 'kw_des.c' || echo '$(srcdir)/'`kw_des.c
+
+libxmlsec1_openssl_la-kt_rsa.lo: kt_rsa.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_openssl_la-kt_rsa.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_openssl_la-kt_rsa.Tpo" -c -o libxmlsec1_openssl_la-kt_rsa.lo `test -f 'kt_rsa.c' || echo '$(srcdir)/'`kt_rsa.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_openssl_la-kt_rsa.Tpo" "$(DEPDIR)/libxmlsec1_openssl_la-kt_rsa.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_openssl_la-kt_rsa.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='kt_rsa.c' object='libxmlsec1_openssl_la-kt_rsa.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_openssl_la-kt_rsa.lo `test -f 'kt_rsa.c' || echo '$(srcdir)/'`kt_rsa.c
+
+libxmlsec1_openssl_la-signatures.lo: signatures.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_openssl_la-signatures.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_openssl_la-signatures.Tpo" -c -o libxmlsec1_openssl_la-signatures.lo `test -f 'signatures.c' || echo '$(srcdir)/'`signatures.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_openssl_la-signatures.Tpo" "$(DEPDIR)/libxmlsec1_openssl_la-signatures.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_openssl_la-signatures.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='signatures.c' object='libxmlsec1_openssl_la-signatures.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_openssl_la-signatures.lo `test -f 'signatures.c' || echo '$(srcdir)/'`signatures.c
+
+libxmlsec1_openssl_la-symkeys.lo: symkeys.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_openssl_la-symkeys.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_openssl_la-symkeys.Tpo" -c -o libxmlsec1_openssl_la-symkeys.lo `test -f 'symkeys.c' || echo '$(srcdir)/'`symkeys.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_openssl_la-symkeys.Tpo" "$(DEPDIR)/libxmlsec1_openssl_la-symkeys.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_openssl_la-symkeys.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='symkeys.c' object='libxmlsec1_openssl_la-symkeys.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_openssl_la-symkeys.lo `test -f 'symkeys.c' || echo '$(srcdir)/'`symkeys.c
+
+libxmlsec1_openssl_la-x509.lo: x509.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_openssl_la-x509.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_openssl_la-x509.Tpo" -c -o libxmlsec1_openssl_la-x509.lo `test -f 'x509.c' || echo '$(srcdir)/'`x509.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_openssl_la-x509.Tpo" "$(DEPDIR)/libxmlsec1_openssl_la-x509.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_openssl_la-x509.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='x509.c' object='libxmlsec1_openssl_la-x509.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_openssl_la-x509.lo `test -f 'x509.c' || echo '$(srcdir)/'`x509.c
+
+libxmlsec1_openssl_la-x509vfy.lo: x509vfy.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_openssl_la-x509vfy.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_openssl_la-x509vfy.Tpo" -c -o libxmlsec1_openssl_la-x509vfy.lo `test -f 'x509vfy.c' || echo '$(srcdir)/'`x509vfy.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_openssl_la-x509vfy.Tpo" "$(DEPDIR)/libxmlsec1_openssl_la-x509vfy.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_openssl_la-x509vfy.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='x509vfy.c' object='libxmlsec1_openssl_la-x509vfy.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_openssl_la-x509vfy.lo `test -f 'x509vfy.c' || echo '$(srcdir)/'`x509vfy.c
+
+libxmlsec1_openssl_la-strings.lo: ../strings.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_openssl_la-strings.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_openssl_la-strings.Tpo" -c -o libxmlsec1_openssl_la-strings.lo `test -f '../strings.c' || echo '$(srcdir)/'`../strings.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_openssl_la-strings.Tpo" "$(DEPDIR)/libxmlsec1_openssl_la-strings.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_openssl_la-strings.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../strings.c' object='libxmlsec1_openssl_la-strings.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_openssl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_openssl_la-strings.lo `test -f '../strings.c' || echo '$(srcdir)/'`../strings.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/src/openssl/app.c b/src/openssl/app.c
index ffd38c8..6e3aa81 100644
--- a/src/openssl/app.c
+++ b/src/openssl/app.c
@@ -18,6 +18,7 @@
 #include <openssl/rand.h>
 #include <openssl/pem.h>
 #include <openssl/pkcs12.h>
+#include <openssl/conf.h>
 
 #include <xmlsec/xmlsec.h>
 #include <xmlsec/keys.h>
@@ -49,6 +50,7 @@ static int      xmlSecOpenSSLDummyPasswordCallback  (char *buf, int bufsize, int
 int
 xmlSecOpenSSLAppInit(const char* config) {
     ERR_load_crypto_strings();
+    OPENSSL_config(NULL);
     OpenSSL_add_all_algorithms();
 
     if((RAND_status() != 1) && (xmlSecOpenSSLAppLoadRANDFile(NULL) != 1)) {
@@ -1135,6 +1137,47 @@ xmlSecOpenSSLAppKeysMngrAddCertsPath(xmlSecKeysMngrPtr mngr, const char *path) {
     return(0);
 }
 
+/**
+ * xmlSecOpenSSLAppKeysMngrAddCertsFile:
+ * @mngr:               the keys manager.
+ * @file:               the file containing trusted certificates.
+ *
+ * Reads certs from @file and adds to the list of trusted certificates.
+ * It is possible for @file to contain multiple certs.
+ *
+ * Returns 0 on success or a negative value otherwise.
+ */
+int
+xmlSecOpenSSLAppKeysMngrAddCertsFile(xmlSecKeysMngrPtr mngr, const char *file) {
+    xmlSecKeyDataStorePtr x509Store;
+    int ret;
+
+    xmlSecAssert2(mngr != NULL, -1);
+    xmlSecAssert2(file != NULL, -1);
+
+    x509Store = xmlSecKeysMngrGetDataStore(mngr, xmlSecOpenSSLX509StoreId);
+    if(x509Store == NULL) {
+        xmlSecError(XMLSEC_ERRORS_HERE,
+                    NULL,
+                    "xmlSecKeysMngrGetDataStore",
+                    XMLSEC_ERRORS_R_XMLSEC_FAILED,
+                    "xmlSecOpenSSLX509StoreId");
+        return(-1);
+    }
+
+    ret = xmlSecOpenSSLX509StoreAddCertsFile(x509Store, file);
+    if(ret < 0) {
+        xmlSecError(XMLSEC_ERRORS_HERE,
+                    NULL,
+                    "xmlSecOpenSSLX509StoreAddCertsFile",
+                    XMLSEC_ERRORS_R_XMLSEC_FAILED,
+                    "file=%s", xmlSecErrorsSafeString(file));
+        return(-1);
+    }
+
+    return(0);
+}
+
 static X509*	
 xmlSecOpenSSLAppCertLoadBIO(BIO* bio, xmlSecKeyDataFormat format) {
     X509 *cert;
diff --git a/src/openssl/bn.c b/src/openssl/bn.c
index 2613b0e..3fd2001 100644
--- a/src/openssl/bn.c
+++ b/src/openssl/bn.c
@@ -142,7 +142,7 @@ xmlSecOpenSSLNodeSetBNValue(xmlNodePtr cur, const BIGNUM *a, int addLineBreaks)
 	xmlNodeSetContent(cur, xmlSecStringEmpty);
     }
     
-    ret = xmlSecBufferBase64NodeContentWrite(&buf, cur, XMLSEC_BASE64_LINESIZE);
+    ret = xmlSecBufferBase64NodeContentWrite(&buf, cur, xmlSecBase64GetDefaultLineSize());
     if(ret < 0) {
 	xmlSecError(XMLSEC_ERRORS_HERE,
 		    NULL,
diff --git a/src/openssl/hmac.c b/src/openssl/hmac.c
index 492663b..7134e34 100644
--- a/src/openssl/hmac.c
+++ b/src/openssl/hmac.c
@@ -32,6 +32,36 @@
 
 #include <xmlsec/openssl/crypto.h>
 
+#define XMLSEC_OPENSSL_MIN_HMAC_SIZE		40
+
+/**************************************************************************
+ *
+ * Configuration
+ *
+ *****************************************************************************/
+static int g_xmlsec_openssl_hmac_min_length = XMLSEC_OPENSSL_MIN_HMAC_SIZE;
+
+/**
+ * xmlSecOpenSSLHmacGetMinOutputLength: 
+ * 
+ * Returns the min HMAC output length
+ */
+int xmlSecOpenSSLHmacGetMinOutputLength()
+{
+    return g_xmlsec_openssl_hmac_min_length;
+}
+
+/**
+ * xmlSecOpenSSLHmacSetMinOutputLength: 
+ *
+ * @min_length: the new min length 
+ * 
+ * Sets the min HMAC output length
+ */
+void xmlSecOpenSSLHmacSetMinOutputLength(int min_length)
+{
+    g_xmlsec_openssl_hmac_min_length = min_length;
+}
 
 /**************************************************************************
  *
@@ -240,7 +270,20 @@ xmlSecOpenSSLHmacNodeRead(xmlSecTransformPtr transform, xmlNodePtr node, xmlSecT
 	    ctx->dgstSize = atoi((char*)content);	    
 	    xmlFree(content);
 	}
-	/* todo: error if dgstSize == 0 ?*/
+
+	/* Ensure that HMAC length is greater than min specified.
+	   Otherwise, an attacker can set this lenght to 0 or very 
+	   small value
+	*/
+	if(ctx->dgstSize < xmlSecOpenSSLHmacGetMinOutputLength()) {
+ 	   xmlSecError(XMLSEC_ERRORS_HERE,
+		    xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
+		    xmlSecNodeHMACOutputLength,
+		    XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE,
+		    "HMAC output length is too small");
+	   return(-1);
+	}
+
 	cur = xmlSecGetNextElementNode(cur->next);
     }
     
diff --git a/src/openssl/x509.c b/src/openssl/x509.c
index a5a703f..4bbf774 100644
--- a/src/openssl/x509.c
+++ b/src/openssl/x509.c
@@ -1084,7 +1084,6 @@ xmlSecOpenSSLX509SubjectNameNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xml
 
     cert = xmlSecOpenSSLX509StoreFindCert(x509Store, subject, NULL, NULL, NULL, keyInfoCtx);
     if(cert == NULL){
-	xmlFree(subject);
 
 	if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT) != 0) {
 	    xmlSecError(XMLSEC_ERRORS_HERE,
@@ -1093,8 +1092,11 @@ xmlSecOpenSSLX509SubjectNameNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xml
 			XMLSEC_ERRORS_R_CERT_NOT_FOUND,
 			"subject=%s", 
 			xmlSecErrorsSafeString(subject));
+    	    xmlFree(subject);
 	    return(-1);
 	}
+
+	xmlFree(subject);	
 	return(0);
     }
 
@@ -1105,6 +1107,7 @@ xmlSecOpenSSLX509SubjectNameNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xml
 		    "X509_dup",
 		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
 		    XMLSEC_ERRORS_NO_MESSAGE);
+
 	xmlFree(subject);
 	return(-1);
     }
@@ -1154,7 +1157,7 @@ xmlSecOpenSSLX509SubjectNameNodeWrite(X509* cert, xmlNodePtr node, xmlSecKeyInfo
 	xmlFree(buf);
 	return(-1);
     }
-    xmlNodeSetContent(cur, buf);
+    xmlSecNodeEncodeAndSetContent(cur, buf);
     xmlFree(buf);
     return(0);
 }
@@ -1257,8 +1260,6 @@ xmlSecOpenSSLX509IssuerSerialNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xm
 
     cert = xmlSecOpenSSLX509StoreFindCert(x509Store, NULL, issuerName, issuerSerial, NULL, keyInfoCtx);
     if(cert == NULL){
-	xmlFree(issuerSerial);
-	xmlFree(issuerName);
 
 	if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT) != 0) {
 	    xmlSecError(XMLSEC_ERRORS_HERE,
@@ -1268,8 +1269,12 @@ xmlSecOpenSSLX509IssuerSerialNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xm
 			"issuerName=%s;issuerSerial=%s",
 		        xmlSecErrorsSafeString(issuerName), 
 			xmlSecErrorsSafeString(issuerSerial));
+    	    xmlFree(issuerSerial);
+	    xmlFree(issuerName);
 	    return(-1);
 	}
+	xmlFree(issuerSerial);
+	xmlFree(issuerName);
 	return(0);    
     }
 
@@ -1357,7 +1362,7 @@ xmlSecOpenSSLX509IssuerSerialNodeWrite(X509* cert, xmlNodePtr node, xmlSecKeyInf
 		    XMLSEC_ERRORS_NO_MESSAGE);
 	return(-1);
     }
-    xmlNodeSetContent(issuerNameNode, buf);
+    xmlSecNodeEncodeAndSetContent(issuerNameNode, buf);
     xmlFree(buf);
 
     buf = xmlSecOpenSSLASN1IntegerWrite(X509_get_serialNumber(cert));
@@ -1369,7 +1374,7 @@ xmlSecOpenSSLX509IssuerSerialNodeWrite(X509* cert, xmlNodePtr node, xmlSecKeyInf
 		    XMLSEC_ERRORS_NO_MESSAGE);
 	return(-1);
     }
-    xmlNodeSetContent(issuerNumberNode, buf);
+    xmlSecNodeEncodeAndSetContent(issuerNumberNode, buf);
     xmlFree(buf);
 
     return(0);
@@ -1488,7 +1493,7 @@ xmlSecOpenSSLX509SKINodeWrite(X509* cert, xmlNodePtr node, xmlSecKeyInfoCtxPtr k
 	xmlFree(buf);
 	return(-1);
     }
-    xmlNodeSetContent(cur, buf);
+    xmlSecNodeEncodeAndSetContent(cur, buf);
     xmlFree(buf);
 
     return(0);
diff --git a/src/openssl/x509vfy.c b/src/openssl/x509vfy.c
index bac172b..3201da7 100644
--- a/src/openssl/x509vfy.c
+++ b/src/openssl/x509vfy.c
@@ -476,6 +476,40 @@ xmlSecOpenSSLX509StoreAdoptCert(xmlSecKeyDataStorePtr store, X509* cert, xmlSecK
 }
 
 /**
+ * xmlSecOpenSSLX509StoreAdoptCrl:
+ * @store:		the pointer to X509 key data store klass.
+ * @crl:		the pointer to OpenSSL X509_CRL.
+ *
+ * Adds X509 CRL to the store.
+ *
+ * Returns 0 on success or a negative value if an error occurs.
+ */
+int 
+xmlSecOpenSSLX509StoreAdoptCrl(xmlSecKeyDataStorePtr store, X509_CRL* crl) {
+    xmlSecOpenSSLX509StoreCtxPtr ctx;
+    int ret;
+    
+    xmlSecAssert2(xmlSecKeyDataStoreCheckId(store, xmlSecOpenSSLX509StoreId), -1);
+    xmlSecAssert2(crl != NULL, -1);
+
+    ctx = xmlSecOpenSSLX509StoreGetCtx(store);
+    xmlSecAssert2(ctx != NULL, -1);
+	xmlSecAssert2(ctx->crls != NULL, -1);
+
+	ret = sk_X509_CRL_push(ctx->crls, crl);
+	if(ret < 1) {
+	    xmlSecError(XMLSEC_ERRORS_HERE,
+			xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+			"sk_X509_CRL_push",
+			XMLSEC_ERRORS_R_CRYPTO_FAILED,
+			XMLSEC_ERRORS_NO_MESSAGE);
+	    return(-1);
+	}
+
+    return (0);
+}
+
+/**
  * xmlSecOpenSSLX509StoreAddCertsPath:
  * @store: the pointer to OpenSSL x509 store.
  * @path: the path to the certs dir.
@@ -506,13 +540,63 @@ xmlSecOpenSSLX509StoreAddCertsPath(xmlSecKeyDataStorePtr store, const char *path
 		    XMLSEC_ERRORS_NO_MESSAGE);
 	return(-1);
     }    
-    X509_LOOKUP_add_dir(lookup, path, X509_FILETYPE_DEFAULT);
+    if(!X509_LOOKUP_add_dir(lookup, path, X509_FILETYPE_PEM)) {
+	xmlSecError(XMLSEC_ERRORS_HERE,
+		    xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+		    "X509_LOOKUP_add_dir",
+		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
+		    XMLSEC_ERRORS_NO_MESSAGE);
+	return(-1);
+    }
+    return(0);
+}
+
+/**
+ * xmlSecOpenSSLX509StoreAddCertsFile:
+ * @store: the pointer to OpenSSL x509 store.
+ * @file: the certs file.
+ *
+ * Adds all certs in @file to the list of trusted certs
+ * in @store. It is possible for @file to contain multiple certs.
+ *
+ * Returns 0 on success or a negative value otherwise.
+ */
+int
+xmlSecOpenSSLX509StoreAddCertsFile(xmlSecKeyDataStorePtr store, const char *file) {
+    xmlSecOpenSSLX509StoreCtxPtr ctx;
+    X509_LOOKUP *lookup = NULL;
+
+    xmlSecAssert2(xmlSecKeyDataStoreCheckId(store, xmlSecOpenSSLX509StoreId), -1);
+    xmlSecAssert2(file != NULL, -1);
+
+    ctx = xmlSecOpenSSLX509StoreGetCtx(store);
+    xmlSecAssert2(ctx != NULL, -1);
+    xmlSecAssert2(ctx->xst != NULL, -1);
+
+    lookup = X509_STORE_add_lookup(ctx->xst, X509_LOOKUP_file());
+    if(lookup == NULL) {
+        xmlSecError(XMLSEC_ERRORS_HERE,
+                    xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+                    "X509_STORE_add_lookup",
+                    XMLSEC_ERRORS_R_CRYPTO_FAILED,
+                    XMLSEC_ERRORS_NO_MESSAGE);
+        return(-1);
+    }
+    if(!X509_LOOKUP_load_file(lookup, file, X509_FILETYPE_PEM)) {
+        xmlSecError(XMLSEC_ERRORS_HERE,
+                    xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+                    "X509_LOOKUP_load_file",
+                    XMLSEC_ERRORS_R_CRYPTO_FAILED,
+                    XMLSEC_ERRORS_NO_MESSAGE);
+        return(-1);
+    }
     return(0);
 }
 
 static int
 xmlSecOpenSSLX509StoreInitialize(xmlSecKeyDataStorePtr store) {
     const xmlChar* path;
+    X509_LOOKUP *lookup = NULL;
     
     xmlSecOpenSSLX509StoreCtxPtr ctx;
     xmlSecAssert2(xmlSecKeyDataStoreCheckId(store, xmlSecOpenSSLX509StoreId), -1);
@@ -541,20 +625,36 @@ xmlSecOpenSSLX509StoreInitialize(xmlSecKeyDataStorePtr store) {
 	return(-1);
     }
     
+	
+    lookup = X509_STORE_add_lookup(ctx->xst, X509_LOOKUP_hash_dir());
+    if(lookup == NULL) {
+         xmlSecError(XMLSEC_ERRORS_HERE,
+		    xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+		    "X509_STORE_add_lookup",
+		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
+		    XMLSEC_ERRORS_NO_MESSAGE);
+         return(-1);
+    }    
+
     path = xmlSecOpenSSLGetDefaultTrustedCertsFolder();
     if(path != NULL) {
-	X509_LOOKUP *lookup = NULL;
-	
-	lookup = X509_STORE_add_lookup(ctx->xst, X509_LOOKUP_hash_dir());
-        if(lookup == NULL) {
+	if(!X509_LOOKUP_add_dir(lookup, (char*)path, X509_FILETYPE_PEM)) {
 	    xmlSecError(XMLSEC_ERRORS_HERE,
 		    xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
-		    "X509_STORE_add_lookup",
+		    "X509_LOOKUP_add_dir",
+		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
+		    XMLSEC_ERRORS_NO_MESSAGE);
+	    return(-1);
+	}    
+    } else {
+	if(!X509_LOOKUP_add_dir(lookup, NULL, X509_FILETYPE_DEFAULT)) {
+	    xmlSecError(XMLSEC_ERRORS_HERE,
+		    xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)),
+		    "X509_LOOKUP_add_dir",
 		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
 		    XMLSEC_ERRORS_NO_MESSAGE);
 	    return(-1);
 	}    
-	X509_LOOKUP_add_dir(lookup, (char*)path, X509_FILETYPE_DEFAULT);
     }
 
     ctx->untrusted = sk_X509_new_null();
@@ -855,7 +955,11 @@ xmlSecOpenSSLX509VerifyCertAgainstCrls(STACK_OF(X509_CRL) *crls, X509* cert) {
      */    
     n = sk_X509_CRL_num(crls);
     for(i = 0; i < n; i++) {
-	crl = sk_X509_CRL_value(crls, i);     
+	crl = sk_X509_CRL_value(crls, i);
+	if(crl == NULL) {
+	    continue;
+	}
+	
 	issuer = X509_CRL_get_issuer(crl);
 	if(xmlSecOpenSSLX509NamesCompare(X509_CRL_get_issuer(crl), issuer) == 0) { 
 	    break;
diff --git a/src/skeleton/Makefile.am b/src/skeleton/Makefile.am
index a03f5a5..8e2e910 100644
--- a/src/skeleton/Makefile.am
+++ b/src/skeleton/Makefile.am
@@ -1,13 +1,16 @@
 NULL =
 
 EXTRA_DIST = \
-	globals.h \
 	README \
 	$(NULL)
 
-INCLUDES = \
+lib_LTLIBRARIES = \
+	libxmlsec1-skeleton.la \
+	$(NULL)
+
+libxmlsec1_skeleton_la_CPPFLAGS = \
 	-DPACKAGE=\"@PACKAGE@\" \
-	-I$(top_srcdir) \
+	-I../../include \
 	-I$(top_srcdir)/include \
 	$(XMLSEC_DEFINES) \
 	$(XMLSEC_SKELETON_DEFINES) \
@@ -16,22 +19,27 @@ INCLUDES = \
 	$(LIBXML_CFLAGS) \
 	$(NULL)
 
-lib_LTLIBRARIES = \
-	libxmlsec1-skeleton.la \
-	$(NULL)
-
 libxmlsec1_skeleton_la_SOURCES =\
 	app.c \
 	crypto.c \
+	globals.h \
 	$(NULL)
 
+if SHAREDLIB_HACK
+libxmlsec1_skeleton_la_SOURCES += ../strings.c
+endif
+
 libxmlsec1_skeleton_la_LIBADD = \
 	../libxmlsec1.la \
 	$(SKELETON_LIBS) \
 	$(LIBXSLT_LIBS) \
 	$(LIBXML_LIBS) \
 	$(NULL)
-        
+
+libxmlsec1_skeleton_la_DEPENDENCIES = \
+	$(NULL)
+
 libxmlsec1_skeleton_la_LDFLAGS = \
+	@XMLSEC_CRYPTO_EXTRA_LDFLAGS@ \
 	-version-info @XMLSEC_VERSION_INFO@ \
 	$(NULL)
diff --git a/src/skeleton/crypto.c b/src/skeleton/crypto.c
index 539d2b2..455bc2f 100644
--- a/src/skeleton/crypto.c
+++ b/src/skeleton/crypto.c
@@ -64,6 +64,10 @@ xmlSecCryptoGetFunctions_skeleton(void) {
     gXmlSecSkeletonFunctions->keyDataDsaGetKlass 	= xmlSecSkeletonKeyDataDsaGetKlass;
 #endif /* XMLSEC_NO_DSA */    
 
+#ifndef XMLSEC_NO_GOST
+    gXmlSecSkeletonFunctions->keyDataGost2001GetKlass 	= xmlSecSkeletonKeyDataGost2001GetKlass;
+#endif /* XMLSEC_NO_GOST */    
+
 #ifndef XMLSEC_NO_HMAC  
     gXmlSecSkeletonFunctions->keyDataHmacGetKlass 	= xmlSecSkeletonKeyDataHmacGetKlass;
 #endif /* XMLSEC_NO_HMAC */    
@@ -105,6 +109,10 @@ xmlSecCryptoGetFunctions_skeleton(void) {
     gXmlSecSkeletonFunctions->transformDsaSha1GetKlass 		= xmlSecSkeletonTransformDsaSha1GetKlass;
 #endif /* XMLSEC_NO_DSA */
 
+#ifndef XMLSEC_NO_GOST
+    gXmlSecSkeletonFunctions->transformGost2001GostR3411_94GetKlass 		= xmlSecSkeletonTransformGost2001GostR3411_94GetKlass;
+#endif /* XMLSEC_GOST */
+
 #ifndef XMLSEC_NO_HMAC
     gXmlSecSkeletonFunctions->transformHmacSha1GetKlass 	= xmlSecSkeletonTransformHmacSha1GetKlass;
     gXmlSecSkeletonFunctions->transformHmacRipemd160GetKlass 	= xmlSecSkeletonTransformHmacRipemd160GetKlass;
@@ -125,6 +133,10 @@ xmlSecCryptoGetFunctions_skeleton(void) {
     gXmlSecSkeletonFunctions->transformSha1GetKlass 		= xmlSecSkeletonTransformSha1GetKlass;
 #endif /* XMLSEC_NO_SHA1 */
 
+#ifndef XMLSEC_NO_GOST    
+    gXmlSecSkeletonFunctions->transformGostR3411_94GetKlass 		= xmlSecSkeletonTransformGostR3411_94GetKlass;
+#endif /* XMLSEC_NO_GOST */
+
     /**
      * High level routines form xmlsec command line utility
      */ 
diff --git a/src/strings.c b/src/strings.c
index 8ed534b..c849d8b 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -285,6 +285,18 @@ const xmlChar xmlSecHrefKWDes3[]		= "http://www.w3.org/2001/04/xmlenc#kw-tripled
 
 /*************************************************************************
  *
+ * GOST2001 strings
+ *
+ ************************************************************************/
+const xmlChar xmlSecNameGOST2001KeyValue[]		= "gost2001";
+const xmlChar xmlSecNodeGOST2001KeyValue[]		= "gostr34102001-gostr3411";
+const xmlChar xmlSecHrefGOST2001KeyValue[]		= "http://www.w3.org/2001/04/xmldsig-more#gostr34102001-gostr3411";
+
+const xmlChar xmlSecNameGost2001GostR3411_94[]		= "gostr34102001-gostr3411";
+const xmlChar xmlSecHrefGost2001GostR3411_94[]		= "http://www.w3.org/2001/04/xmldsig-more#gostr34102001-gostr3411";
+
+/*************************************************************************
+ *
  * DSA strings
  *
  ************************************************************************/
@@ -441,6 +453,14 @@ const xmlChar xmlSecNodeRsaOAEPparams[]		= "OAEPparams";
 
 /*************************************************************************
  *
+ * GOSTR3411_94 strings
+ *
+ ************************************************************************/
+const xmlChar xmlSecNameGostR3411_94[]			= "gostr3411";
+const xmlChar xmlSecHrefGostR3411_94[]			= "http://www.w3.org/2001/04/xmldsig-more#gostr3411";
+
+/*************************************************************************
+ *
  * SHA1 strings
  *
  ************************************************************************/
diff --git a/src/templates.c b/src/templates.c
index 1368d75..b28cb4e 100644
--- a/src/templates.c
+++ b/src/templates.c
@@ -60,6 +60,36 @@ static int 		xmlSecTmplNodeWriteNsList	(xmlNodePtr parentNode,
 xmlNodePtr
 xmlSecTmplSignatureCreate(xmlDocPtr doc, xmlSecTransformId c14nMethodId,
 		      xmlSecTransformId signMethodId, const xmlChar *id) {
+    return xmlSecTmplSignatureCreateNsPref(doc, c14nMethodId, signMethodId, id, NULL);
+}
+
+/**
+ * xmlSecTmplSignatureCreateNsPref:
+ * @doc: 		the pointer to signature document or NULL; in the 
+ *			second case, application must later call @xmlSetTreeDoc
+ *			to ensure that all the children nodes have correct 
+ *			pointer to XML document.
+ * @c14nMethodId: 	the signature canonicalization method.
+ * @signMethodId: 	the signature  method.
+ * @id: 		the node id (may be NULL).
+ * @nsPrefix:	the namespace prefix for the signature element (e.g. "dsig"), or NULL 
+ *
+ * Creates new <dsig:Signature/> node with the mandatory
+ * <dsig:SignedInfo/>, <dsig:CanonicalizationMethod/>,
+ * <dsig:SignatureMethod/> and <dsig:SignatureValue/> children and
+ * sub-children. This method differs from xmlSecTmplSignatureCreate in
+ * that it will define the http://www.w3.org/2000/09/xmldsig#
+ * namespace with the given prefix that will be used for all of the
+ * appropriate child nodes.  The application is responsible for
+ * inserting the returned node in the XML document.
+ *
+ * Returns the pointer to newly created <dsig:Signature/> node or NULL if an 
+ * error occurs.
+ */
+xmlNodePtr
+xmlSecTmplSignatureCreateNsPref(xmlDocPtr doc, xmlSecTransformId c14nMethodId,
+                                xmlSecTransformId signMethodId, const xmlChar *id,
+                                const xmlChar* nsPrefix) {
     xmlNodePtr signNode;
     xmlNodePtr signedInfoNode;
     xmlNodePtr cur;
@@ -82,7 +112,7 @@ xmlSecTmplSignatureCreate(xmlDocPtr doc, xmlSecTransformId c14nMethodId,
 	return(NULL);	            
     }
     
-    ns = xmlNewNs(signNode, xmlSecDSigNs, NULL);
+    ns = xmlNewNs(signNode, xmlSecDSigNs, nsPrefix);
     if(ns == NULL) {
 	xmlSecError(XMLSEC_ERRORS_HERE,
 		    NULL,
@@ -1191,7 +1221,7 @@ xmlSecTmplKeyInfoAddKeyName(xmlNodePtr keyInfoNode, const xmlChar* name) {
 	return(NULL);	
     }
     if(name != NULL) {
-	xmlNodeSetContent(res, name);
+	xmlSecNodeEncodeAndSetContent(res, name);
     }
     return(res);
 }
@@ -1451,6 +1481,92 @@ xmlSecTmplX509DataAddIssuerSerial(xmlNodePtr x509DataNode) {
 }
 
 /**
+ * xmlSecTmplX509IssuerSerialAddIssuerName:
+ * @x509IssuerSerialNode: 	the pointer to <dsig:X509IssuerSerial/> node.
+ * @issuerName:		the issuer name (optional).	
+ *
+ * Adds <dsig:X509IssuerName/> node to the <dsig:X509IssuerSerial/> node @x509IssuerSerialNode.
+ *
+ * Returns the pointer to the newly created <dsig:X509IssuerName/> node or
+ * NULL if an error occurs.
+ */
+xmlNodePtr
+xmlSecTmplX509IssuerSerialAddIssuerName(xmlNodePtr x509IssuerSerialNode, const xmlChar* issuerName) {
+	xmlNodePtr res;
+	
+	xmlSecAssert2(x509IssuerSerialNode != NULL, NULL);
+	
+  if(xmlSecFindChild(x509IssuerSerialNode, xmlSecNodeX509IssuerName,
+				xmlSecDSigNs) != NULL) {
+	xmlSecError(XMLSEC_ERRORS_HERE,
+		    NULL,
+		    xmlSecErrorsSafeString(xmlSecNodeX509IssuerName),
+		    XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT,
+		    XMLSEC_ERRORS_NO_MESSAGE);
+	return(NULL);
+	}
+
+	res = xmlSecAddChild(x509IssuerSerialNode, xmlSecNodeX509IssuerName, xmlSecDSigNs);
+    if(res == NULL) {
+	xmlSecError(XMLSEC_ERRORS_HERE,
+		    NULL,
+		    "xmlSecAddChild",
+		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
+		    "node=%s",
+		    xmlSecErrorsSafeString(xmlSecNodeX509IssuerName));
+	return(NULL);	
+    }
+
+		if (issuerName != NULL) {
+			xmlSecNodeEncodeAndSetContent(res, issuerName);
+		}
+		return(res);
+}
+
+/**
+ * xmlSecTmplX509IssuerSerialAddIssuerName:
+ * @x509IssuerSerialNode: 	the pointer to <dsig:X509IssuerSerial/> node.
+ * @serial:		the serial number (optional).	
+ *
+ * Adds <dsig:X509SerialNumber/> node to the <dsig:X509IssuerSerial/> node @x509IssuerSerialNode.
+ *
+ * Returns the pointer to the newly created <dsig:X509SerialNumber/> node or
+ * NULL if an error occurs.
+ */
+xmlNodePtr
+xmlSecTmplX509IssuerSerialAddSerialNumber(xmlNodePtr x509IssuerSerialNode, const xmlChar* serial) {
+	xmlNodePtr res;
+
+	xmlSecAssert2(x509IssuerSerialNode != NULL, NULL);
+
+	if(xmlSecFindChild(x509IssuerSerialNode, xmlSecNodeX509SerialNumber,
+				xmlSecDSigNs) != NULL) {
+		xmlSecError(XMLSEC_ERRORS_HERE,
+				NULL,
+				xmlSecErrorsSafeString(xmlSecNodeX509SerialNumber),
+				XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT,
+				XMLSEC_ERRORS_NO_MESSAGE);
+		return(NULL);
+	}
+
+	res = xmlSecAddChild(x509IssuerSerialNode, xmlSecNodeX509SerialNumber, xmlSecDSigNs);
+	if(res == NULL) {
+		xmlSecError(XMLSEC_ERRORS_HERE,
+				NULL,
+				"xmlSecAddChild",
+				XMLSEC_ERRORS_R_XMLSEC_FAILED,
+				"node=%s",
+				xmlSecErrorsSafeString(xmlSecNodeX509SerialNumber));
+		return(NULL);	
+	}
+
+	if (serial != NULL) {
+		xmlSecNodeEncodeAndSetContent(res, serial);
+	}
+	return(res);
+}
+
+/**
  * xmlSecTmplX509DataAddSubjectName:
  * @x509DataNode: 	the pointer to <dsig:X509Data/> node.
  * 
@@ -1844,7 +1960,7 @@ xmlSecTmplTransformAddXPath(xmlNodePtr transformNode, const xmlChar *expression,
 	return(-1);    
     }
     
-    xmlNodeSetContent(xpathNode, expression);
+    xmlSecNodeEncodeAndSetContent(xpathNode, expression);
     return((nsList != NULL) ? xmlSecTmplNodeWriteNsList(xpathNode, nsList) : 0);
 }
 
@@ -1882,7 +1998,7 @@ xmlSecTmplTransformAddXPath2(xmlNodePtr transformNode, const xmlChar* type,
     }
     xmlSetProp(xpathNode, xmlSecAttrFilter, type);
     
-    xmlNodeSetContent(xpathNode, expression);
+    xmlSecNodeEncodeAndSetContent(xpathNode, expression);
     return((nsList != NULL) ? xmlSecTmplNodeWriteNsList(xpathNode, nsList) : 0);
 }
 
@@ -1928,7 +2044,7 @@ xmlSecTmplTransformAddXPointer(xmlNodePtr transformNode, const xmlChar *expressi
     }
     
     
-    xmlNodeSetContent(xpointerNode, expression);
+    xmlSecNodeEncodeAndSetContent(xpointerNode, expression);
     return((nsList != NULL) ? xmlSecTmplNodeWriteNsList(xpointerNode, nsList) : 0);
 }
 
diff --git a/src/transforms.c b/src/transforms.c
index c5ed6ba..3933f6c 100644
--- a/src/transforms.c
+++ b/src/transforms.c
@@ -1510,7 +1510,7 @@ xmlSecTransformNodeRead(xmlNodePtr node, xmlSecTransformUsage usage, xmlSecTrans
     if(id == xmlSecTransformIdUnknown) {
 	xmlSecError(XMLSEC_ERRORS_HERE,
 		    NULL,
-		    "xmlSecTransformIdsListFindByHref",
+		    "xmlSecTransformIdListFindByHref",
 		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
 		    "href=%s", 
 		    xmlSecErrorsSafeString(href));
@@ -2521,7 +2521,6 @@ xmlSecTransformIdListFindByHref(xmlSecPtrListPtr list, const xmlChar* href,
 
 	if(((usage & transformId->usage) != 0) && (transformId->href != NULL) && 
 	   xmlStrEqual(href, transformId->href)) {
-	   
 	   return(transformId);	   
 	}
     }
diff --git a/src/xmldsig.c b/src/xmldsig.c
index 1bc7454..8ebaaec 100644
--- a/src/xmldsig.c
+++ b/src/xmldsig.c
@@ -711,12 +711,12 @@ xmlSecDSigCtxProcessSignedInfoNode(xmlSecDSigCtxPtr dsigCtx, xmlNodePtr node) {
     } else {
     	xmlSecError(XMLSEC_ERRORS_HERE,
 		    NULL,
-		    xmlSecErrorsSafeString(xmlSecNodeGetName(cur)),
+		    "CanonicalizationMethod",
 		    XMLSEC_ERRORS_R_INVALID_NODE,
 		    "expected=%s",
 		    xmlSecErrorsSafeString(xmlSecNodeCanonicalizationMethod));
 	return(-1);
-    }	
+    }
     
     /* insert membuf if requested */
     if((dsigCtx->flags & XMLSEC_DSIG_FLAGS_STORE_SIGNATURE) != 0) {
@@ -734,7 +734,7 @@ xmlSecDSigCtxProcessSignedInfoNode(xmlSecDSigCtxPtr dsigCtx, xmlNodePtr node) {
     }
         
     /* next node is required SignatureMethod. */
-    cur = xmlSecGetNextElementNode(cur->next);
+    cur = xmlSecGetNextElementNode( ((cur != NULL) ? cur->next : node->children) );
     if((cur != NULL) && (xmlSecCheckNodeName(cur, xmlSecNodeSignatureMethod, xmlSecDSigNs))) {
 	dsigCtx->signMethod = xmlSecTransformCtxNodeRead(&(dsigCtx->transformCtx), 
 					cur, xmlSecTransformUsageSignatureMethod);
@@ -1446,7 +1446,7 @@ xmlSecDSigReferenceCtxProcessNode(xmlSecDSigReferenceCtxPtr dsigRefCtx, xmlNodeP
     }
 
     /* first is optional Transforms node */
-    cur = xmlSecGetNextElementNode(node->children);
+    cur  = xmlSecGetNextElementNode(node->children);
     if((cur != NULL) && (xmlSecCheckNodeName(cur, xmlSecNodeTransforms, xmlSecDSigNs))) {
 	ret = xmlSecTransformCtxNodesListRead(transformCtx, 
 					cur, xmlSecTransformUsageDSigTransform);
@@ -1459,7 +1459,8 @@ xmlSecDSigReferenceCtxProcessNode(xmlSecDSigReferenceCtxPtr dsigRefCtx, xmlNodeP
 			xmlSecErrorsSafeString(xmlSecNodeGetName(cur)));
 	    return(-1);
 	}	
-        cur = xmlSecGetNextElementNode(cur->next);
+        
+	cur = xmlSecGetNextElementNode(cur->next);
     }
 
     /* insert membuf if requested */
@@ -1496,6 +1497,8 @@ xmlSecDSigReferenceCtxProcessNode(xmlSecDSigReferenceCtxPtr dsigRefCtx, xmlNodeP
 			xmlSecErrorsSafeString(xmlSecNodeGetName(cur)));
 	    return(-1);	
 	}	
+	
+	cur = xmlSecGetNextElementNode(cur->next);     
     } else if(dsigRefCtx->dsigCtx->defSignMethodId != xmlSecTransformIdUnknown) {
 	/* the dsig spec does require DigestMethod node
 	 * to be present but in some case it application might decide to
@@ -1522,8 +1525,10 @@ xmlSecDSigReferenceCtxProcessNode(xmlSecDSigReferenceCtxPtr dsigRefCtx, xmlNodeP
     dsigRefCtx->digestMethod->operation = dsigRefCtx->dsigCtx->operation;
 
     /* last node is required DigestValue */
-    cur = xmlSecGetNextElementNode(cur->next);     
-    if((cur == NULL) || (!xmlSecCheckNodeName(cur, xmlSecNodeDigestValue, xmlSecDSigNs))) {
+    if((cur != NULL) && (xmlSecCheckNodeName(cur, xmlSecNodeDigestValue, xmlSecDSigNs))) {
+	digestValueNode = cur;
+	cur = xmlSecGetNextElementNode(cur->next);     
+    } else {
     	xmlSecError(XMLSEC_ERRORS_HERE,
 		    NULL,
 		    xmlSecErrorsSafeString(xmlSecNodeGetName(cur)),
@@ -1532,8 +1537,6 @@ xmlSecDSigReferenceCtxProcessNode(xmlSecDSigReferenceCtxPtr dsigRefCtx, xmlNodeP
 		    xmlSecErrorsSafeString(xmlSecNodeDigestValue));
 	return(-1);
     }
-    digestValueNode = cur;
-    cur = xmlSecGetNextElementNode(cur->next);     
 
     /* if we have something else then it's an error */
     if(cur != NULL) {
diff --git a/src/xmlenc.c b/src/xmlenc.c
index cf14695..9112045 100644
--- a/src/xmlenc.c
+++ b/src/xmlenc.c
@@ -192,34 +192,45 @@ xmlSecEncCtxReset(xmlSecEncCtxPtr encCtx) {
     encCtx->resultBase64Encoded = 0;
     encCtx->resultReplaced	= 0;
     encCtx->encMethod		= NULL;
+    
+    if (encCtx->replacedNodeList != NULL) { 
+	  	xmlFreeNodeList(encCtx->replacedNodeList);
+    	encCtx->replacedNodeList = NULL;
+    }
+    
     if(encCtx->encKey != NULL) {
-	xmlSecKeyDestroy(encCtx->encKey);
-	encCtx->encKey = NULL;
+	    xmlSecKeyDestroy(encCtx->encKey);
+	    encCtx->encKey = NULL;
     }
     
     if(encCtx->id != NULL) {
-	xmlFree(encCtx->id);
-	encCtx->id = NULL;
+	    xmlFree(encCtx->id);
+	    encCtx->id = NULL;
     }	
+
     if(encCtx->type != NULL) {
-	xmlFree(encCtx->type);
-	encCtx->type = NULL;
+	    xmlFree(encCtx->type);
+	    encCtx->type = NULL;
     }
+
     if(encCtx->mimeType != NULL) {
-	xmlFree(encCtx->mimeType);
-	encCtx->mimeType = NULL;
+	    xmlFree(encCtx->mimeType);
+	    encCtx->mimeType = NULL;
     }
+
     if(encCtx->encoding != NULL) {
-	xmlFree(encCtx->encoding);
-	encCtx->encoding = NULL;
+	    xmlFree(encCtx->encoding);
+	    encCtx->encoding = NULL;
     }	
+
     if(encCtx->recipient != NULL) {
-	xmlFree(encCtx->recipient);
-	encCtx->recipient = NULL;
+	    xmlFree(encCtx->recipient);
+	    encCtx->recipient = NULL;
     }
+
     if(encCtx->carriedKeyName != NULL) {
-	xmlFree(encCtx->carriedKeyName);
-	encCtx->carriedKeyName = NULL;
+	    xmlFree(encCtx->carriedKeyName);
+	    encCtx->carriedKeyName = NULL;
     }
     
     encCtx->encDataNode = encCtx->encMethodNode = 
@@ -445,43 +456,73 @@ xmlSecEncCtxXmlEncrypt(xmlSecEncCtxPtr encCtx, xmlNodePtr tmpl, xmlNodePtr node)
 		    "xmlSecEncCtxEncDataNodeWrite",
 		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
 		    XMLSEC_ERRORS_NO_MESSAGE);
-	return(-1);
+    	return(-1);
     }
     
     /* now we need to update our original document */
     if((encCtx->type != NULL) && xmlStrEqual(encCtx->type, xmlSecTypeEncElement)) {
-	ret = xmlSecReplaceNode(node, tmpl);
-	if(ret < 0) {
-	    xmlSecError(XMLSEC_ERRORS_HERE,
-			NULL,
-			"xmlSecReplaceNode",
-			XMLSEC_ERRORS_R_XMLSEC_FAILED,
-			"node=%s",
-			xmlSecErrorsSafeString(xmlSecNodeGetName(node)));
-	    return(-1);
-	}
-	encCtx->resultReplaced = 1;			       
+        /* check if we need to return the replaced node */
+        if((encCtx->flags & XMLSEC_ENC_RETURN_REPLACED_NODE) != 0) {
+            ret = xmlSecReplaceNodeAndReturn(node, tmpl, &(encCtx->replacedNodeList));
+            if(ret < 0) {
+                xmlSecError(XMLSEC_ERRORS_HERE,
+                NULL,
+                "xmlSecReplaceNode",
+                XMLSEC_ERRORS_R_XMLSEC_FAILED,
+                "node=%s",
+                xmlSecErrorsSafeString(xmlSecNodeGetName(node)));
+                return(-1);
+            }
+        } else {
+            ret = xmlSecReplaceNode(node, tmpl);
+            if(ret < 0) {
+                xmlSecError(XMLSEC_ERRORS_HERE,
+		            NULL,
+		            "xmlSecReplaceNode",
+		            XMLSEC_ERRORS_R_XMLSEC_FAILED,
+		            "node=%s",
+		            xmlSecErrorsSafeString(xmlSecNodeGetName(node)));
+                return(-1);
+            }
+        }
+
+	    encCtx->resultReplaced = 1;			       
     } else if((encCtx->type != NULL) && xmlStrEqual(encCtx->type, xmlSecTypeEncContent)) {
-	ret = xmlSecReplaceContent(node, tmpl);
-	if(ret < 0) {
-	    xmlSecError(XMLSEC_ERRORS_HERE,
-			NULL,
-			"xmlSecReplaceContent",
-			XMLSEC_ERRORS_R_XMLSEC_FAILED,
-			"node=%s",
-			xmlSecErrorsSafeString(xmlSecNodeGetName(node)));
-	    return(-1);
-	}
-	encCtx->resultReplaced = 1;			       
+        /* check if we need to return the replaced node */
+        if((encCtx->flags & XMLSEC_ENC_RETURN_REPLACED_NODE) != 0) {        
+            ret = xmlSecReplaceContentAndReturn(node, tmpl, &(encCtx->replacedNodeList));
+            if(ret < 0) {
+                xmlSecError(XMLSEC_ERRORS_HERE,
+	                NULL,
+	                "xmlSecReplaceContentAndReturn",
+	                XMLSEC_ERRORS_R_XMLSEC_FAILED,
+	                "node=%s",
+	                xmlSecErrorsSafeString(xmlSecNodeGetName(node)));
+                return(-1);
+            }
+        } else {
+            ret = xmlSecReplaceContent(node, tmpl);
+            if(ret < 0) {
+                xmlSecError(XMLSEC_ERRORS_HERE,
+	                NULL,
+	                "xmlSecReplaceContent",
+	                XMLSEC_ERRORS_R_XMLSEC_FAILED,
+	                "node=%s",
+	                xmlSecErrorsSafeString(xmlSecNodeGetName(node)));
+                return(-1);
+            }
+        }
+
+        encCtx->resultReplaced = 1;			       
     } else {
-	/* we should've catached this error before */
-	xmlSecError(XMLSEC_ERRORS_HERE,
-		    NULL,
-		    NULL,
-		    XMLSEC_ERRORS_R_INVALID_TYPE,
-		    "type=%s", 
-		    xmlSecErrorsSafeString(encCtx->type));
-	return(-1);	    	
+	    /* we should've catached this error before */
+	    xmlSecError(XMLSEC_ERRORS_HERE,
+		        NULL,
+		        NULL,
+		        XMLSEC_ERRORS_R_INVALID_TYPE,
+		        "type=%s", 
+		        xmlSecErrorsSafeString(encCtx->type));
+	    return(-1);	    	
     }
     return(0);    
 }
@@ -589,31 +630,62 @@ xmlSecEncCtxDecrypt(xmlSecEncCtxPtr encCtx, xmlNodePtr node) {
     
     /* replace original node if requested */
     if((encCtx->type != NULL) && xmlStrEqual(encCtx->type, xmlSecTypeEncElement)) {
-	ret = xmlSecReplaceNodeBuffer(node, xmlSecBufferGetData(buffer),  xmlSecBufferGetSize(buffer));
-	if(ret < 0) {
-	    xmlSecError(XMLSEC_ERRORS_HERE,
-			NULL,
-			"xmlSecReplaceNodeBuffer",
-			XMLSEC_ERRORS_R_XMLSEC_FAILED,
-			"node=%s",
-			xmlSecErrorsSafeString(xmlSecNodeGetName(node)));
-	    return(-1);	    	
-	}
-	encCtx->resultReplaced = 1;			       
+        /* check if we need to return the replaced node */
+        if((encCtx->flags & XMLSEC_ENC_RETURN_REPLACED_NODE) != 0) {
+	        ret = xmlSecReplaceNodeBufferAndReturn(node, xmlSecBufferGetData(buffer),  xmlSecBufferGetSize(buffer), &(encCtx->replacedNodeList));
+	        if(ret < 0) {
+	            xmlSecError(XMLSEC_ERRORS_HERE,
+			        NULL,
+			        "xmlSecReplaceNodeBufferAndReturn",
+			        XMLSEC_ERRORS_R_XMLSEC_FAILED,
+			        "node=%s",
+			        xmlSecErrorsSafeString(xmlSecNodeGetName(node)));
+	            return(-1);	    	
+	        }
+        } else {
+	        ret = xmlSecReplaceNodeBuffer(node, xmlSecBufferGetData(buffer),  xmlSecBufferGetSize(buffer));
+	        if(ret < 0) {
+	            xmlSecError(XMLSEC_ERRORS_HERE,
+			        NULL,
+			        "xmlSecReplaceNodeBuffer",
+			        XMLSEC_ERRORS_R_XMLSEC_FAILED,
+			        "node=%s",
+			        xmlSecErrorsSafeString(xmlSecNodeGetName(node)));
+	            return(-1);	    	
+	        }
+        }
+
+        encCtx->resultReplaced = 1;			       
     } else if((encCtx->type != NULL) && xmlStrEqual(encCtx->type, xmlSecTypeEncContent)) {
-	/* replace the node with the buffer */
-	ret = xmlSecReplaceNodeBuffer(node, xmlSecBufferGetData(buffer), xmlSecBufferGetSize(buffer));
-	if(ret < 0) {
-	    xmlSecError(XMLSEC_ERRORS_HERE,
-			NULL,
-			"xmlSecReplaceNodeBuffer",
-			XMLSEC_ERRORS_R_XMLSEC_FAILED,
-			"node=%s",
-			xmlSecErrorsSafeString(xmlSecNodeGetName(node)));
-	    return(-1);	    	
-	}	
-	encCtx->resultReplaced = 1;			       
+        /* replace the node with the buffer */
+
+        /* check if we need to return the replaced node */
+        if((encCtx->flags & XMLSEC_ENC_RETURN_REPLACED_NODE) != 0) {
+	        ret = xmlSecReplaceNodeBufferAndReturn(node, xmlSecBufferGetData(buffer), xmlSecBufferGetSize(buffer), &(encCtx->replacedNodeList));
+	        if(ret < 0) {
+	            xmlSecError(XMLSEC_ERRORS_HERE,
+			        NULL,
+			        "xmlSecReplaceNodeBufferAndReturn",
+			        XMLSEC_ERRORS_R_XMLSEC_FAILED,
+			        "node=%s",
+			        xmlSecErrorsSafeString(xmlSecNodeGetName(node)));
+	            return(-1);	    	
+	        }	
+        } else {
+            ret = xmlSecReplaceNodeBuffer(node, xmlSecBufferGetData(buffer), xmlSecBufferGetSize(buffer));
+	        if(ret < 0) {
+	            xmlSecError(XMLSEC_ERRORS_HERE,
+			        NULL,
+			        "xmlSecReplaceNodeBuffer",
+			        XMLSEC_ERRORS_R_XMLSEC_FAILED,
+			        "node=%s",
+			        xmlSecErrorsSafeString(xmlSecNodeGetName(node)));
+	            return(-1);	    	
+	        }	  
+        }
+    	encCtx->resultReplaced = 1;			       
     }
+
     return(0);
 }
 
diff --git a/src/xmlsec-ltdl.c b/src/xmlsec-ltdl.c
index 0f5288f..871081c 100644
--- a/src/xmlsec-ltdl.c
+++ b/src/xmlsec-ltdl.c
@@ -3019,7 +3019,12 @@ xmlsec_lt_dlloader_remove (loader_name)
 	      break;
 	    }
 	}
-
+      if(!prev->next) 
+      {
+          MUTEX_SETERROR (LT_DLSTRERROR (REMOVE_LOADER));
+	  ++errors;
+	  goto done;
+      }
       place = prev->next;
       prev->next = prev->next->next;
     }
diff --git a/src/xmlsec-ltdl.patch b/src/xmlsec-ltdl.patch
index 622a27c..800e2fe 100644
--- a/src/xmlsec-ltdl.patch
+++ b/src/xmlsec-ltdl.patch
@@ -132,3 +132,19 @@
  
  
  
+--- xmlsec-ltdl.c.orig	2003-09-11 16:40:14.000000000 -0700
++++ xmlsec-ltdl.c	2006-03-10 11:43:24.000000000 -0800
+@@ -3019,7 +3019,12 @@
+ 	      break;
+ 	    }
+ 	}
+-
++      if(!prev->next) 
++      {
++          MUTEX_SETERROR (LT_DLSTRERROR (REMOVE_LOADER));
++	  ++errors;
++	  goto done;
++      }
+       place = prev->next;
+       prev->next = prev->next->next;
+     }
diff --git a/src/xmltree.c b/src/xmltree.c
index a995808..61a9eb3 100644
--- a/src/xmltree.c
+++ b/src/xmltree.c
@@ -209,8 +209,9 @@ xmlSecAddChild(xmlNodePtr parent, const xmlChar *name, const xmlChar *ns) {
     if(ns != NULL) {
 	xmlNsPtr nsPtr;
 	
-	nsPtr = xmlSearchNs(cur->doc, cur, NULL);
-	if((nsPtr == NULL) || !xmlStrEqual(nsPtr->href, ns)) {
+        /* find namespace by href and check that its prefix is not overwritten */
+	nsPtr = xmlSearchNsByHref(cur->doc, cur, ns);
+	if((nsPtr == NULL) || (xmlSearchNs(cur->doc, cur, nsPtr->prefix) != nsPtr)) {
 	    nsPtr = xmlNewNs(cur, ns, NULL);
 	}
 	xmlSetNs(cur, nsPtr);
@@ -311,8 +312,9 @@ xmlSecAddNextSibling(xmlNodePtr node, const xmlChar *name, const xmlChar *ns) {
     if(ns != NULL) {
 	xmlNsPtr nsPtr;
 	
-	nsPtr = xmlSearchNs(cur->doc, cur, NULL);
-	if((nsPtr == NULL) || !xmlStrEqual(nsPtr->href, ns)) {
+        /* find namespace by href and check that its prefix is not overwritten */
+	nsPtr = xmlSearchNsByHref(cur->doc, cur, ns);
+	if((nsPtr == NULL) || (xmlSearchNs(cur->doc, cur, nsPtr->prefix) != nsPtr)) {
 	    nsPtr = xmlNewNs(cur, ns, NULL);
 	}
 	xmlSetNs(cur, nsPtr);
@@ -366,8 +368,9 @@ xmlSecAddPrevSibling(xmlNodePtr node, const xmlChar *name, const xmlChar *ns) {
     if(ns != NULL) {
 	xmlNsPtr nsPtr;
 	
-	nsPtr = xmlSearchNs(cur->doc, cur, NULL);
-	if((nsPtr == NULL) || !xmlStrEqual(nsPtr->href, ns)) {
+        /* find namespace by href and check that its prefix is not overwritten */
+	nsPtr = xmlSearchNsByHref(cur->doc, cur, ns);
+	if((nsPtr == NULL) || (xmlSearchNs(cur->doc, cur, nsPtr->prefix) != nsPtr)) {
 	    nsPtr = xmlNewNs(cur, ns, NULL);
 	}
 	xmlSetNs(cur, nsPtr);
@@ -416,6 +419,21 @@ xmlSecGetNextElementNode(xmlNodePtr cur) {
  */
 int
 xmlSecReplaceNode(xmlNodePtr node, xmlNodePtr newNode) {
+    return xmlSecReplaceNodeAndReturn(node, newNode, NULL);
+}
+
+/**                 
+ * xmlSecReplaceNodeAndReturn:
+ * @node: 		the current node.
+ * @newNode: 		the new node.
+ * @replaced:   	the replaced node, or release it if NULL is given
+ * 
+ * Swaps the @node and @newNode in the XML tree.
+ *
+ * Returns 0 on success or a negative value if an error occurs.
+ */
+int
+xmlSecReplaceNodeAndReturn(xmlNodePtr node, xmlNodePtr newNode, xmlNodePtr* replaced) {
     xmlNodePtr oldNode;
     int restoreRoot = 0;
     
@@ -445,7 +463,13 @@ xmlSecReplaceNode(xmlNodePtr node, xmlNodePtr newNode) {
 	xmlDocSetRootElement(oldNode->doc, newNode);
     }
 
-    xmlFreeNode(oldNode);
+    /* return the old node if requested */
+    if(replaced != NULL) {
+     	(*replaced) = oldNode;  	  	
+    } else {
+   	xmlFreeNode(oldNode); 
+    }
+   
     return(0);
 }
 
@@ -460,19 +484,55 @@ xmlSecReplaceNode(xmlNodePtr node, xmlNodePtr newNode) {
  */
 int
 xmlSecReplaceContent(xmlNodePtr node, xmlNodePtr newNode) {
+     return xmlSecReplaceContentAndReturn(node, newNode, NULL);
+}
+
+/**
+ * xmlSecReplaceContentAndReturn
+ * @node: 		the current node.
+ * @newNode: 		the new node.
+ * @replaced:   	the replaced nodes, or release them if NULL is given
+ * 
+ * Swaps the content of @node and @newNode.
+ *
+ * Returns 0 on success or a negative value if an error occurs.
+ */
+int
+xmlSecReplaceContentAndReturn(xmlNodePtr node, xmlNodePtr newNode, xmlNodePtr *replaced) {
     xmlSecAssert2(node != NULL, -1);
     xmlSecAssert2(newNode != NULL, -1);  
 
     xmlUnlinkNode(newNode);
     xmlSetTreeDoc(newNode, node->doc);
-    xmlNodeSetContent(node, NULL);
+
+    /* return the old nodes if requested */
+    if(replaced != NULL) {
+        xmlNodePtr cur, next, tail;
+
+        (*replaced) = tail = NULL;
+        for(cur = node->children; (cur != NULL); cur = next) {
+            next = cur->next;
+            if((*replaced) != NULL) {
+		/* n is unlinked in this function */        	
+                xmlAddNextSibling(tail, cur); 
+		tail = cur;
+            } else {
+		/* this is the first node, (*replaced) is the head */
+                xmlUnlinkNode(cur);
+    	        (*replaced) = tail = cur;    	    
+          }
+        }
+    } else {
+	/* just delete the content */
+        xmlNodeSetContent(node, NULL);
+    }
+
     xmlAddChild(node, newNode);
     xmlSetTreeDoc(newNode, node->doc);
 
     return(0);
 }
 
-
 /**
  * xmlSecReplaceNodeBuffer:
  * @node: 		the current node.
@@ -484,8 +544,23 @@ xmlSecReplaceContent(xmlNodePtr node, xmlNodePtr newNode) {
  * Returns 0 on success or a negative value if an error occurs.
  */
 int
-xmlSecReplaceNodeBuffer(xmlNodePtr node, 
-			const xmlSecByte *buffer, xmlSecSize size) {
+xmlSecReplaceNodeBuffer(xmlNodePtr node, const xmlSecByte *buffer, xmlSecSize size) {
+    return xmlSecReplaceNodeBufferAndReturn(node, buffer, size, NULL);
+}
+
+/**
+ * xmlSecReplaceNodeBufferAndReturn:
+ * @node: 		the current node.
+ * @buffer: 		the XML data.
+ * @size: 		the XML data size.
+ * @replaced: 		the replaced nodes, or release them if NULL is given
+ * 
+ * Swaps the @node and the parsed XML data from the @buffer in the XML tree.
+ *
+ * Returns 0 on success or a negative value if an error occurs.
+ */
+int
+xmlSecReplaceNodeBufferAndReturn(xmlNodePtr node, const xmlSecByte *buffer, xmlSecSize size, xmlNodePtr *replaced) {
     xmlNodePtr results = NULL;
     xmlNodePtr next = NULL;
 
@@ -511,7 +586,50 @@ xmlSecReplaceNodeBuffer(xmlNodePtr node,
 
     /* remove old node */
     xmlUnlinkNode(node);
-    xmlFreeNode(node);  
+
+    /* return the old node if requested */
+    if(replaced != NULL) {
+     	(*replaced) = node;  	  	
+    } else {
+   	xmlFreeNode(node); 
+    }
+
+    return(0);
+}
+
+/**
+ * xmlSecNodeEncodeAndSetContent:
+ * @node: 		    the pointer to an XML node.
+ * @buffer: 		the pointer to the node content.
+ *
+ * Encodes "special" characters in the @buffer and sets the result
+ * as the node content.
+ *
+ * Returns 0 on success or a negative value if an error occurs.
+ */
+int
+xmlSecNodeEncodeAndSetContent(xmlNodePtr node, const xmlChar * buffer) {
+    xmlSecAssert2(node != NULL, -1);
+    xmlSecAssert2(node->doc != NULL, -1);
+    
+    if(buffer != NULL) {
+	    xmlChar * tmp;
+
+        tmp = xmlEncodeSpecialChars(node->doc, buffer);        
+        if (tmp == NULL) {
+            xmlSecError(XMLSEC_ERRORS_HERE,
+                        NULL,
+                        "xmlEncodeSpecialChars",
+                        XMLSEC_ERRORS_R_XML_FAILED,
+                        "Failed to encode special characters");
+            return(-1);         
+        }
+
+        xmlNodeSetContent(node, tmp);
+        xmlFree(tmp);
+    } else {
+        xmlNodeSetContent(node, NULL);
+    }
 
     return(0);
 }
diff --git a/src/xpath.c b/src/xpath.c
index c1ba528..ec765d6 100644
--- a/src/xpath.c
+++ b/src/xpath.c
@@ -523,7 +523,7 @@ xmlSecTransformXPathGetKlass(void) {
     return(&xmlSecTransformXPathKlass);
 }
 
-static const char xpathPattern[] = "(//. | //@* | //namespace::*)[%s]";
+static const char xpathPattern[] = "(//. | //@* | //namespace::*)[boolean(%s)]";
 static int 
 xmlSecTransformXPathNodeRead(xmlSecTransformPtr transform, xmlNodePtr node, xmlSecTransformCtxPtr transformCtx) {
     xmlSecPtrListPtr dataList;
diff --git a/tests/aleksey-xmldsig-01/enveloped-gost.tmpl b/tests/aleksey-xmldsig-01/enveloped-gost.tmpl
new file mode 100644
index 0000000..a89538d
--- /dev/null
+++ b/tests/aleksey-xmldsig-01/enveloped-gost.tmpl
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+XML Security Library example: Simple signature template file for sign1 example. 
+-->
+<Envelope xmlns="urn:envelope">
+  <Data>
+	Hello, World!
+  </Data>
+  <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+    <SignedInfo>
+      <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
+      <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#gostr34102001-gostr3411"/>
+      <Reference URI="">
+        <Transforms>
+          <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
+	<Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116">
+	<XPath xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">not(ancestor-or-self::dsig:Signature)</XPath>
+	</Transform>
+        </Transforms>
+        <DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#gostr3411"/>
+        <DigestValue></DigestValue>
+      </Reference>
+    </SignedInfo>
+    <SignatureValue/>
+    <KeyInfo>
+<X509Data>
+<X509Certificate></X509Certificate>
+</X509Data>
+</KeyInfo>
+</Signature>
+</Envelope>
diff --git a/tests/aleksey-xmldsig-01/enveloped-gost.xml b/tests/aleksey-xmldsig-01/enveloped-gost.xml
new file mode 100644
index 0000000..a00b1a9
--- /dev/null
+++ b/tests/aleksey-xmldsig-01/enveloped-gost.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+XML Security Library example: Simple signature template file for sign1 example. 
+-->
+<Envelope xmlns="urn:envelope">
+  <Data>
+	Hello, World!
+  </Data>
+  <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+    <SignedInfo>
+      <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
+      <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#gostr34102001-gostr3411"/>
+      <Reference URI="">
+        <Transforms>
+          <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
+	<Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116">
+	<XPath xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">not(ancestor-or-self::dsig:Signature)</XPath>
+	</Transform>
+        </Transforms>
+        <DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#gostr3411"/>
+        <DigestValue>e1x3rydsnTQukoiTtQ0vHaWYqKka7yRiP1sB8AVobaA=</DigestValue>
+      </Reference>
+    </SignedInfo>
+    <SignatureValue>DLVX5EypJpYtdD+iAx9/BCKDZlWNnG70jqps5qFGNmoRem5czMSIhc6yVR48ywN2
++HHUYG+9UouTr/d7BfDl8g==</SignatureValue>
+    <KeyInfo>
+<X509Data>
+<X509Certificate>MIICBzCCAbSgAwIBAgIBPDAKBgYqhQMCAgMFADCBjzELMAkGA1UEBhMCUlUxDzAN
+BgNVBAcTBk1vc2NvdzEjMCEGA1UEAxMaR09TVDIwMDEgQ3J5cHRvUHJvIFRlc3Qg
+Q0ExEjAQBgNVBAoTCUNyeXB0b2NvbTETMBEGA1UECxMKT3BlblNTTCBDQTEhMB8G
+CSqGSIb3DQEJARYSdml0dXNAY3J5cHRvY29tLnJ1MB4XDTA2MDExNjExMjQzN1oX
+DTA3MDExNjEyMjQzN1owXjELMAkGA1UEBhMCUlUxEjAQBgNVBAoTCUNyeXB0b2Nv
+bTEMMAoGA1UECxMDMTMwMQwwCgYDVQQDEwNSYW4xHzAdBgkqhkiG9w0BCQEWEHJh
+bkBjcnlwdG9jb20ucnUwYzAcBgYqhQMCAhMwEgYHKoUDAgIjAQYHKoUDAgIeAQND
+AARASEKiNMuNPqSOVf9PSG2IuWKQy9jvKX2w2pAQnJJsslTis9llJAJn10nXMW2T
+qvkI9C/DtrDiRmGuuS0PARgzVqMnMCUwDgYDVR0PAQH/BAQDAgbAMBMGA1UdJQQM
+MAoGCCqFAwIZAQIBMAoGBiqFAwICAwUAA0EAruCZrlhscel2tb/FPtdA0fBv3WOh
+mrmUMgrjVr/xVr0ZPeIzFGXAcKWYiEi5Gu+mJp17VLlhIq0Qny80bc6AdQ==</X509Certificate>
+</X509Data>
+</KeyInfo>
+</Signature>
+</Envelope>
diff --git a/tests/keys/gost2001ca.der b/tests/keys/gost2001ca.der
new file mode 100644
index 0000000..b48d01a
Binary files /dev/null and b/tests/keys/gost2001ca.der differ
diff --git a/tests/keys/gost2001ca.pem b/tests/keys/gost2001ca.pem
new file mode 100644
index 0000000..9bc47e1
--- /dev/null
+++ b/tests/keys/gost2001ca.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIICCzCCAbgCAQEwCgYGKoUDAgIDBQAwgY8xCzAJBgNVBAYTAlJVMQ8wDQYDVQQH
+EwZNb3Njb3cxIzAhBgNVBAMTGkdPU1QyMDAxIENyeXB0b1BybyBUZXN0IENBMRIw
+EAYDVQQKEwlDcnlwdG9jb20xEzARBgNVBAsTCk9wZW5TU0wgQ0ExITAfBgkqhkiG
+9w0BCQEWEnZpdHVzQGNyeXB0b2NvbS5ydTAeFw0wNTA2MDMxNTA3MjhaFw0xNTA2
+MDMxNTA3MjhaMIGPMQswCQYDVQQGEwJSVTEPMA0GA1UEBxMGTW9zY293MSMwIQYD
+VQQDExpHT1NUMjAwMSBDcnlwdG9Qcm8gVGVzdCBDQTESMBAGA1UEChMJQ3J5cHRv
+Y29tMRMwEQYDVQQLEwpPcGVuU1NMIENBMSEwHwYJKoZIhvcNAQkBFhJ2aXR1c0Bj
+cnlwdG9jb20ucnUwYzAcBgYqhQMCAhMwEgYHKoUDAgIjAQYHKoUDAgIeAQNDAARA
+gLdWGphDAny4aHnGbd5sVUaIFLJ0W7bEHiP3TQikVe76L+l/yIBI4BU1YmyOCQnX
+DROKczl5PBGHOPl5J3D7ZjAKBgYqhQMCAgMFAANBANS0ZNrxY7IH6UHHBGdAqkzq
+yMqz7W2v44VaioXKhSHQlgl9x9pwC4t0oirghLKXgMERcE0HJ0zHWKO9g3pqLhc=
+-----END CERTIFICATE-----
diff --git a/tests/testDSig.sh b/tests/testDSig.sh
index b66bf13..5f96e09 100755
--- a/tests/testDSig.sh
+++ b/tests/testDSig.sh
@@ -67,11 +67,11 @@ printRes() {
 execDSigTest() {    
     folder=$1
     file=$2
-    params1=$3
-    params2=$4
-    params3=$5
-    old_pwd=`pwd`
-    
+    req_transforms=$3
+    params1=$4
+    params2=$5
+    params3=$6
+    old_pwd=`pwd`    
     rm -f $tmpfile
 
     if [ -n "$folder" ] ; then 
@@ -84,7 +84,21 @@ execDSigTest() {
         echo $file 
 	echo "Test: $folder/$file" >> $logfile
     fi
-    
+
+    if [ -n "$req_transforms" ] ; then
+	printf "    Checking required transforms                         "
+        echo "$xmlsec_app check-transforms $req_transforms" >> $logfile
+	$xmlsec_app check-transforms $req_transforms >> $logfile 2>> $logfile
+	res=$?
+	if [ $res = 0 ]; then
+    	    echo "   OK"	    
+	else
+	    echo " Skip"
+	    cd $old_pwd
+	    return
+	fi
+    fi
+
     
     printf "    Verify existing signature                            "
     echo "$xmlsec_app verify $xmlsec_params $params1 $full_file.xml" >> $logfile
@@ -118,121 +132,145 @@ echo "--- LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $logfile
 
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-dsa-x509chain" \
+    "sha1 dsa-sha1" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --enabled-key-data x509" \
     "$priv_key_option $topfolder/keys/dsakey.$priv_key_format --pwd secret" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --enabled-key-data x509"
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-rsa-x509chain" \
+    "sha1 rsa-sha1" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --enabled-key-data x509" \
     "$priv_key_option $topfolder/keys/rsakey.$priv_key_format --pwd secret" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --enabled-key-data x509"
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-md5-hmac-md5" \
+    "md5 hmac-md5" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" 
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-md5-hmac-md5-64" \
+    "md5 hmac-md5" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" 
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-ripemd160-hmac-ripemd160" \
+    "ripemd160 hmac-ripemd160" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" 
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-ripemd160-hmac-ripemd160-64" \
+    "ripemd160 hmac-ripemd160" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" 
 
 execDSigTest "" "aleksey-xmldsig-01/xpointer-hmac" \
+    "xpointer sha1 hmac-sha1" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" 
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-sha1-hmac-sha1" \
+    "sha1 hmac-sha1" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" 
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-sha1-hmac-sha1-64" \
+    "sha1 hmac-sha1" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" 
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-sha224-hmac-sha224" \
+    "sha224 hmac-sha224" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" 
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-sha224-hmac-sha224-64" \
+    "sha224 hmac-sha224" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" 
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-sha256-hmac-sha256" \
+    "sha256 hmac-sha256" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" 
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-sha256-hmac-sha256-64" \
+    "sha256 hmac-sha256" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" 
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-sha384-hmac-sha384" \
+    "sha384 hmac-sha384" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" 
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-sha384-hmac-sha384-64" \
+    "sha384 hmac-sha384" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" 
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-sha512-hmac-sha512" \
+    "sha512 hmac-sha512" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" 
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-sha512-hmac-sha512-64" \
+    "sha512 hmac-sha512" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" 
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-md5-rsa-md5" \
+    "md5 rsa-md5" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --enabled-key-data x509" \
     "$priv_key_option $topfolder/keys/rsakey.$priv_key_format --pwd secret" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --enabled-key-data x509"
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-ripemd160-rsa-ripemd160" \
+    "ripemd160 rsa-ripemd160" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --enabled-key-data x509" \
     "$priv_key_option $topfolder/keys/rsakey.$priv_key_format --pwd secret" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --enabled-key-data x509"
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-sha1-rsa-sha1" \
+    "sha1 rsa-sha1" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --enabled-key-data x509" \
     "$priv_key_option $topfolder/keys/rsakey.$priv_key_format --pwd secret" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --enabled-key-data x509"
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-sha224-rsa-sha224" \
+    "sha224 rsa-sha224" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --enabled-key-data x509" \
     "$priv_key_option $topfolder/keys/rsakey.$priv_key_format --pwd secret" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --enabled-key-data x509"
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-sha256-rsa-sha256" \
+    "sha256 rsa-sha256" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --enabled-key-data x509" \
     "$priv_key_option $topfolder/keys/rsakey.$priv_key_format --pwd secret" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --enabled-key-data x509"
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-sha384-rsa-sha384" \
+    "sha384 rsa-sha384" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --enabled-key-data x509" \
     "$priv_key_option $topfolder/keys/largersakey.$priv_key_format --pwd secret" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --enabled-key-data x509"
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-sha512-rsa-sha512" \
+    "sha512 rsa-sha512" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --enabled-key-data x509" \
     "$priv_key_option $topfolder/keys/largersakey.$priv_key_format --pwd secret" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --enabled-key-data x509"
@@ -242,108 +280,131 @@ execDSigTest "" "aleksey-xmldsig-01/enveloping-sha512-rsa-sha512" \
 # > xmlsec1 sign --pkcs12 tests/keys/expiredkey.p12 --pwd secret --output out.xml ./tests/aleksey-xmldsig-01/enveloping-expired-cert.tmpl
 #
 execDSigTest "" "aleksey-xmldsig-01/enveloping-expired-cert" \
+    "sha1 rsa-sha1" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --enabled-key-data x509 --verification-time 2005-07-10+10:00:00" 
 
 
 execDSigTest "" "aleksey-xmldsig-01/dtd-hmac-91" \
+    "sha1 hmac-sha1" \
     "--hmackey $topfolder/keys/hmackey.bin --dtd-file $topfolder/aleksey-xmldsig-01/dtd-hmac-91.dtd" \
     "--hmackey $topfolder/keys/hmackey.bin --dtd-file $topfolder/aleksey-xmldsig-01/dtd-hmac-91.dtd" \
     "--hmackey $topfolder/keys/hmackey.bin --dtd-file $topfolder/aleksey-xmldsig-01/dtd-hmac-91.dtd"
 
 execDSigTest "" "aleksey-xmldsig-01/x509data-test" \
+    "xpath2 sha1 rsa-sha1" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format" \
     "$priv_key_option tests/keys/rsakey.$priv_key_format --pwd secret" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format"
 
 execDSigTest "" "aleksey-xmldsig-01/x509data-sn-test" \
+    "xpath2 sha1 rsa-sha1" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --untrusted-$cert_format $topfolder/keys/ca2cert.$cert_format  --untrusted-$cert_format $topfolder/keys/rsacert.$cert_format --enabled-key-data x509" \
     "$priv_key_option tests/keys/rsakey.$priv_key_format --pwd secret" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --untrusted-$cert_format $topfolder/keys/ca2cert.$cert_format  --untrusted-$cert_format $topfolder/keys/rsacert.$cert_format --enabled-key-data x509"
 
 execDSigTest "" "merlin-xmldsig-twenty-three/signature-enveloped-dsa" \
+    "enveloped-signature sha1 dsa-sha1" \
     " " \
     "$priv_key_option $topfolder/keys/dsakey.$priv_key_format --pwd secret" \
     " " 
     
 execDSigTest "" "merlin-xmldsig-twenty-three/signature-enveloping-dsa" \
+    "sha1 dsa-sha1" \
     " " \
     "$priv_key_option $topfolder/keys/dsakey.$priv_key_format --pwd secret" \
     " " 
     
 execDSigTest "" "merlin-xmldsig-twenty-three/signature-enveloping-b64-dsa" \
+    "base64 sha1 dsa-sha1" \
     " " \
     "$priv_key_option $topfolder/keys/dsakey.$priv_key_format --pwd secret" \
     " " 
     
 execDSigTest "" "merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1-40" \
+    "sha1 hmac-sha1" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" 
     
 execDSigTest "" "merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1" \
+    "sha1 hmac-sha1" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" \
     "--hmackey $topfolder/keys/hmackey.bin" 
 
 execDSigTest "" "merlin-xmldsig-twenty-three/signature-enveloping-rsa" \
+    "sha1 rsa-sha1" \
     " " \
     "$priv_key_option $topfolder/keys/rsakey.$priv_key_format --pwd secret" \
     " " 
     
 execDSigTest "" "merlin-xmldsig-twenty-three/signature-external-b64-dsa" \
+    "base64 sha1 dsa-sha1" \
     " " \
     "$priv_key_option $topfolder/keys/dsakey.$priv_key_format --pwd secret" \
     " " 
     
 execDSigTest "" "merlin-xmldsig-twenty-three/signature-external-dsa" \
+    "sha1 dsa-sha1" \
     " " \
     "$priv_key_option $topfolder/keys/dsakey.$priv_key_format --pwd secret" \
     " " 
 
 execDSigTest "" "merlin-xmldsig-twenty-three/signature-keyname" \
+    "sha1 dsa-sha1" \
     "--pubkey-cert-$cert_format:Lugh $topfolder/merlin-xmldsig-twenty-three/certs/lugh-cert.$cert_format" \
     "$priv_key_option:test-dsa $topfolder/keys/dsakey.$priv_key_format --pwd secret" \
     "$priv_key_option:test-dsa $topfolder/keys/dsakey.$priv_key_format --pwd secret"
 
 execDSigTest "" "merlin-xmldsig-twenty-three/signature-x509-crt" \
+    "sha1 dsa-sha1" \
     "--trusted-$cert_format $topfolder/merlin-xmldsig-twenty-three/certs/ca.$cert_format" \
     "$priv_key_option $topfolder/keys/dsakey.$priv_key_format --pwd secret"\
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format"
 
 execDSigTest "" "merlin-xmldsig-twenty-three/signature-x509-sn" \
+    "sha1 dsa-sha1" \
     "--trusted-$cert_format $topfolder/merlin-xmldsig-twenty-three/certs/ca.$cert_format --untrusted-$cert_format $topfolder/merlin-xmldsig-twenty-three/certs/badb.$cert_format" \
     "$priv_key_option $topfolder/keys/dsakey.$priv_key_format --pwd secret"\
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format"
 
 execDSigTest "" "merlin-xmldsig-twenty-three/signature-x509-is" \
+    "sha1 dsa-sha1" \
     "--trusted-$cert_format $topfolder/merlin-xmldsig-twenty-three/certs/ca.$cert_format --untrusted-$cert_format $topfolder/merlin-xmldsig-twenty-three/certs/macha.$cert_format" \
     "$priv_key_option $topfolder/keys/dsakey.$priv_key_format --pwd secret"\
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format"
 
 execDSigTest "" "merlin-xmldsig-twenty-three/signature-x509-ski" \
+    "sha1 dsa-sha1" \
     "--trusted-$cert_format $topfolder/merlin-xmldsig-twenty-three/certs/ca.$cert_format --untrusted-$cert_format $topfolder/merlin-xmldsig-twenty-three/certs/nemain.$cert_format" \
     "$priv_key_option $topfolder/keys/dsakey.$priv_key_format --pwd secret"\
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format"
 
 execDSigTest "" "merlin-xmldsig-twenty-three/signature-retrievalmethod-rawx509crt" \
+    "sha1 dsa-sha1" \
     "--trusted-$cert_format $topfolder/merlin-xmldsig-twenty-three/certs/ca.$cert_format --untrusted-$cert_format $topfolder/merlin-xmldsig-twenty-three/certs/nemain.$cert_format" \
     "$priv_key_option $topfolder/keys/dsakey.$priv_key_format --pwd secret"\
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --trusted-$cert_format $topfolder/keys/ca2cert.$cert_format"
     
 execDSigTest "" "merlin-xmldsig-twenty-three/signature" \
+    "base64 xpath enveloped-signature c14n-with-comments sha1 dsa-sha1" \
     "--trusted-$cert_format $topfolder/merlin-xmldsig-twenty-three/certs/merlin.$cert_format" \
     "$priv_key_option $topfolder/keys/dsakey.$priv_key_format --pwd secret" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --untrusted-$cert_format $topfolder/keys/ca2cert.$cert_format"
 
 execDSigTest "" "merlin-xmlenc-five/encsig-ripemd160-hmac-ripemd160-kw-tripledes" \
+    "ripemd160 hmac-ripemd160 kw-tripledes" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml" \
     "--session-key hmac-192 --keys-file $topfolder/merlin-xmlenc-five/keys.xml" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml" 
 execDSigTest "" "merlin-xmlenc-five/encsig-sha256-hmac-sha256-kw-aes128" \
+    "sha256 hmac-sha256 kw-aes128" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml" 
 execDSigTest "" "merlin-xmlenc-five/encsig-sha384-hmac-sha384-kw-aes192" \
+    "sha384 hmac-sha384 kw-aes192" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml" 
 execDSigTest "" "merlin-xmlenc-five/encsig-sha512-hmac-sha512-kw-aes256" \
+    "sha512 hmac-sha512 kw-aes256" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml" 
 
 #merlin-xmlenc-five/encsig-hmac-sha256-rsa-1_5.xml
@@ -351,92 +412,121 @@ execDSigTest "" "merlin-xmlenc-five/encsig-sha512-hmac-sha512-kw-aes256" \
 
     
 execDSigTest "" "merlin-exc-c14n-one/exc-signature" \
+    "exc-c14n sha1 dsa-sha1" \
     " " \
     "$priv_key_option $topfolder/keys/dsakey.$priv_key_format --pwd secret" \
     " " 
     
 execDSigTest "" "merlin-exc-c14n-one/exc-signature" \
-    ""
+    "exc-c14n sha1 dsa-sha1" \
+    " "
     
 execDSigTest "" "merlin-c14n-three/signature" \
-    ""
+    "c14n c14n-with-comments exc-c14n exc-c14n-with-comments xpath sha1 dsa-sha1" \
+    " "
     
 execDSigTest "" "merlin-xpath-filter2-three/sign-xfdl" \
+    "enveloped-signature xpath2 sha1 dsa-sha1" \
     ""
 
 execDSigTest "" "merlin-xpath-filter2-three/sign-spec" \
+    "enveloped-signature xpath2 sha1 dsa-sha1" \
     ""
 
 execDSigTest "phaos-xmldsig-three" "signature-big" \
+    "base64 xslt xpath sha1 rsa-sha1" \
     "--pubkey-cert-$cert_format certs/rsa-cert.$cert_format" 
 
 execDSigTest "phaos-xmldsig-three" "signature-dsa-detached" \
+    "sha1 dsa-sha1" \
     "--trusted-$cert_format certs/dsa-ca-cert.$cert_format"
 
 execDSigTest "phaos-xmldsig-three" "signature-dsa-enveloped" \
+    "enveloped-signature sha1 dsa-sha1" \
     "--trusted-$cert_format certs/dsa-ca-cert.$cert_format"
     
 execDSigTest "phaos-xmldsig-three" "signature-dsa-enveloping" \
+    "sha1 dsa-sha1" \
     "--trusted-$cert_format certs/dsa-ca-cert.$cert_format"
 
 execDSigTest "phaos-xmldsig-three" "signature-dsa-manifest" \
+    "sha1 dsa-sha1" \
     "--trusted-$cert_format certs/dsa-ca-cert.$cert_format"
 
 execDSigTest "phaos-xmldsig-three" "signature-hmac-md5-c14n-enveloping" \
+    "md5 hmac-md5" \
     "--hmackey certs/hmackey.bin"
     
 execDSigTest "phaos-xmldsig-three" "signature-hmac-sha1-40-c14n-comments-detached" \
+    "c14n-with-comments sha1 hmac-sha1" \
     "--hmackey certs/hmackey.bin"
     
 execDSigTest "phaos-xmldsig-three" "signature-hmac-sha1-40-exclusive-c14n-comments-detached" \
+    "exc-c14n-with-comments sha1 hmac-sha1" \
     "--hmackey certs/hmackey.bin"
     
 execDSigTest "phaos-xmldsig-three" "signature-hmac-sha1-exclusive-c14n-comments-detached" \
+    "exc-c14n-with-comments sha1 hmac-sha1" \
     "--hmackey certs/hmackey.bin"
     
 execDSigTest "phaos-xmldsig-three" "signature-hmac-sha1-exclusive-c14n-enveloped" \
+    "enveloped-signature exc-c14n sha1 hmac-sha1" \
     "--hmackey certs/hmackey.bin"
 
 execDSigTest "phaos-xmldsig-three" "signature-rsa-detached-b64-transform" \
+    "base64 sha1 rsa-sha1" \
     "--trusted-$cert_format certs/rsa-ca-cert.$cert_format"
 
 execDSigTest "phaos-xmldsig-three" "signature-rsa-detached" \
+    "sha1 rsa-sha1" \
     "--trusted-$cert_format certs/rsa-ca-cert.$cert_format"
 
 execDSigTest "phaos-xmldsig-three" "signature-rsa-detached-xpath-transform" \
+    "xpath sha1 rsa-sha1" \
     "--trusted-$cert_format certs/rsa-ca-cert.$cert_format"
 
 execDSigTest "phaos-xmldsig-three" "signature-rsa-detached-xslt-transform-retrieval-method" \
+    "xslt sha1 rsa-sha1" \
     "--trusted-$cert_format certs/rsa-ca-cert.$cert_format"
 
 execDSigTest "phaos-xmldsig-three" "signature-rsa-detached-xslt-transform" \
+    "xslt sha1 rsa-sha1" \
     "--trusted-$cert_format certs/rsa-ca-cert.$cert_format"
 
 execDSigTest "phaos-xmldsig-three" "signature-rsa-enveloped" \
+    "enveloped-signature sha1 rsa-sha1" \
     "--trusted-$cert_format certs/rsa-ca-cert.$cert_format"
 
 execDSigTest "phaos-xmldsig-three" "signature-rsa-enveloping" \
+    "sha1 rsa-sha1" \
     "--trusted-$cert_format certs/rsa-ca-cert.$cert_format"
 
 execDSigTest "phaos-xmldsig-three" "signature-rsa-manifest-x509-data-cert-chain" \
+    "sha1 rsa-sha1" \
     "--trusted-$cert_format certs/rsa-ca-cert.$cert_format"
 
 execDSigTest "phaos-xmldsig-three" "signature-rsa-manifest-x509-data-cert" \
+    "sha1 rsa-sha1" \
     "--trusted-$cert_format certs/rsa-ca-cert.$cert_format"
 
 execDSigTest "phaos-xmldsig-three" "signature-rsa-manifest-x509-data-issuer-serial" \
+    "sha1 rsa-sha1" \
     "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format"
 
 execDSigTest "phaos-xmldsig-three" "signature-rsa-manifest-x509-data-ski" \
+    "sha1 rsa-sha1" \
     "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format"
 
 execDSigTest "phaos-xmldsig-three" "signature-rsa-manifest-x509-data-subject-name" \
+    "sha1 rsa-sha1" \
     "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format"
 
 execDSigTest "phaos-xmldsig-three" "signature-rsa-manifest" \
+    "sha1 rsa-sha1" \
     "--trusted-$cert_format certs/rsa-ca-cert.$cert_format"
 
 execDSigTest "phaos-xmldsig-three" "signature-rsa-xpath-transform-enveloped" \
+    "enveloped-signature xpath sha1 rsa-sha1" \
     "--trusted-$cert_format certs/rsa-ca-cert.$cert_format"
 
 
@@ -451,30 +541,44 @@ echo "$xmlsec_app verify --keys-file $keysfile $tmpfile" >> $logfile
 $VALGRIND $xmlsec_app verify $xmlsec_params --keys-file $keysfile $tmpfile >> $logfile 2>> $logfile
 printRes $?
 
+
+echo "--------- These tests CAN FAIL (extra OS config required) ----------"
+execDSigTest "" "aleksey-xmldsig-01/enveloped-gost" \
+    "enveloped-signature gostr34102001-gostr3411 gostr3411" \
+    "--trusted-$cert_format $topfolder/keys/gost2001ca.$cert_format --untrusted-$cert_format $topfolder/keys/ca2cert.$cert_format  --enabled-key-data x509" \
+    "" \
+    ""
+
+
 echo "--------- Negative Testing: next test MUST FAIL ----------"
 execDSigTest "" "merlin-xmldsig-twenty-three/signature-x509-crt-crl" \
+    "sha1 rsa-sha1" \
     "--X509-skip-strict-checks --trusted-$cert_format $topfolder/merlin-xmldsig-twenty-three/certs/ca.$cert_format"
 
 execDSigTest "" "aleksey-xmldsig-01/enveloping-expired-cert" \
+    "sha1 dsa-sha1" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --enabled-key-data x509" 
 
 execDSigTest "" "aleksey-xmldsig-01/dtd-hmac-91" \
+    "sha1 hmac-sha1" \
     "--enabled-reference-uris empty --hmackey $topfolder/keys/hmackey.bin --dtd-file $topfolder/aleksey-xmldsig-01/dtd-hmac-91.dtd" 
 
 execDSigTest "phaos-xmldsig-three" "signature-rsa-detached-xslt-transform-bad-retrieval-method" \
+    "xslt sha1 rsa-sha1" \
     "--trusted-$cert_format certs/rsa-ca-cert.$cert_format"
 
 execDSigTest "phaos-xmldsig-three" "signature-rsa-enveloped-bad-digest-val" \
+    "enveloped-signature sha1 rsa-sha1" \
     "--trusted-$cert_format certs/rsa-ca-cert.$cert_format"
 
 execDSigTest "phaos-xmldsig-three" "signature-rsa-enveloped-bad-sig" \
+    "enveloped-signature sha1 rsa-sha1" \
     "--trusted-$cert_format certs/rsa-ca-cert.$cert_format"
 
 execDSigTest "phaos-xmldsig-three" "signature-rsa-manifest-x509-data-crl" \
+    "sha1 rsa-sha1" \
     "--trusted-$cert_format certs/rsa-ca-cert.$cert_format"
 
-
-
 rm -rf $tmpfile
 
 echo "--- testDSig finished" >> $logfile
diff --git a/tests/testEnc.sh b/tests/testEnc.sh
index ba6f098..bf2de36 100755
--- a/tests/testEnc.sh
+++ b/tests/testEnc.sh
@@ -56,9 +56,28 @@ printRes() {
 }
 
 execEncTest() {    
-    file=$topfolder/$1      
-    echo $1
-    echo $1 >>  $logfile 
+    filename=$1
+    req_transforms=$2
+    params1=$3
+    params2=$4
+    params3=$5
+
+    echo $filename
+    echo $filename >>  $logfile 
+    file=$topfolder/$filename      
+
+    if [ -n "$req_transforms" ] ; then
+	printf "    Checking required transforms                         "
+        echo "$xmlsec_app check-transforms $req_transforms" >> $logfile
+	$xmlsec_app check-transforms $req_transforms >> $logfile 2>> $logfile
+	res=$?
+	if [ $res = 0 ]; then
+    	    echo "   OK"	    
+	else
+	    echo " Skip"
+	    return
+	fi
+    fi
     
     printf "    Decrypt existing document                            "
     rm -f $tmpfile
@@ -69,8 +88,8 @@ execEncTest() {
 	diff_param=-u
     fi
 
-    echo "$xmlsec_app decrypt $xmlsec_params $2 $file.xml" >>  $logfile 
-    $VALGRIND $xmlsec_app decrypt $xmlsec_params $2 $file.xml > $tmpfile 2>> $logfile
+    echo "$xmlsec_app decrypt $xmlsec_params $params1 $file.xml" >>  $logfile 
+    $VALGRIND $xmlsec_app decrypt $xmlsec_params $params1 $file.xml > $tmpfile 2>> $logfile
     if [ $? = 0 ]; then
 	diff $diff_param $file.data $tmpfile >> $logfile 2>> $logfile
 	printRes $?
@@ -78,18 +97,18 @@ execEncTest() {
 	echo " Error"
     fi
 
-    if [ -n "$3"  -a -z "$PERF_TEST" ] ; then
+    if [ -n "$params2"  -a -z "$PERF_TEST" ] ; then
 	printf "    Encrypt document                                     "
 	rm -f $tmpfile
-	echo "$xmlsec_app encrypt $xmlsec_params $3 --output $tmpfile $file.tmpl" >>  $logfile 
-	$VALGRIND $xmlsec_app encrypt $xmlsec_params $3 --output $tmpfile $file.tmpl >> $logfile 2>> $logfile
+	echo "$xmlsec_app encrypt $xmlsec_params $params2 --output $tmpfile $file.tmpl" >>  $logfile 
+	$VALGRIND $xmlsec_app encrypt $xmlsec_params $params2 --output $tmpfile $file.tmpl >> $logfile 2>> $logfile
 	printRes $?
 	
-	if [ -n "$4" ] ; then 
+	if [ -n "$params4" ] ; then 
 	    if [ -z "$VALGRIND" ] ; then
 	        printf "    Decrypt new document                                 "
-		echo "$xmlsec_app decrypt $xmlsec_params $4 --output $tmpfile.2 $tmpfile" >>  $logfile 
-	        $VALGRIND $xmlsec_app decrypt $xmlsec_params $4 --output $tmpfile.2 $tmpfile >> $logfile 2>> $logfile
+		echo "$xmlsec_app decrypt $xmlsec_params $params4 --output $tmpfile.2 $tmpfile" >>  $logfile 
+	        $VALGRIND $xmlsec_app decrypt $xmlsec_params $params4 --output $tmpfile.2 $tmpfile >> $logfile 2>> $logfile
 		if [ $? = 0 ]; then
 		    diff $diff_param $file.data $tmpfile.2 >> $logfile 2>> $logfile
 		    printRes $?
@@ -110,96 +129,124 @@ echo "--- LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $logfile
 
 
 execEncTest "aleksey-xmlenc-01/enc-des3cbc-keyname" \
+    "tripledes-cbc" \
     "--keys-file $topfolder/keys/keys.xml" \
     "--keys-file $keysfile --binary-data $topfolder/aleksey-xmlenc-01/enc-des3cbc-keyname.data" \
     "--keys-file $keysfile"
 
 execEncTest "aleksey-xmlenc-01/enc-des3cbc-keyname2" \
+    "tripledes-cbc" \
     "--keys-file $topfolder/keys/keys.xml" \
     "--keys-file $keysfile --binary-data $topfolder/aleksey-xmlenc-01/enc-des3cbc-keyname2.data" \
     "--keys-file $keysfile"
 
 execEncTest "aleksey-xmlenc-01/enc-aes128cbc-keyname" \
+    "aes128-cbc" \
     "--keys-file $topfolder/keys/keys.xml" \
     "--keys-file $keysfile --binary-data $topfolder/aleksey-xmlenc-01/enc-aes128cbc-keyname.data" \
     "--keys-file $keysfile"
 
 execEncTest "aleksey-xmlenc-01/enc-aes192cbc-keyname" \
+    "aes192-cbc" \
     "--keys-file $topfolder/keys/keys.xml" \
     "--keys-file $keysfile --binary-data $topfolder/aleksey-xmlenc-01/enc-aes192cbc-keyname.data" \
     "--keys-file $keysfile"
 
 execEncTest "aleksey-xmlenc-01/enc-aes192cbc-keyname-ref" \
+    "aes192-cbc" \
     "--keys-file $topfolder/keys/keys.xml"
 
 execEncTest "aleksey-xmlenc-01/enc-aes256cbc-keyname" \
+    "aes256-cbc" \
     "--keys-file $topfolder/keys/keys.xml" \
     "--keys-file $keysfile --binary-data $topfolder/aleksey-xmlenc-01/enc-aes256cbc-keyname.data" \
     "--keys-file $keysfile"
 
 execEncTest "aleksey-xmlenc-01/enc-des3cbc-keyname-content" \
+    "tripledes-cbc" \
     "--keys-file $topfolder/keys/keys.xml" \
     "--keys-file $keysfile --xml-data $topfolder/aleksey-xmlenc-01/enc-des3cbc-keyname-content.data --node-id Test" \
     "--keys-file $keysfile"
 
 execEncTest "aleksey-xmlenc-01/enc-des3cbc-keyname-element" \
+    "tripledes-cbc" \
     "--keys-file $topfolder/keys/keys.xml" \
     "--keys-file $keysfile --xml-data $topfolder/aleksey-xmlenc-01/enc-des3cbc-keyname-element.data --node-id Test" \
     "--keys-file $keysfile"
 
 execEncTest "aleksey-xmlenc-01/enc-des3cbc-keyname-element-root" \
+    "tripledes-cbc" \
     "--keys-file $topfolder/keys/keys.xml" \
     "--keys-file $keysfile --xml-data $topfolder/aleksey-xmlenc-01/enc-des3cbc-keyname-element-root.data --node-id Test" \
     "--keys-file $keysfile"
 
 execEncTest "aleksey-xmlenc-01/enc-des3cbc-aes192-keyname" \
+    "tripledes-cbc kw-aes192" \
     "--keys-file $topfolder/keys/keys.xml --enabled-key-data key-name,enc-key" \
     "--keys-file $keysfile  --session-key des-192  --binary-data $topfolder/aleksey-xmlenc-01/enc-des3cbc-aes192-keyname.data" \
     "--keys-file $keysfile"
 
 # Merlin's tests
 execEncTest "merlin-xmlenc-five/encrypt-data-aes128-cbc" \
+    "aes128-cbc" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml --binary-data $topfolder/merlin-xmlenc-five/encrypt-data-aes128-cbc.data" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml"
+
 execEncTest "merlin-xmlenc-five/encrypt-content-tripledes-cbc" \
+    "tripledes-cbc" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml --enabled-key-data key-name --xml-data $topfolder/merlin-xmlenc-five/encrypt-content-tripledes-cbc.data --node-id Payment" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml"
+
 execEncTest "merlin-xmlenc-five/encrypt-content-aes256-cbc-prop" \
+    "aes256-cbc" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml --enabled-key-data key-name --xml-data $topfolder/merlin-xmlenc-five/encrypt-content-aes256-cbc-prop.data --node-id Payment" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml"
+
 execEncTest "merlin-xmlenc-five/encrypt-element-aes192-cbc-ref" \
+    "aes192-cbc" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml"
+
 execEncTest "merlin-xmlenc-five/encrypt-element-aes128-cbc-rsa-1_5" \
+    "aes128-cbc rsa-1_5" \
     "$priv_key_option $topfolder/merlin-xmlenc-five/rsapriv.$priv_key_format --pwd secret" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml --session-key aes-128 $priv_key_option $topfolder/merlin-xmlenc-five/rsapriv.$priv_key_format --xml-data $topfolder/merlin-xmlenc-five/encrypt-element-aes128-cbc-rsa-1_5.data --node-id Purchase --pwd secret"  \
     "$priv_key_option $topfolder/merlin-xmlenc-five/rsapriv.$priv_key_format --pwd secret"
+
 execEncTest "merlin-xmlenc-five/encrypt-data-tripledes-cbc-rsa-oaep-mgf1p" \
+    "tripledes-cbc rsa-oaep-mgf1p" \
     "$priv_key_option $topfolder/merlin-xmlenc-five/rsapriv.$priv_key_format --pwd secret" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml --session-key des-192 $priv_key_option $topfolder/merlin-xmlenc-five/rsapriv.$priv_key_format --binary-data $topfolder/merlin-xmlenc-five/encrypt-data-tripledes-cbc-rsa-oaep-mgf1p.data --pwd secret"  \
     "$priv_key_option $topfolder/merlin-xmlenc-five/rsapriv.$priv_key_format --pwd secret"
+
 execEncTest "merlin-xmlenc-five/encrypt-data-aes256-cbc-kw-tripledes" \
+    "aes256-cbc kw-tripledes" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml --session-key aes-256 --binary-data $topfolder/merlin-xmlenc-five/encrypt-data-aes256-cbc-kw-tripledes.data" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml"
+
 execEncTest "merlin-xmlenc-five/encrypt-content-aes128-cbc-kw-aes192" \
+    "aes128-cbc kw-aes192" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml --session-key aes-128 --node-name urn:example:po:PaymentInfo --xml-data $topfolder/merlin-xmlenc-five/encrypt-content-aes128-cbc-kw-aes192.data" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml"
 
 execEncTest "merlin-xmlenc-five/encrypt-data-aes192-cbc-kw-aes256" \
+    "aes192-cbc kw-aes256" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml --session-key aes-192 --binary-data $topfolder/merlin-xmlenc-five/encrypt-data-aes192-cbc-kw-aes256.data" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml"
 
 execEncTest "merlin-xmlenc-five/encrypt-element-tripledes-cbc-kw-aes128" \
+    "tripledes-cbc kw-aes128" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml  --session-key des-192 --node-name urn:example:po:PaymentInfo --xml-data $topfolder/merlin-xmlenc-five/encrypt-element-tripledes-cbc-kw-aes128.data" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml"
         
 execEncTest "merlin-xmlenc-five/encrypt-element-aes256-cbc-retrieved-kw-aes256" \
+    "aes256-cbc kw-aes256" \
     "--keys-file $topfolder/merlin-xmlenc-five/keys.xml" 
 
 
@@ -214,91 +261,109 @@ execEncTest "merlin-xmlenc-five/encrypt-element-aes256-cbc-retrieved-kw-aes256"
 #merlin-xmlenc-five/encsig-hmac-sha256-kw-tripledes-dh.xml
 
 execEncTest "01-phaos-xmlenc-3/enc-element-3des-kt-rsa1_5" \
+    "tripledes-cbc rsa-1_5" \
     "$priv_key_option $topfolder/01-phaos-xmlenc-3/rsa-priv-key.$priv_key_format --pwd secret" \
     "--session-key des-192 --keys-file $topfolder/01-phaos-xmlenc-3/keys.xml --enabled-key-data key-name --xml-data $topfolder/01-phaos-xmlenc-3/enc-element-3des-kt-rsa1_5.data --node-name http://example.org/paymentv2:CreditCard"  \
     "$priv_key_option $topfolder/01-phaos-xmlenc-3/rsa-priv-key.$priv_key_format --pwd secret"
 
 execEncTest "01-phaos-xmlenc-3/enc-element-3des-kt-rsa_oaep_sha1" \
+    "tripledes-cbc rsa-oaep-mgf1p" \
     "$priv_key_option $topfolder/01-phaos-xmlenc-3/rsa-priv-key.$priv_key_format --pwd secret" \
     "--session-key des-192 --keys-file $topfolder/01-phaos-xmlenc-3/keys.xml --enabled-key-data key-name --xml-data $topfolder/01-phaos-xmlenc-3/enc-element-3des-kt-rsa_oaep_sha1.data --node-name http://example.org/paymentv2:CreditCard"  \
     "$priv_key_option $topfolder/01-phaos-xmlenc-3/rsa-priv-key.$priv_key_format --pwd secret"
 
-execEncTest "01-phaos-xmlenc-3/enc-content-aes256-kt-rsa1_5" \
-    "$priv_key_option $topfolder/01-phaos-xmlenc-3/rsa-priv-key.$priv_key_format --pwd secret" \
-    "--session-key aes-256 --keys-file $topfolder/01-phaos-xmlenc-3/keys.xml --enabled-key-data key-name --xml-data $topfolder/01-phaos-xmlenc-3/enc-content-aes256-kt-rsa1_5.data --node-name http://example.org/paymentv2:CreditCard"  \
-    "$priv_key_option $topfolder/01-phaos-xmlenc-3/rsa-priv-key.$priv_key_format --pwd secret"
-
 execEncTest "01-phaos-xmlenc-3/enc-element-aes128-kt-rsa1_5" \
+    "aes128-cbc rsa-1_5" \
     "$priv_key_option $topfolder/01-phaos-xmlenc-3/rsa-priv-key.$priv_key_format --pwd secret" \
     "--session-key aes-128 --keys-file $topfolder/01-phaos-xmlenc-3/keys.xml --enabled-key-data key-name --xml-data $topfolder/01-phaos-xmlenc-3/enc-element-aes128-kt-rsa1_5.data --node-name http://example.org/paymentv2:CreditCard"  \
     "$priv_key_option $topfolder/01-phaos-xmlenc-3/rsa-priv-key.$priv_key_format --pwd secret"
 
 execEncTest "01-phaos-xmlenc-3/enc-element-aes128-kt-rsa_oaep_sha1" \
+    "aes128-cbc rsa-oaep-mgf1p" \
     "$priv_key_option $topfolder/01-phaos-xmlenc-3/rsa-priv-key.$priv_key_format --pwd secret" \
     "--session-key aes-128 --keys-file $topfolder/01-phaos-xmlenc-3/keys.xml --enabled-key-data key-name --xml-data $topfolder/01-phaos-xmlenc-3/enc-element-aes128-kt-rsa_oaep_sha1.data --node-name http://example.org/paymentv2:CreditCard"  \
     "$priv_key_option $topfolder/01-phaos-xmlenc-3/rsa-priv-key.$priv_key_format --pwd secret"
 
 execEncTest "01-phaos-xmlenc-3/enc-element-aes192-kt-rsa_oaep_sha1" \
+    "aes192-cbc rsa-oaep-mgf1p" \
     "$priv_key_option $topfolder/01-phaos-xmlenc-3/rsa-priv-key.$priv_key_format --pwd secret" \
     "--session-key aes-192 --keys-file $topfolder/01-phaos-xmlenc-3/keys.xml --enabled-key-data key-name --xml-data $topfolder/01-phaos-xmlenc-3/enc-element-aes192-kt-rsa_oaep_sha1.data --node-name http://example.org/paymentv2:CreditCard"  \
     "$priv_key_option $topfolder/01-phaos-xmlenc-3/rsa-priv-key.$priv_key_format --pwd secret"
 
 execEncTest "01-phaos-xmlenc-3/enc-text-aes192-kt-rsa1_5" \
+    "aes192-cbc rsa-1_5" \
     "$priv_key_option $topfolder/01-phaos-xmlenc-3/rsa-priv-key.$priv_key_format --pwd secret" \
     "--session-key aes-192 --keys-file $topfolder/01-phaos-xmlenc-3/keys.xml --enabled-key-data key-name --xml-data $topfolder/01-phaos-xmlenc-3/enc-text-aes192-kt-rsa1_5.data --node-name http://example.org/paymentv2:CreditCard"  \
     "$priv_key_option $topfolder/01-phaos-xmlenc-3/rsa-priv-key.$priv_key_format --pwd secret"
 
+execEncTest "01-phaos-xmlenc-3/enc-content-aes256-kt-rsa1_5" \
+    "aes256-cbc rsa-1_5" \
+    "$priv_key_option $topfolder/01-phaos-xmlenc-3/rsa-priv-key.$priv_key_format --pwd secret" \
+    "--session-key aes-256 --keys-file $topfolder/01-phaos-xmlenc-3/keys.xml --enabled-key-data key-name --xml-data $topfolder/01-phaos-xmlenc-3/enc-content-aes256-kt-rsa1_5.data --node-name http://example.org/paymentv2:CreditCard"  \
+    "$priv_key_option $topfolder/01-phaos-xmlenc-3/rsa-priv-key.$priv_key_format --pwd secret"
+
 execEncTest "01-phaos-xmlenc-3/enc-text-aes256-kt-rsa_oaep_sha1" \
+    "aes256-cbc rsa-oaep-mgf1p" \
     "$priv_key_option $topfolder/01-phaos-xmlenc-3/rsa-priv-key.$priv_key_format --pwd secret" \
     "--session-key aes-256 --keys-file $topfolder/01-phaos-xmlenc-3/keys.xml --enabled-key-data key-name --xml-data $topfolder/01-phaos-xmlenc-3/enc-text-aes256-kt-rsa_oaep_sha1.data --node-name http://example.org/paymentv2:CreditCard"  \
     "$priv_key_option $topfolder/01-phaos-xmlenc-3/rsa-priv-key.$priv_key_format --pwd secret"
 
 execEncTest "01-phaos-xmlenc-3/enc-element-3des-kw-3des" \
+    "tripledes-cbc kw-tripledes" \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml" \
     "--session-key des-192 --keys-file $topfolder/01-phaos-xmlenc-3/keys.xml --enabled-key-data key-name --xml-data $topfolder/01-phaos-xmlenc-3/enc-element-3des-kw-3des.data --node-name http://example.org/paymentv2:CreditCard" \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml" 
 
 execEncTest "01-phaos-xmlenc-3/enc-content-aes128-kw-3des" \
+    "aes128-cbc kw-tripledes" \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml" \
     "--session-key aes-128 --keys-file $topfolder/01-phaos-xmlenc-3/keys.xml --enabled-key-data key-name --xml-data $topfolder/01-phaos-xmlenc-3/enc-content-aes128-kw-3des.data --node-name http://example.org/paymentv2:CreditCard" \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml" 
 
 execEncTest "01-phaos-xmlenc-3/enc-element-aes128-kw-aes128" \
+    "aes128-cbc kw-aes128" \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml" \
     "--session-key aes-128 --keys-file $topfolder/01-phaos-xmlenc-3/keys.xml --enabled-key-data key-name --xml-data $topfolder/01-phaos-xmlenc-3/enc-element-aes128-kw-aes128.data --node-name http://example.org/paymentv2:CreditCard" \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml" 
 
 execEncTest "01-phaos-xmlenc-3/enc-element-aes128-kw-aes256" \
+    "aes128-cbc kw-aes256" \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml" \
     "--session-key aes-128 --keys-file $topfolder/01-phaos-xmlenc-3/keys.xml --enabled-key-data key-name --xml-data $topfolder/01-phaos-xmlenc-3/enc-element-aes128-kw-aes256.data --node-name http://example.org/paymentv2:CreditCard" \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml" 
 
 execEncTest "01-phaos-xmlenc-3/enc-content-3des-kw-aes192" \
+    "tripledes-cbc kw-aes192" \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml" \
     "--session-key des-192 --keys-file $topfolder/01-phaos-xmlenc-3/keys.xml --enabled-key-data key-name --xml-data $topfolder/01-phaos-xmlenc-3/enc-content-3des-kw-aes192.data --node-name http://example.org/paymentv2:CreditCard" \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml" 
 
 execEncTest "01-phaos-xmlenc-3/enc-content-aes192-kw-aes256" \
+    "aes192-cbc kw-aes256" \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml" \
     "--session-key aes-192 --keys-file $topfolder/01-phaos-xmlenc-3/keys.xml --enabled-key-data key-name --xml-data $topfolder/01-phaos-xmlenc-3/enc-content-aes192-kw-aes256.data --node-name http://example.org/paymentv2:CreditCard" \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml" 
 
 execEncTest "01-phaos-xmlenc-3/enc-element-aes192-kw-aes192" \
+    "aes192-cbc kw-aes192" \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml" \
     "--session-key aes-192 --keys-file $topfolder/01-phaos-xmlenc-3/keys.xml --enabled-key-data key-name --xml-data $topfolder/01-phaos-xmlenc-3/enc-element-aes192-kw-aes192.data --node-name http://example.org/paymentv2:CreditCard" \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml" 
 
 execEncTest "01-phaos-xmlenc-3/enc-element-aes256-kw-aes256" \
+    "aes256-cbc kw-aes256" \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml" \
     "--session-key aes-256 --keys-file $topfolder/01-phaos-xmlenc-3/keys.xml --enabled-key-data key-name --xml-data $topfolder/01-phaos-xmlenc-3/enc-element-aes256-kw-aes256.data --node-name http://example.org/paymentv2:CreditCard" \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml" 
 
 execEncTest "01-phaos-xmlenc-3/enc-text-3des-kw-aes256" \
+    "tripledes-cbc kw-aes256" \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml" \
     "--session-key des-192 --keys-file $topfolder/01-phaos-xmlenc-3/keys.xml --enabled-key-data key-name --xml-data $topfolder/01-phaos-xmlenc-3/enc-text-3des-kw-aes256.data --node-name http://example.org/paymentv2:CreditCard"  \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml"
 
 execEncTest "01-phaos-xmlenc-3/enc-text-aes128-kw-aes192" \
+    "aes128-cbc kw-aes192" \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml" \
     "--session-key aes-128 --keys-file $topfolder/01-phaos-xmlenc-3/keys.xml --enabled-key-data key-name --xml-data $topfolder/01-phaos-xmlenc-3/enc-text-aes128-kw-aes192.data --node-name http://example.org/paymentv2:CreditCard"  \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml"
@@ -327,12 +392,15 @@ printRes $?
 echo "--------- Negative Testing: Following tests MUST FAIL ----------"
 echo "--- detailed log is written to  $logfile" 
 execEncTest "01-phaos-xmlenc-3/bad-alg-enc-element-aes128-kw-3des" \
+    "" \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml"
 
 execEncTest "aleksey-xmlenc-01/enc-aes192cbc-keyname-ref" \
+    "" \
     "--keys-file $topfolder/keys/keys.xml --enabled-cipher-reference-uris empty" 
 
 execEncTest "01-phaos-xmlenc-3/enc-content-aes256-kt-rsa1_5" \
+    "" \
     "--keys-file $topfolder/01-phaos-xmlenc-3/keys.xml --enabled-retrieval-method-uris empty"
     
 rm -rf $tmpfile
diff --git a/tests/testKeys.sh b/tests/testKeys.sh
index 3bfa61d..385caf3 100755
--- a/tests/testKeys.sh
+++ b/tests/testKeys.sh
@@ -57,8 +57,22 @@ printRes() {
 }
 
 execKeysTest() {    
-    key_name=$1
-    alg_name=$2
+    req_key_data=$1
+    key_name=$2
+    alg_name=$3
+
+    if [ -n "$req_key_data" ] ; then
+	printf "    Checking $req_key_data key data presense                      "
+        echo "$xmlsec_app check-key-data $req_key_data" >> $logfile
+	$xmlsec_app check-key-data $req_key_data >> $logfile 2>> $logfile
+	res=$?
+	if [ $res = 0 ]; then
+    	    echo "   OK"	    
+	else
+	    echo " Skip"
+	    return
+	fi
+    fi
 
     printf "    Creating new key: $alg_name                           "
 
@@ -84,13 +98,34 @@ if [ "z$crypto" = "znss" ] ; then
     cp -f $nssdbfolder/*.db $crypto_config
 fi
 
-execKeysTest "test-hmac-sha1" 	"hmac-192"
-execKeysTest "test-rsa      " 	"rsa-1024"
-execKeysTest "test-dsa      " 	"dsa-1024"
-execKeysTest "test-des      " 	"des-192 "
-execKeysTest "test-aes128   " 	"aes-128 "
-execKeysTest "test-aes192   " 	"aes-192 "
-execKeysTest "test-aes256   " 	"aes-256 "
+execKeysTest \
+	"hmac" \
+	"test-hmac-sha1" \
+	"hmac-192"
+execKeysTest \
+	"rsa " \
+	"test-rsa      " \
+	"rsa-1024"
+execKeysTest \
+	"dsa " \
+	"test-dsa      " \
+	"dsa-1024"
+execKeysTest \
+	"des " \
+	"test-des      " \
+    	"des-192 "
+execKeysTest \
+	"aes " \
+	"test-aes128   " \
+	"aes-128 "
+execKeysTest \
+	"aes " \
+	"test-aes192   " \
+	"aes-192 "
+execKeysTest \
+	"aes " \
+	"test-aes256   " \
+	"aes-256 "
 
 echo "--- testKeys finished ---" >> $logfile
 echo "--- testKeys finished ---"
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
index 97120cf..9aff95b 100644
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
@@ -389,7 +389,7 @@ XMLSEC_MSCRYPTO_ALIBS   = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32
 
 
 # The archiver and its options.
-AR = lib.exe
+AR = link.exe /lib
 ARFLAGS = /nologo
 
 
diff --git a/win32/mycfg.bat b/win32/mycfg.bat
index 6e43745..3955791 100644
--- a/win32/mycfg.bat
+++ b/win32/mycfg.bat
@@ -11,12 +11,11 @@ REM
 SET XMLSEC_PREFIX=d:\sdk
 SET XMLSEC_INCLUDE=%XMLSEC_PREFIX%\include;%XMLSEC_PREFIX%\include\mozilla;%XMLSEC_PREFIX%\include\mozilla\nspr;%XMLSEC_PREFIX%\include\mozilla\nss;%MSSDK_INCLUDE%
 SET XMLSEC_LIB=%XMLSEC_PREFIX%\lib;%MSSDK_LIB%
-SET XMLSEC_OPTIONS=static=no iconv=no nt4=yes debug=yes xslt=yes crypto=openssl
-
-REM mscrypto,openssl
+SET XMLSEC_OPTIONS=static=no iconv=no nt4=yes debug=yes xslt=yes crypto=openssl=098,mscrypto
 
 del /F Makefile configure.txt
 cscript configure.js prefix=%XMLSEC_PREFIX% %XMLSEC_OPTIONS% include=%XMLSEC_INCLUDE% lib=%XMLSEC_LIB% 
 
 mkdir binaries
 copy %XMLSEC_PREFIX%\bin\*.dll binaries
+copy %XMLSEC_PREFIX%\lib\*.dll binaries
diff --git a/xmlsec-config.in b/xmlsec-config.in
index a7694a5..646109c 100644
--- a/xmlsec-config.in
+++ b/xmlsec-config.in
@@ -4,6 +4,7 @@ prefix="@prefix@"
 package="@PACKAGE@"
 exec_prefix="@exec_prefix@"
 exec_prefix_set=no
+package_libdir="@libdir@"
 
 usage()
 {
@@ -188,7 +189,7 @@ esac
 # Assemble all the settings together
 #
 the_flags="$the_flags @XMLSEC_CORE_CFLAGS@ $the_xml_flags $the_xslt_flags $the_crypto_flags"
-the_libs="$the_libs -L${exec_prefix}/lib @XMLSEC_CORE_LIBS@ $the_xmlsec_crypto_lib -lxmlsec1 $the_xml_libs $the_xslt_libs $the_crypto_libs"
+the_libs="$the_libs -L${package_libdir} @XMLSEC_CORE_LIBS@ $the_xmlsec_crypto_lib -lxmlsec1 $the_xml_libs $the_xslt_libs $the_crypto_libs"
 
 if $cflags; then
     all_flags="$the_flags"
diff --git a/xmlsec-nss.pc.in b/xmlsec-nss.pc.in
index 9a38435..0e71e9e 100644
--- a/xmlsec-nss.pc.in
+++ b/xmlsec-nss.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: xmlsec1-nss
 Version: @VERSION@
 Description: XML Security Library implements XML Signature and XML Encryption standards
-Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@ mozilla-nss >= @MOZILLA_MIN_VERSION@
+Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@ @NSPR_PACKAGE@ >= @MOZILLA_MIN_VERSION@ @NSS_PACKAGE@ >= @MOZILLA_MIN_VERSION@
 Cflags: -DXMLSEC_CRYPTO=\\\"nss\\\" -DXMLSEC_CRYPTO_NSS=1 @XMLSEC_CORE_CFLAGS@
 Libs: -L${libdir} -lxmlsec1-nss @XMLSEC_CORE_LIBS@
diff --git a/xmlsec.spec.in b/xmlsec.spec.in
index 89fda64..20c3a5d 100644
--- a/xmlsec.spec.in
+++ b/xmlsec.spec.in
@@ -17,6 +17,9 @@ BuildRequires: libxslt-devel >= @LIBXSLT_MIN_VERSION@
 Prefix: %{_prefix}
 Docdir: %{_docdir}
 
+%define _unpackaged_files_terminate_build  0 
+%define _missing_doc_files_terminate_build 0
+
 %description
 XML Security Library is a C library based on LibXML2  and OpenSSL. 
 The library was created with a goal to support major XML security 
@@ -148,6 +151,7 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/lib/pkgconfig/xmlsec1.pc
 %{prefix}/lib/xmlsec1Conf.sh
 %{prefix}/share/doc/xmlsec1/* 
+%{prefix}/share/aclocal/xmlsec1.m4
 %doc AUTHORS HACKING ChangeLog NEWS README Copyright
 %doc %{_mandir}/man1/xmlsec1-config.1*
 
diff --git a/xmlsec1-config b/xmlsec1-config
index e646501..c465068 100644
--- a/xmlsec1-config
+++ b/xmlsec1-config
@@ -4,6 +4,7 @@ prefix="/usr"
 package="xmlsec1"
 exec_prefix="${prefix}"
 exec_prefix_set=no
+package_libdir="${exec_prefix}/lib"
 
 usage()
 {
@@ -78,7 +79,7 @@ do
 	;;
 
     --version)
-	echo 1.2.9
+	echo 1.2.12
 	exit 0
 	;;
     
@@ -156,9 +157,9 @@ openssl)
     ;;
 
 gnutls)
-    if test "1" = "0"; then
-        the_crypto_flags=" -DXMLSEC_CRYPTO=\\\"gnutls\\\""
-	the_crypto_libs=""
+    if test "0" = "0"; then
+        the_crypto_flags=" -I/usr/local/include -I/usr/local/include -I/usr/local/include -DXMLSEC_CRYPTO_GNUTLS=1 -DXMLSEC_CRYPTO=\\\"gnutls\\\""
+	the_crypto_libs=" -L/usr/local/lib -lgnutls -L/usr/local/lib -lgcrypt -L/usr/local/lib -lgpg-error"
         the_xmlsec_crypto_lib="-lxmlsec1-gnutls"
     else
         echo "Error: the \"$crypto\" cryptographic library is not supported"
@@ -168,8 +169,8 @@ gnutls)
 
 nss)
     if test "0" = "0"; then
-        the_crypto_flags="-I/usr/include/mozilla-1.7.8/nspr -I/usr/include/mozilla-1.7.8/nss   -DXMLSEC_CRYPTO_NSS=1 -DXMLSEC_CRYPTO=\\\"nss\\\""
-	the_crypto_libs="-L/usr/lib/mozilla-1.7.8 -lnss3 -lsmime3 -lssl3 -lsoftokn3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl  "
+        the_crypto_flags="-I/usr/include/nspr4 -I/usr/include/nss3   -DXMLSEC_CRYPTO_NSS=1 -DXMLSEC_CRYPTO=\\\"nss\\\""
+	the_crypto_libs="-lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl  "
         the_xmlsec_crypto_lib="-lxmlsec1-nss"
     else
         echo "Error: the \"$crypto\" cryptographic library is not supported"
@@ -187,8 +188,8 @@ esac
 #
 # Assemble all the settings together
 #
-the_flags="$the_flags  -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_XKMS=1 -I${prefix}/include/xmlsec1   $the_xml_flags $the_xslt_flags $the_crypto_flags"
-the_libs="$the_libs -L${exec_prefix}/lib -lxmlsec1  -ldl  $the_xmlsec_crypto_lib -lxmlsec1 $the_xml_libs $the_xslt_libs $the_crypto_libs"
+the_flags="$the_flags  -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_GOST=1 -DXMLSEC_NO_XKMS=1 -I${prefix}/include/xmlsec1   $the_xml_flags $the_xslt_flags $the_crypto_flags"
+the_libs="$the_libs -L${package_libdir} -lxmlsec1  -ldl  $the_xmlsec_crypto_lib -lxmlsec1 $the_xml_libs $the_xslt_libs $the_crypto_libs"
 
 if $cflags; then
     all_flags="$the_flags"
diff --git a/xmlsec1-gnutls.pc b/xmlsec1-gnutls.pc
new file mode 100644
index 0000000..029f93a
--- /dev/null
+++ b/xmlsec1-gnutls.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: xmlsec1-gnutls
+Version: 1.2.12
+Description: XML Security Library implements XML Signature and XML Encryption standards
+Requires: libxml-2.0 >= 2.6.12 libxslt >= 1.0.20 
+Cflags: -DXMLSEC_CRYPTO=\\\"gnutls\\\"  -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_GOST=1 -DXMLSEC_NO_XKMS=1 -I${prefix}/include/xmlsec1    -I/usr/local/include -I/usr/local/include -I/usr/local/include -DXMLSEC_CRYPTO_GNUTLS=1
+Libs: -L${exec_prefix}/lib -lxmlsec1-gnutls -lxmlsec1  -ldl   -L/usr/local/lib -lgnutls -L/usr/local/lib -lgcrypt -L/usr/local/lib -lgpg-error 
diff --git a/xmlsec1-nss.pc b/xmlsec1-nss.pc
index f14e2db..0c01f0e 100644
--- a/xmlsec1-nss.pc
+++ b/xmlsec1-nss.pc
@@ -4,8 +4,8 @@ libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
 Name: xmlsec1-nss
-Version: 1.2.9
+Version: 1.2.12
 Description: XML Security Library implements XML Signature and XML Encryption standards
-Requires: libxml-2.0 >= 2.6.12 libxslt >= 1.0.20 mozilla-nss >= 1.4
-Cflags: -DXMLSEC_CRYPTO=\\\"nss\\\" -DXMLSEC_CRYPTO_NSS=1  -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_XKMS=1 -I${prefix}/include/xmlsec1  
+Requires: libxml-2.0 >= 2.6.12 libxslt >= 1.0.20 mozilla-nspr >= 1.4 mozilla-nss >= 1.4
+Cflags: -DXMLSEC_CRYPTO=\\\"nss\\\" -DXMLSEC_CRYPTO_NSS=1  -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_GOST=1 -DXMLSEC_NO_XKMS=1 -I${prefix}/include/xmlsec1  
 Libs: -L${libdir} -lxmlsec1-nss -lxmlsec1  -ldl 
diff --git a/xmlsec1-openssl.pc b/xmlsec1-openssl.pc
index cb49595..b85f467 100644
--- a/xmlsec1-openssl.pc
+++ b/xmlsec1-openssl.pc
@@ -4,8 +4,8 @@ libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
 Name: xmlsec1-openssl
-Version: 1.2.9
+Version: 1.2.12
 Description: XML Security Library implements XML Signature and XML Encryption standards
 Requires: libxml-2.0 >= 2.6.12 libxslt >= 1.0.20 
-Cflags: -DXMLSEC_CRYPTO=\\\"openssl\\\"  -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_XKMS=1 -I${prefix}/include/xmlsec1   -I/usr/kerberos/include   -DXMLSEC_OPENSSL_097=1 -DXMLSEC_CRYPTO_OPENSSL=1
+Cflags: -DXMLSEC_CRYPTO=\\\"openssl\\\"  -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_GOST=1 -DXMLSEC_NO_XKMS=1 -I${prefix}/include/xmlsec1   -I/usr/kerberos/include   -DXMLSEC_OPENSSL_097=1 -DXMLSEC_CRYPTO_OPENSSL=1
 Libs: -L${exec_prefix}/lib -lxmlsec1-openssl -lxmlsec1  -ldl  -L/usr/kerberos/lib -lssl -lcrypto -lgssapi_krb5 -lkrb5 -lcom_err -lk5crypto -lresolv -ldl -lz  
diff --git a/xmlsec1.m4 b/xmlsec1.m4
new file mode 100644
index 0000000..0f5e21a
--- /dev/null
+++ b/xmlsec1.m4
@@ -0,0 +1,172 @@
+#
+# Configure paths for xmlsec1
+# H. Ronsdorf 2006-02-03
+# Adapted from:
+#
+dnl AM_PATH_XMLSEC1([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for libxmlsec1, and define XMLSEC1_CFLAGS and XMLSEC1_LIBS
+dnl
+AC_DEFUN([AM_PATH_XMLSEC1],[
+
+  AC_ARG_WITH(xmlsec1-prefix,
+    AC_HELP_STRING(
+      [--with-xmlsec1-prefix=PFX],
+      [Prefix where libxmlsec1 is installed (optional)]
+    ),
+    xmlsec1_config_prefix="$withval", xmlsec1_config_prefix=""
+  )
+
+  AC_ARG_WITH(xmlsec1-exec-prefix,
+    AC_HELP_STRING(
+      [--with-xmlsec1-exec-prefix=PFX],
+      [Exec prefix where libxmlsec1 is installed (optional)]
+    ),
+    xmlsec1_config_exec_prefix="$withval", xmlsec1_config_exec_prefix=""
+  )
+
+  AC_ARG_ENABLE(xmlsec1test,
+    AC_HELP_STRING(
+      [--disable-xmlsec1test],
+      [Do not try to compile and run a test cSOAP program]
+    ),,
+    enable_xmlsec1test=yes
+  )
+
+  if test x$xmlsec1_config_exec_prefix != x ; then
+     xmlsec1_config_args="$xmlsec1_config_args --exec-prefix=$xmlsec1_config_exec_prefix"
+     if test x${XMLSEC1_CONFIG+set} != xset ; then
+        XMLSEC1_CONFIG=$xmlsec1_config_exec_prefix/bin/xmlsec1-config
+     fi
+  fi
+  if test x$xmlsec1_config_prefix != x ; then
+     xmlsec1_config_args="$xmlsec1_config_args --prefix=$xmlsec1_config_prefix"
+     if test x${XMLSEC1_CONFIG+set} != xset ; then
+        XMLSEC1_CONFIG=$xmlsec1_config_prefix/bin/xmlsec1-config
+     fi
+  fi
+
+
+  AC_PATH_PROG(XMLSEC1_CONFIG, xmlsec1-config, no)
+  min_xmlsec1_version=ifelse([$1], ,1.0.0,[$1])
+  AC_MSG_CHECKING(for libxmlsec1 - version >= $min_xmlsec1_version)
+  no_xmlsec1=""
+  if test "$XMLSEC1_CONFIG" = "no" ; then
+    no_xmlsec1=yes
+  else
+    XMLSEC1_CFLAGS=`$XMLSEC1_CONFIG $xmlsec1_config_args --cflags`
+    XMLSEC1_LIBS=`$XMLSEC1_CONFIG $xmlsec1_config_args --libs`
+    xmlsec1_config_major_version=`$XMLSEC1_CONFIG $xmlsec1_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    xmlsec1_config_minor_version=`$XMLSEC1_CONFIG $xmlsec1_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    xmlsec1_config_micro_version=`$XMLSEC1_CONFIG $xmlsec1_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_xmlsec1test" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $XMLSEC1_CFLAGS"
+      LIBS="$XMLSEC1_LIBS $LIBS"
+dnl
+dnl Now check if the installed libxmlsec1 is sufficiently new.
+dnl (Also sanity checks the results of xmlsec1-config to some extent)
+dnl
+      rm -f conf.xmlsec1test
+      AC_TRY_RUN([
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <libxml/tree.h>
+#include <xmlsec/xmlsec.h>
+
+int main(int argc, char **argv) {
+
+	int major, minor, micro;
+	char *tmp_version;
+
+	system("touch conf.xmlsec1test");
+
+	/* Capture xmlsec1-config output via autoconf/configure variables */
+	/* HP/UX 9 (%@#!) writes to sscanf strings */
+	tmp_version = (char *)strdup("$min_xmlsec1_version");
+	if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+
+		printf("%s, bad version string from xmlsec1-config\n", "$min_xmlsec1_version");
+		exit(1);
+	}
+	free(tmp_version);
+
+	/* Test that the library is greater than our minimum version */
+	if (($xmlsec1_config_major_version < major) ||
+		(($xmlsec1_config_major_version == major) && ($xmlsec1_config_minor_version < minor)) ||
+		(($xmlsec1_config_major_version == major) && ($xmlsec1_config_minor_version == minor) && ($xmlsec1_config_micro_version < micro))) {
+
+		printf("\n*** An old version of libxmlsec1 (%d.%d.%d) was found.\n", $xmlsec1_config_major_version, $xmlsec1_config_minor_version, $xmlsec1_config_micro_version);
+		printf("*** You need a version of libxmlsec1 newer than %d.%d.%d. The latest version of\n", major, minor, micro);
+		printf("*** libxmlsec1 is always available from http://xmlsec1.sf.net.\n\n");
+		printf("*** If you have already installed a sufficiently new version, this error\n");
+		printf("*** probably means that the wrong copy of the xmlsec1-config shell script is\n");
+		printf("*** being found. The easiest way to fix this is to remove the old version\n");
+		printf("*** of libxmlsec1, but you can also set the XMLSEC1_CONFIG environment to point to the\n");
+		printf("*** correct copy of xmlsec1-config. (In this case, you will have to\n");
+		printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+		printf("*** so that the correct libraries are found at run-time))\n");
+		return 1;
+	}
+	else {
+
+		return 0;
+	}
+}
+],, no_xmlsec1=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+
+  if test "x$no_xmlsec1" = x ; then
+     AC_MSG_RESULT(yes (version $xmlsec1_config_major_version.$xmlsec1_config_minor_version.$xmlsec1_config_micro_version))
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$XMLSEC1_CONFIG" = "no" ; then
+       echo "*** The xmlsec1-config script installed by LIBXMLSEC1 could not be found"
+       echo "*** If libxmlsec1 was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the XMLSEC1_CONFIG environment variable to the"
+       echo "*** full path to xmlsec1-config."
+     else
+       if test -f conf.xmlsec1test ; then
+        :
+       else
+          echo "*** Could not run libxmlsec1 test program, checking why..."
+          CFLAGS="$CFLAGS $XMLSEC1_CFLAGS"
+          LIBS="$LIBS $XMLSEC1_LIBS"
+          AC_TRY_LINK([
+#include <libxmlsec1/version.h>
+#include <stdio.h>
+],      [ soap_client_destroy(); return 0;],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding LIBXMLSEC1 or finding the wrong"
+          echo "*** version of LIBXMLSEC1. If it is not finding LIBXMLSEC1, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+          echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means LIBXMLSEC1 was incorrectly installed"
+          echo "*** or that you have moved LIBXMLSEC1 since it was installed. In the latter case, you"
+          echo "*** may want to edit the xmlsec1-config script: $XMLSEC1_CONFIG" ])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+
+     XMLSEC1_CFLAGS=""
+     XMLSEC1_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(XMLSEC1_CFLAGS)
+  AC_SUBST(XMLSEC1_LIBS)
+  rm -f conf.xmlsec1test
+])
diff --git a/xmlsec1.pc b/xmlsec1.pc
index 75ec0bb..79224da 100644
--- a/xmlsec1.pc
+++ b/xmlsec1.pc
@@ -4,8 +4,8 @@ libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
 Name: xmlsec1
-Version: 1.2.9
+Version: 1.2.12
 Description: XML Security Library implements XML Signature and XML Encryption standards
 Requires: libxml-2.0 >= 2.6.12 libxslt >= 1.0.20 
-Cflags: -DXMLSEC_CRYPTO=\\\"openssl\\\" -DXMLSEC_CRYPTO_DYNAMIC_LOADING=1  -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_XKMS=1 -I${prefix}/include/xmlsec1  
+Cflags: -DXMLSEC_CRYPTO=\\\"openssl\\\" -DXMLSEC_CRYPTO_DYNAMIC_LOADING=1  -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_GOST=1 -DXMLSEC_NO_XKMS=1 -I${prefix}/include/xmlsec1  
 Libs: -L${libdir} -lxmlsec1  -ldl  
diff --git a/xmlsec1.spec b/xmlsec1.spec
index c1f9d18..db8bd3f 100644
--- a/xmlsec1.spec
+++ b/xmlsec1.spec
@@ -1,6 +1,6 @@
 Summary: Library providing support for "XML Signature" and "XML Encryption" standards
 Name: xmlsec1
-Version: 1.2.9
+Version: 1.2.12
 Release: 1
 License: MIT
 Group: Development/Libraries
@@ -17,6 +17,9 @@ BuildRequires: libxslt-devel >= 1.0.20
 Prefix: %{_prefix}
 Docdir: %{_docdir}
 
+%define _unpackaged_files_terminate_build  0 
+%define _missing_doc_files_terminate_build 0
+
 %description
 XML Security Library is a C library based on LibXML2  and OpenSSL. 
 The library was created with a goal to support major XML security 
@@ -148,6 +151,7 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/lib/pkgconfig/xmlsec1.pc
 %{prefix}/lib/xmlsec1Conf.sh
 %{prefix}/share/doc/xmlsec1/* 
+%{prefix}/share/aclocal/xmlsec1.m4
 %doc AUTHORS HACKING ChangeLog NEWS README Copyright
 %doc %{_mandir}/man1/xmlsec1-config.1*
 
diff --git a/xmlsec1Conf.sh b/xmlsec1Conf.sh
index 3fcb929..7d533c6 100644
--- a/xmlsec1Conf.sh
+++ b/xmlsec1Conf.sh
@@ -7,7 +7,7 @@ libdir="${exec_prefix}/lib"
 includedir="${prefix}/include"
 
 XMLSEC_LIBDIR="${exec_prefix}/lib"
-XMLSEC_INCLUDEDIR=" -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_XKMS=1 -I${prefix}/include/xmlsec1   -I/usr/include/libxml2   -I/usr/include/libxml2   -I/usr/kerberos/include   -DXMLSEC_OPENSSL_097=1 -DXMLSEC_CRYPTO_OPENSSL=1 -DXMLSEC_CRYPTO=\\\"openssl\\\""
+XMLSEC_INCLUDEDIR=" -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_GOST=1 -DXMLSEC_NO_XKMS=1 -I${prefix}/include/xmlsec1   -I/usr/include/libxml2   -I/usr/include/libxml2   -I/usr/kerberos/include   -DXMLSEC_OPENSSL_097=1 -DXMLSEC_CRYPTO_OPENSSL=1 -DXMLSEC_CRYPTO=\\\"openssl\\\""
 XMLSEC_LIBS="-L${exec_prefix}/lib -lxmlsec1-openssl -lxmlsec1  -ldl  -lxml2 -lpthread -lz -lm   -lxslt -lxml2 -lpthread -lz -lm   -L/usr/kerberos/lib -lssl -lcrypto -lgssapi_krb5 -lkrb5 -lcom_err -lk5crypto -lresolv -ldl -lz  "
-MODULE_VERSION="xmlsec-1.2.9-openssl"
+MODULE_VERSION="xmlsec-1.2.12-openssl"
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-xml-sgml/xmlsec1.git



More information about the debian-xml-sgml-commit mailing list