Upgrade libxmlsec to 1.2.15

The primary benefit is that this release supports sha256 out of the box, so we can drop xmlsec1-nss-sha256.patch.1 and xmlsec1-mscrypto-sha256.patch.1. Change-Id: I78606c02591ac8ae7e347b0faa510ae2483e3183 Reviewed-on: https://gerrit.libreoffice.org/23096Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>

Upgrade libxmlsec to 1.2.15
The primary benefit is that this release supports sha256 out of the box, so we can drop xmlsec1-nss-sha256.patch.1 and xmlsec1-mscrypto-sha256.patch.1. Change-Id: I78606c02591ac8ae7e347b0faa510ae2483e3183 Reviewed-on: https://gerrit.libreoffice.org/23096Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
70c8d278 · Miklos Vajna · Caolán McNamara · 069e92f5 · 70c8d278 · 70c8d278
Kaydet (Commit) 70c8d278 authored Mar 09, 2016 tarafından Miklos Vajna Kaydeden (comit) Caolán McNamara Mar 10, 2016
19 changed files
--- a/download.lst
+++ b/download.lst
@@ -91,7 +91,7 @@ export LIBEXTTEXTCAT_TARBALL := 10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3
 export LIBGLTF_MD5SUM := d63a9f47ab048f5009d90693d6aa6424
 export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2
 export LIBLANGTAG_TARBALL := aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2
-export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+export LIBXMLSEC_TARBALL := 43bc8011a33ef9fba862eca4573034c4-xmlsec1-1.2.15.tar.gz
 export LIBXML_TARBALL := daece17e045f1c107610e137ab50c179-libxml2-2.9.3.tar.gz
 export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz

--- a/external/libxmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/libxmlsec/UnpackedTarball_xmlsec.mk
@@ -8,25 +8,22 @@
 #
 xmlsec_patches :=
-xmlsec_patches += xmlsec1-configure.patch
+xmlsec_patches += xmlsec1-configure.patch.1
-xmlsec_patches += xmlsec1-configure-libxml-libxslt.patch
+xmlsec_patches += xmlsec1-configure-libxml-libxslt.patch.1
-xmlsec_patches += xmlsec1-oldlibtool.patch
+xmlsec_patches += xmlsec1-oldlibtool.patch.1
-xmlsec_patches += xmlsec1-nssdisablecallbacks.patch
+xmlsec_patches += xmlsec1-nssdisablecallbacks.patch.1
-xmlsec_patches += xmlsec1-nssmangleciphers.patch
+xmlsec_patches += xmlsec1-nssmangleciphers.patch.1
-xmlsec_patches += xmlsec1-noverify.patch
+xmlsec_patches += xmlsec1-noverify.patch.1
-xmlsec_patches += xmlsec1-mingw-keymgr-mscrypto.patch
+xmlsec_patches += xmlsec1-mingw-keymgr-mscrypto.patch.1
-xmlsec_patches += xmlsec1-vc.patch
+xmlsec_patches += xmlsec1-vc.patch.1
-xmlsec_patches += xmlsec1-1.2.14_fix_extern_c.patch
+xmlsec_patches += xmlsec1-1.2.14_fix_extern_c.patch.1
-xmlsec_patches += xmlsec1-android.patch
+xmlsec_patches += xmlsec1-android.patch.1
 # Partial backport of <https://github.com/lsh123/xmlsec/commit/6a4968bc33f83aaf61efc0a80333350ce9c372f5>.
-xmlsec_patches += xmlsec1-1.2.14-ansi.patch
+xmlsec_patches += xmlsec1-1.2.14-ansi.patch.1
 xmlsec_patches += xmlsec1-customkeymanage.patch.1
 xmlsec_patches += xmlsec1-update-config.guess.patch.1
 # Upstreamed as <https://github.com/lsh123/xmlsec/commit/7069e2b0ab49679008abedd6d223fb95538b0684>.
 xmlsec_patches += xmlsec1-ooxml.patch.1
-# Partial backport of <https://github.com/lsh123/xmlsec/commit/a17e8da3a8f56348d71d325aa8d3e6366f13b512>.
-xmlsec_patches += xmlsec1-nss-sha256.patch.1
-xmlsec_patches += xmlsec1-mscrypto-sha256.patch.1
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec))

--- a/external/libxmlsec/xmlsec1-1.2.14-ansi.patch
+++ b/external/libxmlsec/xmlsec1-1.2.14-ansi.patch
--- misc/xmlsec1-1.2.14/configure.in	2012-08-29 22:44:51.000000000 +0200
+From 7aaf2be1bb36db78450ea7f06dd571d98f57c06f Mon Sep 17 00:00:00 2001
-+++ misc/build/xmlsec1-1.2.14/configure.in	2012-08-29 22:46:23.000000000 +0200
+From: Miklos Vajna <vmiklos@collabora.co.uk>
-@@ -46,10 +46,6 @@
+Date: Fri, 4 Mar 2016 16:15:25 +0100
+Subject: [PATCH 11/14] xmlsec1-1.2.14-ansi.patch
+---
+ configure.in | 4 ----
+ 1 file changed, 4 deletions(-)
+diff --git a/configure.in b/configure.in
+index cbf6e4a..403ec63 100644
+--- a/configure.in
+++ b/configure.in
+@@ -46,10 +46,6 @@ AC_PATH_PROG(TAR, tar, /bin/tar)
 AC_PATH_PROG(HELP2MAN, help2man)
 AC_PATH_PROG(MAN2HTML, man2html)
@@ -11,3 +22,6 @@
 dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
+-- 
+2.6.2
--- a/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch
+++ b/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch
--- build/xmlsec1-1.2.14/include/xmlsec/xmlsec.h.ORIGINAL	2009-12-05 15:19:18.000000000 -0600
+From 4acfcb9acf87b4e6e6ee4d68875255b198b0fa0c Mon Sep 17 00:00:00 2001
-+++ build/xmlsec1-1.2.14/include/xmlsec/xmlsec.h	2011-02-13 03:09:42.917240245 -0600
+From: Miklos Vajna <vmiklos@collabora.co.uk>
+Date: Fri, 4 Mar 2016 16:12:48 +0100
+Subject: [PATCH 09/14] xmlsec1-1.2.14_fix_extern_c.patch
+Conflicts:
+	include/xmlsec/xmlsec.h
+---
+ include/xmlsec/xmlsec.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+diff --git a/include/xmlsec/xmlsec.h b/include/xmlsec/xmlsec.h
+index 9ab4cea..a6c09f2 100644
+--- a/include/xmlsec/xmlsec.h
+++ b/include/xmlsec/xmlsec.h
 @@ -11,16 +11,16 @@
 #ifndef __XMLSEC_H__
- #define __XMLSEC_H__    
+ #define __XMLSEC_H__
 -#ifdef __cplusplus
 -extern "C" {
-#endif /* __cplusplus */ 
+-#endif /* __cplusplus */
 -
 #include <libxml/tree.h>
@@ -16,8 +29,11 @@
 +#ifdef __cplusplus
 +extern "C" {
-+#endif /* __cplusplus */ 
+#endif /* __cplusplus */
 +
 /***********************************************************************
  *
  * Basic types to make ports to exotic platforms easier
+-- 
+2.6.2
--- a/external/libxmlsec/xmlsec1-android.patch
+++ b/external/libxmlsec/xmlsec1-android.patch
--- build/xmlsec1-1.2.14/config.sub
+From f78fe748f06042492147e4ca57621acd3da2c605 Mon Sep 17 00:00:00 2001
-+++ build/xmlsec1-1.2.14/config.sub
+From: Miklos Vajna <vmiklos@collabora.co.uk>
-@@ -120,7 +120,7 @@
+Date: Fri, 4 Mar 2016 16:13:10 +0100
+Subject: [PATCH 10/14] xmlsec1-android.patch
+---
+ config.sub | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/config.sub b/config.sub
+index a39437d..45bad78 100755
+--- a/config.sub
+++ b/config.sub
+@@ -120,7 +120,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
@@ -9,7 +20,7 @@
   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
-@@ -1275,7 +1275,7 @@
+@@ -1275,7 +1275,7 @@ case $os in
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
@@ -18,3 +29,6 @@
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+-- 
+2.6.2
--- a/external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch
+++ b/external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch
--- misc/xmlsec1-1.2.14/configure.in	Wed Jun 30 11:55:37 2010
+From 9d5883f326e74e846fa9ce987d45516454d6ba0e Mon Sep 17 00:00:00 2001
-+++ misc/build/xmlsec1-1.2.14/configure.in	Wed Jun 30 11:53:55 2010
+From: Miklos Vajna <vmiklos@collabora.co.uk>
-@@ -231,7 +231,7 @@
+Date: Fri, 4 Mar 2016 16:06:58 +0100
+Subject: [PATCH 02/14] xmlsec1-configure-libxml-libxslt.patch
+---
+ configure.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/configure.in b/configure.in
+index 14cb432..cbf6e4a 100644
+--- a/configure.in
+++ b/configure.in
+@@ -220,7 +220,7 @@ fi
 if test "z$LIBXML_FOUND" = "zno" ; then
     if test "z$with_libxml" != "zyes" ; then
 	AC_PATH_PROG([LIBXML_CONFIG], [$LIBXML_CONFIG], [],
@@ -9,7 +20,7 @@
     fi
     AC_MSG_CHECKING([libxml2 $LIBXML_CONFIG ])
     if ! LIBXML_VERSION=`$LIBXML_CONFIG --version 2>/dev/null`; then
-@@ -296,7 +296,7 @@
+@@ -287,7 +287,7 @@ fi
 if test "z$LIBXSLT_FOUND" = "zno" ; then
     if test "z$with_libxslt" != "zyes" ; then
 	AC_PATH_PROG([LIBXSLT_CONFIG], [$LIBXSLT_CONFIG], [],
@@ -18,3 +29,6 @@
     fi
     AC_MSG_CHECKING(for libxslt libraries >= $LIBXSLT_MIN_VERSION) 
     if ! LIBXSLT_VERSION=`$LIBXSLT_CONFIG --version 2>/dev/null`; then
+-- 
+2.6.2
--- a/external/libxmlsec/xmlsec1-configure.patch
+++ b/external/libxmlsec/xmlsec1-configure.patch
--- misc/xmlsec1-1.2.14/Makefile.am
+From e48dde538ebdf7e76b824d65bb600fc7d1e60e17 Mon Sep 17 00:00:00 2001
-+++ misc/build/xmlsec1-1.2.14/Makefile.am
+From: Miklos Vajna <vmiklos@collabora.co.uk>
+Date: Fri, 4 Mar 2016 16:06:19 +0100
+Subject: [PATCH 01/14] xmlsec1-configure.patch
+Conflicts:
+	configure.in
+---
+ Makefile.am         |  5 +++--
+ Makefile.in         |  5 +++--
+ configure.in        | 52 ++++++++++++++++++++++++++++++++++++++++------------
+ win32/Makefile.msvc |  2 +-
+ 4 files changed, 47 insertions(+), 17 deletions(-)
+diff --git a/Makefile.am b/Makefile.am
+index 3fce548..a3befe8 100644
+--- a/Makefile.am
+++ b/Makefile.am
 @@ -1,8 +1,9 @@
 NULL =
@@ -12,9 +28,11 @@
 DEFAULT_CRYPTO	= @XMLSEC_CRYPTO@
 bin_SCRIPTS 	= xmlsec1-config
--- misc/xmlsec1-1.2.14/Makefile.in	2009-06-25 22:53:34.000000000 +0200
+diff --git a/Makefile.in b/Makefile.in
-+++ misc/build/xmlsec1-1.2.14/Makefile.in	2009-10-01 10:32:48.708515261 +0200
+index 9e5401b..47c3cf4 100644
-@@ -341,8 +341,9 @@
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -341,8 +341,9 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 NULL = 
 SAFE_VERSION = @XMLSEC_VERSION_SAFE@
@@ -26,9 +44,11 @@
 DEFAULT_CRYPTO = @XMLSEC_CRYPTO@
 bin_SCRIPTS = xmlsec1-config
 pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@
--- misc/xmlsec1-1.2.14/configure.in	2009-06-25 22:53:18.000000000 +0200
+diff --git a/configure.in b/configure.in
-+++ misc/build/xmlsec1-1.2.14/configure.in	2009-10-01 10:28:50.990755126 +0200
+index bd5837d..14cb432 100644
-@@ -192,8 +192,8 @@
+--- a/configure.in
+++ b/configure.in
+@@ -183,8 +183,8 @@ dnl find libxml
 dnl ==========================================================================
 LIBXML_MIN_VERSION="2.7.4"
 LIBXML_CONFIG="xml2-config"
@@ -39,7 +59,7 @@
 LIBXML_FOUND="no"
 AC_ARG_WITH(libxml, 
     [  --with-libxml=[PFX]       libxml2 location]
-@@ -202,6 +202,8 @@
+@@ -193,6 +193,8 @@ AC_ARG_WITH(libxml-src,
     [  --with-libxml-src=[PFX]   not installed yet libxml2 location]
 )
@@ -48,7 +68,7 @@
 if test "z$with_libxml" = "zno" -o "z$with_libxml_src" = "zno"; then 
     AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_MIN_VERSION) 
     AC_MSG_ERROR(libxml2 >= $LIBXML_MIN_VERSION is required for $XMLSEC_PACKAGE)
-@@ -245,6 +247,8 @@
+@@ -236,6 +238,8 @@ if test "z$LIBXML_FOUND" = "zno" ; then
     fi
 fi
@@ -57,15 +77,15 @@
 AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
 AC_SUBST(LIBXML_CONFIG)
-@@ -555,12 +559,26 @@
+@@ -546,12 +550,26 @@ dnl ==========================================================================
 XMLSEC_NO_NSS="1"
 MOZILLA_MIN_VERSION="1.4"
 +if test "z$MOZ_FLAVOUR" = "zfirefox" ; then
 +    MOZILLA_MIN_VERSION="1.0"
 +fi
- NSS_MIN_VERSION="3.2"
+ NSS_MIN_VERSION="3.9"
- NSPR_MIN_VERSION="4.0"
+ NSPR_MIN_VERSION="4.4.1"
 NSS_CFLAGS=""
 NSS_LIBS=""
 -NSS_LIBS_LIST="-lnss3 -lsmime3"
@@ -86,7 +106,7 @@
 NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
 NSS_FOUND="no"
 NSPR_PACKAGE=mozilla-nspr
-@@ -586,6 +604,16 @@
+@@ -577,6 +595,16 @@ elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z
     dnl We are going to try all options
     dnl
     if test "z$NSS_FOUND" = "zno" ; then
@@ -103,7 +123,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])
-@@ -612,8 +640,8 @@
+@@ -603,8 +631,8 @@ if test "z$NSS_FOUND" = "zno" ; then
         ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
     fi
@@ -114,7 +134,7 @@
     AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION)
     NSPR_INCLUDES_FOUND="no"
-@@ -634,21 +662,21 @@
+@@ -625,21 +653,21 @@ if test "z$NSS_FOUND" = "zno" ; then
 	NSPR_PRINIT_H="$with_nspr/include/prinit.h"
     else
 	for dir in $ac_nss_inc_dir ; do
@@ -140,7 +160,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"
-@@ -719,7 +747,7 @@
+@@ -710,7 +738,7 @@ if test "z$NSS_FOUND" = "zno" ; then
         done
         for dir in $ac_nss_lib_dir ; do
@@ -149,7 +169,7 @@
         	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"
-@@ -738,7 +766,7 @@
+@@ -729,7 +757,7 @@ if test "z$NSS_FOUND" = "zno" ; then
     if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then
        OLD_CPPFLAGS=$CPPFLAGS
@@ -158,9 +178,11 @@
        AC_EGREP_CPP(yes,[
           #include <nss.h>
           #if NSS_VMAJOR >= 3 && NSS_VMINOR >= 2
--- misc/xmlsec1-1.2.14/win32/Makefile.msvc	2009-06-25 22:53:18.000000000 +0200
+diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
-+++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc	2009-10-01 10:28:50.997747312 +0200
+index 2577a1e..cfa0a46 100644
-@@ -376,7 +376,7 @@
+--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
+@@ -388,7 +388,7 @@ APP_LIBS  		= $(SOLIBS) $(XMLSEC_CRYPTO_SOLIBS)
 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
@@ -169,3 +191,6 @@
 XMLSEC_NSS_ALIBS    	= smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
 XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
+-- 
+2.6.2
--- a/external/libxmlsec/xmlsec1-customkeymanage.patch.1
+++ b/external/libxmlsec/xmlsec1-customkeymanage.patch.1
--- a/external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch
+++ b/external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch
--- misc/xmlsec1-1.2.14/src/mscrypto/Makefile.am	2009-06-26 05:53:18.000000000 +0900
+From 26f650d3eb4b0c633d1dc44c7180aff836ee13b5 Mon Sep 17 00:00:00 2001
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/Makefile.am	2009-09-30 18:53:05.373000000 +0900
+From: Miklos Vajna <vmiklos@collabora.co.uk>
-@@ -35,6 +35,7 @@
+Date: Fri, 4 Mar 2016 16:11:52 +0100
+Subject: [PATCH 07/14] xmlsec1-mingw-keymgr-mscrypto.patch
+Conflicts:
+	src/mscrypto/Makefile.in
+---
+ src/mscrypto/Makefile.am |  1 +
+ src/mscrypto/Makefile.in | 15 +++++++++++++--
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+diff --git a/src/mscrypto/Makefile.am b/src/mscrypto/Makefile.am
+index 1099e3f..ccb9715 100644
+--- a/src/mscrypto/Makefile.am
+++ b/src/mscrypto/Makefile.am
+@@ -37,6 +37,7 @@ libxmlsec1_mscrypto_la_SOURCES =\
+ 	csp_calg.h \
 	csp_oid.h \
- 	globals.h \
 	xmlsec-mingw.h \
 +	akmngr.c \
 	$(NULL)
 if SHAREDLIB_HACK
--- misc/xmlsec1-1.2.14/src/mscrypto/Makefile.in	2009-06-26 05:53:32.000000000 +0900
+diff --git a/src/mscrypto/Makefile.in b/src/mscrypto/Makefile.in
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/Makefile.in	2009-09-30 19:00:50.107375000 +0900
+index e3d1607..4336fe0 100644
-@@ -72,7 +72,8 @@
+--- a/src/mscrypto/Makefile.in
- am__libxmlsec1_mscrypto_la_SOURCES_DIST = app.c certkeys.c ciphers.c \
+++ b/src/mscrypto/Makefile.in
- 	crypto.c digests.c keysstore.c kt_rsa.c signatures.c symkeys.c \
+@@ -72,7 +72,8 @@ am__DEPENDENCIES_1 =
- 	x509.c x509vfy.c csp_calg.h csp_oid.h globals.h xmlsec-mingw.h \
+ am__libxmlsec1_mscrypto_la_SOURCES_DIST = globals.h private.h app.c \
-	../strings.c
+ 	certkeys.c ciphers.c crypto.c digests.c hmac.c keysstore.c \
-+	../strings.c \
+ 	kt_rsa.c signatures.c symkeys.c x509.c x509vfy.c csp_calg.h \
+-	csp_oid.h xmlsec-mingw.h ../strings.c
+	csp_oid.h xmlsec-mingw.h ../strings.c \
 +	akmngr.c
 am__objects_1 =
 @SHAREDLIB_HACK_TRUE@am__objects_2 =  \
 @SHAREDLIB_HACK_TRUE@	libxmlsec1_mscrypto_la-strings.lo
-@@ -86,7 +87,8 @@
+@@ -87,7 +88,8 @@ am_libxmlsec1_mscrypto_la_OBJECTS = libxmlsec1_mscrypto_la-app.lo \
 	libxmlsec1_mscrypto_la-signatures.lo \
 	libxmlsec1_mscrypto_la-symkeys.lo \
 	libxmlsec1_mscrypto_la-x509.lo \
@@ -30,15 +46,15 @@
 	$(am__objects_2)
 libxmlsec1_mscrypto_la_OBJECTS = $(am_libxmlsec1_mscrypto_la_OBJECTS)
 libxmlsec1_mscrypto_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-@@ -338,6 +340,7 @@
+@@ -339,6 +341,7 @@ libxmlsec1_mscrypto_la_CPPFLAGS = \
- libxmlsec1_mscrypto_la_SOURCES = app.c certkeys.c ciphers.c crypto.c \
+ libxmlsec1_mscrypto_la_SOURCES = globals.h private.h app.c certkeys.c \
- 	digests.c keysstore.c kt_rsa.c signatures.c symkeys.c x509.c \
+ 	ciphers.c crypto.c digests.c hmac.c keysstore.c kt_rsa.c \
- 	x509vfy.c csp_calg.h csp_oid.h globals.h xmlsec-mingw.h \
+ 	signatures.c symkeys.c x509.c x509vfy.c csp_calg.h csp_oid.h \
 +	akmngr.c \
- 	$(NULL) $(am__append_1)
+ 	xmlsec-mingw.h $(NULL) $(am__append_1)
 libxmlsec1_mscrypto_la_LIBADD = \
 	../libxmlsec1.la \
-@@ -441,6 +444,7 @@
+@@ -443,6 +446,7 @@ distclean-compile:
 @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@
@@ -46,17 +62,20 @@
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -470,6 +474,13 @@
+@@ -472,6 +476,13 @@ libxmlsec1_mscrypto_la-app.lo: app.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @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; \
+@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-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
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_mscrypto_la-akmngr.Tpo" "$(DEPDIR)/libxmlsec1_mscrypto_la-akmngr.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_mscrypto_la-akmngr.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxmlsec1_mscrypto_la-akmngr.Tpo $(DEPDIR)/libxmlsec1_mscrypto_la-akmngr.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='akmngr.c' object='libxmlsec1_mscrypto_la-akmngr.lo' libtool=yes @AMDEPBACKSLASH@
 +@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-akmngr.lo `test -f 'akmngr.c' || echo '$(srcdir)/'`akmngr.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-akmngr.lo `test -f 'akmngr.c' || echo '$(srcdir)/'`akmngr.c
 +
 libxmlsec1_mscrypto_la-certkeys.lo: certkeys.c
 @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
+-- 
+2.6.2
--- a/external/libxmlsec/xmlsec1-mscrypto-sha256.patch.1
+++ b/external/libxmlsec/xmlsec1-mscrypto-sha256.patch.1
--- a/external/libxmlsec/xmlsec1-noverify.patch
+++ b/external/libxmlsec/xmlsec1-noverify.patch
--- misc/xmlsec1-1.2.14/src/mscrypto/x509vfy.c	2009-06-25 22:53:18.000000000 +0200
+From 9a28fa3b996be34b72548456c9877a9e0e0460ab Mon Sep 17 00:00:00 2001
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/x509vfy.c	2009-09-23 10:01:07.237316078 +0200
+From: Miklos Vajna <vmiklos@collabora.co.uk>
-@@ -567,9 +567,16 @@
+Date: Fri, 4 Mar 2016 16:10:16 +0100
-             CertFreeCertificateContext(nextCert);                
+Subject: [PATCH 06/14] xmlsec1-noverify.patch
+Conflicts:
+	src/nss/x509vfy.c
+---
+ src/mscrypto/x509vfy.c | 13 ++++++++++---
+ src/nss/x509vfy.c      | 28 +++++++++++++++++++++-------
+ 2 files changed, 31 insertions(+), 10 deletions(-)
+diff --git a/src/mscrypto/x509vfy.c b/src/mscrypto/x509vfy.c
+index ab6fe0f..5a91bdf 100644
+--- a/src/mscrypto/x509vfy.c
+++ b/src/mscrypto/x509vfy.c
+@@ -564,9 +564,16 @@ xmlSecMSCryptoX509StoreVerify(xmlSecKeyDataStorePtr store, HCERTSTORE certs,
+             CertFreeCertificateContext(nextCert);
         }
 -        if((selected == 1) && xmlSecMSCryptoX509StoreConstructCertsChain(store, cert, certs, keyInfoCtx)) {
@@ -20,21 +34,23 @@
     }
     return (NULL);
--- misc/xmlsec1-1.2.14/src/nss/x509vfy.c	2009-09-23 10:06:52.989793254 +0200
+diff --git a/src/nss/x509vfy.c b/src/nss/x509vfy.c
-+++ misc/build/xmlsec1-1.2.14/src/nss/x509vfy.c	2009-09-23 10:05:03.183042205 +0200
+index fdb866f..8a6e97a 100644
-@@ -191,13 +191,27 @@
+--- a/src/nss/x509vfy.c
- 	    continue;
+++ b/src/nss/x509vfy.c
- 	}
+@@ -211,13 +211,27 @@ xmlSecNssX509StoreVerify(xmlSecKeyDataStorePtr store, CERTCertList* certs,
+             continue;
+         }
-	status = CERT_VerifyCertificate(CERT_GetDefaultCertDB(), 
+-        status = CERT_VerifyCertificate(CERT_GetDefaultCertDB(),
-					cert, PR_FALSE, 
+-                                        cert, PR_FALSE,
-					(SECCertificateUsage)0,
+-                                        (SECCertificateUsage)0,
-                			timeboundary , NULL, NULL, NULL);
+-                                        timeboundary , NULL, NULL, NULL);
-	if (status == SECSuccess) {
+-        if (status == SECSuccess) {
-	    break;
+-            break;
-	}
+-        }
 +
-+	/*
+       /*
 +      JL: OpenOffice.org implements its own certificate verification routine. 
 +      The goal is to separate validation of the signature
 +      and the certificate. For example, OOo could show that the document signature is valid,
@@ -49,11 +65,14 @@
 +      if (status == SECSuccess) {
 +         break;
 +      }
-+	 
+        
 +    */
-+	status = SECSuccess;
+       status = SECSuccess;
-+	break;
+       break;
 +
     }
     if (status == SECSuccess) {
+-- 
+2.6.2
--- a/external/libxmlsec/xmlsec1-nss-sha256.patch.1
+++ b/external/libxmlsec/xmlsec1-nss-sha256.patch.1
-From 04101dc871b13cba28d520fd00caf2d96b2e4c72 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos@collabora.co.uk>
-Date: Mon, 25 Jan 2016 11:24:01 +0100
-Subject: [PATCH] NSS glue layer: add SHA-256 support
---
- include/xmlsec/nss/crypto.h | 25 ++++++++++++++++++++
- src/nss/crypto.c            |  4 ++++
- src/nss/digests.c           | 57 +++++++++++++++++++++++++++++++++++++++++++++
- src/nss/signatures.c        | 51 ++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 137 insertions(+)
-diff --git a/include/xmlsec/nss/crypto.h b/include/xmlsec/nss/crypto.h
-index 42ba6ca..707f8d9 100644
--- a/include/xmlsec/nss/crypto.h
-+++ b/include/xmlsec/nss/crypto.h
-@@ -263,6 +263,15 @@ XMLSEC_CRYPTO_EXPORT xmlSecKeyDataId 	xmlSecNssKeyDataRsaGetKlass	(void);
- XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecNssTransformRsaSha1GetKlass(void);
- /**
-+ * xmlSecNssTransformRsaSha256Id:
-+ *
-+ * The RSA-SHA256 signature transform klass.
-+ */
-+#define xmlSecNssTransformRsaSha256Id	\
-+	xmlSecNssTransformRsaSha256GetKlass()
-+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecNssTransformRsaSha256GetKlass(void);
-+
-+/**
-  * xmlSecNssTransformRsaPkcs1Id:
-  * 
-  * The RSA PKCS1 key transport transform klass.
-@@ -304,6 +313,22 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecNssTransformRsaOaepGetKlass(void);
- XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecNssTransformSha1GetKlass	(void);
- #endif /* XMLSEC_NO_SHA1 */
-+/********************************************************************
-+ *
-+ * SHA256 transform
-+ *
-+ *******************************************************************/
-+#ifndef XMLSEC_NO_SHA256
-+/**
-+ * xmlSecNssTransformSha256Id:
-+ *
-+ * The SHA256 digest transform klass.
-+ */
-+#define xmlSecNssTransformSha256Id \
-+	xmlSecNssTransformSha256GetKlass()
-+XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecNssTransformSha256GetKlass	(void);
-+#endif /* XMLSEC_NO_SHA256 */
-+
- #ifdef __cplusplus
- }
- #endif /* __cplusplus */
-diff --git a/src/nss/crypto.c b/src/nss/crypto.c
-index 0495165..33f17cc 100644
--- a/src/nss/crypto.c
-+++ b/src/nss/crypto.c
-@@ -120,6 +120,7 @@ xmlSecCryptoGetFunctions_nss(void) {
- #ifndef XMLSEC_NO_RSA
-     gXmlSecNssFunctions->transformRsaSha1GetKlass 	= xmlSecNssTransformRsaSha1GetKlass;
-+    gXmlSecNssFunctions->transformRsaSha256GetKlass 	= xmlSecNssTransformRsaSha256GetKlass;
-     gXmlSecNssFunctions->transformRsaPkcs1GetKlass 	= xmlSecNssTransformRsaPkcs1GetKlass;
- /* RSA OAEP is not supported by NSS yet */
-@@ -132,6 +133,9 @@ xmlSecCryptoGetFunctions_nss(void) {
- #ifndef XMLSEC_NO_SHA1    
-     gXmlSecNssFunctions->transformSha1GetKlass 		= xmlSecNssTransformSha1GetKlass;
- #endif /* XMLSEC_NO_SHA1 */
-+#ifndef XMLSEC_NO_SHA256
-+    gXmlSecNssFunctions->transformSha256GetKlass = xmlSecNssTransformSha256GetKlass;
-+#endif /* XMLSEC_NO_SHA256 */
-     /**
-      * High level routines form xmlsec command line utility
-diff --git a/src/nss/digests.c b/src/nss/digests.c
-index 5a1db91..0c4657c 100644
--- a/src/nss/digests.c
-+++ b/src/nss/digests.c
-@@ -70,6 +70,11 @@ xmlSecNssDigestCheckId(xmlSecTransformPtr transform) {
- 	return(1);
-     }
- #endif /* XMLSEC_NO_SHA1 */    
-+#ifndef XMLSEC_NO_SHA256
-+    if(xmlSecTransformCheckId(transform, xmlSecNssTransformSha256Id)) {
-+	return(1);
-+    }
-+#endif /* XMLSEC_NO_SHA256 */
-     return(0);
- }
-@@ -92,6 +97,11 @@ xmlSecNssDigestInitialize(xmlSecTransformPtr transform) {
- 	ctx->digest = SECOID_FindOIDByTag(SEC_OID_SHA1);
-     } else
- #endif /* XMLSEC_NO_SHA1 */    	
-+#ifndef XMLSEC_NO_SHA256
-+    if(xmlSecTransformCheckId(transform, xmlSecNssTransformSha256Id)) {
-+	ctx->digest = SECOID_FindOIDByTag(SEC_OID_SHA256);
-+    } else
-+#endif /* XMLSEC_NO_SHA256 */
-     if(1) {
- 	xmlSecError(XMLSEC_ERRORS_HERE, 
-@@ -327,5 +337,52 @@ xmlSecNssTransformSha1GetKlass(void) {
- }
- #endif /* XMLSEC_NO_SHA1 */
-+#ifndef XMLSEC_NO_SHA256
-+/******************************************************************************
-+ *
-+ * SHA256 Digest transforms
-+ *
-+ *****************************************************************************/
-+static xmlSecTransformKlass xmlSecNssSha256Klass = {
-+    /* klass/object sizes */
-+    sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-+    xmlSecNssDigestSize,			/* xmlSecSize objSize */
-+
-+    /* data */
-+    xmlSecNameSha256,				/* const xmlChar* name; */
-+    xmlSecHrefSha256, 				/* const xmlChar* href; */
-+    xmlSecTransformUsageDigestMethod,		/* xmlSecTransformUsage usage; */
-+
-+    /* methods */
-+    xmlSecNssDigestInitialize,			/* xmlSecTransformInitializeMethod initialize; */
-+    xmlSecNssDigestFinalize,			/* xmlSecTransformFinalizeMethod finalize; */
-+    NULL,					/* xmlSecTransformNodeReadMethod readNode; */
-+    NULL,					/* xmlSecTransformNodeWriteMethod writeNode; */
-+    NULL,					/* xmlSecTransformSetKeyReqMethod setKeyReq; */
-+    NULL,					/* xmlSecTransformSetKeyMethod setKey; */
-+    xmlSecNssDigestVerify,			/* xmlSecTransformVerifyMethod verify; */
-+    xmlSecTransformDefaultGetDataType,		/* xmlSecTransformGetDataTypeMethod getDataType; */
-+    xmlSecTransformDefaultPushBin,		/* xmlSecTransformPushBinMethod pushBin; */
-+    xmlSecTransformDefaultPopBin,		/* xmlSecTransformPopBinMethod popBin; */
-+    NULL,					/* xmlSecTransformPushXmlMethod pushXml; */
-+    NULL,					/* xmlSecTransformPopXmlMethod popXml; */
-+    xmlSecNssDigestExecute,			/* xmlSecTransformExecuteMethod execute; */
-+
-+    NULL,					/* void* reserved0; */
-+    NULL,					/* void* reserved1; */
-+};
-+
-+/**
-+ * xmlSecNssTransformSha256GetKlass:
-+ *
-+ * SHA-256 digest transform klass.
-+ *
-+ * Returns: pointer to SHA-256 digest transform klass.
-+ */
-+xmlSecTransformId
-+xmlSecNssTransformSha256GetKlass(void) {
-+    return(&xmlSecNssSha256Klass);
-+}
-+#endif /* XMLSEC_NO_SHA256 */
-diff --git a/src/nss/signatures.c b/src/nss/signatures.c
-index 3c9639c..fb58403 100644
--- a/src/nss/signatures.c
-+++ b/src/nss/signatures.c
-@@ -87,6 +87,9 @@ xmlSecNssSignatureCheckId(xmlSecTransformPtr transform) {
-     if(xmlSecTransformCheckId(transform, xmlSecNssTransformRsaSha1Id)) {
- 	return(1);
-     }
-+    if(xmlSecTransformCheckId(transform, xmlSecNssTransformRsaSha256Id)) {
-+	return(1);
-+    }
- #endif /* XMLSEC_NO_RSA */
-     return(0);
-@@ -123,6 +126,10 @@ xmlSecNssSignatureInitialize(xmlSecTransformPtr transform) {
- 	ctx->keyId	= xmlSecNssKeyDataRsaId;
- 	ctx->alg	= SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION;
-     } else 
-+    if(xmlSecTransformCheckId(transform, xmlSecNssTransformRsaSha256Id)) {
-+	ctx->keyId	= xmlSecNssKeyDataRsaId;
-+	ctx->alg	= SEC_OID_PKCS1_SHA256_WITH_RSA_ENCRYPTION;
-+    } else
- #endif /* XMLSEC_NO_RSA */
-         if(1) {
- 	    xmlSecError(XMLSEC_ERRORS_HERE, 
-@@ -545,6 +552,50 @@ xmlSecNssTransformRsaSha1GetKlass(void) {
-     return(&xmlSecNssRsaSha1Klass);
- }
-+/****************************************************************************
-+ *
-+ * RSA-SHA256 signature transform
-+ *
-+ ***************************************************************************/
-+static xmlSecTransformKlass xmlSecNssRsaSha256Klass = {
-+    /* klass/object sizes */
-+    sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-+    xmlSecNssSignatureSize,		/* xmlSecSize objSize */
-+
-+    xmlSecNameRsaSha256,				/* const xmlChar* name; */
-+    xmlSecHrefRsaSha256, 				/* const xmlChar* href; */
-+    xmlSecTransformUsageSignatureMethod,	/* xmlSecTransformUsage usage; */
-+
-+    xmlSecNssSignatureInitialize,	/* xmlSecTransformInitializeMethod initialize; */
-+    xmlSecNssSignatureFinalize,		/* xmlSecTransformFinalizeMethod finalize; */
-+    NULL,					/* xmlSecTransformNodeReadMethod readNode; */
-+    NULL,					/* xmlSecTransformNodeWriteMethod writeNode; */
-+    xmlSecNssSignatureSetKeyReq,		/* xmlSecTransformSetKeyReqMethod setKeyReq; */
-+    xmlSecNssSignatureSetKey,		/* xmlSecTransformSetKeyMethod setKey; */
-+    xmlSecNssSignatureVerify,		/* xmlSecTransformVerifyMethod verify; */
-+    xmlSecTransformDefaultGetDataType,		/* xmlSecTransformGetDataTypeMethod getDataType; */
-+    xmlSecTransformDefaultPushBin,		/* xmlSecTransformPushBinMethod pushBin; */
-+    xmlSecTransformDefaultPopBin,		/* xmlSecTransformPopBinMethod popBin; */
-+    NULL,					/* xmlSecTransformPushXmlMethod pushXml; */
-+    NULL,					/* xmlSecTransformPopXmlMethod popXml; */
-+    xmlSecNssSignatureExecute,		/* xmlSecTransformExecuteMethod execute; */
-+
-+    NULL,					/* void* reserved0; */
-+    NULL,					/* void* reserved1; */
-+};
-+
-+/**
-+ * xmlSecNssTransformRsaSha256GetKlass:
-+ *
-+ * The RSA-SHA256 signature transform klass.
-+ *
-+ * Returns: RSA-SHA256 signature transform klass.
-+ */
-+xmlSecTransformId
-+xmlSecNssTransformRsaSha256GetKlass(void) {
-+    return(&xmlSecNssRsaSha256Klass);
-+}
-+
- #endif /* XMLSEC_NO_DSA */
-- 
-2.6.2
--- a/external/libxmlsec/xmlsec1-nssdisablecallbacks.patch
+++ b/external/libxmlsec/xmlsec1-nssdisablecallbacks.patch
--- 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
-      */ 
-+#if 0
-     gXmlSecNssFunctions->cryptoAppInit 			= xmlSecNssAppInit;
-     gXmlSecNssFunctions->cryptoAppShutdown 		= xmlSecNssAppShutdown;
-     gXmlSecNssFunctions->cryptoAppDefaultKeysMngrInit 	= xmlSecNssAppDefaultKeysMngrInit;
-@@ -153,6 +154,25 @@
-     gXmlSecNssFunctions->cryptoAppKeyLoad 		= xmlSecNssAppKeyLoad; 
-     gXmlSecNssFunctions->cryptoAppKeyLoadMemory		= xmlSecNssAppKeyLoadMemory; 
-     gXmlSecNssFunctions->cryptoAppDefaultPwdCallback	= (void*)xmlSecNssAppGetDefaultPwdCallback();
-+#else
-+    gXmlSecNssFunctions->cryptoAppInit                         = NULL ;
-+    gXmlSecNssFunctions->cryptoAppShutdown             = NULL ;
-+    gXmlSecNssFunctions->cryptoAppDefaultKeysMngrInit  = NULL ;
-+    gXmlSecNssFunctions->cryptoAppDefaultKeysMngrAdoptKey      = NULL ;
-+    gXmlSecNssFunctions->cryptoAppDefaultKeysMngrLoad  = NULL ;
-+    gXmlSecNssFunctions->cryptoAppDefaultKeysMngrSave  = NULL ;
-+#ifndef XMLSEC_NO_X509
-+    gXmlSecNssFunctions->cryptoAppKeysMngrCertLoad     = NULL ;
-+    gXmlSecNssFunctions->cryptoAppKeysMngrCertLoadMemory= NULL ;
-+    gXmlSecNssFunctions->cryptoAppPkcs12Load           = NULL ; 
-+    gXmlSecNssFunctions->cryptoAppPkcs12LoadMemory     = NULL ; 
-+    gXmlSecNssFunctions->cryptoAppKeyCertLoad          = NULL ;
-+    gXmlSecNssFunctions->cryptoAppKeyCertLoadMemory    = NULL ;
-+#endif /* XMLSEC_NO_X509 */
-+    gXmlSecNssFunctions->cryptoAppKeyLoad              = NULL ; 
-+    gXmlSecNssFunctions->cryptoAppKeyLoadMemory                = NULL ; 
-+    gXmlSecNssFunctions->cryptoAppDefaultPwdCallback   = (void*)NULL ;
-+#endif
-     return(gXmlSecNssFunctions);
- }
--- a/external/libxmlsec/xmlsec1-nssdisablecallbacks.patch.1
+++ b/external/libxmlsec/xmlsec1-nssdisablecallbacks.patch.1
+From 8b86c6ee388008ab5ab9afd8807e869db0e420e4 Mon Sep 17 00:00:00 2001
+From: Miklos Vajna <vmiklos@collabora.co.uk>
+Date: Fri, 4 Mar 2016 16:09:10 +0100
+Subject: [PATCH 04/14] xmlsec1-nssdisablecallbacks.patch
+Conflicts:
+	src/nss/crypto.c
+---
+ src/nss/crypto.c | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+diff --git a/src/nss/crypto.c b/src/nss/crypto.c
+index 7137f1c..7a59575 100644
+--- a/src/nss/crypto.c
+++ b/src/nss/crypto.c
+@@ -214,6 +214,7 @@ xmlSecCryptoGetFunctions_nss(void) {
+      * High level routines form xmlsec command line utility
+      *
+      ********************************************************************/
+#if 0
+     gXmlSecNssFunctions->cryptoAppInit                  = xmlSecNssAppInit;
+     gXmlSecNssFunctions->cryptoAppShutdown              = xmlSecNssAppShutdown;
+     gXmlSecNssFunctions->cryptoAppDefaultKeysMngrInit   = xmlSecNssAppDefaultKeysMngrInit;
+@@ -231,6 +232,25 @@ xmlSecCryptoGetFunctions_nss(void) {
+     gXmlSecNssFunctions->cryptoAppKeyLoad               = xmlSecNssAppKeyLoad;
+     gXmlSecNssFunctions->cryptoAppKeyLoadMemory         = xmlSecNssAppKeyLoadMemory;
+     gXmlSecNssFunctions->cryptoAppDefaultPwdCallback    = (void*)xmlSecNssAppGetDefaultPwdCallback();
+#else
+    gXmlSecNssFunctions->cryptoAppInit                  = NULL;
+    gXmlSecNssFunctions->cryptoAppShutdown              = NULL;
+    gXmlSecNssFunctions->cryptoAppDefaultKeysMngrInit   = NULL;
+    gXmlSecNssFunctions->cryptoAppDefaultKeysMngrAdoptKey       = NULL;
+    gXmlSecNssFunctions->cryptoAppDefaultKeysMngrLoad   = NULL;
+    gXmlSecNssFunctions->cryptoAppDefaultKeysMngrSave   = NULL;
+#ifndef XMLSEC_NO_X509
+    gXmlSecNssFunctions->cryptoAppKeysMngrCertLoad      = NULL;
+    gXmlSecNssFunctions->cryptoAppKeysMngrCertLoadMemory= NULL;
+    gXmlSecNssFunctions->cryptoAppPkcs12Load            = NULL;
+    gXmlSecNssFunctions->cryptoAppPkcs12LoadMemory      = NULL;
+    gXmlSecNssFunctions->cryptoAppKeyCertLoad           = NULL;
+    gXmlSecNssFunctions->cryptoAppKeyCertLoadMemory     = NULL;
+#endif /* XMLSEC_NO_X509 */
+    gXmlSecNssFunctions->cryptoAppKeyLoad               = NULL;
+    gXmlSecNssFunctions->cryptoAppKeyLoadMemory         = NULL;
+    gXmlSecNssFunctions->cryptoAppDefaultPwdCallback    = (void*)NULL;
+#endif
+     return(gXmlSecNssFunctions);
+ }
+-- 
+2.6.2
--- a/external/libxmlsec/xmlsec1-nssmangleciphers.patch
+++ b/external/libxmlsec/xmlsec1-nssmangleciphers.patch
--- a/external/libxmlsec/xmlsec1-oldlibtool.patch
+++ b/external/libxmlsec/xmlsec1-oldlibtool.patch
--- /dev/null	2012-11-27 15:14:41.892226008 +0100
+From 68c5e703a5db9b58eb7b90c0e6a42323cd7c3d47 Mon Sep 17 00:00:00 2001
-+++ misc/xmlsec1-1.2.14/compile	2012-11-29 12:27:14.000000000 +0100
+From: Miklos Vajna <vmiklos@collabora.co.uk>
+Date: Fri, 4 Mar 2016 16:08:09 +0100
+Subject: [PATCH 03/14] xmlsec1-oldlibtool.patch
+---
+ compile | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 142 insertions(+)
+ create mode 100644 compile
+diff --git a/compile b/compile
+new file mode 100644
+index 0000000..1b1d232
+--- /dev/null
+++ b/compile
 @@ -0,0 +1,142 @@
 +#! /bin/sh
 +# Wrapper for compilers which do not understand `-c -o'.
@@ -143,3 +156,6 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
+-- 
+2.6.2
--- a/external/libxmlsec/xmlsec1-ooxml.patch.1
+++ b/external/libxmlsec/xmlsec1-ooxml.patch.1
-From 24c1395c547f8a2f0c78a8618c766ecd55909c66 Mon Sep 17 00:00:00 2001
+From 236d595dec5e4df1036ba797ebebcd2bb3b29234 Mon Sep 17 00:00:00 2001
 From: Miklos Vajna <vmiklos@collabora.co.uk>
 Date: Mon, 25 Jan 2016 09:50:03 +0100
-Subject: [PATCH] OOXML Relationship Transform
+Subject: [PATCH 14/14] OOXML Relationship Transform
+Conflicts:
+	include/xmlsec/transforms.h
 ---
 include/xmlsec/strings.h    |   3 +
 include/xmlsec/transforms.h |   4 +
@@ -12,7 +14,7 @@ Subject: [PATCH] OOXML Relationship Transform
 5 files changed, 563 insertions(+)
 diff --git a/include/xmlsec/strings.h b/include/xmlsec/strings.h
-index 07afb9d..9c72d1b 100644
+index 98650bf..d9fa3df 100644
 --- a/include/xmlsec/strings.h
 +++ b/include/xmlsec/strings.h
 @@ -551,6 +551,9 @@ XMLSEC_EXPORT_VAR const xmlChar xmlSecXPath2FilterUnion[];
@@ -26,13 +28,13 @@ index 07afb9d..9c72d1b 100644
  *
  * Xslt strings
 diff --git a/include/xmlsec/transforms.h b/include/xmlsec/transforms.h
-index 4008cae..b0e31e4 100644
+index aec8bb5..0bbd7ec 100644
 --- a/include/xmlsec/transforms.h
 +++ b/include/xmlsec/transforms.h
-@@ -961,6 +961,10 @@ XMLSEC_EXPORT int		xmlSecTransformXPointerSetExpr		(xmlSecTransformPtr transform
+@@ -961,6 +961,10 @@ XMLSEC_EXPORT int               xmlSecTransformXPointerSetExpr          (xmlSecT
- 									 const xmlChar* expr,
+                                                                          const xmlChar* expr,
- 									 xmlSecNodeSetType nodeSetType,
+                                                                          xmlSecNodeSetType nodeSetType,
- 									 xmlNodePtr hereNode);
+                                                                          xmlNodePtr hereNode);
 +
 +#define xmlSecTransformRelationshipId xmlSecTransformRelationshipGetKlass()
 +XMLSEC_EXPORT xmlSecTransformId xmlSecTransformRelationshipGetKlass (void);
@@ -41,12 +43,12 @@ index 4008cae..b0e31e4 100644
 /**
  * xmlSecTransformXsltId:
 diff --git a/src/strings.c b/src/strings.c
-index 9897198..546e993 100644
+index 99ee316..d318d16 100644
 --- a/src/strings.c
 +++ b/src/strings.c
-@@ -543,6 +543,9 @@ const xmlChar xmlSecXPath2FilterUnion[]		= "union";
+@@ -543,6 +543,9 @@ const xmlChar xmlSecXPath2FilterUnion[]         = "union";
- const xmlChar xmlSecNameXPointer[]		= "xpointer";
+ const xmlChar xmlSecNameXPointer[]              = "xpointer";
- const xmlChar xmlSecNodeXPointer[]		= "XPointer";
+ const xmlChar xmlSecNodeXPointer[]              = "XPointer";
 +const xmlChar xmlSecNameRelationship[] = "relationship";
 +const xmlChar xmlSecHrefRelationship[] = "http://schemas.openxmlformats.org/package/2006/RelationshipTransform";
@@ -55,11 +57,11 @@ index 9897198..546e993 100644
  *
  * Xslt strings
 diff --git a/src/transforms.c b/src/transforms.c
-index 2ed3fe8..9e5ad27 100644
+index e8e0050..a966f0b 100644
 --- a/src/transforms.c
 +++ b/src/transforms.c
 @@ -271,6 +271,17 @@ xmlSecTransformIdsRegisterDefault(void) {
- 	return(-1);
+         return(-1);
     }
 +    if (xmlSecTransformIdsRegister(xmlSecTransformRelationshipId) < 0)
@@ -75,9 +77,9 @@ index 2ed3fe8..9e5ad27 100644
 +
 #ifndef XMLSEC_NO_XSLT
     if(xmlSecTransformIdsRegister(xmlSecTransformXsltId) < 0) {
- 	xmlSecError(XMLSEC_ERRORS_HERE,
+         xmlSecError(XMLSEC_ERRORS_HERE,
 diff --git a/src/xpath.c b/src/xpath.c
-index 8b0b4f8..b9a03e5 100644
+index afa7c52..92a2337 100644
 --- a/src/xpath.c
 +++ b/src/xpath.c
 @@ -17,6 +17,7 @@
@@ -383,14 +385,14 @@ index 8b0b4f8..b9a03e5 100644
 +    {
 +        int size;
 +        int i;
+
 +        xmlListSort(list);
 +        size = xmlListSize(list);
 +        for (i = 0; i < size; ++i)
 +        {
 +            xmlLinkPtr link = xmlListFront(list);
 +            xmlNodePtr node = (xmlNodePtr)xmlLinkGetData(link);
+
 +            ret = xmlSecTransformRelationshipProcessNode(transform, buf, node);
 +            if (ret < 0)
 +            {
@@ -484,7 +486,7 @@ index 8b0b4f8..b9a03e5 100644
 +	    return(-1);
 +	}
 +    }
-+
 +    ret = xmlSecTransformRelationshipExecute(transform, buf, nodes->doc);
 +    if (ret < 0)
 +    {
@@ -496,7 +498,7 @@ index 8b0b4f8..b9a03e5 100644
 +	xmlOutputBufferClose(buf);
 +	return(-1);
 +    }
-+
 +    ret = xmlOutputBufferClose(buf);
 +    if (ret < 0)
 +    {

--- a/external/libxmlsec/xmlsec1-update-config.guess.patch.1
+++ b/external/libxmlsec/xmlsec1-update-config.guess.patch.1
-From dd15aae9ce221198be486a6e75d5a42f75ff9de6 Mon Sep 17 00:00:00 2001
+From 23a37fb61ca6eaa5b5cdb98b5ed559896012dc7c Mon Sep 17 00:00:00 2001
 From: David Tardon <dtardon@redhat.com>
 Date: Tue, 13 May 2014 16:35:04 +0200
-Subject: [PATCH] update config.* to support ppc64le
+Subject: [PATCH 13/14] update config.* to support ppc64le
 ---
 config.guess | 541 +++++++++++++++++++++++++++++------------------------------
@@ -1626,5 +1626,5 @@ index 45bad78..d2a9613 100755
 				;;
 			-beos*)
 -- 
-1.9.0
+2.6.2
--- a/external/libxmlsec/xmlsec1-vc.patch
+++ b/external/libxmlsec/xmlsec1-vc.patch
--- build/xmlsec1-1.2.14/win32/Makefile.msvc.old	2010-10-20 00:49:04.671875000 +0200
+From de1c40ec9621c4100bc4153a947f2e67be0c42e5 Mon Sep 17 00:00:00 2001
-+++ build/xmlsec1-1.2.14/win32/Makefile.msvc	2010-10-20 00:49:23.406250000 +0200
+From: Miklos Vajna <vmiklos@collabora.co.uk>
-@@ -351,7 +351,11 @@
+Date: Fri, 4 Mar 2016 16:12:29 +0100
- !if "$(DEBUG)" == "1"
+Subject: [PATCH 08/14] xmlsec1-vc.patch
- LDFLAGS 		= $(LDFLAGS) /DEBUG
- !else
+---
-LDFLAGS 		= $(LDFLAGS) /OPT:NOWIN98
+ apps/cmdline.c      |  2 +-
-+!if "$(_NMAKE_VER)" >= "10.00.30319.01"
+ apps/crypto.c       |  2 +-
-+LDFLAGS = $(LDFLAGS)
+ apps/xmlsec.c       |  2 +-
-+!else
+ win32/Makefile.msvc | 10 +++++++++-
-+LDFLAGS = $(LDFLAGS) /OPT:NOWIN98
+ 4 files changed, 12 insertions(+), 4 deletions(-)
-+!endif
- !endif
+diff --git a/apps/cmdline.c b/apps/cmdline.c
+index b9ecafb..4425eaf 100644
- SOLIBS 			= $(LIBS) libxml2.lib 
+--- a/apps/cmdline.c
--- build/xmlsec/win32/Makefile.msvc.old	2012-11-30 11:09:23.130479800 -0500
+++ b/apps/cmdline.c
-+++ build/xmlsec/win32/Makefile.msvc	2012-11-30 11:11:06.037550700 -0500
-@@ -301,6 +301,10 @@
- CFLAGS 			= $(CFLAGS) /D "HAVE_STDIO_H" /D "HAVE_STDLIB_H"
- CFLAGS 			= $(CFLAGS) /D "HAVE_STRING_H" /D "HAVE_CTYPE_H"
- CFLAGS 			= $(CFLAGS) /D "HAVE_MALLOC_H" /D "HAVE_MEMORY_H"
-+CFLAGS 			= $(CFLAGS) -arch:SSE $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common
-+!if "$(MSVC_USE_DEBUG_RUNTIME)" != ""
-+CFLAGS 			= $(CFLAGS) /MDd
-+!endif
- # Optimisation and debug symbols.
- !if "$(DEBUG)" == "1"
-diff -ru xmlsec.orig/apps/cmdline.c xmlsec/apps/cmdline.c
--- build/xmlsec.orig/apps/cmdline.c	2009-12-05 22:19:17.000000000 +0100
-+++ build/xmlsec/apps/cmdline.c	2015-09-03 23:05:01.003150300 +0200
 @@ -7,7 +7,7 @@
  * 
  * Copyright (C) 2002-2003 Aleksey Sanin <aleksey@aleksey.com>
@@ -38,9 +23,10 @@ diff -ru xmlsec.orig/apps/cmdline.c xmlsec/apps/cmdline.c
 #define snprintf _snprintf
 #endif
-diff -ru xmlsec.orig/apps/crypto.c xmlsec/apps/crypto.c
+diff --git a/apps/crypto.c b/apps/crypto.c
--- build/xmlsec.orig/apps/crypto.c	2009-12-05 22:19:17.000000000 +0100
+index 49dd127..f46eeee 100644
-+++ build/xmlsec/apps/crypto.c	2015-09-03 23:04:36.928472100 +0200
+--- a/apps/crypto.c
+++ b/apps/crypto.c
 @@ -7,7 +7,7 @@
  * 
  * Copyright (C) 2002-2003 Aleksey Sanin <aleksey@aleksey.com>
@@ -50,9 +36,10 @@ diff -ru xmlsec.orig/apps/crypto.c xmlsec/apps/crypto.c
 #define snprintf _snprintf
 #endif
-diff -ru xmlsec.orig/apps/xmlsec.c xmlsec/apps/xmlsec.c
+diff --git a/apps/xmlsec.c b/apps/xmlsec.c
--- build/xmlsec.orig/apps/xmlsec.c	2009-12-05 22:19:17.000000000 +0100
+index 72d68fa..364ed5e 100644
-+++ build/xmlsec/apps/xmlsec.c	2015-09-03 23:05:08.057636300 +0200
+--- a/apps/xmlsec.c
+++ b/apps/xmlsec.c
 @@ -9,7 +9,7 @@
 #include <string.h>
 #include <time.h>
@@ -62,3 +49,34 @@ diff -ru xmlsec.orig/apps/xmlsec.c xmlsec/apps/xmlsec.c
 #define snprintf _snprintf
 #endif
+diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
+index cfa0a46..2f4c3e7 100644
+--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
+@@ -305,6 +305,10 @@ CFLAGS 			= $(CFLAGS) /D PACKAGE=\"$(XMLSEC_NAME)\"
+ CFLAGS 			= $(CFLAGS) /D "HAVE_STDIO_H" /D "HAVE_STDLIB_H"
+ CFLAGS 			= $(CFLAGS) /D "HAVE_STRING_H" /D "HAVE_CTYPE_H"
+ CFLAGS 			= $(CFLAGS) /D "HAVE_MALLOC_H" /D "HAVE_MEMORY_H"
+CFLAGS 			= $(CFLAGS) -arch:SSE $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common
+!if "$(MSVC_USE_DEBUG_RUNTIME)" != ""
+CFLAGS 			= $(CFLAGS) /MDd
+!endif
+ !if "$(UNICODE)" == "1"
+ CFLAGS 			= $(CFLAGS) /D "UNICODE" /D "_UNICODE"
+@@ -359,7 +363,11 @@ LIBS 			=
+ !if "$(DEBUG)" == "1"
+ LDFLAGS 		= $(LDFLAGS) /DEBUG
+ !else
+-LDFLAGS 		= $(LDFLAGS) /OPT:NOWIN98
+!if "$(_NMAKE_VER)" >= "10.00.30319.01"
+LDFLAGS = $(LDFLAGS)
+!else
+LDFLAGS = $(LDFLAGS) /OPT:NOWIN98
+!endif
+ !endif
+ SOLIBS 			= $(LIBS) libxml2.lib 
+-- 
+2.6.2