summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-06 22:12:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-06 22:12:37 -0700
commit7cd4767e696123cdb7447fbd7c281eb8c610c8e4 (patch)
tree8a44dfbe0a131f6036eab36f887a058e9750fe69 /include/linux
parent1957e7fdefce4494cb8d8f09ee2317b7ede24994 (diff)
parent6e5714eaf77d79ae1c8b47e3e040ff5411b717ec (diff)
downloadop-kernel-dev-7cd4767e696123cdb7447fbd7c281eb8c610c8e4.zip
op-kernel-dev-7cd4767e696123cdb7447fbd7c281eb8c610c8e4.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: net: Compute protocol sequence numbers and fragment IDs using MD5. crypto: Move md5_transform to lib/md5.c
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/cryptohash.h5
-rw-r--r--include/linux/random.h12
2 files changed, 5 insertions, 12 deletions
diff --git a/include/linux/cryptohash.h b/include/linux/cryptohash.h
index f945218..2cd9f1c 100644
--- a/include/linux/cryptohash.h
+++ b/include/linux/cryptohash.h
@@ -8,6 +8,11 @@
void sha_init(__u32 *buf);
void sha_transform(__u32 *digest, const char *data, __u32 *W);
+#define MD5_DIGEST_WORDS 4
+#define MD5_MESSAGE_BYTES 64
+
+void md5_transform(__u32 *hash, __u32 const *in);
+
__u32 half_md4_transform(__u32 buf[4], __u32 const in[8]);
#endif
diff --git a/include/linux/random.h b/include/linux/random.h
index ce29a04..d13059f3 100644
--- a/include/linux/random.h
+++ b/include/linux/random.h
@@ -57,18 +57,6 @@ extern void add_interrupt_randomness(int irq);
extern void get_random_bytes(void *buf, int nbytes);
void generate_random_uuid(unsigned char uuid_out[16]);
-extern __u32 secure_ip_id(__be32 daddr);
-extern __u32 secure_ipv6_id(const __be32 daddr[4]);
-extern u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
-extern u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
- __be16 dport);
-extern __u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr,
- __be16 sport, __be16 dport);
-extern __u32 secure_tcpv6_sequence_number(__be32 *saddr, __be32 *daddr,
- __be16 sport, __be16 dport);
-extern u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr,
- __be16 sport, __be16 dport);
-
#ifndef MODULE
extern const struct file_operations random_fops, urandom_fops;
#endif
OpenPOWER on IntegriCloud