nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove base64_decode_nopad()

Browse Source 
Remove base64_decode_nopad() because it is redundant now that
base64_decode() correctly handles both padded and unpadded base64
encodings with "right-sized" output buffers.
This commit is contained in:
Taylor Yu 2017-04-07 17:54:50 -04:00
parent 00ffefb41b
commit 2b38bb28b4
2 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/common/util_format.c
View File

@ -313,39 +313,6 @@ base64_encode_nopad(char *dest, size_t destlen,
return (int)(out - dest);
}
/** As base64_decode, but do not require any padding on the input */
int
base64_decode_nopad(uint8_t *dest, size_t destlen,
const char *src, size_t srclen)
{
if (srclen > SIZE_T_CEILING - 4)
return -1;
char *buf = tor_malloc(srclen + 4);
memcpy(buf, src, srclen+1);
size_t buflen;
switch (srclen % 4)
{
case 0:
default:
buflen = srclen;
break;
case 1:
tor_free(buf);
return -1;
case 2:
memcpy(buf+srclen, "==", 3);
buflen = srclen + 2;
break;
case 3:
memcpy(buf+srclen, "=", 2);
buflen = srclen + 1;
break;
}
int n = base64_decode((char*)dest, destlen, buf, buflen);
tor_free(buf);
return n;
}
#undef BASE64_OPENSSL_LINELEN
/** @{ */

2
src/common/util_format.h
View File

@ -37,8 +37,6 @@ int base64_encode(char *dest, size_t destlen, const char *src, size_t srclen,
int base64_decode(char *dest, size_t destlen, const char *src, size_t srclen);
int base64_encode_nopad(char *dest, size_t destlen,
const uint8_t *src, size_t srclen);
int base64_decode_nopad(uint8_t *dest, size_t destlen,
const char *src, size_t srclen);
/** Characters that can appear (case-insensitively) in a base32 encoding. */
#define BASE32_CHARS "abcdefghijklmnopqrstuvwxyz234567"