cmcfixes75: merge with DEV300 m80

2010-05-31 20:37:41 +01:00
parent 458067db24 8c29919ec8
commit 0f110b9f5e
13 changed files with 955 additions and 521 deletions
--- a/cppunit/ldflags.patch
+++ b/cppunit/ldflags.patch
@@ -0,0 +1,10 @@
+--- misc/cppunit-1.12.1/src/cppunit/Makefile.am	Wed Feb 20 06:36:38 2008
+++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.am	Mon May  3 17:00:41 2010
+@@ -63,5 +63,6 @@
+ 
+ libcppunit_la_LDFLAGS= \
+  -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+- -release $(LT_RELEASE)
+ -release $(LT_RELEASE) \
+ @LIBADD_DL@
+ 
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -34,7 +34,7 @@ TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19
    # from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/
    #  cppunit-1.12.1.tar.gz/download>

-PATCH_FILES = solarisfinite.patch warnings.patch windows.patch
+PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch
    # solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail&
    #  aid=2912590&group_id=11795&atid=311795>
    # warnings.patch: see <https://sourceforge.net/tracker/?func=detail&
@@ -97,7 +97,7 @@ OOO_STLPORT_LIBS += -lm
 # execute that program; however, the program would fail to locate the STLport
 # library (another work-around might be to add something like --as-needed around
 # $(LIBSTLPORT)):
-.IF "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS"
+.IF "$(OS)" == "FREEBSD" || "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS"
 .IF "$(LD_LIBRARY_PATH)" == ""
 LD_LIBRARY_PATH := $(SOLARLIBDIR)
    # strictly speaking, this is incorrect if the LD_LIBRARY_PATH environment
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -42,24 +42,25 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE

 # --- Files --------------------------------------------------------

-XMLSEC1VERSION=1.2.12
+XMLSEC1VERSION=1.2.14

 TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION)
-TARFILE_MD5=195d042623bcc2e1668ab8370de6dc2a
+TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f

-#xmlsec1-configure.patch: Set up the build. Straightforward
-#configuration
+#xmlsec1-configure.patch: Set up the build. Straightforward configuration
+#xmlsec1-olderlibxml2.patch: Allow build against older libxml2, for macosx
+#xmlsec1-nssdisablecallbacks.patch: Disable use of smime3 so don't need to package it
 #xmlsec1-customkeymanage.patch: Could we do this alternatively outside xmlsec
 #xmlsec1-nssmangleciphers.patch: Dubious, do we still need this ?
-#xmlsec1-nssdisablecallbacks.patch: Dubious, do we still need this ?
 #xmlsec1-noverify.patch: As per readme.txt. 
 #xmlsec1-mingw32.patch: Mingw32 support. 
 #xmlsec1-mingw-customkeymanage-addmscrypto.patch builds the custom keymanager on mingw
 PATCH_FILES=\
   xmlsec1-configure.patch \
+   xmlsec1-olderlibxml2.patch \
+   xmlsec1-nssdisablecallbacks.patch \
   xmlsec1-customkeymanage.patch \
   xmlsec1-nssmangleciphers.patch \
-   xmlsec1-nssdisablecallbacks.patch \
   xmlsec1-noverify.patch \
   xmlsec1-mingw32.patch \
   xmlsec1-mingw-keymgr-mscrypto.patch
@@ -96,7 +97,7 @@ xmlsec_LIBS+=-lstdc++_s
 .ENDIF
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --enable-mscrypto --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
+CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --enable-mscrypto --disable-crypto-dl --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"

 .IF "$(SYSTEM_MOZILLA)" != "YES"
 CONFIGURE_FLAGS+=--enable-pkgconfig=no
@@ -152,7 +153,7 @@ LDFLAGS:=$(xmlsec_LDFLAGS)
 .ENDIF
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
-CONFIGURE_FLAGS=--with-pic --disable-shared --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
+CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
 # system-mozilla needs pkgconfig to get the information about nss
 # FIXME: This also will enable pkg-config usage for libxml2. It *seems*
 # that the internal headers still are used when they are there but....
--- a/libxmlsec/readme.txt
+++ b/libxmlsec/readme.txt
@@ -22,7 +22,7 @@ for details.

 There is a flag XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS that can be set
 in a xmlSecKeyInfoCtx (see function xmlSecNssKeyDataX509XmlRead, in file
-src/nss/x509.c), which indicates that one can turn of the validation. However,
+src/nss/x509.c), which indicates that one can turn off the validation. However,
 setting it will cause that the validation key is not found. If the flag is set,
 then the key is not extracted from the certificate store which contains all the
 certificates of the X509Data elements. In other words, the certificates which
--- a/libxmlsec/xmlsec1-configure.patch
+++ b/libxmlsec/xmlsec1-configure.patch
@@ -1,24 +1,449 @@
--- misc/xmlsec1-1.2.12/Makefile.in	2009-06-25 22:53:34.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/Makefile.in	2009-10-01 10:32:48.708515261 +0200
-@@ -340,8 +340,9 @@
- target_alias = @target_alias@
+--- misc/xmlsec1-1.2.14/Makefile.in	2009-06-25 22:53:34.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/Makefile.in	2009-10-01 10:32:48.708515261 +0200
+@@ -341,8 +341,9 @@
+ top_srcdir = @top_srcdir@
 NULL = 
 SAFE_VERSION = @XMLSEC_VERSION_SAFE@
 -SUBDIRS = include src apps man docs
-TEST_APP = apps/xmlsec1
+-TEST_APP = apps/xmlsec1$(EXEEXT)
 +#Do not build xmlsec1 app. It is not needed. Also the libtool includes 
 +#a -L/path_to_lib_dir which may contain an incompatible lixbml2.
 +SUBDIRS = include src man docs
 DEFAULT_CRYPTO = @XMLSEC_CRYPTO@
 bin_SCRIPTS = xmlsec1-config
 pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@
--- misc/xmlsec1-1.2.12/configure	2009-06-25 22:53:35.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/configure	2009-10-01 10:28:50.980389049 +0200
-@@ -24769,7 +24769,11 @@
+--- misc/xmlsec1-1.2.14/configure	2009-06-25 22:53:35.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/configure	2009-10-01 10:28:50.980389049 +0200
+@@ -1,12 +1,14 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.64 for xmlsec1 1.2.14.
+# Generated by GNU Autoconf 2.65 for xmlsec1 1.2.14.
+ #
+ # Report bugs to <http://www.aleksey.com/xmlsec>.
+ #
+#
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+#
+ #
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+@@ -676,7 +678,8 @@
+ 
+ 
+ 
+-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+ 
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+@@ -1749,7 +1752,7 @@
+   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+               nonstandard directory <lib dir>
+   LIBS        libraries to pass to the linker, e.g. -l<library>
+-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+               you have headers in a nonstandard directory <include dir>
+   CPP         C preprocessor
+   PKG_CONFIG  path to pkg-config utility
+@@ -1837,7 +1840,7 @@
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ xmlsec1 configure 1.2.14
+-generated by GNU Autoconf 2.64
+generated by GNU Autoconf 2.65
+ 
+ Copyright (C) 2009 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+@@ -1884,7 +1887,7 @@
+ 	ac_retval=1
+ fi
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
+  as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_compile
+ 
+@@ -1921,7 +1924,7 @@
+     ac_retval=1
+ fi
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
+  as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_cpp
+ 
+@@ -1963,7 +1966,7 @@
+ fi
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
+  as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_run
+ 
+@@ -2009,7 +2012,7 @@
+   # left behind by Apple's compiler.  We do this before executing the actions.
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
+  as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_link
+ 
+@@ -2378,7 +2381,7 @@
+ 
+   fi
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
+  as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_compute_int
+ cat >config.log <<_ACEOF
+@@ -2386,7 +2389,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by xmlsec1 $as_me 1.2.14, which was
+-generated by GNU Autoconf 2.64.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -2639,7 +2642,7 @@
+ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+ do
+   test "x$ac_site_file" = xNONE && continue
+-  if test -r "$ac_site_file"; then
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+     sed 's/^/| /' "$ac_site_file" >&5
+@@ -2648,9 +2651,9 @@
+ done
+ 
+ if test -r "$cache_file"; then
+-  # Some versions of bash will fail to source /dev/null (special
+-  # files actually), so we avoid doing that.
+-  if test -f "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+ $as_echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+@@ -3160,6 +3163,7 @@
+ 
 fi
 
- LIBXML_MIN_VERSION="2.6.12"
-LIBXML_CONFIG="xml2-config"
+  test -d ./--version && rmdir ./--version
+   if test "${ac_cv_path_mkdir+set}" = set; then
+     MKDIR_P="$ac_cv_path_mkdir -p"
+   else
+@@ -3167,7 +3171,6 @@
+     # value for MKDIR_P within a source directory, because that will
+     # break other packages using the cache if that directory is
+     # removed, or if the value is a relative name.
+-    test -d ./--version && rmdir ./--version
+     MKDIR_P="$ac_install_sh -d"
+   fi
+ fi
+@@ -3753,32 +3756,30 @@
+ ... rest of stderr output deleted ...
+          10q' conftest.err >conftest.er1
+     cat conftest.er1 >&5
+-    rm -f conftest.er1 conftest.err
+   fi
+  rm -f conftest.er1 conftest.err
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }
+ done
+ 
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <stdio.h>
+
+ int
+ main ()
+ {
+-FILE *f = fopen ("conftest.out", "w");
+- return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ 
+ # The possible output files:
+@@ -3840,10 +3841,10 @@
+ else
+   ac_file=''
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+-$as_echo "$ac_file" >&6; }
+ if test -z "$ac_file"; then :
+-  $as_echo "$as_me: failed program was:" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+@@ -3851,51 +3852,18 @@
+ { as_fn_set_status 77
+ as_fn_error "C compiler cannot create executables
+ See \`config.log' for more details." "$LINENO" 5; }; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ ac_exeext=$ac_cv_exeext
+ 
+-# Check that the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+-$as_echo_n "checking whether the C compiler works... " >&6; }
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+-  if { ac_try='./$ac_file'
+-  { { case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; }; then
+-    cross_compiling=no
+-  else
+-    if test "$cross_compiling" = maybe; then
+-	cross_compiling=yes
+-    else
+-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." "$LINENO" 5; }
+-    fi
+-  fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+-# Check that the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+-$as_echo "$cross_compiling" >&6; }
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+ $as_echo_n "checking for suffix of executables... " >&6; }
+ if { { ac_try="$ac_link"
+@@ -3928,13 +3896,72 @@
+ as_fn_error "cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." "$LINENO" 5; }
+ fi
+-rm -f conftest$ac_cv_exeext
+rm -f conftest conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+ $as_echo "$ac_cv_exeext" >&6; }
+ 
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+ $as_echo_n "checking for suffix of object files... " >&6; }
+ if test "${ac_cv_objext+set}" = set; then :
+@@ -5249,13 +5276,13 @@
+ else
+   lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:5252: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5279: $ac_compile\"" >&5)
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:5255: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5282: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:5258: output\"" >&5)
+  (eval echo "\"\$as_me:5285: output\"" >&5)
+   cat conftest.out >&5
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
+@@ -6460,7 +6487,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 6463 "configure"' > conftest.$ac_ext
+  echo '#line 6490 "configure"' > conftest.$ac_ext
+   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -7736,11 +7763,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:7739: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7766: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:7743: \$? = $ac_status" >&5
+   echo "$as_me:7770: \$? = $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 other than the usual output.
+@@ -8075,11 +8102,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8078: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8105: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:8082: \$? = $ac_status" >&5
+   echo "$as_me:8109: \$? = $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 other than the usual output.
+@@ -8180,11 +8207,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8183: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8210: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:8187: \$? = $ac_status" >&5
+   echo "$as_me:8214: \$? = $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
+@@ -8235,11 +8262,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8238: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8265: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:8242: \$? = $ac_status" >&5
+   echo "$as_me:8269: \$? = $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
+@@ -10618,7 +10645,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 10621 "configure"
+#line 10648 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -10714,7 +10741,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 10717 "configure"
+#line 10744 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11804,8 +11831,12 @@
+     fi
+ fi
+ 
+-LIBXML_MIN_VERSION="2.7.4"
+ LIBXML_CONFIG="xml2-config"
 +if test -f "$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config" ; then
 +  LIBXML_CONFIG="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config"
 +else
@@ -27,7 +452,7 @@
 LIBXML_CFLAGS=""
 LIBXML_LIBS=""
 LIBXML_FOUND="no"
-@@ -25678,12 +25682,26 @@
+@@ -12757,12 +12788,26 @@
 
 XMLSEC_NO_NSS="1"
 MOZILLA_MIN_VERSION="1.4"
@@ -56,112 +481,87 @@
 NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
 NSS_FOUND="no"
 NSPR_PACKAGE=mozilla-nspr
-@@ -25776,6 +25794,104 @@
-   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 $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION" >&5
-+echo $ECHO_N "checking for $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
+@@ -12811,6 +12856,79 @@
+         pkg_cv_NSS_CFLAGS="$NSS_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MOZ_FLAVOUR-nspr >= \$MOZILLA_MIN_VERSION \$MOZ_FLAVOUR >= \$MOZILLA_MIN_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$NSS_LIBS"; then
+        pkg_cv_NSS_LIBS="$NSS_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MOZ_FLAVOUR-nspr >= \$MOZILLA_MIN_VERSION \$MOZ_FLAVOUR >= \$MOZILLA_MIN_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
 +
-+        if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $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 "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $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 "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION"`
-+            echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
-+echo "${ECHO_T}$NSS_LIBS" >&6
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION"`
 +        else
-+            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.
-+            NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION"`
-+
+	        NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION"`
 +        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$NSS_PKG_ERRORS" >&5
 +
-+
-+
-+     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
-+     NSS_FOUND=yes NSPR_PACKAGE=$MOZ_FLAVOUR-nspr NSS_PACKAGE=$MOZ_FLAVOUR-nss
-+  else
-+     NSS_FOUND=no
-+  fi
-+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                NSS_FOUND=no
+elif test $pkg_failed = untried; then
+	NSS_FOUND=no
+else
+	NSS_CFLAGS=$pkg_cv_NSS_CFLAGS
+	NSS_LIBS=$pkg_cv_NSS_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	NSS_FOUND=yes NSPR_PACKAGE=$MOZ_FLAVOUR-nspr NSS_PACKAGE=$MOZ_FLAVOUR-nss
+fi
 +    fi
 +    if test "z$NSS_FOUND" = "zno" ; then
 +
-+  succeeded=no
-+
-+  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
-+  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
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS" >&5
+$as_echo_n "checking for NSS... " >&6; }
 +
 +if test -n "$PKG_CONFIG"; then
-+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6
-+else
-+  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 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
- 
-@@ -26026,8 +26142,8 @@
+    if test -n "$NSS_CFLAGS"; then
+        pkg_cv_NSS_CFLAGS="$NSS_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr >= \$MOZILLA_MIN_VERSION mozilla-nss >= \$MOZILLA_MIN_VERSION\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION") 2>&5
+   ac_status=$?
+@@ -13030,8 +13148,8 @@
         ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
     fi
 
@@ -170,9 +570,9 @@
 +    ac_nss_lib_dir="${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}"
 +    ac_nss_inc_dir="${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/mozilla"
 
-     echo "$as_me:$LINENO: checking for nspr libraries >= $NSPR_MIN_VERSION" >&5
- echo $ECHO_N "checking for nspr libraries >= $NSPR_MIN_VERSION... $ECHO_C" >&6
-@@ -26062,7 +26178,7 @@
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nspr libraries >= $NSPR_MIN_VERSION" >&5
+ $as_echo_n "checking for nspr libraries >= $NSPR_MIN_VERSION... " >&6; }
+@@ -13066,7 +13184,7 @@
 	done
 
 	for dir in $ac_nss_lib_dir ; do
@@ -181,7 +581,7 @@
 		        	if test "z$dir" = "z/usr/lib" ; then
             	    NSPR_LIBS="$NSPR_LIBS_LIST"
     		else
-@@ -26148,7 +26264,7 @@
+@@ -13148,7 +13266,7 @@
         done
 
         for dir in $ac_nss_lib_dir ; do
@@ -190,13 +590,72 @@
         	    		if test "z$dir" = "z/usr/lib" ; then
         	    NSS_LIBS="$NSS_LIBS_LIST"
                 else
--- misc/xmlsec1-1.2.12/configure.in	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/configure.in	2009-10-01 10:28:50.990755126 +0200
-@@ -183,7 +183,11 @@
+@@ -15036,7 +15154,7 @@
+ # values after options handling.
+ ac_log="
+ This file was extended by xmlsec1 $as_me 1.2.14, which was
+-generated by GNU Autoconf 2.64.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -15076,6 +15194,7 @@
+ 
+   -h, --help       print this help, then exit
+   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+   -q, --quiet, --silent
+                    do not print progress messages
+   -d, --debug      don't remove temporary files
+@@ -15098,10 +15217,11 @@
+ 
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ xmlsec1 config.status 1.2.14
+-configured by $0, generated by GNU Autoconf 2.64,
+-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
+  with options \\"\$ac_cs_config\\"
+ 
+ Copyright (C) 2009 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+@@ -15139,6 +15259,8 @@
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+   --debug | --debu | --deb | --de | --d | -d )
+     debug=: ;;
+   --file | --fil | --fi | --f )
+@@ -15606,7 +15728,7 @@
+ t delim
+ :nl
+ h
+-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
+ t more1
+ s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+ p
+@@ -15620,7 +15742,7 @@
+ t nl
+ :delim
+ h
+-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
+ t more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"/
+ p
+--- misc/xmlsec1-1.2.14/configure.in	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/configure.in	2009-10-01 10:28:50.990755126 +0200
+@@ -190,8 +190,12 @@
+ dnl ==========================================================================
 dnl find libxml
 dnl ==========================================================================
- LIBXML_MIN_VERSION="2.6.12"
-LIBXML_CONFIG="xml2-config"
+-LIBXML_MIN_VERSION="2.7.4"
+ LIBXML_CONFIG="xml2-config"
 +if test -f "$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config" ; then 
 +  LIBXML_CONFIG="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config"
 +else
@@ -205,7 +664,7 @@
 LIBXML_CFLAGS=""
 LIBXML_LIBS=""
 LIBXML_FOUND="no"
-@@ -490,12 +494,26 @@
+@@ -555,12 +559,26 @@
     
 XMLSEC_NO_NSS="1"
 MOZILLA_MIN_VERSION="1.4"
@@ -234,7 +693,7 @@
 NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
 NSS_FOUND="no"
 NSPR_PACKAGE=mozilla-nspr
-@@ -521,6 +539,11 @@
+@@ -586,6 +604,11 @@
     dnl We are going to try all options
     dnl
     if test "z$NSS_FOUND" = "zno" ; then
@@ -246,7 +705,7 @@
         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])
-@@ -547,8 +570,8 @@
+@@ -612,8 +635,8 @@
         ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
     fi
 
@@ -257,7 +716,7 @@
 
     AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION)
     NSPR_INCLUDES_FOUND="no"
-@@ -583,7 +606,7 @@
+@@ -648,7 +671,7 @@
 	done
 	
 	for dir in $ac_nss_lib_dir ; do
@@ -266,7 +725,7 @@
 		dnl do not add -L/usr/lib because compiler does it anyway
         	if test "z$dir" = "z/usr/lib" ; then
             	    NSPR_LIBS="$NSPR_LIBS_LIST"
-@@ -654,7 +677,7 @@
+@@ -719,7 +742,7 @@
         done
        
         for dir in $ac_nss_lib_dir ; do
@@ -275,9 +734,9 @@
         	dnl do not add -L/usr/lib because compiler does it anyway
     		if test "z$dir" = "z/usr/lib" ; then
         	    NSS_LIBS="$NSS_LIBS_LIST"
--- misc/xmlsec1-1.2.12/win32/Makefile.msvc	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/win32/Makefile.msvc	2009-10-01 10:28:50.997747312 +0200
-@@ -381,7 +381,7 @@
+--- misc/xmlsec1-1.2.14/win32/Makefile.msvc	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc	2009-10-01 10:28:50.997747312 +0200
+@@ -376,7 +376,7 @@
 XMLSEC_OPENSSL_SOLIBS   = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib
 XMLSEC_OPENSSL_ALIBS    = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib
 
--- a/libxmlsec/xmlsec1-customkeymanage.patch
+++ b/libxmlsec/xmlsec1-customkeymanage.patch
@@ -1,5 +1,5 @@
--- misc/xmlsec1-1.2.12/include/xmlsec/mscrypto/Makefile.am	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/include/xmlsec/mscrypto/Makefile.am	2009-09-21 14:02:48.563253008 +0200
+--- misc/xmlsec1-1.2.14/include/xmlsec/mscrypto/Makefile.am	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/include/xmlsec/mscrypto/Makefile.am	2009-09-21 14:02:48.563253008 +0200
@@ -3,6 +3,7 @@
 xmlsecmscryptoincdir = $(includedir)/xmlsec1/xmlsec/mscrypto
 
@@ -8,9 +8,9 @@
 app.h \
 certkeys.h \
 crypto.h \
--- misc/xmlsec1-1.2.12/include/xmlsec/mscrypto/Makefile.in	2009-06-25 22:53:30.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/include/xmlsec/mscrypto/Makefile.in	2009-09-21 14:02:48.571021349 +0200
-@@ -308,6 +308,7 @@
+--- misc/xmlsec1-1.2.14/include/xmlsec/mscrypto/Makefile.in	2009-06-25 22:53:30.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/include/xmlsec/mscrypto/Makefile.in	2009-09-21 14:02:48.571021349 +0200
+@@ -281,6 +281,7 @@
 NULL = 
 xmlsecmscryptoincdir = $(includedir)/xmlsec1/xmlsec/mscrypto
 xmlsecmscryptoinc_HEADERS = \
@@ -18,8 +18,8 @@
 app.h \
 certkeys.h \
 crypto.h \
--- misc/xmlsec1-1.2.12/include/xmlsec/mscrypto/akmngr.h	2009-09-21 14:07:19.052318336 +0200
-+++ misc/build/xmlsec1-1.2.12/include/xmlsec/mscrypto/akmngr.h	2009-09-21 14:02:48.504966762 +0200
+--- misc/xmlsec1-1.2.14/include/xmlsec/mscrypto/akmngr.h	2009-09-21 14:07:19.052318336 +0200
+++ misc/build/xmlsec1-1.2.14/include/xmlsec/mscrypto/akmngr.h	2009-09-21 14:02:48.504966762 +0200
@@ -1 +1,71 @@
 -dummy
 +/** 
@@ -93,8 +93,8 @@
 +#endif /* __XMLSEC_MSCRYPTO_AKMNGR_H__ */
 +
 +
--- misc/xmlsec1-1.2.12/include/xmlsec/nss/Makefile.am	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/include/xmlsec/nss/Makefile.am	2009-09-21 14:02:48.577933031 +0200
+--- misc/xmlsec1-1.2.14/include/xmlsec/nss/Makefile.am	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/Makefile.am	2009-09-21 14:02:48.577933031 +0200
@@ -10,6 +10,9 @@
 keysstore.h \
 pkikeys.h \
@@ -105,9 +105,9 @@
 $(NULL)
 
 install-exec-hook:
--- misc/xmlsec1-1.2.12/include/xmlsec/nss/Makefile.in	2009-06-25 22:53:31.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/include/xmlsec/nss/Makefile.in	2009-09-21 14:02:48.585376325 +0200
-@@ -315,6 +315,9 @@
+--- misc/xmlsec1-1.2.14/include/xmlsec/nss/Makefile.in	2009-06-25 22:53:31.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/Makefile.in	2009-09-21 14:02:48.585376325 +0200
+@@ -288,6 +288,9 @@
 keysstore.h \
 pkikeys.h \
 x509.h \
@@ -117,8 +117,8 @@
 $(NULL)
 
 all: all-am
--- misc/xmlsec1-1.2.12/include/xmlsec/nss/akmngr.h	2009-09-21 14:07:19.105517659 +0200
-+++ misc/build/xmlsec1-1.2.12/include/xmlsec/nss/akmngr.h	2009-09-21 14:02:48.510978278 +0200
+--- misc/xmlsec1-1.2.14/include/xmlsec/nss/akmngr.h	2009-09-21 14:07:19.105517659 +0200
+++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/akmngr.h	2009-09-21 14:02:48.510978278 +0200
@@ -1 +1,56 @@
 -dummy
 +/** 
@@ -177,8 +177,8 @@
 +#endif /* __XMLSEC_NSS_AKMNGR_H__ */
 +
 +
--- misc/xmlsec1-1.2.12/include/xmlsec/nss/app.h	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/include/xmlsec/nss/app.h	2009-09-21 14:02:48.612847068 +0200
+--- misc/xmlsec1-1.2.14/include/xmlsec/nss/app.h	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/app.h	2009-09-21 14:02:48.612847068 +0200
@@ -22,6 +22,9 @@
 #include <xmlsec/keysmngr.h>
 #include <xmlsec/transforms.h>
@@ -198,8 +198,8 @@
 XMLSEC_CRYPTO_EXPORT int 		xmlSecNssAppDefaultKeysMngrSave	(xmlSecKeysMngrPtr mngr,
 									 const char* filename,
 									 xmlSecKeyDataType type);
--- misc/xmlsec1-1.2.12/include/xmlsec/nss/ciphers.h	2009-09-21 14:07:19.146496548 +0200
-+++ misc/build/xmlsec1-1.2.12/include/xmlsec/nss/ciphers.h	2009-09-21 14:02:48.516689712 +0200
+--- misc/xmlsec1-1.2.14/include/xmlsec/nss/ciphers.h	2009-09-21 14:07:19.146496548 +0200
+++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/ciphers.h	2009-09-21 14:02:48.516689712 +0200
@@ -1 +1,35 @@
 -dummy
 +/** 
@@ -237,8 +237,8 @@
 +#endif /* __XMLSEC_NSS_CIPHERS_H__ */
 +
 +
--- misc/xmlsec1-1.2.12/include/xmlsec/nss/keysstore.h	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/include/xmlsec/nss/keysstore.h	2009-09-21 14:02:48.626261748 +0200
+--- misc/xmlsec1-1.2.14/include/xmlsec/nss/keysstore.h	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/keysstore.h	2009-09-21 14:02:48.626261748 +0200
@@ -16,6 +16,8 @@
 #endif /* __cplusplus */ 
 
@@ -257,8 +257,8 @@
 XMLSEC_CRYPTO_EXPORT int		xmlSecNssKeysStoreLoad 	(xmlSecKeyStorePtr store,
 								 const char *uri,
 								 xmlSecKeysMngrPtr keysMngr);
--- misc/xmlsec1-1.2.12/include/xmlsec/nss/tokens.h	2009-09-21 14:07:19.172421448 +0200
-+++ misc/build/xmlsec1-1.2.12/include/xmlsec/nss/tokens.h	2009-09-21 14:02:48.522913605 +0200
+--- misc/xmlsec1-1.2.14/include/xmlsec/nss/tokens.h	2009-09-21 14:07:19.172421448 +0200
+++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/tokens.h	2009-09-21 14:02:48.522913605 +0200
@@ -1 +1,182 @@
 -dummy
 +/**
@@ -443,8 +443,8 @@
 +
 +#endif	/* __XMLSEC_NSS_TOKENS_H__ */
 +
--- misc/xmlsec1-1.2.12/src/mscrypto/akmngr.c	2009-09-21 14:07:19.078910929 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/akmngr.c	2009-09-21 14:02:48.531281225 +0200
+--- misc/xmlsec1-1.2.14/src/mscrypto/akmngr.c	2009-09-21 14:07:19.078910929 +0200
+++ misc/build/xmlsec1-1.2.14/src/mscrypto/akmngr.c	2009-09-21 14:02:48.531281225 +0200
@@ -1 +1,235 @@
 -dummy
 +/** 
@@ -682,8 +682,8 @@
 +	return( 0 ) ;
 +}
 +
--- misc/xmlsec1-1.2.12/src/nss/Makefile.am	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/Makefile.am	2009-09-21 14:02:48.591560472 +0200
+--- misc/xmlsec1-1.2.14/src/nss/Makefile.am	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/Makefile.am	2009-09-21 14:02:48.591560472 +0200
@@ -35,6 +35,9 @@
 	kw_des.c \
 	kw_aes.c \
@@ -694,9 +694,9 @@
 	$(NULL)
 
 if SHAREDLIB_HACK
--- misc/xmlsec1-1.2.12/src/nss/Makefile.in	2009-06-25 22:53:33.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/Makefile.in	2009-09-21 14:02:48.599339718 +0200
-@@ -61,7 +61,8 @@
+--- misc/xmlsec1-1.2.14/src/nss/Makefile.in	2009-06-25 22:53:33.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/Makefile.in	2009-09-21 14:02:48.599339718 +0200
+@@ -72,7 +72,8 @@
 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 \
@@ -706,7 +706,7 @@
 am__objects_1 =
 @SHAREDLIB_HACK_TRUE@am__objects_2 = libxmlsec1_nss_la-strings.lo
 am_libxmlsec1_nss_la_OBJECTS = libxmlsec1_nss_la-app.lo \
-@@ -72,6 +73,8 @@
+@@ -83,6 +84,8 @@
 	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 \
@@ -714,8 +714,8 @@
 +	libxmlsec1_nss_la-tokens.lo \
 	$(am__objects_1) $(am__objects_2)
 libxmlsec1_nss_la_OBJECTS = $(am_libxmlsec1_nss_la_OBJECTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -357,6 +360,7 @@
+ libxmlsec1_nss_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+@@ -333,6 +336,7 @@
 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 \
@@ -723,7 +723,7 @@
 	$(NULL) $(am__append_1)
 libxmlsec1_nss_la_LIBADD = \
 	../libxmlsec1.la \
-@@ -458,6 +462,9 @@
+@@ -439,6 +443,9 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-symkeys.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-x509.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-x509vfy.Plo@am__quote@
@@ -732,10 +732,10 @@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-tokens.Plo@am__quote@
 
 .c.o:
- @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@@ -487,6 +494,27 @@
+ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -468,6 +475,27 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @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
+ @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(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-akmngr.lo: akmngr.c
 +@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-akmngr.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-akmngr.Tpo" -c -o libxmlsec1_nss_la-akmngr.lo `test -f 'akmngr.c' || echo '$(srcdir)/'`akmngr.c; \
@@ -759,10 +759,10 @@
 +@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-tokens.lo `test -f 'tokens.c' || echo '$(srcdir)/'`tokens.c
 +
 libxmlsec1_nss_la-bignum.lo: bignum.c
- @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; \
- @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
--- misc/xmlsec1-1.2.12/src/nss/akmngr.c	2009-09-21 14:07:19.197249962 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/akmngr.c	2009-09-21 14:02:48.539616129 +0200
+ @am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(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
+ @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxmlsec1_nss_la-bignum.Tpo $(DEPDIR)/libxmlsec1_nss_la-bignum.Plo
+--- misc/xmlsec1-1.2.14/src/nss/akmngr.c	2009-09-21 14:07:19.197249962 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/akmngr.c	2009-09-21 14:02:48.539616129 +0200
@@ -1 +1,384 @@
 -dummy
 +/** 
@@ -1149,8 +1149,8 @@
 +	return(0) ;
 +}
 +
--- misc/xmlsec1-1.2.12/src/nss/hmac.c	2009-06-26 06:18:13.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/hmac.c	2009-09-21 14:02:48.649065288 +0200
+--- misc/xmlsec1-1.2.14/src/nss/hmac.c	2009-06-26 06:18:13.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/hmac.c	2009-09-21 14:02:48.649065288 +0200
@@ -23,8 +23,8 @@
 #include <xmlsec/transforms.h>
 #include <xmlsec/errors.h>
@@ -1159,9 +1159,9 @@
 #include <xmlsec/nss/crypto.h>
 +#include <xmlsec/nss/tokens.h>
 
- #define XMLSEC_NSS_MIN_HMAC_SIZE		40
- #define XMLSEC_NSS_MAX_HMAC_SIZE		128
-@@ -284,13 +284,13 @@
+ /* sizes in bits */
+ #define XMLSEC_NSS_MIN_HMAC_SIZE		80
+@@ -286,13 +286,13 @@
     keyItem.data = xmlSecBufferGetData(buffer);
     keyItem.len  = xmlSecBufferGetSize(buffer); 
 
@@ -1178,8 +1178,8 @@
 	return(-1);
     }
 	
--- misc/xmlsec1-1.2.12/src/nss/keysstore.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/keysstore.c	2009-09-21 14:02:48.633533885 +0200
+--- misc/xmlsec1-1.2.14/src/nss/keysstore.c	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/keysstore.c	2009-09-21 14:02:48.633533885 +0200
@@ -1,36 +1,56 @@
 /** 
  * XMLSec library
@@ -1252,7 +1252,7 @@
 #include <xmlsec/errors.h>
 #include <xmlsec/xmltree.h>
 
-@@ -38,82 +58,464 @@
+@@ -38,82 +58,461 @@
 
 #include <xmlsec/nss/crypto.h>
 #include <xmlsec/nss/keysstore.h>
@@ -1344,6 +1344,8 @@
 +                       XMLSEC_ERRORS_NO_MESSAGE ) ;
 +               return -1 ;
 +       }
+       return 0 ;
+}
 
 -    /* data */
 -    BAD_CAST "NSS-keys-store",		/* const xmlChar* name; */ 
@@ -1357,13 +1359,6 @@
 -    NULL,				/* void* reserved0; */
 -    NULL,				/* void* reserved1; */
 -};
-+       return 0 ;
-+}
- 
-/**
- * xmlSecNssKeysStoreGetKlass:
- * 
- * The Nss list based keys store klass.
 +int xmlSecNssKeysStoreAdoptKey(
 +       xmlSecKeyStorePtr       store ,
 +       xmlSecKeyPtr            key
@@ -1411,7 +1406,11 @@
 +                       XMLSEC_ERRORS_NO_MESSAGE ) ;
 +               return -1 ;
 +       }
-+
+ 
+-/**
+- * xmlSecNssKeysStoreGetKlass:
+- * 
+- * The Nss list based keys store klass.
 +       return 0 ;
 +}
 +
@@ -1421,7 +1420,7 @@
 + *
 + * Keys store specific initialization method.
  *
- * Returns Nss list based keys store klass.
+- * Returns: Nss list based keys store klass.
 + * Returns 0 on success or a negative value if an error occurs.
  */
 -xmlSecKeyStoreId 
@@ -1459,7 +1458,7 @@
 - * 
 - * Adds @key to the @store. 
  *
- * Returns 0 on success or a negative value if an error occurs.
+- * Returns: 0 on success or a negative value if an error occurs.
 + * xmlSecKeyStoreFinalizeMethod:
 + * @store:             the store.
 + *
@@ -1500,10 +1499,7 @@
 +               context->slotList = NULL ;
 +       }
 +}
- 
-    ss = xmlSecNssKeysStoreGetSS(store);
-    xmlSecAssert2(((ss != NULL) && (*ss != NULL) && 
-		   (xmlSecKeyStoreCheckId(*ss, xmlSecSimpleKeysStoreId))), -1);
+
 +xmlSecKeyPtr
 +xmlSecNssKeysStoreFindKeyFromSlot(
 +       PK11SlotInfo* slot,
@@ -1639,10 +1635,11 @@
 +               }
 +       }
 
-    return (xmlSecSimpleKeysStoreAdoptKey(*ss, key));
-+       return(key);
- }
- 
+-    ss = xmlSecNssKeysStoreGetSS(store);
+-    xmlSecAssert2(((ss != NULL) && (*ss != NULL) && 
+-		   (xmlSecKeyStoreCheckId(*ss, xmlSecSimpleKeysStoreId))), -1);
+    return(key);
+}
 +
 +/** 
 + * xmlSecKeyStoreFindKeyMethod:
@@ -1750,19 +1747,19 @@
 +       NULL ,
 +       NULL
 +} ;
-+
+ 
+-    return (xmlSecSimpleKeysStoreAdoptKey(*ss, key));
 +/**
 + * xmlSecNssKeysStoreGetKlass:
 + * 
 + * The simple list based keys store klass.
 + *
-+ * Returns simple list based keys store klass.
 + */
 +xmlSecKeyStoreId 
 +xmlSecNssKeysStoreGetKlass( void ) {
 +    return &xmlSecNssKeysStoreKlass ;
-+}
-+
+ }
+ 
 +/**************************
 + * Application routines
 + */
@@ -1770,7 +1767,7 @@
 /** 
  * xmlSecNssKeysStoreLoad:
  * @store:		the pointer to Nss keys store.
-@@ -252,234 +654,147 @@
+@@ -252,234 +651,147 @@
  */
 int
 xmlSecNssKeysStoreSave(xmlSecKeyStorePtr store, const char *filename, xmlSecKeyDataType type) {
@@ -1794,26 +1791,26 @@
 -    ss = xmlSecNssKeysStoreGetSS(store);
 -    xmlSecAssert2(((ss != NULL) && (*ss != NULL) && 
 -		   (xmlSecKeyStoreCheckId(*ss, xmlSecSimpleKeysStoreId))), -1);
-+    xmlSecAssert2( xmlSecKeyStoreCheckSize( store , xmlSecNssKeysStoreSize ), -1 ) ;
-+    xmlSecAssert2(filename != NULL, -1);   
- 
+-
 -    return (xmlSecSimpleKeysStoreSave(*ss, filename, type));
 -}
-+    context = xmlSecNssKeysStoreGetCtx( store ) ;
-+    xmlSecAssert2( context != NULL, -1 );
- 
+-
 -static int
 -xmlSecNssKeysStoreInitialize(xmlSecKeyStorePtr store) {
 -    xmlSecKeyStorePtr *ss;
+    xmlSecAssert2( xmlSecKeyStoreCheckSize( store , xmlSecNssKeysStoreSize ), -1 ) ;
+    xmlSecAssert2(filename != NULL, -1);   
+ 
+-    xmlSecAssert2(xmlSecKeyStoreCheckId(store, xmlSecNssKeysStoreId), -1);
+    context = xmlSecNssKeysStoreGetCtx( store ) ;
+    xmlSecAssert2( context != NULL, -1 );
+ 
+-    ss = xmlSecNssKeysStoreGetSS(store);
+-    xmlSecAssert2((*ss == NULL), -1);
 +    list = context->keyList ;
 +       xmlSecAssert2( list != NULL, -1 );
 +    xmlSecAssert2(xmlSecPtrListCheckId(list, xmlSecKeyPtrListId), -1);
 
-    xmlSecAssert2(xmlSecKeyStoreCheckId(store, xmlSecNssKeysStoreId), -1);
-
-    ss = xmlSecNssKeysStoreGetSS(store);
-    xmlSecAssert2((*ss == NULL), -1);
-
 -    *ss = xmlSecKeyStoreCreate(xmlSecSimpleKeysStoreId);
 -    if(*ss == NULL) {
 -	xmlSecError(XMLSEC_ERRORS_HERE,
@@ -1832,9 +1829,7 @@
 
 -    return(0);    
 -}
-+    idsList = xmlSecKeyDataIdsGet();   
-+    xmlSecAssert2(idsList != NULL, -1);
- 
+-
 -static void
 -xmlSecNssKeysStoreFinalize(xmlSecKeyStorePtr store) {
 -    xmlSecKeyStorePtr *ss;
@@ -1846,12 +1841,7 @@
 -    
 -    xmlSecKeyStoreDestroy(*ss);
 -}
-+    keysSize = xmlSecPtrListGetSize(list);
-+    idsSize = xmlSecPtrListGetSize(idsList);
-+    for(i = 0; i < keysSize; ++i) {
-+        key = (xmlSecKeyPtr)xmlSecPtrListGetItem(list, i);
-+        xmlSecAssert2(key != NULL, -1);
- 
+-
 -static xmlSecKeyPtr 
 -xmlSecNssKeysStoreFindKey(xmlSecKeyStorePtr store, const xmlChar* name, 
 -		          xmlSecKeyInfoCtxPtr keyInfoCtx) {
@@ -1883,7 +1873,9 @@
 -    if (name == NULL) {
 -	goto done;
 -    }
-
+    idsList = xmlSecKeyDataIdsGet();   
+    xmlSecAssert2(idsList != NULL, -1);
+ 
 -    /* what type of key are we looking for? 
 -     * TBD: For now, we'll look only for public/private keys using the
 -     * name as a cert nickname. Later on, we can attempt to find
@@ -1896,7 +1888,12 @@
 -	if (cert == NULL) {
 -	    goto done;
 -	}
-
+    keysSize = xmlSecPtrListGetSize(list);
+    idsSize = xmlSecPtrListGetSize(idsList);
+    for(i = 0; i < keysSize; ++i) {
+        key = (xmlSecKeyPtr)xmlSecPtrListGetItem(list, i);
+        xmlSecAssert2(key != NULL, -1);
+ 
 -	if (keyReq->keyType & xmlSecKeyDataTypePublic) {
 - 	    pubkey = CERT_ExtractPublicKey(cert);
 -	    if (pubkey == NULL) {
@@ -2112,8 +2109,8 @@
 +    xmlFreeDoc(doc);
 +    return(0);
 }
--- misc/xmlsec1-1.2.12/src/nss/keywrapers.c	2009-09-21 14:07:19.223802688 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/keywrapers.c	2009-09-21 14:02:48.548869372 +0200
+--- misc/xmlsec1-1.2.14/src/nss/keywrapers.c	2009-09-21 14:07:19.223802688 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/keywrapers.c	2009-09-21 14:02:48.548869372 +0200
@@ -1 +1,1213 @@
 -dummy
 +/** 
@@ -3329,8 +3326,8 @@
 +
 +#endif /* XMLSEC_NO_DES */
 +
--- misc/xmlsec1-1.2.12/src/nss/pkikeys.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/pkikeys.c	2009-09-21 14:02:48.657352624 +0200
+--- misc/xmlsec1-1.2.14/src/nss/pkikeys.c	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/pkikeys.c	2009-09-21 14:02:48.657352624 +0200
@@ -24,6 +24,7 @@
 #include <xmlsec/nss/crypto.h>
 #include <xmlsec/nss/bignum.h>
@@ -3520,8 +3517,8 @@
 
     return(8 * SECKEY_PublicKeyStrength(ctx->pubkey));
 }
--- misc/xmlsec1-1.2.12/src/nss/symkeys.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/symkeys.c	2009-09-21 14:02:48.620574832 +0200
+--- misc/xmlsec1-1.2.14/src/nss/symkeys.c	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/symkeys.c	2009-09-21 14:02:48.620574832 +0200
@@ -15,20 +15,41 @@
 #include <stdio.h>
 #include <string.h>
@@ -4362,8 +4359,8 @@
 
     /* data */
     xmlSecNameHMACKeyValue,
--- misc/xmlsec1-1.2.12/src/nss/tokens.c	2009-09-21 14:07:19.249145861 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/tokens.c	2009-09-21 14:02:48.556772442 +0200
+--- misc/xmlsec1-1.2.14/src/nss/tokens.c	2009-09-21 14:07:19.249145861 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/tokens.c	2009-09-21 14:02:48.556772442 +0200
@@ -1 +1,548 @@
 -dummy
 +/**
@@ -4914,8 +4911,8 @@
 +	return(0);
 +}
 +
--- misc/xmlsec1-1.2.12/src/nss/x509.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/x509.c	2009-09-21 14:02:48.642312431 +0200
+--- misc/xmlsec1-1.2.14/src/nss/x509.c	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/x509.c	2009-09-21 14:02:48.642312431 +0200
@@ -34,7 +34,6 @@
 #include <xmlsec/keys.h>
 #include <xmlsec/keyinfo.h>
@@ -5651,8 +5648,8 @@
 static void 
 xmlSecNssX509CertDebugDump(CERTCertificate* cert, FILE* output) {
     SECItem *sn;
--- misc/xmlsec1-1.2.12/src/nss/x509vfy.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/x509vfy.c	2009-09-21 14:02:48.669245207 +0200
+--- misc/xmlsec1-1.2.14/src/nss/x509vfy.c	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/x509vfy.c	2009-09-21 14:02:48.669245207 +0200
@@ -30,6 +30,7 @@
 #include <xmlsec/keyinfo.h>
 #include <xmlsec/keysmngr.h>
@@ -5680,7 +5677,7 @@
 
 static xmlSecKeyDataStoreKlass xmlSecNssX509StoreKlass = {
     sizeof(xmlSecKeyDataStoreKlass),
-@@ -343,40 +334,28 @@
+@@ -339,40 +330,28 @@
 xmlSecNssX509FindCert(xmlChar *subjectName, xmlChar *issuerName, 
 		      xmlChar *issuerSerial, xmlChar *ski) {
     CERTCertificate *cert = NULL;
@@ -5724,7 +5721,7 @@
 	    goto done;
 	}
 
-@@ -398,34 +377,23 @@
+@@ -394,34 +373,23 @@
     if((issuerName != NULL) && (issuerSerial != NULL)) {
 	CERTIssuerAndSN issuerAndSN;
 
@@ -5762,7 +5759,7 @@
 	    goto done;
 	}
 
-@@ -445,8 +413,15 @@
+@@ -441,8 +409,15 @@
 	issuerAndSN.derIssuer.data = nameitem->data;
 	issuerAndSN.derIssuer.len = nameitem->len;
 
@@ -5780,7 +5777,7 @@
 
 	cert = CERT_FindCertByIssuerAndSN(CERT_GetDefaultCertDB(), 
 					  &issuerAndSN);
-@@ -477,9 +452,6 @@
+@@ -473,9 +448,6 @@
     }
 
 done:
@@ -5790,13 +5787,10 @@
     if (arena != NULL) {
 	PORT_FreeArena(arena, PR_FALSE);
     }
-@@ -490,226 +462,76 @@
+@@ -486,176 +458,6 @@
     return(cert);
 }
 
-/**
- * xmlSecNssX509NameRead:
- */       
 -static xmlSecByte *
 -xmlSecNssX509NameRead(xmlSecByte *str, int len) {
 -    xmlSecByte name[256];
@@ -5804,15 +5798,7 @@
 -    xmlSecByte *retval = NULL;
 -    xmlSecByte *p = NULL;
 -    int nameLen, valueLen;
-+static int
-+xmlSecNssIntegerToItem(
-+       const xmlChar* integer ,
-+       SECItem *item
-+) {
-+    xmlSecBn bn ;
-+    xmlSecSize i, length ;
-+    const xmlSecByte* bnInteger ;
- 
+-
 -    xmlSecAssert2(str != NULL, NULL);
 -    
 -    /* return string should be no longer than input string */
@@ -5832,20 +5818,14 @@
 -	while((len > 0) && isspace(*str)) {
 -	    ++str; --len;
 -	}
-+    xmlSecAssert2( integer != NULL, -1 ) ;
-+    xmlSecAssert2( item != NULL, -1 ) ;
- 
+-
 -	nameLen = xmlSecNssX509NameStringRead(&str, &len, name, sizeof(name), '=', 0);	
 -	if(nameLen < 0) {
 -	    xmlSecError(XMLSEC_ERRORS_HERE,
-+    if( xmlSecBnInitialize( &bn, 0 ) < 0 ) {
-+        xmlSecError(XMLSEC_ERRORS_HERE,
- 			NULL,
+-			NULL,
 -			"xmlSecNssX509NameStringRead",
 -			XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+			"xmlSecBnInitialize",
-+			XMLSEC_ERRORS_R_INVALID_DATA,
- 			XMLSEC_ERRORS_NO_MESSAGE);
+-			XMLSEC_ERRORS_NO_MESSAGE);
 -	    goto done;
 -	}
 -	memcpy(p, name, nameLen);
@@ -5857,17 +5837,11 @@
 -		valueLen = xmlSecNssX509NameStringRead(&str, &len, 
 -					value, sizeof(value), '"', 1);	
 -		if(valueLen < 0) {
-+	    return -1 ;
-+    }
-+
-+    if( xmlSecBnFromDecString( &bn, integer ) < 0 ) {
- 		    xmlSecError(XMLSEC_ERRORS_HERE,
- 				NULL,
+-		    xmlSecError(XMLSEC_ERRORS_HERE,
+-				NULL,
 -				"xmlSecNssX509NameStringRead",
 -				XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+				"xmlSecBnFromDecString",
-+				XMLSEC_ERRORS_R_INVALID_DATA,
- 				XMLSEC_ERRORS_NO_MESSAGE);
+-				XMLSEC_ERRORS_NO_MESSAGE);
 -		    goto done;
 -    		}
 -		/* skip spaces before comma or semicolon */
@@ -5875,17 +5849,10 @@
 -		    ++str; --len;
 -		}
 -		if((len > 0) && ((*str) != ',')) {
-+        xmlSecBnFinalize( &bn ) ;
-+        return -1 ;
-+    }
-+
-+    length = xmlSecBnGetSize( &bn ) ;
-+    if( length <= 0 ) {
- 		    xmlSecError(XMLSEC_ERRORS_HERE,
- 				NULL,
+-		    xmlSecError(XMLSEC_ERRORS_HERE,
 -				NULL,
-+				"xmlSecBnGetSize",
- 				XMLSEC_ERRORS_R_INVALID_DATA,
+-				NULL,
+-				XMLSEC_ERRORS_R_INVALID_DATA,
 -				"comma is expected");
 -		    goto done;
 -		}
@@ -5912,7 +5879,7 @@
 -				NULL,
 -				"xmlSecNssX509NameStringRead",
 -				XMLSEC_ERRORS_R_XMLSEC_FAILED,
- 				XMLSEC_ERRORS_NO_MESSAGE);
+-				XMLSEC_ERRORS_NO_MESSAGE);
 -		    goto done;
 -    		}
 -		memcpy(p, value, valueLen);
@@ -5926,8 +5893,8 @@
 -	if(len > 0) {
 -	    ++str; --len;
 -	}	
-     }
- 
+-    }
+-
 -    *p = 0;
 -    return(retval);
 -    
@@ -5936,11 +5903,6 @@
 -    return (NULL);
 -}
 -
-
-
-/**
- * xmlSecNssX509NameStringRead:
- */
 -static int 
 -xmlSecNssX509NameStringRead(xmlSecByte **str, int *strLen, 
 -			    xmlSecByte *res, int resLen,
@@ -5964,13 +5926,10 @@
 -	    nonSpace = q;    
 -	    if(xmlSecIsHex((*p))) {
 -		if((p - (*str) + 1) >= (*strLen)) {
-+    bnInteger = xmlSecBnGetData( &bn ) ;
-+    if( bnInteger == NULL ) {
- 		    xmlSecError(XMLSEC_ERRORS_HERE,
- 				NULL,
+-		    xmlSecError(XMLSEC_ERRORS_HERE,
 -				NULL,
-+				"xmlSecBnGetData",
- 				XMLSEC_ERRORS_R_INVALID_DATA,
+-				NULL,
+-				XMLSEC_ERRORS_R_INVALID_DATA,
 -				"two hex digits expected");
 -	    	    return(-1);
 -		}
@@ -5978,28 +5937,17 @@
 -		p += 2;
 -	    } else {
 -		if(((++p) - (*str)) >= (*strLen)) {
-+				XMLSEC_ERRORS_NO_MESSAGE ) ;
-+        xmlSecBnFinalize( &bn ) ;
-+        return -1 ;
-+    }
-+
-+    item->data = ( unsigned char * )PORT_Alloc( length );
-+    if( item->data == NULL ) {
- 		    xmlSecError(XMLSEC_ERRORS_HERE,
- 				NULL,
+-		    xmlSecError(XMLSEC_ERRORS_HERE,
 -				NULL,
-+				"PORT_Alloc",
- 				XMLSEC_ERRORS_R_INVALID_DATA,
+-				NULL,
+-				XMLSEC_ERRORS_R_INVALID_DATA,
 -				"escaped symbol missed");
 -		    return(-1);
 -		}
 -		*(q++) = *(p++); 
 -	    }
 -	}	    
-+				XMLSEC_ERRORS_NO_MESSAGE ) ;
-+        xmlSecBnFinalize( &bn ) ;
-+        return -1 ;
-     }
+-    }
 -    if(((p - (*str)) < (*strLen)) && ((*p) != delim)) {
 -	xmlSecError(XMLSEC_ERRORS_HERE,
 -		    NULL,
@@ -6012,61 +5960,91 @@
 -    (*str) = p;
 -    return((ingoreTrailingSpaces) ? nonSpace - res + 1 : q - res);
 -}
- 
-/* code lifted from NSS */
-static void
-xmlSecNssNumToItem(SECItem *it, unsigned long ui)
-{
-    unsigned char bb[5];
-    int len;
 -
-    bb[0] = 0;
-    bb[1] = (unsigned char) (ui >> 24);
-    bb[2] = (unsigned char) (ui >> 16);
-    bb[3] = (unsigned char) (ui >> 8);
-    bb[4] = (unsigned char) (ui);
-
-    /*
-    ** Small integers are encoded in a single byte. Larger integers
-    ** require progressively more space.
-    */
-    if (ui > 0x7f) {
-        if (ui > 0x7fff) {
-            if (ui > 0x7fffffL) {
-                if (ui >= 0x80000000L) {
-                    len = 5;
-                } else {
-                    len = 4;
-                }
-            } else {
-                len = 3;
-            }
-        } else {
-            len = 2;
-        }
-    } else {
-        len = 1;
-    }
+ /* code lifted from NSS */
+ static void
+ xmlSecNssNumToItem(SECItem *it, unsigned long ui)
+@@ -699,6 +501,77 @@
+     it->len = len;
+     PORT_Memcpy(it->data, bb + (sizeof(bb) - len), len);
+ }
+
+static int
+xmlSecNssIntegerToItem(
+       const xmlChar* integer ,
+       SECItem *item
+) {
+    xmlSecBn bn ;
+    xmlSecSize i, length ;
+    const xmlSecByte* bnInteger ;
+
+    xmlSecAssert2( integer != NULL, -1 ) ;
+    xmlSecAssert2( item != NULL, -1 ) ;
+
+    if( xmlSecBnInitialize( &bn, 0 ) < 0 ) {
+        xmlSecError(XMLSEC_ERRORS_HERE,
+                       NULL,
+                       "xmlSecBnInitialize",
+                       XMLSEC_ERRORS_R_INVALID_DATA,
+                       XMLSEC_ERRORS_NO_MESSAGE);
+           return -1 ;
+    }
+
+    if( xmlSecBnFromDecString( &bn, integer ) < 0 ) {
+                   xmlSecError(XMLSEC_ERRORS_HERE,
+                               NULL,
+                               "xmlSecBnFromDecString",
+                               XMLSEC_ERRORS_R_INVALID_DATA,
+                               XMLSEC_ERRORS_NO_MESSAGE);
+        xmlSecBnFinalize( &bn ) ;
+        return -1 ;
+    }
+
+    length = xmlSecBnGetSize( &bn ) ;
+    if( length <= 0 ) {
+                   xmlSecError(XMLSEC_ERRORS_HERE,
+                               NULL,
+                               "xmlSecBnGetSize",
+                               XMLSEC_ERRORS_R_INVALID_DATA,
+                               XMLSEC_ERRORS_NO_MESSAGE);
+    }
+
+    bnInteger = xmlSecBnGetData( &bn ) ;
+    if( bnInteger == NULL ) {
+                   xmlSecError(XMLSEC_ERRORS_HERE,
+                               NULL,
+                               "xmlSecBnGetData",
+                               XMLSEC_ERRORS_R_INVALID_DATA,
+                               XMLSEC_ERRORS_NO_MESSAGE ) ;
+        xmlSecBnFinalize( &bn ) ;
+        return -1 ;
+    }
+
+    item->data = ( unsigned char * )PORT_Alloc( length );
+    if( item->data == NULL ) {
+                   xmlSecError(XMLSEC_ERRORS_HERE,
+                               NULL,
+                               "PORT_Alloc",
+                               XMLSEC_ERRORS_R_INVALID_DATA,
+                               XMLSEC_ERRORS_NO_MESSAGE ) ;
+        xmlSecBnFinalize( &bn ) ;
+        return -1 ;
+    }
+
 +    item->len = length;
- 
-    it->data = (unsigned char *)PORT_Alloc(len);
-    if (it->data == NULL) {
-        return;
-    }
 +    for( i = 0 ; i < length ; i ++ )
 +        item->data[i] = *( bnInteger + i ) ;
 +
 +    xmlSecBnFinalize( &bn ) ;
- 
-    it->len = len;
-    PORT_Memcpy(it->data, bb + (sizeof(bb) - len), len);
+
 +    return 0 ;
- }
+}
 #endif /* XMLSEC_NO_X509 */
 
--- misc/xmlsec1-1.2.12/win32/Makefile.msvc	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/win32/Makefile.msvc	2009-09-21 14:02:48.607277908 +0200
-@@ -223,6 +223,9 @@
+ 
+--- misc/xmlsec1-1.2.14/win32/Makefile.msvc	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc	2009-09-21 14:02:48.607277908 +0200
+@@ -218,6 +218,9 @@
 	$(XMLSEC_OPENSSL_INTDIR_A)\x509vfy.obj 
 
 XMLSEC_NSS_OBJS = \
@@ -6076,7 +6054,7 @@
 	$(XMLSEC_NSS_INTDIR)\app.obj\
 	$(XMLSEC_NSS_INTDIR)\bignum.obj\
 	$(XMLSEC_NSS_INTDIR)\ciphers.obj \
-@@ -258,6 +261,7 @@
+@@ -253,6 +256,7 @@
 	$(XMLSEC_NSS_INTDIR_A)\strings.obj
 
 XMLSEC_MSCRYPTO_OBJS = \
--- a/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch
+++ b/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch
@@ -1,5 +1,5 @@
--- misc/xmlsec1-1.2.12/src/mscrypto/Makefile.am	2009-06-26 05:53:18.000000000 +0900
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/Makefile.am	2009-09-30 18:53:05.373000000 +0900
+--- misc/xmlsec1-1.2.14/src/mscrypto/Makefile.am	2009-06-26 05:53:18.000000000 +0900
+++ misc/build/xmlsec1-1.2.14/src/mscrypto/Makefile.am	2009-09-30 18:53:05.373000000 +0900
@@ -35,6 +35,7 @@
 	csp_oid.h \
 	globals.h \
@@ -8,9 +8,9 @@
 	$(NULL)
 
 if SHAREDLIB_HACK
--- misc/xmlsec1-1.2.12/src/mscrypto/Makefile.in	2009-06-26 05:53:32.000000000 +0900
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/Makefile.in	2009-09-30 19:00:50.107375000 +0900
-@@ -61,7 +61,8 @@
+--- misc/xmlsec1-1.2.14/src/mscrypto/Makefile.in	2009-06-26 05:53:32.000000000 +0900
+++ misc/build/xmlsec1-1.2.14/src/mscrypto/Makefile.in	2009-09-30 19:00:50.107375000 +0900
+@@ -72,7 +72,8 @@
 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 \
@@ -20,7 +20,7 @@
 am__objects_1 =
 @SHAREDLIB_HACK_TRUE@am__objects_2 =  \
 @SHAREDLIB_HACK_TRUE@	libxmlsec1_mscrypto_la-strings.lo
-@@ -75,7 +76,8 @@
+@@ -86,7 +87,8 @@
 	libxmlsec1_mscrypto_la-signatures.lo \
 	libxmlsec1_mscrypto_la-symkeys.lo \
 	libxmlsec1_mscrypto_la-x509.lo \
@@ -29,8 +29,8 @@
 +	libxmlsec1_mscrypto_la-akmngr.lo $(am__objects_1) \
 	$(am__objects_2)
 libxmlsec1_mscrypto_la_OBJECTS = $(am_libxmlsec1_mscrypto_la_OBJECTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -362,6 +364,7 @@
+ libxmlsec1_mscrypto_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+@@ -338,6 +340,7 @@
 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 \
@@ -38,17 +38,17 @@
 	$(NULL) $(am__append_1)
 libxmlsec1_mscrypto_la_LIBADD = \
 	../libxmlsec1.la \
-@@ -460,6 +463,7 @@
+@@ -441,6 +444,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-symkeys.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-x509.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-x509vfy.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-akmngr.Plo@am__quote@
 
 .c.o:
- @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@@ -489,6 +493,13 @@
+ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -470,6 +474,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @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
+ @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(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-akmngr.lo: akmngr.c
 +@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-akmngr.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_mscrypto_la-akmngr.Tpo" -c -o libxmlsec1_mscrypto_la-akmngr.lo `test -f 'akmngr.c' || echo '$(srcdir)/'`akmngr.c; \
@@ -58,5 +58,5 @@
 +@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-akmngr.lo `test -f 'akmngr.c' || echo '$(srcdir)/'`akmngr.c
 +
 libxmlsec1_mscrypto_la-certkeys.lo: certkeys.c
- @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; \
- @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
+ @am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(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
+ @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Tpo $(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Plo
--- a/libxmlsec/xmlsec1-mingw32.patch
+++ b/libxmlsec/xmlsec1-mingw32.patch
@@ -1,57 +1,6 @@
--- misc/xmlsec1-1.2.12/aclocal.m4	2009-06-25 22:53:24.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/aclocal.m4	2009-09-29 15:49:39.550158665 +0200
-@@ -6219,6 +6219,10 @@
- AC_SUBST(LIBADD_DL)
- AC_LANG_PUSH([C])
- 
-+case $host_os in
-+mingw*)
-+;;
-+*)
- AC_CHECK_FUNC([shl_load],
-       [AC_DEFINE([HAVE_SHL_LOAD], [1],
- 		 [Define if you have the shl_load function.])],
-@@ -6254,6 +6258,8 @@
-     ])
-   ])
- ])
-+;;
-+esac
- 
- if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
- then
--- misc/xmlsec1-1.2.12/configure	2009-09-29 15:55:33.269924586 +0200
-+++ misc/build/xmlsec1-1.2.12/configure	2009-09-29 15:55:08.838176411 +0200
-@@ -21883,6 +21883,10 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
-+case $host_os in
-+mingw*)
-+;;
-+*)
- echo "$as_me:$LINENO: checking for shl_load" >&5
- echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
- if test "${ac_cv_func_shl_load+set}" = set; then
-@@ -22434,6 +22438,8 @@
- 
- fi
- 
-+;;
-+esac
- 
- if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
- then
-@@ -22614,7 +22620,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
-#line 22617 "configure"
-+#line 22623 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -26178,7 +26184,9 @@
+--- misc/xmlsec1-1.2.14/configure	2009-09-29 15:55:33.269924586 +0200
+++ misc/build/xmlsec1-1.2.14/configure	2009-09-29 15:55:08.838176411 +0200
+@@ -13184,7 +13184,9 @@
 	done
 
 	for dir in $ac_nss_lib_dir ; do
@@ -62,7 +11,7 @@
 		        	if test "z$dir" = "z/usr/lib" ; then
             	    NSPR_LIBS="$NSPR_LIBS_LIST"
     		else
-@@ -26191,6 +26199,25 @@
+@@ -13197,6 +13199,25 @@
 		NSPR_LIBS_FOUND="yes"
 		break
 	    fi
@@ -88,7 +37,7 @@
 	done
     fi
 
-@@ -26264,6 +26291,24 @@
+@@ -13266,6 +13287,24 @@
         done
 
         for dir in $ac_nss_lib_dir ; do
@@ -113,7 +62,7 @@
             if test -f $dir/libnss3.so -o -f $dir/libnss3.dylib ; then
         	    		if test "z$dir" = "z/usr/lib" ; then
         	    NSS_LIBS="$NSS_LIBS_LIST"
-@@ -26277,6 +26322,8 @@
+@@ -13279,6 +13318,8 @@
     		NSS_LIBS_FOUND="yes"
     		break
 	    fi
@@ -122,16 +71,16 @@
 	done
     fi
 
-@@ -26769,7 +26816,7 @@
- echo "${ECHO_T}$MSCRYPTO_ENABLE" >&6
+@@ -13684,7 +13725,7 @@
+ $as_echo "$MSCRYPTO_ENABLE" >&6; }
 else
     LIBS_SAVE="$LIBS"
 -    LIBS="$LIBS -lcrypt32"
 +    LIBS="$LIBS ${PSDK_HOME}/lib/crypt32.lib"
-     echo "$as_me:$LINENO: checking for mscrypto libraries" >&5
- echo $ECHO_N "checking for mscrypto libraries... $ECHO_C" >&6
-     cat >conftest.$ac_ext <<_ACEOF
-@@ -26819,13 +26866,7 @@
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mscrypto libraries" >&5
+ $as_echo_n "checking for mscrypto libraries... " >&6; }
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -13711,13 +13752,7 @@
     XMLSEC_NO_MSCRYPTO="0"
 
     MSCRYPTO_CFLAGS="$MSCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MSCRYPTO=1"
@@ -146,9 +95,9 @@
         if test "z$XMLSEC_CRYPTO" = "z" ; then
 	XMLSEC_CRYPTO="mscrypto"
     	XMLSEC_CRYPTO_LIB="$MSCRYPTO_CRYPTO_LIB"
--- misc/xmlsec1-1.2.12/configure.in	2009-09-29 15:55:33.282288142 +0200
-+++ misc/build/xmlsec1-1.2.12/configure.in	2009-09-29 15:49:39.614223428 +0200
-@@ -606,7 +606,9 @@
+--- misc/xmlsec1-1.2.14/configure.in	2009-09-29 15:55:33.282288142 +0200
+++ misc/build/xmlsec1-1.2.14/configure.in	2009-09-29 15:49:39.614223428 +0200
+@@ -671,7 +671,9 @@
 	done
 	
 	for dir in $ac_nss_lib_dir ; do
@@ -159,7 +108,7 @@
 		dnl do not add -L/usr/lib because compiler does it anyway
         	if test "z$dir" = "z/usr/lib" ; then
             	    NSPR_LIBS="$NSPR_LIBS_LIST"
-@@ -620,6 +622,26 @@
+@@ -685,6 +687,26 @@
 		NSPR_LIBS_FOUND="yes"
 		break
 	    fi
@@ -186,7 +135,7 @@
 	done
     fi
 
-@@ -677,6 +699,25 @@
+@@ -742,6 +764,25 @@
         done
        
         for dir in $ac_nss_lib_dir ; do
@@ -212,7 +161,7 @@
             if test -f $dir/libnss3.so -o -f $dir/libnss3.dylib ; then
         	dnl do not add -L/usr/lib because compiler does it anyway
     		if test "z$dir" = "z/usr/lib" ; then
-@@ -691,6 +732,8 @@
+@@ -756,6 +797,8 @@
     		NSS_LIBS_FOUND="yes"
     		break
 	    fi
@@ -221,7 +170,7 @@
 	done
     fi
 
-@@ -861,7 +904,7 @@
+@@ -926,7 +969,7 @@
 dnl cannot detect __stdcall functions
 dnl    AC_CHECK_LIB(crypt32, CertOpenStore, ....
     LIBS_SAVE="$LIBS"
@@ -230,7 +179,7 @@
     AC_MSG_CHECKING(for mscrypto libraries)
     AC_LINK_IFELSE([
 	#include <windows.h>
-@@ -878,15 +921,7 @@
+@@ -943,15 +986,7 @@
     XMLSEC_NO_MSCRYPTO="0"
 
     MSCRYPTO_CFLAGS="$MSCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MSCRYPTO=1"
@@ -247,9 +196,9 @@
     dnl first crypto library is default one
     if test "z$XMLSEC_CRYPTO" = "z" ; then
 	XMLSEC_CRYPTO="mscrypto"
--- misc/xmlsec1-1.2.12/ltmain.sh	2009-06-25 22:53:19.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/ltmain.sh	2009-09-29 15:49:39.628349554 +0200
-@@ -1661,6 +1661,11 @@
+--- misc/xmlsec1-1.2.14/ltmain.sh	2009-06-25 22:53:19.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/ltmain.sh	2009-09-29 15:49:39.628349554 +0200
+@@ -4868,6 +4868,11 @@
 	fi
 	;;
 
@@ -261,7 +210,7 @@
       *.$libext)
 	# An archive.
 	deplibs="$deplibs $arg"
-@@ -1974,6 +1979,10 @@
+@@ -5213,6 +5218,10 @@
 	  continue
 	  ;;
 	*.la) lib="$deplib" ;;
@@ -272,9 +221,9 @@
 	*.$libext)
 	  if test "$pass" = conv; then
 	    deplibs="$deplib $deplibs"
--- misc/xmlsec1-1.2.12/src/mscrypto/certkeys.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/certkeys.c	2009-09-29 15:49:39.643186151 +0200
-@@ -938,7 +938,11 @@
+--- misc/xmlsec1-1.2.14/src/mscrypto/certkeys.c	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/mscrypto/certkeys.c	2009-09-29 15:49:39.643186151 +0200
+@@ -947,7 +947,11 @@
 static void	            xmlSecMSCryptoKeyDataRsaDebugDump(xmlSecKeyDataPtr data, FILE* output);
 static void	            xmlSecMSCryptoKeyDataRsaDebugXmlDump(xmlSecKeyDataPtr data, FILE* output);
 
@@ -286,7 +235,7 @@
     sizeof(xmlSecKeyDataKlass),
     xmlSecMSCryptoKeyDataSize,
 
-@@ -1649,7 +1653,11 @@
+@@ -1658,7 +1662,11 @@
 static void		xmlSecMSCryptoKeyDataDsaDebugXmlDump(xmlSecKeyDataPtr data,
 							 FILE* output);
 
@@ -298,8 +247,8 @@
     sizeof(xmlSecKeyDataKlass),
     xmlSecMSCryptoKeyDataSize,
 
--- misc/xmlsec1-1.2.12/src/mscrypto/ciphers.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/ciphers.c	2009-09-29 15:49:39.652528324 +0200
+--- misc/xmlsec1-1.2.14/src/mscrypto/ciphers.c	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/mscrypto/ciphers.c	2009-09-29 15:49:39.652528324 +0200
@@ -802,7 +802,11 @@
  * AES CBC cipher transforms
  *
@@ -348,8 +297,8 @@
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),	/* size_t klassSize */
     xmlSecMSCryptoBlockCipherSize,	/* size_t objSize */
--- misc/xmlsec1-1.2.12/src/mscrypto/digests.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/digests.c	2009-09-29 15:49:39.660554904 +0200
+--- misc/xmlsec1-1.2.14/src/mscrypto/digests.c	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/mscrypto/digests.c	2009-09-29 15:49:39.660554904 +0200
@@ -329,7 +329,11 @@
  * SHA1
  *
@@ -362,8 +311,8 @@
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),		/* size_t klassSize */
     xmlSecMSCryptoDigestSize,			/* size_t objSize */
--- misc/xmlsec1-1.2.12/src/mscrypto/keysstore.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/keysstore.c	2009-09-29 15:49:39.667289994 +0200
+--- misc/xmlsec1-1.2.14/src/mscrypto/keysstore.c	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/mscrypto/keysstore.c	2009-09-29 15:49:39.667289994 +0200
@@ -66,7 +66,11 @@
 								     const xmlChar* name, 
 								     xmlSecKeyInfoCtxPtr keyInfoCtx);
@@ -376,8 +325,8 @@
     sizeof(xmlSecKeyStoreKlass),
     xmlSecMSCryptoKeysStoreSize,
 
--- misc/xmlsec1-1.2.12/src/mscrypto/kt_rsa.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/kt_rsa.c	2009-09-29 15:49:39.674284044 +0200
+--- misc/xmlsec1-1.2.14/src/mscrypto/kt_rsa.c	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/mscrypto/kt_rsa.c	2009-09-29 15:49:39.674284044 +0200
@@ -66,7 +66,11 @@
 static int  	xmlSecMSCryptoRsaPkcs1Process			(xmlSecTransformPtr transform, 
 								 xmlSecTransformCtxPtr transformCtx);
@@ -390,8 +339,8 @@
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
     xmlSecMSCryptoRsaPkcs1Size,			/* xmlSecSize objSize */
--- misc/xmlsec1-1.2.12/src/mscrypto/signatures.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/signatures.c	2009-09-29 15:49:39.682580497 +0200
+--- misc/xmlsec1-1.2.14/src/mscrypto/signatures.c	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/mscrypto/signatures.c	2009-09-29 15:49:39.682580497 +0200
@@ -524,7 +524,11 @@
  * RSA-SHA1 signature transform
  *
@@ -416,8 +365,8 @@
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
     xmlSecMSCryptoSignatureSize,	        /* xmlSecSize objSize */
--- misc/xmlsec1-1.2.12/src/mscrypto/symkeys.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/symkeys.c	2009-09-29 15:49:39.691081347 +0200
+--- misc/xmlsec1-1.2.14/src/mscrypto/symkeys.c	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/mscrypto/symkeys.c	2009-09-29 15:49:39.691081347 +0200
@@ -72,7 +72,11 @@
  * <xmlsec:AESKeyValue> processing
  *
@@ -442,8 +391,8 @@
     sizeof(xmlSecKeyDataKlass),
     xmlSecKeyDataBinarySize,
 
--- misc/xmlsec1-1.2.12/src/mscrypto/x509.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/x509.c	2009-09-29 15:49:39.699931741 +0200
+--- misc/xmlsec1-1.2.14/src/mscrypto/x509.c	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/mscrypto/x509.c	2009-09-29 15:49:39.699931741 +0200
@@ -243,7 +243,11 @@
 
 
@@ -456,7 +405,7 @@
     sizeof(xmlSecKeyDataKlass),
     xmlSecMSCryptoX509DataSize,
 
-@@ -2148,7 +2152,11 @@
+@@ -2159,7 +2163,11 @@
 								 xmlSecSize bufSize,
 								 xmlSecKeyInfoCtxPtr keyInfoCtx);
 
@@ -468,8 +417,8 @@
     sizeof(xmlSecKeyDataKlass),
     sizeof(xmlSecKeyData),
 
--- misc/xmlsec1-1.2.12/src/mscrypto/x509vfy.c	2009-09-29 15:55:33.502779834 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/x509vfy.c	2009-09-29 15:49:39.708831697 +0200
+--- misc/xmlsec1-1.2.14/src/mscrypto/x509vfy.c	2009-09-29 15:55:33.502779834 +0200
+++ misc/build/xmlsec1-1.2.14/src/mscrypto/x509vfy.c	2009-09-29 15:49:39.708831697 +0200
@@ -67,7 +67,11 @@
 static int         xmlSecMSCryptoX509StoreInitialize    (xmlSecKeyDataStorePtr store);
 static void        xmlSecMSCryptoX509StoreFinalize      (xmlSecKeyDataStorePtr store);
@@ -482,8 +431,8 @@
     sizeof(xmlSecKeyDataStoreKlass),
     xmlSecMSCryptoX509StoreSize,
 
--- misc/xmlsec1-1.2.12/src/nss/ciphers.c	2009-09-29 15:55:33.488430535 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/ciphers.c	2009-09-29 15:49:39.717511164 +0200
+--- misc/xmlsec1-1.2.14/src/nss/ciphers.c	2009-09-29 15:55:33.488430535 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/ciphers.c	2009-09-29 15:49:39.717511164 +0200
@@ -777,7 +777,11 @@
  * AES CBC cipher transforms
  *
@@ -532,8 +481,8 @@
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
     xmlSecNssBlockCipherSize,		/* xmlSecSize objSize */
--- misc/xmlsec1-1.2.12/src/nss/digests.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/digests.c	2009-09-29 15:49:39.725650968 +0200
+--- misc/xmlsec1-1.2.14/src/nss/digests.c	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/digests.c	2009-09-29 15:49:39.725650968 +0200
@@ -285,7 +285,11 @@
  * SHA1 Digest transforms
  *
@@ -546,9 +495,9 @@
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
     xmlSecNssDigestSize,			/* xmlSecSize objSize */
--- misc/xmlsec1-1.2.12/src/nss/hmac.c	2009-09-29 15:55:33.409285968 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/hmac.c	2009-09-29 15:49:39.733673690 +0200
-@@ -502,7 +502,11 @@
+--- misc/xmlsec1-1.2.14/src/nss/hmac.c	2009-09-29 15:55:33.409285968 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/hmac.c	2009-09-29 15:49:39.733673690 +0200
+@@ -504,7 +504,11 @@
 /** 
  * HMAC SHA1
  */
@@ -560,7 +509,7 @@
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
     xmlSecNssHmacSize,				/* xmlSecSize objSize */
-@@ -544,7 +548,11 @@
+@@ -546,7 +550,11 @@
 /** 
  * HMAC Ripemd160
  */
@@ -572,7 +521,7 @@
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
     xmlSecNssHmacSize,				/* xmlSecSize objSize */
-@@ -586,7 +594,11 @@
+@@ -588,7 +596,11 @@
 /** 
  * HMAC Md5
  */
@@ -584,9 +533,9 @@
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
     xmlSecNssHmacSize,				/* xmlSecSize objSize */
--- misc/xmlsec1-1.2.12/src/nss/keysstore.c	2009-09-29 15:55:33.422265895 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/keysstore.c	2009-09-29 15:49:39.741628057 +0200
-@@ -489,7 +489,11 @@
+--- misc/xmlsec1-1.2.14/src/nss/keysstore.c	2009-09-29 15:55:33.422265895 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/keysstore.c	2009-09-29 15:49:39.741628057 +0200
+@@ -487,7 +487,11 @@
     return NULL ;
 }
 
@@ -598,8 +547,8 @@
        sizeof( xmlSecKeyStoreKlass ) ,
        xmlSecNssKeysStoreSize ,
        BAD_CAST "implicit_nss_keys_store" ,
--- misc/xmlsec1-1.2.12/src/nss/keywrapers.c	2009-09-29 15:55:33.430875248 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/keywrapers.c	2009-09-29 15:49:39.749963247 +0200
+--- misc/xmlsec1-1.2.14/src/nss/keywrapers.c	2009-09-29 15:55:33.430875248 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/keywrapers.c	2009-09-29 15:49:39.749963247 +0200
@@ -1126,6 +1126,7 @@
     NULL,					/* void* reserved1; */
 };
@@ -632,8 +581,8 @@
 
 #endif /* XMLSEC_NO_DES */
 
--- misc/xmlsec1-1.2.12/src/nss/pkikeys.c	2009-09-29 15:55:33.440002568 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/pkikeys.c	2009-09-29 15:49:39.757984523 +0200
+--- misc/xmlsec1-1.2.14/src/nss/pkikeys.c	2009-09-29 15:55:33.440002568 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/pkikeys.c	2009-09-29 15:49:39.757984523 +0200
@@ -491,7 +491,11 @@
 static void		xmlSecNssKeyDataDsaDebugXmlDump	(xmlSecKeyDataPtr data,
 							 FILE* output);
@@ -658,8 +607,8 @@
     sizeof(xmlSecKeyDataKlass),
     xmlSecNssPKIKeyDataSize,
 
--- misc/xmlsec1-1.2.12/src/nss/signatures.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/signatures.c	2009-09-29 15:49:39.765851110 +0200
+--- misc/xmlsec1-1.2.14/src/nss/signatures.c	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/signatures.c	2009-09-29 15:49:39.765851110 +0200
@@ -459,7 +459,11 @@
  *
  ***************************************************************************/
@@ -684,8 +633,8 @@
     /* klass/object sizes */
     sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
     xmlSecNssSignatureSize,		/* xmlSecSize objSize */
--- misc/xmlsec1-1.2.12/src/nss/symkeys.c	2009-09-29 15:55:33.448817761 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/symkeys.c	2009-09-29 15:49:39.773211741 +0200
+--- misc/xmlsec1-1.2.14/src/nss/symkeys.c	2009-09-29 15:55:33.448817761 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/symkeys.c	2009-09-29 15:49:39.773211741 +0200
@@ -856,7 +856,11 @@
  * <xmlsec:AESKeyValue> processing
  *
@@ -722,8 +671,8 @@
     sizeof(xmlSecKeyDataKlass),
     xmlSecNssSymKeyDataSize,
 
--- misc/xmlsec1-1.2.12/src/nss/x509.c	2009-09-29 15:55:33.465839785 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/x509.c	2009-09-29 15:49:39.784408301 +0200
+--- misc/xmlsec1-1.2.14/src/nss/x509.c	2009-09-29 15:55:33.465839785 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/x509.c	2009-09-29 15:49:39.784408301 +0200
@@ -235,7 +235,11 @@
 
 
@@ -736,7 +685,7 @@
     sizeof(xmlSecKeyDataKlass),
     xmlSecNssX509DataSize,
 
-@@ -1779,7 +1783,11 @@
+@@ -1785,7 +1789,11 @@
 								 xmlSecSize bufSize,
 								 xmlSecKeyInfoCtxPtr keyInfoCtx);
 
@@ -748,8 +697,8 @@
     sizeof(xmlSecKeyDataKlass),
     sizeof(xmlSecKeyData),
 
--- misc/xmlsec1-1.2.12/src/nss/x509vfy.c	2009-09-29 15:55:33.510337681 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/x509vfy.c	2009-09-29 15:49:39.791239957 +0200
+--- misc/xmlsec1-1.2.14/src/nss/x509vfy.c	2009-09-29 15:55:33.510337681 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/x509vfy.c	2009-09-29 15:49:39.791239957 +0200
@@ -64,7 +64,11 @@
 static void		xmlSecNssX509StoreFinalize	(xmlSecKeyDataStorePtr store);
 static int		xmlSecNssIntegerToItem( const xmlChar* integer , SECItem *it ) ;
--- a/libxmlsec/xmlsec1-noverify.patch
+++ b/libxmlsec/xmlsec1-noverify.patch
@@ -1,6 +1,6 @@
--- misc/xmlsec1-1.2.12/src/mscrypto/x509vfy.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/x509vfy.c	2009-09-23 10:01:07.237316078 +0200
-@@ -559,9 +559,16 @@
+--- misc/xmlsec1-1.2.14/src/mscrypto/x509vfy.c	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/mscrypto/x509vfy.c	2009-09-23 10:01:07.237316078 +0200
+@@ -567,9 +567,16 @@
             CertFreeCertificateContext(nextCert);                
         }
 
@@ -20,8 +20,8 @@
     }
 
     return (NULL);
--- misc/xmlsec1-1.2.12/src/nss/x509vfy.c	2009-09-23 10:06:52.989793254 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/x509vfy.c	2009-09-23 10:05:03.183042205 +0200
+--- misc/xmlsec1-1.2.14/src/nss/x509vfy.c	2009-09-23 10:06:52.989793254 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/x509vfy.c	2009-09-23 10:05:03.183042205 +0200
@@ -191,13 +191,27 @@
 	    continue;
 	}
--- a/libxmlsec/xmlsec1-nssdisablecallbacks.patch
+++ b/libxmlsec/xmlsec1-nssdisablecallbacks.patch
@@ -1,5 +1,5 @@
--- misc/xmlsec1-1.2.12.orig/src/nss/crypto.c	2009-09-10 07:06:17.000000000 -0400
-+++ misc/build/xmlsec1-1.2.12/src/nss/crypto.c	2009-09-10 07:08:24.000000000 -0400
+--- misc/xmlsec1-1.2.14.orig/src/nss/crypto.c	2009-09-10 07:06:17.000000000 -0400
+++ misc/build/xmlsec1-1.2.14/src/nss/crypto.c	2009-09-10 07:08:24.000000000 -0400
@@ -136,6 +136,7 @@
     /**
      * High level routines form xmlsec command line utility
--- a/libxmlsec/xmlsec1-nssmangleciphers.patch
+++ b/libxmlsec/xmlsec1-nssmangleciphers.patch
@@ -1,5 +1,5 @@
--- misc/xmlsec1-1.2.12/src/nss/ciphers.c	2009-09-10 05:16:27.000000000 -0400
-+++ misc/build/xmlsec1-1.2.12/src/nss/ciphers.c	2009-09-10 06:59:39.000000000 -0400
+--- misc/xmlsec1-1.2.14/src/nss/ciphers.c	2009-09-10 05:16:27.000000000 -0400
+++ misc/build/xmlsec1-1.2.14/src/nss/ciphers.c	2009-09-10 06:59:39.000000000 -0400
@@ -11,180 +11,421 @@
 
 #include <string.h>
--- a/libxmlsec/xmlsec1-olderlibxml2.patch
+++ b/libxmlsec/xmlsec1-olderlibxml2.patch
@@ -0,0 +1,23 @@
+--- misc/xmlsec1-1.2.14/src/c14n.c	2010-03-02 15:46:05.000000000 +0000
+++ misc/build/xmlsec1-1.2.14/src/c14n.c	2010-03-02 15:50:35.000000000 +0000
+@@ -406,6 +406,20 @@
+     return(0);
+ }
+ 
+#if !defined(LIBXML_VERSION) || LIBXML_VERSION < 20706
+/*
+ * xmlC14NMode:
+ * 
+ * Predefined values for C14N modes
+ *
+ */
+typedef enum {
+    XML_C14N_1_0            = 0,    /* Origianal C14N 1.0 spec */
+    XML_C14N_EXCLUSIVE_1_0  = 1,    /* Exclusive C14N 1.0 spec */
+    XML_C14N_1_1            = 2     /* C14N 1.1 spec */
+} xmlC14NMode;
+#endif
+
+ static int 
+ xmlSecTransformC14NExecute(xmlSecTransformId id, xmlSecNodeSetPtr nodes, xmlChar** nsList, 
+ 			   xmlOutputBufferPtr buf) {
--- a/np_sdk/mozsrc/npunix.c
+++ b/np_sdk/mozsrc/npunix.c
@@ -1,25 +1,41 @@
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
 *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
 *
 * The Original Code is mozilla.org code.
 *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
 *
 * Contributor(s):
- * Stephen Mak <smak@sun.com>
- */
+ *   Stephen Mak <smak@sun.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */

 /*
 * npunix.c
@@ -223,8 +239,6 @@ NPN_ForceRedraw(NPP instance)
    CallNPN_ForceRedrawProc(gNetscapeFuncs.forceredraw, instance);
 }

-
-
 /***********************************************************************
 *
 * Wrapper functions : Netscape Navigator -> plugin
@@ -364,7 +378,7 @@ NP_GetMIMEDescription(void)
 *    that the navigator needs.
 */
 NPError
-NP_GetValue(NPP future, NPPVariable variable, void *value)
+NP_GetValue(void* future, NPPVariable variable, void *value)
 {
    return NPP_GetValue(future, variable, value);
 }