diff options
| -rw-r--r-- | crypto/md5.c | 95 | ||||
| -rw-r--r-- | include/linux/cryptohash.h | 5 | ||||
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | lib/md5.c | 95 |
4 files changed, 95 insertions, 102 deletions
diff --git a/crypto/md5.c b/crypto/md5.c index 2355a7c25c45..f7ae1a48225b 100644 --- a/crypto/md5.c +++ b/crypto/md5.c | |||
| @@ -21,9 +21,11 @@ | |||
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/string.h> | 22 | #include <linux/string.h> |
| 23 | #include <linux/types.h> | 23 | #include <linux/types.h> |
| 24 | #include <linux/cryptohash.h> | ||
| 25 | #include <asm/byteorder.h> | 24 | #include <asm/byteorder.h> |
| 26 | 25 | ||
| 26 | #define MD5_DIGEST_WORDS 4 | ||
| 27 | #define MD5_MESSAGE_BYTES 64 | ||
| 28 | |||
| 27 | const u8 md5_zero_message_hash[MD5_DIGEST_SIZE] = { | 29 | const u8 md5_zero_message_hash[MD5_DIGEST_SIZE] = { |
| 28 | 0xd4, 0x1d, 0x8c, 0xd9, 0x8f, 0x00, 0xb2, 0x04, | 30 | 0xd4, 0x1d, 0x8c, 0xd9, 0x8f, 0x00, 0xb2, 0x04, |
| 29 | 0xe9, 0x80, 0x09, 0x98, 0xec, 0xf8, 0x42, 0x7e, | 31 | 0xe9, 0x80, 0x09, 0x98, 0xec, 0xf8, 0x42, 0x7e, |
| @@ -47,6 +49,97 @@ static inline void cpu_to_le32_array(u32 *buf, unsigned int words) | |||
| 47 | } | 49 | } |
| 48 | } | 50 | } |
| 49 | 51 | ||
| 52 | #define F1(x, y, z) (z ^ (x & (y ^ z))) | ||
| 53 | #define F2(x, y, z) F1(z, x, y) | ||
| 54 | #define F3(x, y, z) (x ^ y ^ z) | ||
| 55 | #define F4(x, y, z) (y ^ (x | ~z)) | ||
| 56 | |||
| 57 | #define MD5STEP(f, w, x, y, z, in, s) \ | ||
| 58 | (w += f(x, y, z) + in, w = (w<<s | w>>(32-s)) + x) | ||
| 59 | |||
| 60 | static void md5_transform(__u32 *hash, __u32 const *in) | ||
| 61 | { | ||
| 62 | u32 a, b, c, d; | ||
| 63 | |||
| 64 | a = hash[0]; | ||
| 65 | b = hash[1]; | ||
| 66 | c = hash[2]; | ||
| 67 | d = hash[3]; | ||
| 68 | |||
| 69 | MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7); | ||
| 70 | MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12); | ||
| 71 | MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17); | ||
| 72 | MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22); | ||
| 73 | MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7); | ||
| 74 | MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12); | ||
| 75 | MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17); | ||
| 76 | MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22); | ||
| 77 | MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7); | ||
| 78 | MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12); | ||
| 79 | MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17); | ||
| 80 | MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22); | ||
| 81 | MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7); | ||
| 82 | MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12); | ||
| 83 | MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17); | ||
| 84 | MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22); | ||
| 85 | |||
| 86 | MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5); | ||
| 87 | MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9); | ||
| 88 | MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14); | ||
| 89 | MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20); | ||
| 90 | MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5); | ||
| 91 | MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9); | ||
| 92 | MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14); | ||
| 93 | MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20); | ||
| 94 | MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5); | ||
| 95 | MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9); | ||
| 96 | MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14); | ||
| 97 | MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20); | ||
| 98 | MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5); | ||
| 99 | MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9); | ||
| 100 | MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14); | ||
| 101 | MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20); | ||
| 102 | |||
| 103 | MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4); | ||
| 104 | MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11); | ||
| 105 | MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16); | ||
| 106 | MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23); | ||
| 107 | MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4); | ||
| 108 | MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11); | ||
| 109 | MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16); | ||
| 110 | MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23); | ||
| 111 | MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4); | ||
| 112 | MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11); | ||
| 113 | MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16); | ||
| 114 | MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23); | ||
| 115 | MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4); | ||
| 116 | MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11); | ||
| 117 | MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16); | ||
| 118 | MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23); | ||
| 119 | |||
| 120 | MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6); | ||
| 121 | MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10); | ||
| 122 | MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15); | ||
| 123 | MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21); | ||
| 124 | MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6); | ||
| 125 | MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10); | ||
| 126 | MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15); | ||
| 127 | MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21); | ||
| 128 | MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6); | ||
| 129 | MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10); | ||
| 130 | MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15); | ||
| 131 | MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21); | ||
| 132 | MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6); | ||
| 133 | MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10); | ||
| 134 | MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15); | ||
| 135 | MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21); | ||
| 136 | |||
| 137 | hash[0] += a; | ||
| 138 | hash[1] += b; | ||
| 139 | hash[2] += c; | ||
| 140 | hash[3] += d; | ||
| 141 | } | ||
| 142 | |||
| 50 | static inline void md5_transform_helper(struct md5_state *ctx) | 143 | static inline void md5_transform_helper(struct md5_state *ctx) |
| 51 | { | 144 | { |
| 52 | le32_to_cpu_array(ctx->block, sizeof(ctx->block) / sizeof(u32)); | 145 | le32_to_cpu_array(ctx->block, sizeof(ctx->block) / sizeof(u32)); |
diff --git a/include/linux/cryptohash.h b/include/linux/cryptohash.h index 3252799832cf..df4d3e943d28 100644 --- a/include/linux/cryptohash.h +++ b/include/linux/cryptohash.h | |||
| @@ -10,9 +10,4 @@ | |||
| 10 | void sha_init(__u32 *buf); | 10 | void sha_init(__u32 *buf); |
| 11 | void sha_transform(__u32 *digest, const char *data, __u32 *W); | 11 | void sha_transform(__u32 *digest, const char *data, __u32 *W); |
| 12 | 12 | ||
| 13 | #define MD5_DIGEST_WORDS 4 | ||
| 14 | #define MD5_MESSAGE_BYTES 64 | ||
| 15 | |||
| 16 | void md5_transform(__u32 *hash, __u32 const *in); | ||
| 17 | |||
| 18 | #endif | 13 | #endif |
diff --git a/lib/Makefile b/lib/Makefile index 320ac46a8725..acbc16bed9af 100644 --- a/lib/Makefile +++ b/lib/Makefile | |||
| @@ -19,7 +19,7 @@ KCOV_INSTRUMENT_dynamic_debug.o := n | |||
| 19 | lib-y := ctype.o string.o vsprintf.o cmdline.o \ | 19 | lib-y := ctype.o string.o vsprintf.o cmdline.o \ |
| 20 | rbtree.o radix-tree.o dump_stack.o timerqueue.o\ | 20 | rbtree.o radix-tree.o dump_stack.o timerqueue.o\ |
| 21 | idr.o int_sqrt.o extable.o \ | 21 | idr.o int_sqrt.o extable.o \ |
| 22 | sha1.o chacha20.o md5.o irq_regs.o argv_split.o \ | 22 | sha1.o chacha20.o irq_regs.o argv_split.o \ |
| 23 | flex_proportions.o ratelimit.o show_mem.o \ | 23 | flex_proportions.o ratelimit.o show_mem.o \ |
| 24 | is_single_threaded.o plist.o decompress.o kobject_uevent.o \ | 24 | is_single_threaded.o plist.o decompress.o kobject_uevent.o \ |
| 25 | earlycpio.o seq_buf.o siphash.o \ | 25 | earlycpio.o seq_buf.o siphash.o \ |
diff --git a/lib/md5.c b/lib/md5.c deleted file mode 100644 index bb0cd01d356d..000000000000 --- a/lib/md5.c +++ /dev/null | |||
| @@ -1,95 +0,0 @@ | |||
| 1 | #include <linux/compiler.h> | ||
| 2 | #include <linux/export.h> | ||
| 3 | #include <linux/cryptohash.h> | ||
| 4 | |||
| 5 | #define F1(x, y, z) (z ^ (x & (y ^ z))) | ||
| 6 | #define F2(x, y, z) F1(z, x, y) | ||
| 7 | #define F3(x, y, z) (x ^ y ^ z) | ||
| 8 | #define F4(x, y, z) (y ^ (x | ~z)) | ||
| 9 | |||
| 10 | #define MD5STEP(f, w, x, y, z, in, s) \ | ||
| 11 | (w += f(x, y, z) + in, w = (w<<s | w>>(32-s)) + x) | ||
| 12 | |||
| 13 | void md5_transform(__u32 *hash, __u32 const *in) | ||
| 14 | { | ||
| 15 | u32 a, b, c, d; | ||
| 16 | |||
| 17 | a = hash[0]; | ||
| 18 | b = hash[1]; | ||
| 19 | c = hash[2]; | ||
| 20 | d = hash[3]; | ||
| 21 | |||
| 22 | MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7); | ||
| 23 | MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12); | ||
| 24 | MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17); | ||
| 25 | MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22); | ||
| 26 | MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7); | ||
| 27 | MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12); | ||
| 28 | MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17); | ||
| 29 | MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22); | ||
| 30 | MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7); | ||
| 31 | MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12); | ||
| 32 | MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17); | ||
| 33 | MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22); | ||
| 34 | MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7); | ||
| 35 | MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12); | ||
| 36 | MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17); | ||
| 37 | MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22); | ||
| 38 | |||
| 39 | MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5); | ||
| 40 | MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9); | ||
| 41 | MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14); | ||
| 42 | MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20); | ||
| 43 | MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5); | ||
| 44 | MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9); | ||
| 45 | MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14); | ||
| 46 | MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20); | ||
| 47 | MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5); | ||
| 48 | MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9); | ||
| 49 | MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14); | ||
| 50 | MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20); | ||
| 51 | MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5); | ||
| 52 | MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9); | ||
| 53 | MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14); | ||
| 54 | MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20); | ||
| 55 | |||
| 56 | MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4); | ||
| 57 | MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11); | ||
| 58 | MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16); | ||
| 59 | MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23); | ||
| 60 | MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4); | ||
| 61 | MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11); | ||
| 62 | MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16); | ||
| 63 | MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23); | ||
| 64 | MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4); | ||
| 65 | MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11); | ||
| 66 | MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16); | ||
| 67 | MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23); | ||
| 68 | MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4); | ||
| 69 | MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11); | ||
| 70 | MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16); | ||
| 71 | MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23); | ||
| 72 | |||
| 73 | MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6); | ||
| 74 | MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10); | ||
| 75 | MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15); | ||
| 76 | MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21); | ||
| 77 | MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6); | ||
| 78 | MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10); | ||
| 79 | MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15); | ||
| 80 | MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21); | ||
| 81 | MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6); | ||
| 82 | MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10); | ||
| 83 | MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15); | ||
| 84 | MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21); | ||
| 85 | MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6); | ||
| 86 | MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10); | ||
| 87 | MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15); | ||
| 88 | MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21); | ||
| 89 | |||
| 90 | hash[0] += a; | ||
| 91 | hash[1] += b; | ||
| 92 | hash[2] += c; | ||
| 93 | hash[3] += d; | ||
| 94 | } | ||
| 95 | EXPORT_SYMBOL(md5_transform); | ||
