Roll libxslt to 891681e3e948f31732229f53cb6db7215f740fc7

third_party/libxslt/libexslt/crypto.c

 #define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
 #if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
 #include <win32config.h>
 #else
 #include "config.h"
 #endif
 
 #include <libxml/tree.h>
@@ skipping 439 matching lines @@
 
 #endif /* defined(HAVE_GCRYPT) */
 
 #if defined(HAVE_CRYPTO)
 
 /**
  * exsltCryptoPopString:
  * @ctxt: an XPath parser context
  * @nargs: the number of arguments
  *
- * Helper function which checks for and returns first string argument and its length
+ * Helper function which checks for and returns first string argument and its
+ * length in bytes.
  */
 static int
 exsltCryptoPopString (xmlXPathParserContextPtr ctxt, int nargs,
                       xmlChar ** str) {
 
     int str_len = 0;
 
     if ((nargs < 1) || (nargs > 2)) {
         xmlXPathSetArityError (ctxt);
         return 0;
     }
 
     *str = xmlXPathPopString (ctxt);
-    str_len = xmlUTF8Strlen (*str);
+    str_len = xmlStrlen (*str);
 
     if (str_len == 0) {
         xmlXPathReturnEmptyString (ctxt);
         xmlFree (*str);
         return 0;
     }
 
     return str_len;
 }
 
@@ skipping 99 matching lines @@
 /**
  * exsltCryptoRc4EncryptFunction:
  * @ctxt: an XPath parser context
  * @nargs: the number of arguments
  *
  * computes the sha1 hash of a string and returns as hex
  */
 static void
 exsltCryptoRc4EncryptFunction (xmlXPathParserContextPtr ctxt, int nargs) {
 
-    int key_len = 0, key_size = 0;
+    int key_len = 0;
     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 != 2) {
         xmlXPathSetArityError (ctxt);
         return;
     }
     tctxt = xsltXPathGetTransformContext(ctxt);
 
     str = xmlXPathPopString (ctxt);
-    str_len = xmlUTF8Strlen (str);
+    str_len = xmlStrlen (str);
 
     if (str_len == 0) {
         xmlXPathReturnEmptyString (ctxt);
         xmlFree (str);
         return;
     }
 
     key = xmlXPathPopString (ctxt);
-    key_len = xmlUTF8Strlen (key);
+    key_len = xmlStrlen (key);
 
     if (key_len == 0) {
         xmlXPathReturnEmptyString (ctxt);
         xmlFree (key);
         xmlFree (str);
         return;
     }
 
     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)) {
+    if ((key_len > RC4_KEY_LENGTH) || (key_len < 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);
+    memcpy (padkey, key, key_len);
 
 /* 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;
@@ skipping 28 matching lines @@
 /**
  * exsltCryptoRc4DecryptFunction:
  * @ctxt: an XPath parser context
  * @nargs: the number of arguments
  *
  * computes the sha1 hash of a string and returns as hex
  */
 static void
 exsltCryptoRc4DecryptFunction (xmlXPathParserContextPtr ctxt, int nargs) {
 
-    int key_len = 0, key_size = 0;
+    int key_len = 0;
     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 != 2) {
         xmlXPathSetArityError (ctxt);
         return;
     }
     tctxt = xsltXPathGetTransformContext(ctxt);
 
     str = xmlXPathPopString (ctxt);
-    str_len = xmlUTF8Strlen (str);
+    str_len = xmlStrlen (str);
 
     if (str_len == 0) {
         xmlXPathReturnEmptyString (ctxt);
         xmlFree (str);
         return;
     }
 
     key = xmlXPathPopString (ctxt);
-    key_len = xmlUTF8Strlen (key);
+    key_len = xmlStrlen (key);
 
     if (key_len == 0) {
         xmlXPathReturnEmptyString (ctxt);
         xmlFree (key);
         xmlFree (str);
         return;
     }
 
     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)) {
+    if ((key_len > RC4_KEY_LENGTH) || (key_len < 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);
+    memcpy (padkey, key, key_len);
 
 /* 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;
@@ skipping 56 matching lines @@
  *
  * Registers the EXSLT - Crypto module
  */
 void
 exsltCryptoRegister (void) {
 }
 
 #endif /* defined(HAVE_CRYPTO) */
 
 #endif /* EXSLT_CRYPTO_ENABLED */