cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't mix lengths and block sizes

Browse Source
This commit is contained in:
Frank Denis 2018-09-10 19:57:06 +02:00
parent 3e9d341d06
commit 04a7ab95f2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libsodium/crypto_stream/chacha20/stream_chacha20.c
View File

@ -120,8 +120,7 @@ int
crypto_stream_chacha20_ietf(unsigned char *c, unsigned long long clen, crypto_stream_chacha20_ietf(unsigned char *c, unsigned long long clen,
const unsigned char *n, const unsigned char *k) const unsigned char *n, const unsigned char *k)
{ {
if (clen > if (clen > crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX) {
crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX / 64ULL - (clen + 63ULL) / 64ULL) {
sodium_misuse(); sodium_misuse();
} }
return crypto_stream_chacha20_ietf_ext(c, clen, n, k); return crypto_stream_chacha20_ietf_ext(c, clen, n, k);
@ -145,8 +144,7 @@ crypto_stream_chacha20_ietf_xor(unsigned char *c, const unsigned char *m,
unsigned long long mlen, const unsigned char *n, unsigned long long mlen, const unsigned char *n,
const unsigned char *k) const unsigned char *k)
{ {
if (mlen > if (mlen > crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX) {
crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX / 64ULL - (mlen + 63ULL) / 64ULL) {
sodium_misuse(); sodium_misuse();
} }
return crypto_stream_chacha20_ietf_ext_xor(c, m, mlen, n, k); return crypto_stream_chacha20_ietf_ext_xor(c, m, mlen, n, k);