Upgrade libxmlsec to 1.2.24

Upstream changes interesting for us:

- Added ECDSA-SHA1, ECDSA-SHA256, ECDSA-SHA512 support for xmlsec-nss,
  so we can drop 2 patches
- Fixed XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS handling, which
  allows dropping xmlsec1-noverify.patch.1 in the future

Also backport a patch from xmlsec master that fixes signature creation
on Windows (the release regressed in this regard).

Change-Id: I2c14328283bf7d4f8af5595ea4c1efc29ee81f9e

download.lst

@@ -139,8 +139,8 @@ export LIBLANGTAG_SHA256SUM := d6242790324f1432fb0a6fae71b6851f520b2c5a87675497c
 export LIBLANGTAG_TARBALL := liblangtag-0.6.2.tar.bz2
 export LIBTOMMATH_SHA256SUM := 083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
-export LIBXMLSEC_SHA256SUM := 41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f
-export LIBXMLSEC_TARBALL := 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
+export LIBXMLSEC_SHA256SUM := 99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc
+export LIBXMLSEC_TARBALL := xmlsec1-1.2.24.tar.gz
 export LIBXML_SHA256SUM := ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c
 export LIBXML_TARBALL := ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz
 export LIBXSLT_SHA256SUM := b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce

external/libxmlsec/UnpackedTarball_xmlsec.mk

@@ -14,10 +14,8 @@ xmlsec_patches += xmlsec1-noverify.patch.1
 xmlsec_patches += xmlsec1-vc.patch.1
 xmlsec_patches += xmlsec1-1.2.14_fix_extern_c.patch.1
 xmlsec_patches += xmlsec1-customkeymanage.patch.1
-# Backport of <https://github.com/lsh123/xmlsec/pull/83>.
-xmlsec_patches += xmlsec1-nss-ecdsa-sha256.patch.1
-# Backport of <https://github.com/lsh123/xmlsec/pull/91>.
-xmlsec_patches += xmlsec1-nss-ecdsa-memset.patch.1
+# Backport of <https://github.com/lsh123/xmlsec/pull/112>.
+xmlsec_patches += xmlsec1-mscrypto-fix-signing-regression.patch.1
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec))
 

external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1

-From b4cb46f2737f7e3a4073b747ed4a0dfb99d48fdd Mon Sep 17 00:00:00 2001
+From 057ee59c4e63b9afe0e95c626312ac530feadbeb Mon Sep 17 00:00:00 2001
 From: Miklos Vajna <vmiklos@collabora.co.uk>
 Date: Fri, 4 Mar 2016 16:12:48 +0100
 Subject: [PATCH] xmlsec1-1.2.14_fix_extern_c.patch
@@ -10,7 +10,7 @@ Conflicts:
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/include/xmlsec/xmlsec.h b/include/xmlsec/xmlsec.h
-index 963b37a..ec58bec 100644
+index 69d765f2..11b9975c 100644
 --- a/include/xmlsec/xmlsec.h
 +++ b/include/xmlsec/xmlsec.h
 @@ -11,16 +11,16 @@
@@ -35,5 +35,5 @@ index 963b37a..ec58bec 100644
   *
   * Basic types to make ports to exotic platforms easier
 -- 
-2.6.6
+2.12.0
 

external/libxmlsec/xmlsec1-configure.patch.1

-From 70139f4422c78f21ed9a7435267e37d15c4c8fa6 Mon Sep 17 00:00:00 2001
+From 49f9bed356b307d7700f429851f1509639956b20 Mon Sep 17 00:00:00 2001
 From: Miklos Vajna <vmiklos@collabora.co.uk>
 Date: Fri, 4 Mar 2016 16:06:19 +0100
 Subject: [PATCH] xmlsec1-configure.patch
@@ -7,44 +7,51 @@ Conflicts:
 	Makefile.am
 	Makefile.in
 	configure.ac
+	win32/Makefile.msvc
 ---
- Makefile.am         |  2 +-
- Makefile.in         |  2 +-
+ Makefile.am         |  4 ++--
+ Makefile.in         |  4 ++--
  configure.ac        | 50 +++++++++++++++++++++++++++++++++++++++-----------
  win32/Makefile.msvc |  2 +-
- 4 files changed, 42 insertions(+), 14 deletions(-)
+ 4 files changed, 44 insertions(+), 16 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 3453c01..2c5effb 100644
+index 82e26656..dac213ad 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -1,7 +1,7 @@
- NULL =
- 
+@@ -3,10 +3,10 @@ NULL =
  SAFE_VERSION	= @XMLSEC_VERSION_SAFE@
--SUBDIRS 	    = include src apps man docs
-+SUBDIRS 	    = include src
+ SUBDIRS 	    = include src
+ if XMLSEC_APPS
+-SUBDIRS += apps
++SUBDIRS += 
+ endif
+ if XMLSEC_DOCS
+-SUBDIRS += man docs
++SUBDIRS += 
+ endif
  TEST_APP 	    = apps/xmlsec1$(EXEEXT)
  DEFAULT_CRYPTO	= @XMLSEC_DEFAULT_CRYPTO@
- 
 diff --git a/Makefile.in b/Makefile.in
-index f35b430..f3ca4ed 100644
+index ef0aed99..73f9db9c 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -468,7 +468,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- NULL = 
- SAFE_VERSION = @XMLSEC_VERSION_SAFE@
--SUBDIRS = include src apps man docs
-+SUBDIRS = include src
- TEST_APP = apps/xmlsec1$(EXEEXT)
- DEFAULT_CRYPTO = @XMLSEC_DEFAULT_CRYPTO@
- bin_SCRIPTS = xmlsec1-config
+@@ -89,8 +89,8 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-@XMLSEC_APPS_TRUE@am__append_1 = apps
+-@XMLSEC_DOCS_TRUE@am__append_2 = man docs
++@XMLSEC_APPS_TRUE@am__append_1 = 
++@XMLSEC_DOCS_TRUE@am__append_2 = 
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 diff --git a/configure.ac b/configure.ac
-index b8770ad..721e4ca 100644
+index c100f92e..6e5c387b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -227,8 +227,8 @@ dnl find libxml
+@@ -226,8 +226,8 @@ dnl find libxml
  dnl ==========================================================================
  LIBXML_MIN_VERSION="2.7.4"
  LIBXML_CONFIG="xml2-config"
@@ -55,7 +62,7 @@ index b8770ad..721e4ca 100644
  LIBXML_FOUND="no"
  AC_ARG_WITH(libxml, 
      [  --with-libxml=[PFX]       libxml2 location]
-@@ -237,6 +237,8 @@ AC_ARG_WITH(libxml-src,
+@@ -236,6 +236,8 @@ AC_ARG_WITH(libxml-src,
      [  --with-libxml-src=[PFX]   not installed yet libxml2 location]
  )
  
@@ -64,7 +71,7 @@ index b8770ad..721e4ca 100644
  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)
-@@ -285,6 +287,8 @@ if test "z$LIBXML_FOUND" = "zno" ; then
+@@ -284,6 +286,8 @@ if test "z$LIBXML_FOUND" = "zno" ; then
      fi
  fi
  
@@ -73,14 +80,14 @@ index b8770ad..721e4ca 100644
  AC_SUBST(LIBXML_CFLAGS)
  AC_SUBST(LIBXML_LIBS)
  AC_SUBST(LIBXML_CONFIG)
-@@ -598,12 +602,26 @@ dnl ==========================================================================
+@@ -586,12 +590,26 @@ dnl ==========================================================================
  XMLSEC_NO_NSS="1"
  SEAMONKEY_MIN_VERSION="1.0"
  MOZILLA_MIN_VERSION="1.4"
 +if test "z$MOZ_FLAVOUR" = "zfirefox" ; then
 +    MOZILLA_MIN_VERSION="1.0"
 +fi
- NSS_MIN_VERSION="3.9"
+ NSS_MIN_VERSION="3.11.1"
  NSPR_MIN_VERSION="4.4.1"
  NSS_CFLAGS=""
  NSS_LIBS=""
@@ -102,7 +109,7 @@ index b8770ad..721e4ca 100644
  NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
  NSS_FOUND="no"
  NSPR_PACKAGE=mozilla-nspr
-@@ -630,6 +648,16 @@ elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z
+@@ -618,6 +636,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
@@ -119,7 +126,7 @@ index b8770ad..721e4ca 100644
          PKG_CHECK_MODULES(NSS, seamonkey-nspr >= $NSPR_MIN_VERSION seamonkey-nss >= $SEAMONKEY_MIN_VERSION,
      	    [NSS_FOUND=yes NSPR_PACKAGE=seamonkey-nspr NSS_PACKAGE=seamonkey-nss],
  	    [NSS_FOUND=no])
-@@ -661,8 +689,8 @@ if test "z$NSS_FOUND" = "zno" ; then
+@@ -649,8 +677,8 @@ if test "z$NSS_FOUND" = "zno" ; then
          ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
      fi
  
@@ -130,7 +137,7 @@ index b8770ad..721e4ca 100644
  
      AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION)
      NSPR_INCLUDES_FOUND="no"
-@@ -683,21 +711,21 @@ if test "z$NSS_FOUND" = "zno" ; then
+@@ -671,21 +699,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
@@ -156,7 +163,7 @@ index b8770ad..721e4ca 100644
  		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"
-@@ -768,7 +796,7 @@ if test "z$NSS_FOUND" = "zno" ; then
+@@ -756,7 +784,7 @@ if test "z$NSS_FOUND" = "zno" ; then
          done
         
          for dir in $ac_nss_lib_dir ; do
@@ -166,18 +173,18 @@ index b8770ad..721e4ca 100644
      		if test "z$dir" = "z/usr/lib" ; then
          	    NSS_LIBS="$NSS_LIBS_LIST"
 diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
-index 8c887a1..bbc661a 100644
+index c1eea253..8156caa7 100644
 --- a/win32/Makefile.msvc
 +++ b/win32/Makefile.msvc
-@@ -394,7 +394,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
+@@ -393,7 +393,7 @@ APP_LIBS  		= $(SOLIBS) $(XMLSEC_CRYPTO_SOLIBS)
+ XMLSEC_OPENSSL_SOLIBS   = libcrypto.lib wsock32.lib kernel32.lib user32.lib gdi32.lib crypt32.lib advapi32.lib ws2_32.lib
+ XMLSEC_OPENSSL_ALIBS    = libcrypto.lib wsock32.lib kernel32.lib user32.lib gdi32.lib crypt32.lib advapi32.lib ws2_32.lib
  
--XMLSEC_NSS_SOLIBS   	= smime3.lib ssl3.lib nss3.lib libnspr4.lib libplds4.lib libplc4.lib kernel32.lib user32.lib gdi32.lib
-+XMLSEC_NSS_SOLIBS   	= smime3.lib nss3.lib nspr4.lib kernel32.lib user32.lib gdi32.lib
- 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_NSS_SOLIBS       = smime3.lib ssl3.lib nss3.lib libnspr4.lib libplds4.lib libplc4.lib kernel32.lib user32.lib gdi32.lib
++XMLSEC_NSS_SOLIBS       = smime3.lib nss3.lib nspr4.lib kernel32.lib user32.lib gdi32.lib
+ 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.6
+2.12.0
 

external/libxmlsec/xmlsec1-mscrypto-fix-signing-regression.patch.1

+From 92d28e2a9110c19e75482942702516505714fc72 Mon Sep 17 00:00:00 2001
+From: lsh123 <aleksey@aleksey.com>
+Date: Sun, 7 May 2017 07:53:46 -0700
+Subject: [PATCH] fix regression
+
+---
+ src/mscrypto/x509.c | 16 ++++------------
+ 1 file changed, 4 insertions(+), 12 deletions(-)
+
+diff --git a/src/mscrypto/x509.c b/src/mscrypto/x509.c
+index 08c9088d..497fa0e9 100644
+--- a/src/mscrypto/x509.c
++++ b/src/mscrypto/x509.c
+@@ -392,12 +392,8 @@ xmlSecMSCryptoKeyDataX509GetCert(xmlSecKeyDataPtr data, xmlSecSize pos) {
+     xmlSecAssert2(ctx->hMemStore != 0, NULL);
+     xmlSecAssert2(ctx->numCerts > pos, NULL);
+ 
+-    while (pos > 0) {
+-       pCert = CertEnumCertificatesInStore(ctx->hMemStore, pCert);
+-       if(pCert == NULL) {
+-            break;
+-       }
+-        pos--;
++    while ((pCert = CertEnumCertificatesInStore(ctx->hMemStore, pCert)) && (pos > 0)) {
++      pos--;
+     }
+ 
+     return(pCert);
+@@ -474,12 +470,8 @@ xmlSecMSCryptoKeyDataX509GetCrl(xmlSecKeyDataPtr data, xmlSecSize pos) {
+     xmlSecAssert2(ctx->hMemStore != 0, NULL);
+     xmlSecAssert2(ctx->numCrls > pos, NULL);
+ 
+-    while(pos > 0) {
+-        pCRL = CertEnumCRLsInStore(ctx->hMemStore, pCRL);
+-       if(pCRL == NULL) {
+-            break;
+-        }
+-        pos--;
++    while ((pCRL = CertEnumCRLsInStore(ctx->hMemStore, pCRL)) && (pos > 0)) {
++      pos--;
+     }
+ 
+     return(pCRL);
+-- 
+2.12.0
+

external/libxmlsec/xmlsec1-noverify.patch.1

-From 06564ccc3e2484553a23a2595d48b0ef3445497b Mon Sep 17 00:00:00 2001
+From 4960b231f67eb86e5f6d6a79154c15268c959b34 Mon Sep 17 00:00:00 2001
 From: Miklos Vajna <vmiklos@collabora.co.uk>
 Date: Fri, 4 Mar 2016 16:10:16 +0100
 Subject: [PATCH] xmlsec1-noverify.patch
 
 Conflicts:
+	src/mscrypto/x509vfy.c
 	src/nss/x509vfy.c
 ---
- src/mscrypto/x509vfy.c | 13 ++++++++++---
- src/nss/x509vfy.c      | 28 +++++++++++++++++++++-------
- 2 files changed, 31 insertions(+), 10 deletions(-)
+ src/mscrypto/x509vfy.c | 12 ++++++++----
+ src/nss/x509vfy.c      | 24 ++++++++++--------------
+ 2 files changed, 18 insertions(+), 18 deletions(-)
 
 diff --git a/src/mscrypto/x509vfy.c b/src/mscrypto/x509vfy.c
-index 899cb6e..cf4cbb7 100644
+index e4a84a60..a12cb709 100644
 --- a/src/mscrypto/x509vfy.c
 +++ b/src/mscrypto/x509vfy.c
-@@ -560,9 +560,16 @@ xmlSecMSCryptoX509StoreVerify(xmlSecKeyDataStorePtr store, HCERTSTORE certs,
-             CertFreeCertificateContext(nextCert);
+@@ -525,10 +525,14 @@ xmlSecMSCryptoX509StoreVerify(xmlSecKeyDataStorePtr store, HCERTSTORE certs,
          }
  
--        if((selected == 1) && xmlSecMSCryptoX509StoreConstructCertsChain(store, cert, certs, keyInfoCtx)) {
--            return(cert);
--        }
+         if(selected == 1) {
+-	    if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS) != 0
+-               || xmlSecMSCryptoX509StoreConstructCertsChain(store, cert, certs, keyInfoCtx)) {
+-                return(cert);
+-            }
 +        /* 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,
@@ -28,28 +30,32 @@ index 899cb6e..cf4cbb7 100644
 +           the certificate by libxmlsec and the verification fails, then the XML signature will not be 
 +           verified. This would happen, for example, if the root certificate is not installed.                
 +         */
-+/*      if((selected == 1) && xmlSecMSCryptoX509StoreConstructCertsChain(store, cert, certs, keyInfoCtx)) { */
-+        if (selected == 1)
-+            return cert;
++            return(cert);
+         }
      }
  
-     return (NULL);
 diff --git a/src/nss/x509vfy.c b/src/nss/x509vfy.c
-index 9e957fe..0edaa2d 100644
+index cd328fea..b28a37e1 100644
 --- a/src/nss/x509vfy.c
 +++ b/src/nss/x509vfy.c
-@@ -211,13 +211,27 @@ xmlSecNssX509StoreVerify(xmlSecKeyDataStorePtr store, CERTCertList* certs,
+@@ -213,20 +213,16 @@ xmlSecNssX509StoreVerify(xmlSecKeyDataStorePtr store, CERTCertList* certs,
              continue;
          }
  
--        status = CERT_VerifyCertificate(CERT_GetDefaultCertDB(),
--                                        cert, PR_FALSE,
--                                        (SECCertificateUsage)0,
--                                        timeboundary , NULL, NULL, NULL);
--        if (status == SECSuccess) {
+-        if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS) == 0) {
+-            /* it's important to set the usage here, otherwise no real verification
+-             * is performed. */
+-            status = CERT_VerifyCertificate(CERT_GetDefaultCertDB(),
+-                                            cert, PR_FALSE,
+-                                            certificateUsageEmailSigner,
+-                                            timeboundary , NULL, NULL, NULL);
+-            if(status == SECSuccess) {
+-                break;
+-            }
+-        } else {
+-            status = SECSuccess;
 -            break;
 -        }
-+
 +       /*
 +      JL: OpenOffice.org implements its own certificate verification routine. 
 +      The goal is to separate validation of the signature
@@ -57,22 +63,12 @@ index 9e957fe..0edaa2d 100644
 +      but the certificate could not be verified. If we do not prevent the verification of
 +      the certificate by libxmlsec and the verification fails, then the XML signature may not be 
 +      verified. This would happen, for example, if the root certificate is not installed.
-+      
-+      status = CERT_VerifyCertificate(CERT_GetDefaultCertDB(), 
-+          cert, PR_FALSE, 
-+          (SECCertificateUsage)0,
-+          timeboundary , NULL, NULL, NULL);
-+      if (status == SECSuccess) {
-+         break;
-+      }
-+        
 +    */
-+       status = SECSuccess;
-+       break;
-+
++        status = SECSuccess;
++        break;
      }
  
      if (status == SECSuccess) {
 -- 
-2.6.6
+2.12.0
 

external/libxmlsec/xmlsec1-nss-ecdsa-memset.patch.1

-From 2ef2b9f34e2eebcdb4116e55e1e3b8034a1961c8 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos@collabora.co.uk>
-Date: Mon, 6 Mar 2017 22:34:46 +0100
-Subject: [PATCH] nss: fix assert when building against debug nss (#91)
-
-Due to reading uninitialized memory. gdb says:
-
-    Assertion failure: dest == NULL || dest->data == NULL, at secasn1e.c:1483
-    Program received signal SIGABRT, Aborted.
-    0x00007ffff74748d7 in raise () from /lib64/libc.so.6
-    (gdb) up
-    #1  0x00007ffff7475caa in abort () from /lib64/libc.so.6
-    (gdb)
-    #2  0x00007fffe57f96ae in PR_Assert (s=0x7fffe1cbf298 "dest == NULL || dest->data == NULL", file=0x7fffe1cbef60 "secasn1e.c", ln=1483) at ../../../../pr/src/io/prlog.c:553
-    553         abort();
-    (gdb)
-    #3  0x00007fffe1cb1941 in SEC_ASN1EncodeItem_Util (poolp=0x0, dest=0x7fffffff95f0, src=0x7fffffff9530, theTemplate=0x7fffe55ae180 <DSA_SignatureTemplate>) at secasn1e.c:1483
-    1483        PORT_Assert(dest == NULL || dest->data == NULL);
----
- src/nss/signatures.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/nss/signatures.c b/src/nss/signatures.c
-index a8fec2c..b7a292e 100644
---- a/src/nss/signatures.c
-+++ b/src/nss/signatures.c
-@@ -354,6 +354,7 @@ xmlSecNssSignatureVerify(xmlSecTransformPtr transform,
-         SECItem   signatureDer;
-         SECStatus statusDer;
- 
-+        memset(&signatureDer, 0, sizeof(signatureDer));
-         statusDer = DSAU_EncodeDerSigWithLen(&signatureDer, &signature, signature.len);
-         if(statusDer != SECSuccess) {
-             xmlSecError(XMLSEC_ERRORS_HERE,
--- 
-2.10.2
-

external/libxmlsec/xmlsec1-nssdisablecallbacks.patch.1

-From b317891749a5dd23ad75ce289ac1a318851bda0d Mon Sep 17 00:00:00 2001
+From 25b4d8494eaf7b2321a931e29af292f336fe0aff 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] xmlsec1-nssdisablecallbacks.patch
@@ -10,10 +10,10 @@ Conflicts:
  1 file changed, 20 insertions(+)
 
 diff --git a/src/nss/crypto.c b/src/nss/crypto.c
-index ea79519..473429f 100644
+index a0559c89..ba8f2dd0 100644
 --- a/src/nss/crypto.c
 +++ b/src/nss/crypto.c
-@@ -214,6 +214,7 @@ xmlSecCryptoGetFunctions_nss(void) {
+@@ -227,6 +227,7 @@ xmlSecCryptoGetFunctions_nss(void) {
       * High level routines form xmlsec command line utility
       *
       ********************************************************************/
@@ -21,7 +21,7 @@ index ea79519..473429f 100644
      gXmlSecNssFunctions->cryptoAppInit                  = xmlSecNssAppInit;
      gXmlSecNssFunctions->cryptoAppShutdown              = xmlSecNssAppShutdown;
      gXmlSecNssFunctions->cryptoAppDefaultKeysMngrInit   = xmlSecNssAppDefaultKeysMngrInit;
-@@ -231,6 +232,25 @@ xmlSecCryptoGetFunctions_nss(void) {
+@@ -244,6 +245,25 @@ xmlSecCryptoGetFunctions_nss(void) {
      gXmlSecNssFunctions->cryptoAppKeyLoad               = xmlSecNssAppKeyLoad;
      gXmlSecNssFunctions->cryptoAppKeyLoadMemory         = xmlSecNssAppKeyLoadMemory;
      gXmlSecNssFunctions->cryptoAppDefaultPwdCallback    = (void*)xmlSecNssAppGetDefaultPwdCallback();
@@ -48,5 +48,5 @@ index ea79519..473429f 100644
      return(gXmlSecNssFunctions);
  }
 -- 
-2.6.6
+2.12.0
 

external/libxmlsec/xmlsec1-vc.patch.1

-From c821fea172b4ffdb60f65867862dd48049589ea6 Mon Sep 17 00:00:00 2001
+From 223ae3881bedb8070774271ab4300a447f94f845 Mon Sep 17 00:00:00 2001
 From: Miklos Vajna <vmiklos@collabora.co.uk>
 Date: Fri, 4 Mar 2016 16:12:29 +0100
 Subject: [PATCH] xmlsec1-vc.patch
 
+Conflicts:
+	win32/Makefile.msvc
 ---
  win32/Makefile.msvc | 10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
-index bbc661a..a474592 100644
+index 8156caa7..ef1909ce 100644
 --- a/win32/Makefile.msvc
 +++ b/win32/Makefile.msvc
-@@ -311,6 +311,10 @@ CFLAGS 			= $(CFLAGS) /D PACKAGE=\"$(XMLSEC_NAME)\"
- CFLAGS 			= $(CFLAGS) /D "HAVE_STDIO_H" /D "HAVE_STDLIB_H"
+@@ -311,6 +311,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) /D "XMLSEC_NO_GOST" /D "XMLSEC_NO_GOST2012" 
 +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
@@ -22,11 +24,11 @@ index bbc661a..a474592 100644
  
  !if "$(UNICODE)" == "1"
  CFLAGS 			= $(CFLAGS) /D "UNICODE" /D "_UNICODE"
-@@ -365,7 +369,11 @@ LIBS 			=
+@@ -363,7 +367,11 @@ LIBS 			=
  !if "$(DEBUG)" == "1"
  LDFLAGS 		= $(LDFLAGS) /DEBUG
  !else
--LDFLAGS 		= $(LDFLAGS) /OPT:NOWIN98
+-LDFLAGS 		= $(LDFLAGS)
 +!if "$(_NMAKE_VER)" >= "10.00.30319.01"
 +LDFLAGS = $(LDFLAGS)
 +!else
@@ -36,5 +38,5 @@ index bbc661a..a474592 100644
  
  SOLIBS 			= $(LIBS) libxml2.lib 
 -- 
-2.6.6
+2.12.0