Revert "Update to 7.40.1"

[platform/upstream/curl.git] / lib / base64.c

diff --git a/lib/base64.c b/lib/base64.c
index 6b1eb7c..a941cc7 100644 (file)
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -37,29 +37,24 @@
 #include "memdebug.h"
 
 /* ---- Base64 Encoding/Decoding Table --- */
-static const char base64[]=
+static const char table64[]=
   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
-/* The Base 64 encoding with an URL and filename safe alphabet, RFC 4648
-   section 5 */
-static const char base64url[]=
-  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
-
 static size_t decodeQuantum(unsigned char *dest, const char *src)
 {
   size_t padding = 0;
   const char *s, *p;
-  unsigned long i, x = 0;
+  unsigned long i, v, x = 0;
 
   for(i = 0, s = src; i < 4; i++, s++) {
-    unsigned long v = 0;
+    v = 0;
 
     if(*s == '=') {
       x = (x << 6);
       padding++;
     }
     else {
-      p = base64;
+      p = table64;
 
       while(*p && (*p != *s)) {
         v++;
@@ -107,6 +102,7 @@ CURLcode Curl_base64_decode(const char *src,
   size_t length = 0;
   size_t padding = 0;
   size_t i;
+  size_t result;
   size_t numQuantums;
   size_t rawlen = 0;
   unsigned char *pos;
@@ -150,7 +146,7 @@ CURLcode Curl_base64_decode(const char *src,
 
   /* Decode the quantums */
   for(i = 0; i < numQuantums; i++) {
-    size_t result = decodeQuantum(pos, src);
+    result = decodeQuantum(pos, src);
     if(!result) {
       Curl_safefree(newstr);
 
@@ -171,10 +167,26 @@ CURLcode Curl_base64_decode(const char *src,
   return CURLE_OK;
 }
 
-static CURLcode base64_encode(const char *table64,
-                              struct SessionHandle *data,
-                              const char *inputbuff, size_t insize,
-                              char **outptr, size_t *outlen)
+/*
+ * Curl_base64_encode()
+ *
+ * Given a pointer to an input buffer and an input size, encode it and
+ * return a pointer in *outptr to a newly allocated memory area holding
+ * encoded data. Size of encoded data is returned in variable pointed by
+ * outlen.
+ *
+ * Input length of 0 indicates input buffer holds a NUL-terminated string.
+ *
+ * Returns CURLE_OK on success, otherwise specific error code. Function
+ * output shall not be considered valid unless CURLE_OK is returned.
+ *
+ * When encoded data length is 0, returns NULL in *outptr.
+ *
+ * @unittest: 1302
+ */
+CURLcode Curl_base64_encode(struct SessionHandle *data,
+                            const char *inputbuff, size_t insize,
+                            char **outptr, size_t *outlen)
 {
   CURLcode error;
   unsigned char ibuf[3];
@@ -262,52 +274,4 @@ static CURLcode base64_encode(const char *table64,
 
   return CURLE_OK;
 }
-
-/*
- * Curl_base64_encode()
- *
- * Given a pointer to an input buffer and an input size, encode it and
- * return a pointer in *outptr to a newly allocated memory area holding
- * encoded data. Size of encoded data is returned in variable pointed by
- * outlen.
- *
- * Input length of 0 indicates input buffer holds a NUL-terminated string.
- *
- * Returns CURLE_OK on success, otherwise specific error code. Function
- * output shall not be considered valid unless CURLE_OK is returned.
- *
- * When encoded data length is 0, returns NULL in *outptr.
- *
- * @unittest: 1302
- */
-CURLcode Curl_base64_encode(struct SessionHandle *data,
-                            const char *inputbuff, size_t insize,
-                            char **outptr, size_t *outlen)
-{
-  return base64_encode(base64, data, inputbuff, insize, outptr, outlen);
-}
-
-/*
- * Curl_base64url_encode()
- *
- * Given a pointer to an input buffer and an input size, encode it and
- * return a pointer in *outptr to a newly allocated memory area holding
- * encoded data. Size of encoded data is returned in variable pointed by
- * outlen.
- *
- * Input length of 0 indicates input buffer holds a NUL-terminated string.
- *
- * Returns CURLE_OK on success, otherwise specific error code. Function
- * output shall not be considered valid unless CURLE_OK is returned.
- *
- * When encoded data length is 0, returns NULL in *outptr.
- *
- * @unittest: 1302
- */
-CURLcode Curl_base64url_encode(struct SessionHandle *data,
-                               const char *inputbuff, size_t insize,
-                               char **outptr, size_t *outlen)
-{
-  return base64_encode(base64url, data, inputbuff, insize, outptr, outlen);
-}
 /* ---- End of Base64 Encoding ---- */