kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

rmd160.c: fix for huge data

Browse source 
* ext/digest/rmd160/rmd160.c (RMD160_Update): fix for huge data.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35554 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-05-07 01:27:59 +00:00
parent 298258891d
commit cc3f33073d
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Mon May 7 10:27:56 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/digest/rmd160/rmd160.c (RMD160_Update): fix for huge data.
Mon May 7 10:23:04 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon May 7 10:23:04 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/fileutils/fileasserts.rb: use assert_equal, assert_match, and so on. * test/fileutils/fileasserts.rb: use assert_equal, assert_match, and so on.

10
ext/digest/rmd160/rmd160.c
View file

@ -362,16 +362,20 @@ RMD160_Update(RMD160_CTX *context, const uint8_t *data, size_t nbytes)
_DIAGASSERT(data != NULL); _DIAGASSERT(data != NULL);
/* update length[] */ /* update length[] */
#if SIZEOF_SIZE_T * CHAR_BIT > 32
context->length[1] += (uint32_t)((context->length[0] + nbytes) >> 32);
#else
if (context->length[0] + nbytes < context->length[0]) if (context->length[0] + nbytes < context->length[0])
context->length[1]++; /* overflow to msb of length */ context->length[1]++; /* overflow to msb of length */
context->length[0] += nbytes; #endif
context->length[0] += (uint32_t)nbytes;
(void)memset(X, 0, sizeof(X)); (void)memset(X, 0, sizeof(X));
if ( context->buflen + nbytes < 64 ) if ( context->buflen + nbytes < 64 )
{ {
(void)memcpy(context->bbuffer + context->buflen, data, nbytes); (void)memcpy(context->bbuffer + context->buflen, data, nbytes);
context->buflen += nbytes; context->buflen += (uint32_t)nbytes;
} }
else else
{ {
@ -401,7 +405,7 @@ RMD160_Update(RMD160_CTX *context, const uint8_t *data, size_t nbytes)
/* /*
* Put last bytes from data into context's buffer * Put last bytes from data into context's buffer
*/ */
context->buflen = nbytes & 63; context->buflen = (uint32_t)nbytes & 63;
memcpy(context->bbuffer, data + (64 * i) + ofs, context->buflen); memcpy(context->bbuffer, data + (64 * i) + ofs, context->buflen);
} }
} }