Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

small optimalizations #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

small optimalizations #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 22 additions & 31 deletions MD5.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,23 +71,11 @@ char* MD5::make_digest(const unsigned char *digest, int len) /* {{{ */
const void *MD5::body(void *ctxBuf, const void *data, size_t size)
{
MD5_CTX *ctx = (MD5_CTX*)ctxBuf;
const unsigned char *ptr;
MD5_u32plus a, b, c, d;
MD5_u32plus saved_a, saved_b, saved_c, saved_d;

ptr = (unsigned char*)data;

a = ctx->a;
b = ctx->b;
c = ctx->c;
d = ctx->d;

do {
saved_a = a;
saved_b = b;
saved_c = c;
saved_d = d;
const uint8_t *ptr = (uint8_t *)data;
MD5_u32plus a = ctx->a, b = ctx->b, c = ctx->c, d = ctx->d;
MD5_u32plus saved_a = a, saved_b = b, saved_c = c, saved_d = d;

for(;;) {
/* Round 1 */
STEP(F, a, b, c, d, SET(0), 0xd76aa478, 7)
STEP(F, d, a, b, c, SET(1), 0xe8c7b756, 12)
Expand Down Expand Up @@ -166,7 +154,16 @@ const void *MD5::body(void *ctxBuf, const void *data, size_t size)
d += saved_d;

ptr += 64;
} while (size -= 64);
size -= 64;

if (size == 0)
break;

saved_a = a;
saved_b = b;
saved_c = c;
saved_d = d;
}

ctx->a = a;
ctx->b = b;
Expand All @@ -184,26 +181,22 @@ void MD5::MD5Init(void *ctxBuf)
ctx->c = 0x98badcfe;
ctx->d = 0x10325476;

ctx->lo = 0;
ctx->hi = 0;
ctx->lo = ctx->hi = 0;
}

void MD5::MD5Update(void *ctxBuf, const void *data, size_t size)
{
MD5_CTX *ctx = (MD5_CTX*)ctxBuf;
MD5_u32plus saved_lo;
MD5_u32plus used, free;
MD5_u32plus saved_lo = ctx->lo;
MD5_u32plus used = saved_lo & 0x3f;

saved_lo = ctx->lo;
if ((ctx->lo = (saved_lo + size) & 0x1fffffff) < saved_lo) {
if ((ctx->lo = (saved_lo + size) & 0x1fffffff) < saved_lo)
ctx->hi++;
}
ctx->hi += size >> 29;

used = saved_lo & 0x3f;
ctx->hi += size >> 29;

if (used) {
free = 64 - used;
MD5_u32plus free = 64 - used;

if (size < free) {
memcpy(&ctx->buffer[used], data, size);
Expand All @@ -227,9 +220,7 @@ void MD5::MD5Update(void *ctxBuf, const void *data, size_t size)
void MD5::MD5Final(unsigned char *result, void *ctxBuf)
{
MD5_CTX *ctx = (MD5_CTX*)ctxBuf;
MD5_u32plus used, free;

used = ctx->lo & 0x3f;
MD5_u32plus used = ctx->lo & 0x3f, free;

ctx->buffer[used++] = 0x80;

Expand Down Expand Up @@ -283,4 +274,4 @@ unsigned char* MD5::make_hash(char *arg)
MD5Update(&context, arg, strlen(arg));
MD5Final(digest, &context);
return digest;
}
}