emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

md5: code shrink; and use 64-byte temp buf, not 128-byte.

Browse Source 
function                                             old     new   delta
md5_hash                                             111     108      -3
md5_end                                              129     125      -4
md5_hash_block                                       459     454      -5
filter_rename_config                                 250     244      -6
md5_crypt                                            587     578      -9
popmaildir_main                                      828     816     -12
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/6 up/down: 0/-39)             Total: -39 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-10-16 20:46:35 +02:00
parent c0683acce8
commit bcccad3531
3 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libbb.h
View File

@ -1540,7 +1540,7 @@ typedef struct md5_ctx_t {
uint32_t C; uint32_t C;
uint32_t D; uint32_t D;
uint64_t total; uint64_t total;
char buffer[128]; char buffer[64];
} md5_ctx_t; } md5_ctx_t;
#else #else
/* libbb/md5prime.c uses a bit different one: */ /* libbb/md5prime.c uses a bit different one: */

4
include/platform.h
View File

@ -197,6 +197,8 @@
# define SWAP_LE16(x) bswap_16(x) # define SWAP_LE16(x) bswap_16(x)
# define SWAP_LE32(x) bswap_32(x) # define SWAP_LE32(x) bswap_32(x)
# define SWAP_LE64(x) bswap_64(x) # define SWAP_LE64(x) bswap_64(x)
# define IF_BIG_ENDIAN(...) __VA_ARGS__
# define IF_LITTLE_ENDIAN(...)
#else #else
# define SWAP_BE16(x) bswap_16(x) # define SWAP_BE16(x) bswap_16(x)
# define SWAP_BE32(x) bswap_32(x) # define SWAP_BE32(x) bswap_32(x)
@ -204,6 +206,8 @@
# define SWAP_LE16(x) (x) # define SWAP_LE16(x) (x)
# define SWAP_LE32(x) (x) # define SWAP_LE32(x) (x)
# define SWAP_LE64(x) (x) # define SWAP_LE64(x) (x)
# define IF_BIG_ENDIAN(...)
# define IF_LITTLE_ENDIAN(...) __VA_ARGS__
#endif #endif
/* ---- Unaligned access ------------------------------------ */ /* ---- Unaligned access ------------------------------------ */

51
libbb/md5.c
View File

@ -49,11 +49,8 @@ void FAST_FUNC md5_begin(md5_ctx_t *ctx)
#define rotl32(w, s) (((w) << (s)) | ((w) >> (32 - (s)))) #define rotl32(w, s) (((w) << (s)) | ((w) >> (32 - (s))))
/* Hash a single block, 64 bytes long and 4-byte aligned. */ /* Hash a single block, 64 bytes long and 4-byte aligned. */
static void md5_hash_block(md5_ctx_t *ctx, const void *buffer) static void md5_hash_block(md5_ctx_t *ctx)
{ {
uint32_t correct_words[16];
const uint32_t *words = buffer;
#if MD5_SIZE_VS_SPEED > 0 #if MD5_SIZE_VS_SPEED > 0
/* Before we start, one word to the strange constants. /* Before we start, one word to the strange constants.
They are defined in RFC 1321 as They are defined in RFC 1321 as
@ -98,12 +95,13 @@ static void md5_hash_block(md5_ctx_t *ctx, const void *buffer)
}; };
# endif # endif
#endif #endif
const uint32_t *words = (const void*) ctx->buffer;
uint32_t A = ctx->A; uint32_t A = ctx->A;
uint32_t B = ctx->B; uint32_t B = ctx->B;
uint32_t C = ctx->C; uint32_t C = ctx->C;
uint32_t D = ctx->D; uint32_t D = ctx->D;
uint32_t *cwp = correct_words;
uint32_t A_save = A; uint32_t A_save = A;
uint32_t B_save = B; uint32_t B_save = B;
uint32_t C_save = C; uint32_t C_save = C;
@ -116,9 +114,10 @@ static void md5_hash_block(md5_ctx_t *ctx, const void *buffer)
int i; int i;
uint32_t temp; uint32_t temp;
# if BB_BIG_ENDIAN
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
cwp[i] = SWAP_LE32(words[i]); words[i] = SWAP_LE32(words[i]);
words += 16; # endif
# if MD5_SIZE_VS_SPEED > 2 # if MD5_SIZE_VS_SPEED > 2
pc = C_array; pc = C_array;
@ -142,7 +141,7 @@ static void md5_hash_block(md5_ctx_t *ctx, const void *buffer)
case 3: case 3:
temp += FI(B, C, D); temp += FI(B, C, D);
} }
temp += cwp[(int) (*pp++)] + *pc++; temp += words[(int) (*pp++)] + *pc++;
temp = rotl32(temp, ps[i & 3]); temp = rotl32(temp, ps[i & 3]);
temp += B; temp += B;
A = D; A = D;
@ -156,7 +155,7 @@ static void md5_hash_block(md5_ctx_t *ctx, const void *buffer)
ps = S_array; ps = S_array;
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
temp = A + FF(B, C, D) + cwp[(int) (*pp++)] + *pc++; temp = A + FF(B, C, D) + words[(int) (*pp++)] + *pc++;
temp = rotl32(temp, ps[i & 3]); temp = rotl32(temp, ps[i & 3]);
temp += B; temp += B;
A = D; A = D;
@ -166,7 +165,7 @@ static void md5_hash_block(md5_ctx_t *ctx, const void *buffer)
} }
ps += 4; ps += 4;
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
temp = A + FG(B, C, D) + cwp[(int) (*pp++)] + *pc++; temp = A + FG(B, C, D) + words[(int) (*pp++)] + *pc++;
temp = rotl32(temp, ps[i & 3]); temp = rotl32(temp, ps[i & 3]);
temp += B; temp += B;
A = D; A = D;
@ -176,7 +175,7 @@ static void md5_hash_block(md5_ctx_t *ctx, const void *buffer)
} }
ps += 4; ps += 4;
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
temp = A + FH(B, C, D) + cwp[(int) (*pp++)] + *pc++; temp = A + FH(B, C, D) + words[(int) (*pp++)] + *pc++;
temp = rotl32(temp, ps[i & 3]); temp = rotl32(temp, ps[i & 3]);
temp += B; temp += B;
A = D; A = D;
@ -186,7 +185,7 @@ static void md5_hash_block(md5_ctx_t *ctx, const void *buffer)
} }
ps += 4; ps += 4;
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
temp = A + FI(B, C, D) + cwp[(int) (*pp++)] + *pc++; temp = A + FI(B, C, D) + words[(int) (*pp++)] + *pc++;
temp = rotl32(temp, ps[i & 3]); temp = rotl32(temp, ps[i & 3]);
temp += B; temp += B;
A = D; A = D;
@ -203,12 +202,12 @@ static void md5_hash_block(md5_ctx_t *ctx, const void *buffer)
unit is a 32-bit word and it is determined to work on words in unit is a 32-bit word and it is determined to work on words in
little endian byte order we perhaps have to change the byte order little endian byte order we perhaps have to change the byte order
before the computation. To reduce the work for the next steps before the computation. To reduce the work for the next steps
we store the swapped words in the array CORRECT_WORDS. */ we save swapped words in WORDS array. */
# undef OP # undef OP
# define OP(a, b, c, d, s, T) \ # define OP(a, b, c, d, s, T) \
do { \ do { \
a += FF(b, c, d) + (*cwp++ = SWAP_LE32(*words)) + T; \ a += FF(b, c, d) + (*words IF_BIG_ENDIAN(= SWAP_LE32(*words))) + T; \
++words; \ words++; \
a = rotl32(a, s); \ a = rotl32(a, s); \
a += b; \ a += b; \
} while (0) } while (0)
@ -248,7 +247,7 @@ static void md5_hash_block(md5_ctx_t *ctx, const void *buffer)
# endif # endif
/* For the second to fourth round we have the possibly swapped words /* For the second to fourth round we have the possibly swapped words
in CORRECT_WORDS. Redefine the macro to take an additional first in WORDS. Redefine the macro to take an additional first
argument specifying the function to use. */ argument specifying the function to use. */
# undef OP # undef OP
# define OP(f, a, b, c, d, k, s, T) \ # define OP(f, a, b, c, d, k, s, T) \
@ -385,7 +384,7 @@ void FAST_FUNC md5_hash(md5_ctx_t *ctx, const void *buffer, size_t len)
if (buflen != 0) if (buflen != 0)
break; break;
/* Buffer is filled up, process it. */ /* Buffer is filled up, process it. */
md5_hash_block(ctx, ctx->buffer); md5_hash_block(ctx);
/*buflen = 0; - already is */ /*buflen = 0; - already is */
} }
} }
@ -398,29 +397,29 @@ void FAST_FUNC md5_hash(md5_ctx_t *ctx, const void *buffer, size_t len)
void FAST_FUNC md5_end(md5_ctx_t *ctx, void *resbuf) void FAST_FUNC md5_end(md5_ctx_t *ctx, void *resbuf)
{ {
uint64_t total; uint64_t total;
char *buf = ctx->buffer;
unsigned i; unsigned i;
unsigned buflen = BUFLEN(ctx); unsigned buflen = BUFLEN(ctx);
/* Pad data to block size. */ /* Pad data to block size. */
buf[buflen++] = 0x80; ctx->buffer[buflen++] = 0x80;
memset(buf + buflen, 0, 128 - buflen); memset(ctx->buffer + buflen, 0, 64 - buflen);
if (buflen > 56) {
md5_hash_block(ctx);
memset(ctx->buffer, 0, 64);
}
/* Put the 64-bit file length, expressed in *bits*, /* Put the 64-bit file length, expressed in *bits*,
* at the end of the buffer. * at the end of the buffer.
*/ */
/* clever way to do "if (buflen > 56) buf += 64": */
buf += ((buflen + 7) & 64);
total = ctx->total << 3; total = ctx->total << 3;
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
buf[56 + i] = total; ctx->buffer[56 + i] = total;
total >>= 8; total >>= 8;
} }
/* Process last bytes. */ /* Process last bytes. */
if (buf != ctx->buffer) md5_hash_block(ctx);
md5_hash_block(ctx, ctx->buffer);
md5_hash_block(ctx, buf);
/* The MD5 result is in little endian byte order. /* The MD5 result is in little endian byte order.
* We (ab)use the fact that A-D are consecutive in memory. * We (ab)use the fact that A-D are consecutive in memory.