generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More size_t cleanups in the base64 functions.

Browse Source
This commit is contained in:
Daniel Stenberg 2004-02-23 08:22:43 +00:00
parent 1aba4c519b
commit e1b5e15431
3 changed files with 44 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
lib/base64.c
View File

@ -1,8 +1,8 @@
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
@ -10,7 +10,7 @@
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at http://curl.haxx.se/docs/copyright.html.
*
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
* furnished to do so, under the terms of the COPYING file.
@ -28,7 +28,7 @@
* a base64-encoded version to stdout, and the length returned by the
* encoding function to stderr. Compile with -DTEST_DECODE for a program that
* will go the other way.
*
*
* This code will break if int is smaller than 32 bits
*/
@ -46,7 +46,7 @@
#include "memdebug.h"
#endif
static void decodeQuantum(unsigned char *dest, char *src)
static void decodeQuantum(unsigned char *dest, const char *src)
{
unsigned int x = 0;
int i;
@ -55,7 +55,7 @@ static void decodeQuantum(unsigned char *dest, char *src)
x = (x << 6) + (unsigned int)(src[i] - 'A' + 0);
else if(src[i] >= 'a' && src[i] <= 'z')
x = (x << 6) + (unsigned int)(src[i] - 'a' + 26);
else if(src[i] >= '0' && src[i] <= '9')
else if(src[i] >= '0' && src[i] <= '9')
x = (x << 6) + (unsigned int)(src[i] - '0' + 52);
else if(src[i] == '+')
x = (x << 6) + 62;
@ -70,43 +70,46 @@ static void decodeQuantum(unsigned char *dest, char *src)
dest[0] = (unsigned char)(x & 255); x >>= 8;
}
/* base64Decode
* Given a base64 string at src, decode it into the memory pointed
* to by dest. If rawLength points to a valid address (ie not NULL),
* store the length of the decoded data to it.
/*
* Curl_base64_decode()
*
* Given a base64 string at src, decode it into the memory pointed to by
* dest. Returns the length of the decoded data.
*/
static void base64Decode(unsigned char *dest, char *src, int *rawLength)
size_t Curl_base64_decode(char *dest, const char *src)
{
int length = 0;
int equalsTerm = 0;
int i;
int numQuantums;
unsigned char lastQuantum[3];
size_t rawlen=0;
while((src[length] != '=') && src[length])
length++;
while(src[length+equalsTerm] == '=')
equalsTerm++;
numQuantums = (length + equalsTerm) / 4;
if(rawLength)
*rawLength = (numQuantums * 3) - equalsTerm;
rawlen = (numQuantums * 3) - equalsTerm;
for(i = 0; i < numQuantums - 1; i++) {
decodeQuantum(dest, src);
decodeQuantum((unsigned char *)dest, src);
dest += 3; src += 4;
}
decodeQuantum(lastQuantum, src);
for(i = 0; i < 3 - equalsTerm; i++)
dest[i] = lastQuantum[i];
return rawlen;
}
/* ---- Base64 Encoding --- */
static char table64[]=
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
/*
* Curl_base64_encode()
*
@ -115,7 +118,7 @@ static char table64[]=
* went wrong, -1 is returned.
*
*/
int Curl_base64_encode(const void *inp, size_t insize, char **outptr)
size_t Curl_base64_encode(const char *inp, size_t insize, char **outptr)
{
unsigned char ibuf[3];
unsigned char obuf[4];
@ -131,10 +134,10 @@ int Curl_base64_encode(const void *inp, size_t insize, char **outptr)
base64data = output = (char*)malloc(insize*4/3+4);
if(NULL == output)
return -1;
return 0;
while(insize > 0) {
for (i = inputparts = 0; i < 3; i++) {
for (i = inputparts = 0; i < 3; i++) {
if(insize > 0) {
inputparts++;
ibuf[i] = *indata;
@ -144,7 +147,7 @@ int Curl_base64_encode(const void *inp, size_t insize, char **outptr)
else
ibuf[i] = 0;
}
obuf [0] = (ibuf [0] & 0xFC) >> 2;
obuf [1] = ((ibuf [0] & 0x03) << 4) | ((ibuf [1] & 0xF0) >> 4);
obuf [2] = ((ibuf [1] & 0x0F) << 2) | ((ibuf [2] & 0xC0) >> 6);
@ -152,18 +155,18 @@ int Curl_base64_encode(const void *inp, size_t insize, char **outptr)
switch(inputparts) {
case 1: /* only one byte read */
sprintf(output, "%c%c==",
sprintf(output, "%c%c==",
table64[obuf[0]],
table64[obuf[1]]);
break;
case 2: /* two bytes read */
sprintf(output, "%c%c%c=",
sprintf(output, "%c%c%c=",
table64[obuf[0]],
table64[obuf[1]],
table64[obuf[2]]);
break;
default:
sprintf(output, "%c%c%c%c",
sprintf(output, "%c%c%c%c",
table64[obuf[0]],
table64[obuf[1]],
table64[obuf[2]],
@ -179,14 +182,6 @@ int Curl_base64_encode(const void *inp, size_t insize, char **outptr)
}
/* ---- End of Base64 Encoding ---- */
int Curl_base64_decode(const char *str, void *data)
{
int ret;
base64Decode((unsigned char *)data, (char *)str, &ret);
return ret;
}
/************* TEST HARNESS STUFF ****************/
@ -205,20 +200,20 @@ int main(int argc, char **argv, char **envp)
size_t base64Len;
unsigned char *data;
int dataLen;
data = (unsigned char *)suck(&dataLen);
base64Len = Curl_base64_encode(data, dataLen, &base64);
fprintf(stderr, "%d\n", base64Len);
fprintf(stdout, "%s", base64);
free(base64); free(data);
return 0;
}
#endif
#ifdef TEST_DECODE
/* decoding test harness. Read in a base64 string from stdin and write out the
/* decoding test harness. Read in a base64 string from stdin and write out the
* length returned by Curl_base64_decode, followed by the decoded data itself
*
* gcc -DTEST_DECODE base64.c -o base64 mprintf.o memdebug.o
@ -235,11 +230,11 @@ int main(int argc, char **argv, char **envp)
unsigned char *data;
int dataLen;
int i, j;
base64 = (char *)suck(&base64Len);
data = (unsigned char *)malloc(base64Len * 3/4 + 8);
dataLen = Curl_base64_decode(base64, data);
fprintf(stderr, "%d\n", dataLen);
for(i=0; i < dataLen; i+=0x10) {
@ -249,7 +244,7 @@ int main(int argc, char **argv, char **envp)
printf("%02x ", data[i+j]);
else
printf(" ");
printf(" | ");
for(j=0; j < 0x10; j++)
@ -259,7 +254,7 @@ int main(int argc, char **argv, char **envp)
break;
puts("");
}
free(base64); free(data);
return 0;
}
@ -273,7 +268,7 @@ void *suck(int *lenptr)
unsigned char *buf = NULL;
int lastread;
int len = 0;
do {
cursize *= 2;
buf = (unsigned char *)realloc(buf, cursize);
@ -281,7 +276,7 @@ void *suck(int *lenptr)
lastread = fread(buf + len, 1, cursize - len, stdin);
len += lastread;
} while(!feof(stdin));
lenptr[0] = len;
return (void *)buf;
}

4
lib/base64.h
View File

@ -22,6 +22,6 @@
*
* $Id$
***************************************************************************/
int Curl_base64_encode(const void *data, size_t size, char **str);
int Curl_base64_decode(const char *str, void *data);
size_t Curl_base64_encode(const char *input, size_t size, char **str);
size_t Curl_base64_decode(char *dest, const char *source);
#endif

4
lib/http.c
View File

@ -127,7 +127,7 @@ static CURLcode Curl_output_basic(struct connectdata *conn)
sprintf(data->state.buffer, "%s:%s", conn->user, conn->passwd);
if(Curl_base64_encode(data->state.buffer, strlen(data->state.buffer),
&authorization) >= 0) {
&authorization) > 0) {
if(conn->allocptr.userpwd)
free(conn->allocptr.userpwd);
conn->allocptr.userpwd = aprintf( "Authorization: Basic %s\015\012",
@ -147,7 +147,7 @@ static CURLcode Curl_output_basic_proxy(struct connectdata *conn)
sprintf(data->state.buffer, "%s:%s",
conn->proxyuser, conn->proxypasswd);
if(Curl_base64_encode(data->state.buffer, strlen(data->state.buffer),
&authorization) >= 0) {
&authorization) > 0) {
Curl_safefree(conn->allocptr.proxyuserpwd);
conn->allocptr.proxyuserpwd =
aprintf("Proxy-authorization: Basic %s\015\012", authorization);