move lib/md5.c to its proper originating commit

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

2 files changed, 103 insertions, 128 deletions

diff --git a/queue/crypto-Move-md5_transform-to-lib-md5.c.patch b/queue/crypto-Move-md5_transform-to-lib-md5.c.patch
index d12d839..597e360 100644
--- a/queue/crypto-Move-md5_transform-to-lib-md5.c.patch
+++ b/queue/crypto-Move-md5_transform-to-lib-md5.c.patch
@@ -1,4 +1,4 @@
-From 49cf50286b48f59535f1a031d858a94adeda7f16 Mon Sep 17 00:00:00 2001
+From b6847a236737b95bbc69a5901afe771602b1ed8a Mon Sep 17 00:00:00 2001
 From: "David S. Miller" <davem@davemloft.net>
 Date: Wed, 3 Aug 2011 19:45:10 -0700
 Subject: [PATCH] crypto: Move md5_transform to lib/md5.c
@@ -10,11 +10,6 @@ generation.
 
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
----
- crypto/md5.c               |   92 +-------------------------------------------
- include/linux/cryptohash.h |    5 +++
- lib/Makefile               |    2 +-
- 3 files changed, 7 insertions(+), 92 deletions(-)
 
 diff --git a/crypto/md5.c b/crypto/md5.c
 index 30efc7d..7febeaa 100644
@@ -150,6 +145,107 @@ index 0d40152..e0d495e 100644
  	 proportions.o prio_heap.o ratelimit.o show_mem.o \
  	 is_single_threaded.o plist.o decompress.o flex_array.o
  
+diff --git a/lib/md5.c b/lib/md5.c
+new file mode 100644
+index 0000000..c777180
+--- /dev/null
++++ b/lib/md5.c
+@@ -0,0 +1,95 @@
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/cryptohash.h>
++
++#define F1(x, y, z)	(z ^ (x & (y ^ z)))
++#define F2(x, y, z)	F1(z, x, y)
++#define F3(x, y, z)	(x ^ y ^ z)
++#define F4(x, y, z)	(y ^ (x | ~z))
++
++#define MD5STEP(f, w, x, y, z, in, s) \
++	(w += f(x, y, z) + in, w = (w<<s | w>>(32-s)) + x)
++
++void md5_transform(__u32 *hash, __u32 const *in)
++{
++	u32 a, b, c, d;
++
++	a = hash[0];
++	b = hash[1];
++	c = hash[2];
++	d = hash[3];
++
++	MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
++	MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
++	MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
++	MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
++	MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
++	MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
++	MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
++	MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
++	MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
++	MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
++	MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
++	MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
++	MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
++	MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
++	MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
++	MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
++
++	MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
++	MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
++	MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
++	MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
++	MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
++	MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
++	MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
++	MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
++	MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
++	MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
++	MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
++	MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
++	MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
++	MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
++	MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
++	MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
++
++	MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
++	MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
++	MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
++	MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
++	MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
++	MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
++	MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
++	MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
++	MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
++	MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
++	MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
++	MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
++	MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
++	MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
++	MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
++	MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
++
++	MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
++	MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
++	MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
++	MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
++	MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
++	MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
++	MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
++	MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
++	MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
++	MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
++	MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
++	MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
++	MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
++	MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
++	MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
++	MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
++
++	hash[0] += a;
++	hash[1] += b;
++	hash[2] += c;
++	hash[3] += d;
++}
++EXPORT_SYMBOL(md5_transform);
 -- 
 1.7.9.6
 
diff --git a/queue/net-Compute-protocol-sequence-numbers-and-fragment-I.patch b/queue/net-Compute-protocol-sequence-numbers-and-fragment-I.patch
index 24d559f..f0c3d80 100644
--- a/queue/net-Compute-protocol-sequence-numbers-and-fragment-I.patch
+++ b/queue/net-Compute-protocol-sequence-numbers-and-fragment-I.patch
@@ -1,4 +1,4 @@
-From a83b2dfa6b8a1b305cdf8ab7b0ee462494f3dbf1 Mon Sep 17 00:00:00 2001
+From e41899ee0c866c971a4a56908b7c728d49c7d799 Mon Sep 17 00:00:00 2001
 From: "David S. Miller" <davem@davemloft.net>
 Date: Wed, 3 Aug 2011 20:50:44 -0700
 Subject: [PATCH] net: Compute protocol sequence numbers and fragment IDs
@@ -25,26 +25,6 @@ Tested-by: Willy Tarreau <w@1wt.eu>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 [PG: diffstat vs. 6e5714 differs, since no secure_ipv6_id to delete in 34]
 Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
----
- drivers/char/random.c                    |  334 +-----------------------------
- include/linux/random.h                   |   11 -
- include/net/secure_seq.h                 |   20 ++
- lib/md5.c                                |   95 +++++++++
- net/core/Makefile                        |    2 +-
- net/core/secure_seq.c                    |  184 ++++++++++++++++
- net/dccp/ipv4.c                          |    1 +
- net/dccp/ipv6.c                          |    9 +-
- net/ipv4/inet_hashtables.c               |    1 +
- net/ipv4/inetpeer.c                      |    1 +
- net/ipv4/netfilter/nf_nat_proto_common.c |    1 +
- net/ipv4/route.c                         |    1 +
- net/ipv4/tcp_ipv4.c                      |    1 +
- net/ipv6/inet6_hashtables.c              |    1 +
- net/ipv6/tcp_ipv6.c                      |    1 +
- 15 files changed, 318 insertions(+), 345 deletions(-)
- create mode 100644 include/net/secure_seq.h
- create mode 100644 lib/md5.c
- create mode 100644 net/core/secure_seq.c
 
 diff --git a/drivers/char/random.c b/drivers/char/random.c
 index 2fd3d39..ccdadd9 100644
@@ -455,107 +435,6 @@ index 0000000..d97f689
 +					 __be16 sport, __be16 dport);
 +
 +#endif /* _NET_SECURE_SEQ */
-diff --git a/lib/md5.c b/lib/md5.c
-new file mode 100644
-index 0000000..c777180
---- /dev/null
-+++ b/lib/md5.c
-@@ -0,0 +1,95 @@
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/cryptohash.h>
-+
-+#define F1(x, y, z)	(z ^ (x & (y ^ z)))
-+#define F2(x, y, z)	F1(z, x, y)
-+#define F3(x, y, z)	(x ^ y ^ z)
-+#define F4(x, y, z)	(y ^ (x | ~z))
-+
-+#define MD5STEP(f, w, x, y, z, in, s) \
-+	(w += f(x, y, z) + in, w = (w<<s | w>>(32-s)) + x)
-+
-+void md5_transform(__u32 *hash, __u32 const *in)
-+{
-+	u32 a, b, c, d;
-+
-+	a = hash[0];
-+	b = hash[1];
-+	c = hash[2];
-+	d = hash[3];
-+
-+	MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
-+	MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
-+	MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
-+	MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
-+	MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
-+	MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
-+	MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
-+	MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
-+	MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
-+	MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
-+	MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
-+	MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
-+	MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
-+	MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
-+	MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
-+	MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
-+
-+	MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
-+	MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
-+	MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
-+	MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
-+	MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
-+	MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
-+	MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
-+	MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
-+	MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
-+	MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
-+	MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
-+	MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
-+	MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
-+	MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
-+	MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
-+	MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
-+
-+	MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
-+	MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
-+	MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
-+	MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
-+	MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
-+	MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
-+	MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
-+	MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
-+	MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
-+	MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
-+	MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
-+	MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
-+	MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
-+	MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
-+	MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
-+	MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
-+
-+	MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
-+	MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
-+	MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
-+	MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
-+	MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
-+	MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
-+	MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
-+	MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
-+	MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
-+	MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
-+	MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
-+	MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
-+	MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
-+	MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
-+	MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
-+	MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
-+
-+	hash[0] += a;
-+	hash[1] += b;
-+	hash[2] += c;
-+	hash[3] += d;
-+}
-+EXPORT_SYMBOL(md5_transform);
 diff --git a/net/core/Makefile b/net/core/Makefile
 index 08791ac..1e8ca3c 100644
 --- a/net/core/Makefile