diff options
| -rw-r--r-- | libxmlsec/xmlsec1-1.2.6.patch | 120 |
1 files changed, 62 insertions, 58 deletions
diff --git a/libxmlsec/xmlsec1-1.2.6.patch b/libxmlsec/xmlsec1-1.2.6.patch index a61ccfce759e..eab7842e217f 100644 --- a/libxmlsec/xmlsec1-1.2.6.patch +++ b/libxmlsec/xmlsec1-1.2.6.patch @@ -1,5 +1,5 @@ *** misc/xmlsec1-1.2.6/apps/Makefile.in 2004-08-26 08:00:30.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/apps/Makefile.in 2006-02-24 17:41:54.674581000 +0100 +--- misc/build/xmlsec1-1.2.6/apps/Makefile.in 2006-05-08 12:19:38.678768000 +0200 *************** *** 370,376 **** $(CRYPTO_DEPS) \ @@ -18,7 +18,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj *** misc/xmlsec1-1.2.6/configure 2004-08-26 08:00:34.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/configure 2006-02-24 17:41:54.812909000 +0100 +--- misc/build/xmlsec1-1.2.6/configure 2006-05-08 12:19:38.812054000 +0200 *************** *** 24598,24604 **** fi @@ -107,7 +107,7 @@ NSS_LIBS="$NSS_LIBS_LIST" else *** misc/xmlsec1-1.2.6/configure.in 2004-08-26 04:49:24.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/configure.in 2006-02-24 17:41:54.851083000 +0100 +--- misc/build/xmlsec1-1.2.6/configure.in 2006-05-08 12:19:38.849322000 +0200 *************** *** 143,149 **** dnl find libxml @@ -195,8 +195,8 @@ 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.6/include/xmlsec/mscrypto/akmngr.h 2006-02-24 17:42:19.621125000 +0100 ---- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h 2006-02-24 17:41:54.869082000 +0100 +*** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h 2006-05-08 12:20:35.543960000 +0200 +--- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/akmngr.h 2006-05-08 12:19:38.865837000 +0200 *************** *** 1 **** ! dummy @@ -273,7 +273,7 @@ ! ! *** misc/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h 2003-09-26 08:12:46.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h 2006-02-24 17:41:54.881490000 +0100 +--- misc/build/xmlsec1-1.2.6/include/xmlsec/mscrypto/x509.h 2006-05-08 12:19:38.877030000 +0200 *************** *** 77,82 **** --- 77,97 ---- @@ -298,12 +298,12 @@ #endif /* XMLSEC_NO_X509 */ -*** misc/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h 2006-02-24 17:42:19.408712000 +0100 ---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h 2006-02-24 17:41:54.894050000 +0100 +*** misc/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h 2006-05-08 12:20:35.464923000 +0200 +--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/akmngr.h 2006-05-08 12:19:38.888548000 +0200 *************** *** 1 **** ! dummy ---- 1,55 ---- +--- 1,56 ---- ! /** ! * XMLSec library ! * @@ -330,7 +330,8 @@ ! ! XMLSEC_CRYPTO_EXPORT xmlSecKeysMngrPtr ! xmlSecNssAppliedKeysMngrCreate( -! PK11SlotInfo* slot , +! PK11SlotInfo** slots, +! int cSlots, ! CERTCertDBHandle* handler ! ) ; ! @@ -360,7 +361,7 @@ ! ! *** misc/xmlsec1-1.2.6/include/xmlsec/nss/app.h 2004-01-12 22:06:14.000000000 +0100 ---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/app.h 2006-02-24 17:41:54.907072000 +0100 +--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/app.h 2006-05-08 12:19:38.900161000 +0200 *************** *** 22,27 **** --- 22,30 ---- @@ -384,8 +385,8 @@ XMLSEC_CRYPTO_EXPORT int xmlSecNssAppDefaultKeysMngrLoad (xmlSecKeysMngrPtr mngr, const char* uri); XMLSEC_CRYPTO_EXPORT int xmlSecNssAppDefaultKeysMngrSave (xmlSecKeysMngrPtr mngr, -*** misc/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h 2006-02-24 17:42:19.478785000 +0100 ---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h 2006-02-24 17:41:54.920914000 +0100 +*** misc/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h 2006-05-08 12:20:35.490138000 +0200 +--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/ciphers.h 2006-05-08 12:19:38.911289000 +0200 *************** *** 1 **** ! dummy @@ -426,7 +427,7 @@ ! ! *** misc/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h 2004-01-12 22:06:14.000000000 +0100 ---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h 2006-02-24 17:41:54.934304000 +0100 +--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/crypto.h 2006-05-08 12:19:38.923311000 +0200 *************** *** 264,269 **** --- 264,278 ---- @@ -446,7 +447,7 @@ *** misc/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h 2003-07-30 04:46:35.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h 2006-02-24 17:41:54.949656000 +0100 +--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/keysstore.h 2006-05-08 12:19:38.935294000 +0200 *************** *** 16,21 **** --- 16,23 ---- @@ -470,7 +471,7 @@ const char *uri, xmlSecKeysMngrPtr keysMngr); *** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am 2003-07-30 04:46:35.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am 2006-02-24 17:41:54.963506000 +0100 +--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.am 2006-05-08 12:19:38.946533000 +0200 *************** *** 3,8 **** --- 3,9 ---- @@ -493,7 +494,7 @@ install-exec-hook: *** misc/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in 2004-08-26 08:00:31.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in 2006-02-24 17:41:54.977876000 +0100 +--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/Makefile.in 2006-05-08 12:19:38.959507000 +0200 *************** *** 273,278 **** --- 273,279 ---- @@ -515,8 +516,8 @@ $(NULL) all: all-am -*** misc/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h 2006-02-24 17:42:19.547732000 +0100 ---- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h 2006-02-24 17:41:54.993398000 +0100 +*** misc/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h 2006-05-08 12:20:35.516481000 +0200 +--- misc/build/xmlsec1-1.2.6/include/xmlsec/nss/tokens.h 2006-05-08 12:19:38.973290000 +0200 *************** *** 1 **** ! dummy @@ -703,8 +704,8 @@ ! ! #endif /* __XMLSEC_NSS_TOKENS_H__ */ ! -*** misc/xmlsec1-1.2.6/libxml2-config 2006-02-24 17:42:20.027372000 +0100 ---- misc/build/xmlsec1-1.2.6/libxml2-config 2006-02-24 17:41:55.012345000 +0100 +*** misc/xmlsec1-1.2.6/libxml2-config 2006-05-08 12:20:35.726710000 +0200 +--- misc/build/xmlsec1-1.2.6/libxml2-config 2006-05-08 12:19:38.987291000 +0200 *************** *** 1 **** ! dummy @@ -758,7 +759,7 @@ ! ! exit 0 *** misc/xmlsec1-1.2.6/ltmain.sh 2004-08-26 08:00:15.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/ltmain.sh 2006-02-24 17:41:55.047328000 +0100 +--- misc/build/xmlsec1-1.2.6/ltmain.sh 2006-05-08 12:19:39.019434000 +0200 *************** *** 2994,3006 **** ;; @@ -807,7 +808,7 @@ elif test -n "$runpath_var"; then case "$perm_rpath " in *** misc/xmlsec1-1.2.6/src/bn.c 2004-06-21 20:33:27.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/src/bn.c 2006-02-24 17:41:55.094683000 +0100 +--- misc/build/xmlsec1-1.2.6/src/bn.c 2006-05-08 12:19:39.063224000 +0200 *************** *** 170,177 **** */ @@ -1374,7 +1375,7 @@ return(0); *** misc/xmlsec1-1.2.6/src/dl.c 2003-10-29 16:57:20.000000000 +0100 ---- misc/build/xmlsec1-1.2.6/src/dl.c 2006-02-24 17:41:55.115019000 +0100 +--- misc/build/xmlsec1-1.2.6/src/dl.c 2006-05-08 12:19:39.082717000 +0200 *************** *** 329,334 **** --- 329,338 ---- @@ -1400,8 +1401,8 @@ } --- 354,359 ---- -*** misc/xmlsec1-1.2.6/src/mscrypto/akmngr.c 2006-02-24 17:42:19.769406000 +0100 ---- misc/build/xmlsec1-1.2.6/src/mscrypto/akmngr.c 2006-02-24 17:41:55.132567000 +0100 +*** misc/xmlsec1-1.2.6/src/mscrypto/akmngr.c 2006-05-08 12:20:35.610428000 +0200 +--- misc/build/xmlsec1-1.2.6/src/mscrypto/akmngr.c 2006-05-08 12:19:39.098982000 +0200 *************** *** 1 **** ! dummy @@ -1642,7 +1643,7 @@ ! } ! *** misc/xmlsec1-1.2.6/src/mscrypto/certkeys.c 2004-03-17 06:06:43.000000000 +0100 ---- misc/build/xmlsec1-1.2.6/src/mscrypto/certkeys.c 2006-02-24 17:41:55.153688000 +0100 +--- misc/build/xmlsec1-1.2.6/src/mscrypto/certkeys.c 2006-05-08 12:19:39.118188000 +0200 *************** *** 41,46 **** --- 41,47 ---- @@ -2320,7 +2321,7 @@ static xmlSecKeyDataType *** misc/xmlsec1-1.2.6/src/mscrypto/crypto.c 2003-11-12 03:38:51.000000000 +0100 ---- misc/build/xmlsec1-1.2.6/src/mscrypto/crypto.c 2006-02-24 17:41:55.179319000 +0100 +--- misc/build/xmlsec1-1.2.6/src/mscrypto/crypto.c 2006-05-08 12:19:39.142137000 +0200 *************** *** 330,342 **** BYTE* @@ -2353,7 +2354,7 @@ } *** misc/xmlsec1-1.2.6/src/mscrypto/digests.c 2003-09-30 04:09:51.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/src/mscrypto/digests.c 2006-02-24 17:44:18.719839000 +0100 +--- misc/build/xmlsec1-1.2.6/src/mscrypto/digests.c 2006-05-08 12:19:39.156282000 +0200 *************** *** 96,107 **** @@ -2385,7 +2386,7 @@ return(0); *** misc/xmlsec1-1.2.6/src/mscrypto/x509.c 2003-09-26 02:58:13.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/src/mscrypto/x509.c 2006-02-24 17:41:55.215235000 +0100 +--- misc/build/xmlsec1-1.2.6/src/mscrypto/x509.c 2006-05-08 12:19:39.176194000 +0200 *************** *** 1572,1577 **** --- 1572,1578 ---- @@ -2554,7 +2555,7 @@ return(res); } *** misc/xmlsec1-1.2.6/src/mscrypto/x509vfy.c 2003-09-27 05:12:22.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/src/mscrypto/x509vfy.c 2006-02-24 17:41:55.245230000 +0100 +--- misc/build/xmlsec1-1.2.6/src/mscrypto/x509vfy.c 2006-05-08 12:19:39.203022000 +0200 *************** *** 125,130 **** --- 125,131 ---- @@ -3282,12 +3283,12 @@ } } xmlFree(cName); -*** misc/xmlsec1-1.2.6/src/nss/akmngr.c 2006-02-24 17:42:19.689605000 +0100 ---- misc/build/xmlsec1-1.2.6/src/nss/akmngr.c 2006-02-24 17:41:55.264359000 +0100 +*** misc/xmlsec1-1.2.6/src/nss/akmngr.c 2006-05-08 12:20:35.581067000 +0200 +--- misc/build/xmlsec1-1.2.6/src/nss/akmngr.c 2006-05-08 12:20:20.572545000 +0200 *************** *** 1 **** ! dummy ---- 1,381 ---- +--- 1,384 ---- ! /** ! * XMLSec library ! * @@ -3318,7 +3319,8 @@ ! ! /** ! * xmlSecNssAppliedKeysMngrCreate: -! * @slot: the pointer to NSS PKCS#11 slot infomation. +! * @slot: array of pointers to NSS PKCS#11 slot infomation. +! * @cSlots: number of slots in the array ! * @handler: the pointer to NSS certificate database. ! * ! * Create and load NSS crypto slot and certificate database into keys manager @@ -3327,13 +3329,14 @@ ! */ ! xmlSecKeysMngrPtr ! xmlSecNssAppliedKeysMngrCreate( -! PK11SlotInfo* slot , +! PK11SlotInfo** slots, +! int cSlots, ! CERTCertDBHandle* handler ! ) { ! xmlSecKeyDataStorePtr certStore = NULL ; ! xmlSecKeysMngrPtr keyMngr = NULL ; ! xmlSecKeyStorePtr keyStore = NULL ; -! +! int islot = 0; ! keyStore = xmlSecKeyStoreCreate( xmlSecNssKeysStoreId ) ; ! if( keyStore == NULL ) { ! xmlSecError( XMLSEC_ERRORS_HERE , @@ -3344,7 +3347,8 @@ ! return NULL ; ! } ! -! if( slot != NULL ) { +! for (islot = 0; islot < cSlots; islot++) +! { ! xmlSecNssKeySlotPtr keySlot ; ! ! /* Create a key slot */ @@ -3361,7 +3365,7 @@ ! } ! ! /* Set slot */ -! if( xmlSecNssKeySlotSetSlot( keySlot , slot ) < 0 ) { +! if( xmlSecNssKeySlotSetSlot( keySlot , slots[islot] ) < 0 ) { ! xmlSecError( XMLSEC_ERRORS_HERE , ! xmlSecErrorsSafeString( xmlSecKeyStoreGetName( keyStore ) ) , ! "xmlSecNssKeySlotSetSlot" , @@ -3670,7 +3674,7 @@ ! } ! *** misc/xmlsec1-1.2.6/src/nss/ciphers.c 2003-09-26 02:58:15.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/src/nss/ciphers.c 2006-02-24 17:41:55.285802000 +0100 +--- misc/build/xmlsec1-1.2.6/src/nss/ciphers.c 2006-05-08 12:19:39.240657000 +0200 *************** *** 1,838 **** ! /** @@ -5464,7 +5468,7 @@ ! *** misc/xmlsec1-1.2.6/src/nss/crypto.c 2003-10-29 16:57:25.000000000 +0100 ---- misc/build/xmlsec1-1.2.6/src/nss/crypto.c 2006-02-24 17:41:55.305202000 +0100 +--- misc/build/xmlsec1-1.2.6/src/nss/crypto.c 2006-05-08 12:19:39.257648000 +0200 *************** *** 130,135 **** --- 130,136 ---- @@ -5518,7 +5522,7 @@ return(gXmlSecNssFunctions); } *** misc/xmlsec1-1.2.6/src/nss/digests.c 2003-09-26 02:58:15.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/src/nss/digests.c 2006-02-24 17:41:55.321489000 +0100 +--- misc/build/xmlsec1-1.2.6/src/nss/digests.c 2006-05-08 12:19:39.272123000 +0200 *************** *** 21,27 **** #include <xmlsec/transforms.h> @@ -5615,7 +5619,7 @@ } xmlSecAssert2(ctx->dgstSize > 0, -1); *** misc/xmlsec1-1.2.6/src/nss/hmac.c 2003-09-26 02:58:15.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/src/nss/hmac.c 2006-02-24 17:41:55.338612000 +0100 +--- misc/build/xmlsec1-1.2.6/src/nss/hmac.c 2006-05-08 12:19:39.287801000 +0200 *************** *** 23,30 **** #include <xmlsec/transforms.h> @@ -5750,7 +5754,7 @@ } xmlSecAssert2(dgstSize > 0, -1); *** misc/xmlsec1-1.2.6/src/nss/keysstore.c 2003-09-26 02:58:15.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/src/nss/keysstore.c 2006-02-24 17:41:55.359620000 +0100 +--- misc/build/xmlsec1-1.2.6/src/nss/keysstore.c 2006-05-08 12:19:39.306795000 +0200 *************** *** 1,119 **** /** @@ -6817,8 +6821,8 @@ ! return(0); } + -*** misc/xmlsec1-1.2.6/src/nss/keytrans.c 2006-02-24 17:42:19.846485000 +0100 ---- misc/build/xmlsec1-1.2.6/src/nss/keytrans.c 2006-02-24 17:41:55.380498000 +0100 +*** misc/xmlsec1-1.2.6/src/nss/keytrans.c 2006-05-08 12:20:35.636652000 +0200 +--- misc/build/xmlsec1-1.2.6/src/nss/keytrans.c 2006-05-08 12:19:39.325291000 +0200 *************** *** 1 **** ! dummy @@ -7567,8 +7571,8 @@ ! ! #endif /* XMLSEC_NO_RSA */ ! -*** misc/xmlsec1-1.2.6/src/nss/keywrapers.c 2006-02-24 17:42:19.892708000 +0100 ---- misc/build/xmlsec1-1.2.6/src/nss/keywrapers.c 2006-02-24 17:41:55.405360000 +0100 +*** misc/xmlsec1-1.2.6/src/nss/keywrapers.c 2006-05-08 12:20:35.663491000 +0200 +--- misc/build/xmlsec1-1.2.6/src/nss/keywrapers.c 2006-05-08 12:19:39.346178000 +0200 *************** *** 1 **** ! dummy @@ -8771,7 +8775,7 @@ ! #endif /* XMLSEC_NO_DES */ ! *** misc/xmlsec1-1.2.6/src/nss/Makefile.am 2003-09-16 11:43:03.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/src/nss/Makefile.am 2006-02-24 17:41:55.427236000 +0100 +--- misc/build/xmlsec1-1.2.6/src/nss/Makefile.am 2006-05-08 12:19:39.363816000 +0200 *************** *** 20,40 **** $(NULL) @@ -8819,7 +8823,7 @@ libxmlsec1_nss_la_LIBADD = \ *** misc/xmlsec1-1.2.6/src/nss/Makefile.in 2004-08-26 08:00:32.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/src/nss/Makefile.in 2006-02-24 17:41:55.443755000 +0100 +--- misc/build/xmlsec1-1.2.6/src/nss/Makefile.in 2006-05-08 12:19:39.378564000 +0200 *************** *** 54,62 **** $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ @@ -8944,7 +8948,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signatures.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symkeys.Plo@am__quote@ *** misc/xmlsec1-1.2.6/src/nss/pkikeys.c 2004-03-17 06:06:45.000000000 +0100 ---- misc/build/xmlsec1-1.2.6/src/nss/pkikeys.c 2006-02-24 17:41:55.467274000 +0100 +--- misc/build/xmlsec1-1.2.6/src/nss/pkikeys.c 2006-05-08 12:19:39.399185000 +0200 *************** *** 5,10 **** --- 5,11 ---- @@ -9744,7 +9748,7 @@ return(8 * SECKEY_PublicKeyStrength(ctx->pubkey)); } *** misc/xmlsec1-1.2.6/src/nss/signatures.c 2003-09-26 02:58:15.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/src/nss/signatures.c 2006-02-24 17:41:55.493148000 +0100 +--- misc/build/xmlsec1-1.2.6/src/nss/signatures.c 2006-05-08 12:19:39.421762000 +0200 *************** *** 199,205 **** xmlSecErrorsSafeString(xmlSecTransformGetName(transform)), @@ -9882,7 +9886,7 @@ } *** misc/xmlsec1-1.2.6/src/nss/symkeys.c 2003-07-21 05:12:52.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/src/nss/symkeys.c 2006-02-24 17:41:55.518317000 +0100 +--- misc/build/xmlsec1-1.2.6/src/nss/symkeys.c 2006-05-08 12:19:39.443317000 +0200 *************** *** 15,192 **** #include <stdio.h> @@ -11213,8 +11217,8 @@ * * Sets the value of HMAC key data. * -*** misc/xmlsec1-1.2.6/src/nss/tokens.c 2006-02-24 17:42:19.943421000 +0100 ---- misc/build/xmlsec1-1.2.6/src/nss/tokens.c 2006-02-24 17:41:55.540040000 +0100 +*** misc/xmlsec1-1.2.6/src/nss/tokens.c 2006-05-08 12:20:35.687962000 +0200 +--- misc/build/xmlsec1-1.2.6/src/nss/tokens.c 2006-05-08 12:19:39.463184000 +0200 *************** *** 1 **** ! dummy @@ -11764,7 +11768,7 @@ ! } ! *** misc/xmlsec1-1.2.6/src/nss/x509.c 2003-09-26 05:53:09.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/src/nss/x509.c 2006-02-24 17:41:55.562665000 +0100 +--- misc/build/xmlsec1-1.2.6/src/nss/x509.c 2006-05-08 12:19:39.484058000 +0200 *************** *** 34,40 **** #include <xmlsec/keys.h> @@ -12873,7 +12877,7 @@ SECItem *sn; --- 1701,1706 ---- *** misc/xmlsec1-1.2.6/src/nss/x509vfy.c 2003-09-26 02:58:15.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/src/nss/x509vfy.c 2006-02-24 17:41:55.587422000 +0100 +--- misc/build/xmlsec1-1.2.6/src/nss/x509vfy.c 2006-05-08 12:19:39.508316000 +0200 *************** *** 30,35 **** --- 30,36 ---- @@ -14016,7 +14020,7 @@ + #endif /* XMLSEC_NO_X509 */ *** misc/xmlsec1-1.2.6/win32/Makefile.msvc 2004-06-09 16:35:12.000000000 +0200 ---- misc/build/xmlsec1-1.2.6/win32/Makefile.msvc 2006-02-24 17:41:55.603676000 +0100 +--- misc/build/xmlsec1-1.2.6/win32/Makefile.msvc 2006-05-08 12:19:39.522849000 +0200 *************** *** 223,228 **** --- 223,232 ---- |