highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md5: cosmetics

Browse Source 
Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Mans Rullgard
2011-07-03 18:18:26 +01:00
parent fa49fc72d9
commit 82494cad9d
1 changed files with 60 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
libavutil/md5.c
View File

@@ -41,7 +41,7 @@ typedef struct AVMD5{
uint32_t ABCD[4]; uint32_t ABCD[4];
} AVMD5; } AVMD5;
const int av_md5_size= sizeof(AVMD5); const int av_md5_size = sizeof(AVMD5);
static const uint8_t S[4][4] = { static const uint8_t S[4][4] = {
{ 7, 12, 17, 22 }, /* round 1 */ { 7, 12, 17, 22 }, /* round 1 */
@@ -72,42 +72,49 @@ static const uint32_t T[64] = { // T[i]= fabs(sin(i+1)<<32)
0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391, 0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391,
}; };
#define CORE(i, a, b, c, d) \ #define CORE(i, a, b, c, d) do { \
t = S[i>>4][i&3];\ t = S[i >> 4][i & 3]; \
a += T[i];\ a += T[i]; \
\ \
if(i<32){\ if (i < 32) { \
if(i<16) a += (d ^ (b&(c^d))) + X[ i &15 ];\ if (i < 16) a += (d ^ (b & (c ^ d))) + X[ i & 15]; \
else a += (c ^ (d&(c^b))) + X[ (1+5*i)&15 ];\ else a += (c ^ (d & (c ^ b))) + X[(1 + 5*i) & 15]; \
}else{\ } else { \
if(i<48) a += (b^c^d) + X[ (5+3*i)&15 ];\ if (i < 48) a += (b ^ c ^ d) + X[(5 + 3*i) & 15]; \
else a += (c^(b|~d)) + X[ ( 7*i)&15 ];\ else a += (c ^ (b | ~d)) + X[( 7*i) & 15]; \
}\ } \
a = b + (( a << t ) | ( a >> (32 - t) )); a = b + (a << t | a >> (32 - t)); \
} while (0)
static void body(uint32_t ABCD[4], uint32_t X[16]){
static void body(uint32_t ABCD[4], uint32_t X[16])
{
int t; int t;
int i av_unused; int i av_unused;
unsigned int a= ABCD[3]; unsigned int a = ABCD[3];
unsigned int b= ABCD[2]; unsigned int b = ABCD[2];
unsigned int c= ABCD[1]; unsigned int c = ABCD[1];
unsigned int d= ABCD[0]; unsigned int d = ABCD[0];
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
for(i=0; i<16; i++) for (i = 0; i < 16; i++)
X[i]= av_bswap32(X[i]); X[i] = av_bswap32(X[i]);
#endif #endif
#if CONFIG_SMALL #if CONFIG_SMALL
for( i = 0; i < 64; i++ ){ for (i = 0; i < 64; i++) {
CORE(i,a,b,c,d) CORE(i, a, b, c, d);
t=d; d=c; c=b; b=a; a=t; t = d;
d = c;
c = b;
b = a;
a = t;
} }
#else #else
#define CORE2(i) CORE(i,a,b,c,d) CORE((i+1),d,a,b,c) CORE((i+2),c,d,a,b) CORE((i+3),b,c,d,a) #define CORE2(i) \
#define CORE4(i) CORE2(i) CORE2((i+4)) CORE2((i+8)) CORE2((i+12)) CORE( i, a,b,c,d); CORE((i+1),d,a,b,c); \
CORE4(0) CORE4(16) CORE4(32) CORE4(48) CORE((i+2),c,d,a,b); CORE((i+3),b,c,d,a)
#define CORE4(i) CORE2(i); CORE2((i+4)); CORE2((i+8)); CORE2((i+12))
CORE4(0); CORE4(16); CORE4(32); CORE4(48);
#endif #endif
ABCD[0] += d; ABCD[0] += d;
@@ -116,8 +123,9 @@ CORE4(0) CORE4(16) CORE4(32) CORE4(48)
ABCD[3] += a; ABCD[3] += a;
} }
void av_md5_init(AVMD5 *ctx){ void av_md5_init(AVMD5 *ctx)
ctx->len = 0; {
ctx->len = 0;
ctx->ABCD[0] = 0x10325476; ctx->ABCD[0] = 0x10325476;
ctx->ABCD[1] = 0x98badcfe; ctx->ABCD[1] = 0x98badcfe;
@@ -125,41 +133,44 @@ void av_md5_init(AVMD5 *ctx){
ctx->ABCD[3] = 0x67452301; ctx->ABCD[3] = 0x67452301;
} }
void av_md5_update(AVMD5 *ctx, const uint8_t *src, const int len){ void av_md5_update(AVMD5 *ctx, const uint8_t *src, const int len)
{
int i, j; int i, j;
j= ctx->len & 63; j = ctx->len & 63;
ctx->len += len; ctx->len += len;
for( i = 0; i < len; i++ ){ for (i = 0; i < len; i++) {
ctx->block[j++] = src[i]; ctx->block[j++] = src[i];
if( 64 == j ){ if (j == 64) {
body(ctx->ABCD, (uint32_t*) ctx->block); body(ctx->ABCD, (uint32_t *) ctx->block);
j = 0; j = 0;
} }
} }
} }
void av_md5_final(AVMD5 *ctx, uint8_t *dst){ void av_md5_final(AVMD5 *ctx, uint8_t *dst)
{
int i; int i;
uint64_t finalcount= av_le2ne64(ctx->len<<3); uint64_t finalcount = av_le2ne64(ctx->len << 3);
av_md5_update(ctx, "\200", 1); av_md5_update(ctx, "\200", 1);
while((ctx->len & 63)!=56) while ((ctx->len & 63) != 56)
av_md5_update(ctx, "", 1); av_md5_update(ctx, "", 1);
av_md5_update(ctx, (uint8_t*)&finalcount, 8); av_md5_update(ctx, (uint8_t *)&finalcount, 8);
for(i=0; i<4; i++) for (i = 0; i < 4; i++)
AV_WL32(dst + 4*i, ctx->ABCD[3-i]); AV_WL32(dst + 4*i, ctx->ABCD[3 - i]);
} }
void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len){ void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len)
AVMD5 ctx[1]; {
AVMD5 ctx;
av_md5_init(ctx); av_md5_init(&ctx);
av_md5_update(ctx, src, len); av_md5_update(&ctx, src, len);
av_md5_final(ctx, dst); av_md5_final(&ctx, dst);
} }
#ifdef TEST #ifdef TEST
@@ -179,12 +190,14 @@ int main(void){
int i; int i;
uint8_t in[1000]; uint8_t in[1000];
for(i=0; i<1000; i++) in[i]= i*i; for (i = 0; i < 1000; i++)
in[i] = i * i;
av_md5_sum(md5val, in, 1000); print_md5(md5val); av_md5_sum(md5val, in, 1000); print_md5(md5val);
av_md5_sum(md5val, in, 63); print_md5(md5val); av_md5_sum(md5val, in, 63); print_md5(md5val);
av_md5_sum(md5val, in, 64); print_md5(md5val); av_md5_sum(md5val, in, 64); print_md5(md5val);
av_md5_sum(md5val, in, 65); print_md5(md5val); av_md5_sum(md5val, in, 65); print_md5(md5val);
for(i=0; i<1000; i++) in[i]= i % 127; for (i = 0; i < 1000; i++)
in[i] = i % 127;
av_md5_sum(md5val, in, 999); print_md5(md5val); av_md5_sum(md5val, in, 999); print_md5(md5val);
return 0; return 0;