diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-05-03 21:57:36 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-05-03 21:57:36 +0000 |
commit | f8f40998a6355cd908792f1b1312e09e3edfd19e (patch) | |
tree | d574070a712cecc5d5dac6aa8c73d857bbf3a976 /dev-libs/libxslt/files | |
parent | Add metadata. (diff) | |
download | historical-f8f40998a6355cd908792f1b1312e09e3edfd19e.tar.gz historical-f8f40998a6355cd908792f1b1312e09e3edfd19e.tar.bz2 historical-f8f40998a6355cd908792f1b1312e09e3edfd19e.zip |
old
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/libxslt/files')
-rw-r--r-- | dev-libs/libxslt/files/libxslt-1.1.24-exslt_crypt.patch | 152 | ||||
-rw-r--r-- | dev-libs/libxslt/files/libxslt.m4-libxslt-1.1.8.patch | 37 |
2 files changed, 0 insertions, 189 deletions
diff --git a/dev-libs/libxslt/files/libxslt-1.1.24-exslt_crypt.patch b/dev-libs/libxslt/files/libxslt-1.1.24-exslt_crypt.patch deleted file mode 100644 index c9ab232dd4b9..000000000000 --- a/dev-libs/libxslt/files/libxslt-1.1.24-exslt_crypt.patch +++ /dev/null @@ -1,152 +0,0 @@ -Index: libexslt/crypto.c -=================================================================== ---- libexslt/crypto.c (revision 1479) -+++ libexslt/crypto.c (working copy) -@@ -595,11 +595,13 @@ exsltCryptoRc4EncryptFunction (xmlXPathP - int str_len = 0, bin_len = 0, hex_len = 0; - xmlChar *key = NULL, *str = NULL, *padkey = NULL; - xmlChar *bin = NULL, *hex = NULL; -+ xsltTransformContextPtr tctxt = NULL; - -- if ((nargs < 1) || (nargs > 3)) { -+ if (nargs != 2) { - xmlXPathSetArityError (ctxt); - return; - } -+ tctxt = xsltXPathGetTransformContext(ctxt); - - str = xmlXPathPopString (ctxt); - str_len = xmlUTF8Strlen (str); -@@ -611,7 +613,7 @@ exsltCryptoRc4EncryptFunction (xmlXPathP - } - - key = xmlXPathPopString (ctxt); -- key_len = xmlUTF8Strlen (str); -+ key_len = xmlUTF8Strlen (key); - - if (key_len == 0) { - xmlXPathReturnEmptyString (ctxt); -@@ -620,15 +622,33 @@ exsltCryptoRc4EncryptFunction (xmlXPathP - return; - } - -- padkey = xmlMallocAtomic (RC4_KEY_LENGTH); -+ padkey = xmlMallocAtomic (RC4_KEY_LENGTH + 1); -+ if (padkey == NULL) { -+ xsltTransformError(tctxt, NULL, tctxt->inst, -+ "exsltCryptoRc4EncryptFunction: Failed to allocate padkey\n"); -+ tctxt->state = XSLT_STATE_STOPPED; -+ xmlXPathReturnEmptyString (ctxt); -+ goto done; -+ } -+ memset(padkey, 0, RC4_KEY_LENGTH + 1); -+ - key_size = xmlUTF8Strsize (key, key_len); -+ if ((key_size > RC4_KEY_LENGTH) || (key_size < 0)) { -+ xsltTransformError(tctxt, NULL, tctxt->inst, -+ "exsltCryptoRc4EncryptFunction: key size too long or key broken\n"); -+ tctxt->state = XSLT_STATE_STOPPED; -+ xmlXPathReturnEmptyString (ctxt); -+ goto done; -+ } - memcpy (padkey, key, key_size); -- memset (padkey + key_size, '\0', sizeof (padkey)); - - /* encrypt it */ - bin_len = str_len; - bin = xmlStrdup (str); - if (bin == NULL) { -+ xsltTransformError(tctxt, NULL, tctxt->inst, -+ "exsltCryptoRc4EncryptFunction: Failed to allocate string\n"); -+ tctxt->state = XSLT_STATE_STOPPED; - xmlXPathReturnEmptyString (ctxt); - goto done; - } -@@ -638,6 +658,9 @@ exsltCryptoRc4EncryptFunction (xmlXPathP - hex_len = str_len * 2 + 1; - hex = xmlMallocAtomic (hex_len); - if (hex == NULL) { -+ xsltTransformError(tctxt, NULL, tctxt->inst, -+ "exsltCryptoRc4EncryptFunction: Failed to allocate result\n"); -+ tctxt->state = XSLT_STATE_STOPPED; - xmlXPathReturnEmptyString (ctxt); - goto done; - } -@@ -670,11 +693,13 @@ exsltCryptoRc4DecryptFunction (xmlXPathP - int str_len = 0, bin_len = 0, ret_len = 0; - xmlChar *key = NULL, *str = NULL, *padkey = NULL, *bin = - NULL, *ret = NULL; -+ xsltTransformContextPtr tctxt = NULL; - -- if ((nargs < 1) || (nargs > 3)) { -+ if (nargs != 2) { - xmlXPathSetArityError (ctxt); - return; - } -+ tctxt = xsltXPathGetTransformContext(ctxt); - - str = xmlXPathPopString (ctxt); - str_len = xmlUTF8Strlen (str); -@@ -686,7 +711,7 @@ exsltCryptoRc4DecryptFunction (xmlXPathP - } - - key = xmlXPathPopString (ctxt); -- key_len = xmlUTF8Strlen (str); -+ key_len = xmlUTF8Strlen (key); - - if (key_len == 0) { - xmlXPathReturnEmptyString (ctxt); -@@ -695,22 +720,51 @@ exsltCryptoRc4DecryptFunction (xmlXPathP - return; - } - -- padkey = xmlMallocAtomic (RC4_KEY_LENGTH); -+ padkey = xmlMallocAtomic (RC4_KEY_LENGTH + 1); -+ if (padkey == NULL) { -+ xsltTransformError(tctxt, NULL, tctxt->inst, -+ "exsltCryptoRc4EncryptFunction: Failed to allocate padkey\n"); -+ tctxt->state = XSLT_STATE_STOPPED; -+ xmlXPathReturnEmptyString (ctxt); -+ goto done; -+ } -+ memset(padkey, 0, RC4_KEY_LENGTH + 1); - key_size = xmlUTF8Strsize (key, key_len); -+ if ((key_size > RC4_KEY_LENGTH) || (key_size < 0)) { -+ xsltTransformError(tctxt, NULL, tctxt->inst, -+ "exsltCryptoRc4EncryptFunction: key size too long or key broken\n"); -+ tctxt->state = XSLT_STATE_STOPPED; -+ xmlXPathReturnEmptyString (ctxt); -+ goto done; -+ } - memcpy (padkey, key, key_size); -- memset (padkey + key_size, '\0', sizeof (padkey)); - - /* decode hex to binary */ - bin_len = str_len; - bin = xmlMallocAtomic (bin_len); -+ if (bin == NULL) { -+ xsltTransformError(tctxt, NULL, tctxt->inst, -+ "exsltCryptoRc4EncryptFunction: Failed to allocate string\n"); -+ tctxt->state = XSLT_STATE_STOPPED; -+ xmlXPathReturnEmptyString (ctxt); -+ goto done; -+ } - ret_len = exsltCryptoHex2Bin (str, str_len, bin, bin_len); - - /* decrypt the binary blob */ - ret = xmlMallocAtomic (ret_len); -+ if (ret == NULL) { -+ xsltTransformError(tctxt, NULL, tctxt->inst, -+ "exsltCryptoRc4EncryptFunction: Failed to allocate result\n"); -+ tctxt->state = XSLT_STATE_STOPPED; -+ xmlXPathReturnEmptyString (ctxt); -+ goto done; -+ } - PLATFORM_RC4_DECRYPT (ctxt, padkey, bin, ret_len, ret, ret_len); - - xmlXPathReturnString (ctxt, ret); - -+done: - if (key != NULL) - xmlFree (key); - if (str != NULL) diff --git a/dev-libs/libxslt/files/libxslt.m4-libxslt-1.1.8.patch b/dev-libs/libxslt/files/libxslt.m4-libxslt-1.1.8.patch deleted file mode 100644 index 82db848d954e..000000000000 --- a/dev-libs/libxslt/files/libxslt.m4-libxslt-1.1.8.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- libxslt.m4 2004-05-17 05:25:26.000000000 +0200 -+++ libxslt.m4.patched 2004-07-26 06:05:36.000000000 +0200 -@@ -52,8 +52,10 @@ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_xslttest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" -+ ac_save_CXXFLAGS="$CXXFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $XSLT_CFLAGS" -+ CXXFLAGS="$CFLAGS" - LIBS="$XSLT_LIBS $LIBS" - dnl - dnl Now check if the installed libxslt is sufficiently new. -@@ -138,6 +140,7 @@ - } - ],, no_xslt=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" -+ CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - fi - fi -@@ -158,6 +161,7 @@ - else - echo "*** Could not run libxslt test program, checking why..." - CFLAGS="$CFLAGS $XSLT_CFLAGS" -+ CXXFLAGS="$CFLAGS" - LIBS="$LIBS $XSLT_LIBS" - AC_TRY_LINK([ - #include <libxslt/xslt.h> -@@ -177,6 +181,7 @@ - echo "*** or that you have moved LIBXSLT since it was installed. In the latter case, you" - echo "*** may want to edit the xslt-config script: $XSLT_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" -+ CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - fi - fi |