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

Fix some implicit conversion warnings

Browse Source
This commit is contained in:
Nick Mathewson 2015-04-23 09:09:20 -04:00
parent 196499da73
commit 55118d90ca
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/crypto.c
View File

@ -2496,6 +2496,8 @@ base64_encode(char *dest, size_t destlen, const char *src, size_t srclen,
return -1; return -1;
if (destlen > SIZE_T_CEILING) if (destlen > SIZE_T_CEILING)
return -1; return -1;
if (enclen > INT_MAX)
return -1;
memset(dest, 0, enclen); memset(dest, 0, enclen);
@ -2576,7 +2578,7 @@ base64_encode(char *dest, size_t destlen, const char *src, size_t srclen,
*d++ = '\0'; /* NUL terminate the output. */ *d++ = '\0'; /* NUL terminate the output. */
return enclen; return (int) enclen;
} }
#undef BASE64_OPENSSL_LINELEN #undef BASE64_OPENSSL_LINELEN

2
src/test/test_crypto.c
View File

@ -614,7 +614,7 @@ base64_encode_evp(char *dest, char *src, size_t srclen)
int len, ret; int len, ret;
EVP_EncodeInit(&ctx); EVP_EncodeInit(&ctx);
EVP_EncodeUpdate(&ctx, (unsigned char *)dest, &len, s, srclen); EVP_EncodeUpdate(&ctx, (unsigned char *)dest, &len, s, (int)srclen);
EVP_EncodeFinal(&ctx, (unsigned char *)(dest + len), &ret); EVP_EncodeFinal(&ctx, (unsigned char *)(dest + len), &ret);
return ret+ len; return ret+ len;
} }