From 2dcaaad11631147ff774981f446c0101badb7699 Mon Sep 17 00:00:00 2001 From: suzuki toshiya Date: Wed, 13 Sep 2017 10:57:02 +0900 Subject: [md5] make some constants typed unsigned long, and MD5_u32plus is changed from unsigned int to FT_UInt32. --- src/base/md5.c | 130 ++++++++++++++++++++++++++++----------------------------- src/base/md5.h | 2 +- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/src/base/md5.c b/src/base/md5.c index b235e17a5..b3078225f 100644 --- a/src/base/md5.c +++ b/src/base/md5.c @@ -59,7 +59,7 @@ */ #define STEP(f, a, b, c, d, x, t, s) \ (a) += f((b), (c), (d)) + (x) + (t); \ - (a) = (((a) << (s)) | (((a) & 0xffffffff) >> (32 - (s)))); \ + (a) = (((a) << (s)) | (((a) & 0xffffffffUL) >> (32 - (s)))); \ (a) += (b); /* @@ -117,76 +117,76 @@ static const void *body(MD5_CTX *ctx, const void *data, unsigned long size) saved_d = d; /* Round 1 */ - STEP(F, a, b, c, d, SET(0), 0xd76aa478, 7) - STEP(F, d, a, b, c, SET(1), 0xe8c7b756, 12) - STEP(F, c, d, a, b, SET(2), 0x242070db, 17) - STEP(F, b, c, d, a, SET(3), 0xc1bdceee, 22) - STEP(F, a, b, c, d, SET(4), 0xf57c0faf, 7) - STEP(F, d, a, b, c, SET(5), 0x4787c62a, 12) - STEP(F, c, d, a, b, SET(6), 0xa8304613, 17) - STEP(F, b, c, d, a, SET(7), 0xfd469501, 22) - STEP(F, a, b, c, d, SET(8), 0x698098d8, 7) - STEP(F, d, a, b, c, SET(9), 0x8b44f7af, 12) - STEP(F, c, d, a, b, SET(10), 0xffff5bb1, 17) - STEP(F, b, c, d, a, SET(11), 0x895cd7be, 22) - STEP(F, a, b, c, d, SET(12), 0x6b901122, 7) - STEP(F, d, a, b, c, SET(13), 0xfd987193, 12) - STEP(F, c, d, a, b, SET(14), 0xa679438e, 17) - STEP(F, b, c, d, a, SET(15), 0x49b40821, 22) + STEP(F, a, b, c, d, SET(0), 0xd76aa478UL, 7) + STEP(F, d, a, b, c, SET(1), 0xe8c7b756UL, 12) + STEP(F, c, d, a, b, SET(2), 0x242070dbUL, 17) + STEP(F, b, c, d, a, SET(3), 0xc1bdceeeUL, 22) + STEP(F, a, b, c, d, SET(4), 0xf57c0fafUL, 7) + STEP(F, d, a, b, c, SET(5), 0x4787c62aUL, 12) + STEP(F, c, d, a, b, SET(6), 0xa8304613UL, 17) + STEP(F, b, c, d, a, SET(7), 0xfd469501UL, 22) + STEP(F, a, b, c, d, SET(8), 0x698098d8UL, 7) + STEP(F, d, a, b, c, SET(9), 0x8b44f7afUL, 12) + STEP(F, c, d, a, b, SET(10), 0xffff5bb1UL, 17) + STEP(F, b, c, d, a, SET(11), 0x895cd7beUL, 22) + STEP(F, a, b, c, d, SET(12), 0x6b901122UL, 7) + STEP(F, d, a, b, c, SET(13), 0xfd987193UL, 12) + STEP(F, c, d, a, b, SET(14), 0xa679438eUL, 17) + STEP(F, b, c, d, a, SET(15), 0x49b40821UL, 22) /* Round 2 */ - STEP(G, a, b, c, d, GET(1), 0xf61e2562, 5) - STEP(G, d, a, b, c, GET(6), 0xc040b340, 9) - STEP(G, c, d, a, b, GET(11), 0x265e5a51, 14) - STEP(G, b, c, d, a, GET(0), 0xe9b6c7aa, 20) - STEP(G, a, b, c, d, GET(5), 0xd62f105d, 5) - STEP(G, d, a, b, c, GET(10), 0x02441453, 9) - STEP(G, c, d, a, b, GET(15), 0xd8a1e681, 14) - STEP(G, b, c, d, a, GET(4), 0xe7d3fbc8, 20) - STEP(G, a, b, c, d, GET(9), 0x21e1cde6, 5) - STEP(G, d, a, b, c, GET(14), 0xc33707d6, 9) - STEP(G, c, d, a, b, GET(3), 0xf4d50d87, 14) - STEP(G, b, c, d, a, GET(8), 0x455a14ed, 20) - STEP(G, a, b, c, d, GET(13), 0xa9e3e905, 5) - STEP(G, d, a, b, c, GET(2), 0xfcefa3f8, 9) - STEP(G, c, d, a, b, GET(7), 0x676f02d9, 14) - STEP(G, b, c, d, a, GET(12), 0x8d2a4c8a, 20) + STEP(G, a, b, c, d, GET(1), 0xf61e2562UL, 5) + STEP(G, d, a, b, c, GET(6), 0xc040b340UL, 9) + STEP(G, c, d, a, b, GET(11), 0x265e5a51UL, 14) + STEP(G, b, c, d, a, GET(0), 0xe9b6c7aaUL, 20) + STEP(G, a, b, c, d, GET(5), 0xd62f105dUL, 5) + STEP(G, d, a, b, c, GET(10), 0x02441453UL, 9) + STEP(G, c, d, a, b, GET(15), 0xd8a1e681UL, 14) + STEP(G, b, c, d, a, GET(4), 0xe7d3fbc8UL, 20) + STEP(G, a, b, c, d, GET(9), 0x21e1cde6UL, 5) + STEP(G, d, a, b, c, GET(14), 0xc33707d6UL, 9) + STEP(G, c, d, a, b, GET(3), 0xf4d50d87UL, 14) + STEP(G, b, c, d, a, GET(8), 0x455a14edUL, 20) + STEP(G, a, b, c, d, GET(13), 0xa9e3e905UL, 5) + STEP(G, d, a, b, c, GET(2), 0xfcefa3f8UL, 9) + STEP(G, c, d, a, b, GET(7), 0x676f02d9UL, 14) + STEP(G, b, c, d, a, GET(12), 0x8d2a4c8aUL, 20) /* Round 3 */ - STEP(H, a, b, c, d, GET(5), 0xfffa3942, 4) - STEP(H2, d, a, b, c, GET(8), 0x8771f681, 11) - STEP(H, c, d, a, b, GET(11), 0x6d9d6122, 16) - STEP(H2, b, c, d, a, GET(14), 0xfde5380c, 23) - STEP(H, a, b, c, d, GET(1), 0xa4beea44, 4) - STEP(H2, d, a, b, c, GET(4), 0x4bdecfa9, 11) - STEP(H, c, d, a, b, GET(7), 0xf6bb4b60, 16) - STEP(H2, b, c, d, a, GET(10), 0xbebfbc70, 23) - STEP(H, a, b, c, d, GET(13), 0x289b7ec6, 4) - STEP(H2, d, a, b, c, GET(0), 0xeaa127fa, 11) - STEP(H, c, d, a, b, GET(3), 0xd4ef3085, 16) - STEP(H2, b, c, d, a, GET(6), 0x04881d05, 23) - STEP(H, a, b, c, d, GET(9), 0xd9d4d039, 4) - STEP(H2, d, a, b, c, GET(12), 0xe6db99e5, 11) - STEP(H, c, d, a, b, GET(15), 0x1fa27cf8, 16) - STEP(H2, b, c, d, a, GET(2), 0xc4ac5665, 23) + STEP(H, a, b, c, d, GET(5), 0xfffa3942UL, 4) + STEP(H2, d, a, b, c, GET(8), 0x8771f681UL, 11) + STEP(H, c, d, a, b, GET(11), 0x6d9d6122UL, 16) + STEP(H2, b, c, d, a, GET(14), 0xfde5380cUL, 23) + STEP(H, a, b, c, d, GET(1), 0xa4beea44UL, 4) + STEP(H2, d, a, b, c, GET(4), 0x4bdecfa9UL, 11) + STEP(H, c, d, a, b, GET(7), 0xf6bb4b60UL, 16) + STEP(H2, b, c, d, a, GET(10), 0xbebfbc70UL, 23) + STEP(H, a, b, c, d, GET(13), 0x289b7ec6UL, 4) + STEP(H2, d, a, b, c, GET(0), 0xeaa127faUL, 11) + STEP(H, c, d, a, b, GET(3), 0xd4ef3085UL, 16) + STEP(H2, b, c, d, a, GET(6), 0x04881d05UL, 23) + STEP(H, a, b, c, d, GET(9), 0xd9d4d039UL, 4) + STEP(H2, d, a, b, c, GET(12), 0xe6db99e5UL, 11) + STEP(H, c, d, a, b, GET(15), 0x1fa27cf8UL, 16) + STEP(H2, b, c, d, a, GET(2), 0xc4ac5665UL, 23) /* Round 4 */ - STEP(I, a, b, c, d, GET(0), 0xf4292244, 6) - STEP(I, d, a, b, c, GET(7), 0x432aff97, 10) - STEP(I, c, d, a, b, GET(14), 0xab9423a7, 15) - STEP(I, b, c, d, a, GET(5), 0xfc93a039, 21) - STEP(I, a, b, c, d, GET(12), 0x655b59c3, 6) - STEP(I, d, a, b, c, GET(3), 0x8f0ccc92, 10) - STEP(I, c, d, a, b, GET(10), 0xffeff47d, 15) - STEP(I, b, c, d, a, GET(1), 0x85845dd1, 21) - STEP(I, a, b, c, d, GET(8), 0x6fa87e4f, 6) - STEP(I, d, a, b, c, GET(15), 0xfe2ce6e0, 10) - STEP(I, c, d, a, b, GET(6), 0xa3014314, 15) - STEP(I, b, c, d, a, GET(13), 0x4e0811a1, 21) - STEP(I, a, b, c, d, GET(4), 0xf7537e82, 6) - STEP(I, d, a, b, c, GET(11), 0xbd3af235, 10) - STEP(I, c, d, a, b, GET(2), 0x2ad7d2bb, 15) - STEP(I, b, c, d, a, GET(9), 0xeb86d391, 21) + STEP(I, a, b, c, d, GET(0), 0xf4292244UL, 6) + STEP(I, d, a, b, c, GET(7), 0x432aff97UL, 10) + STEP(I, c, d, a, b, GET(14), 0xab9423a7UL, 15) + STEP(I, b, c, d, a, GET(5), 0xfc93a039UL, 21) + STEP(I, a, b, c, d, GET(12), 0x655b59c3UL, 6) + STEP(I, d, a, b, c, GET(3), 0x8f0ccc92UL, 10) + STEP(I, c, d, a, b, GET(10), 0xffeff47dUL, 15) + STEP(I, b, c, d, a, GET(1), 0x85845dd1UL, 21) + STEP(I, a, b, c, d, GET(8), 0x6fa87e4fUL, 6) + STEP(I, d, a, b, c, GET(15), 0xfe2ce6e0UL, 10) + STEP(I, c, d, a, b, GET(6), 0xa3014314UL, 15) + STEP(I, b, c, d, a, GET(13), 0x4e0811a1UL, 21) + STEP(I, a, b, c, d, GET(4), 0xf7537e82UL, 6) + STEP(I, d, a, b, c, GET(11), 0xbd3af235UL, 10) + STEP(I, c, d, a, b, GET(2), 0x2ad7d2bbUL, 15) + STEP(I, b, c, d, a, GET(9), 0xeb86d391UL, 21) a += saved_a; b += saved_b; diff --git a/src/base/md5.h b/src/base/md5.h index 2da44bf35..31075bcf2 100644 --- a/src/base/md5.h +++ b/src/base/md5.h @@ -29,7 +29,7 @@ #define _MD5_H /* Any 32-bit or wider unsigned integer data type will do */ -typedef unsigned int MD5_u32plus; +typedef FT_UInt32 MD5_u32plus; typedef struct { MD5_u32plus lo, hi; -- cgit v1.2.1