Skip to content

Commit 1a3880f

Browse files
committed
Revert "re-factor size checks in blake2 implementations"
This reverts commit af38b18.
1 parent af38b18 commit 1a3880f

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/hashes/blake2b.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,14 +333,14 @@ int blake2b_process(hash_state *md, const unsigned char *in, unsigned long inlen
333333
LTC_ARGCHK(md != NULL);
334334
LTC_ARGCHK(in != NULL);
335335

336-
if (md->blake2b.curlen >= sizeof(md->blake2b.buf)) {
336+
if (md->blake2b.curlen > sizeof(md->blake2b.buf)) {
337337
return CRYPT_INVALID_ARG;
338338
}
339339

340340
if (inlen > 0) {
341341
unsigned long left = md->blake2b.curlen;
342342
unsigned long fill = BLAKE2B_BLOCKBYTES - left;
343-
if (inlen >= fill) {
343+
if (inlen > fill) {
344344
md->blake2b.curlen = 0;
345345
XMEMCPY(md->blake2b.buf + left, in, fill); /* Fill buffer */
346346
blake2b_increment_counter(md, BLAKE2B_BLOCKBYTES);

src/hashes/blake2s.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,14 +321,14 @@ int blake2s_process(hash_state *md, const unsigned char *in, unsigned long inlen
321321
LTC_ARGCHK(md != NULL);
322322
LTC_ARGCHK(in != NULL);
323323

324-
if (md->blake2s.curlen >= sizeof(md->blake2s.buf)) {
324+
if (md->blake2s.curlen > sizeof(md->blake2s.buf)) {
325325
return CRYPT_INVALID_ARG;
326326
}
327327

328328
if (inlen > 0) {
329329
unsigned long left = md->blake2s.curlen;
330330
unsigned long fill = BLAKE2S_BLOCKBYTES - left;
331-
if (inlen >= fill) {
331+
if (inlen > fill) {
332332
md->blake2s.curlen = 0;
333333
XMEMCPY(md->blake2s.buf + left, in, fill); /* Fill buffer */
334334
blake2s_increment_counter(md, BLAKE2S_BLOCKBYTES);

0 commit comments

Comments
 (0)