From cc8f9e4b7fa6a82415c2f13d4434b379ef760bcb Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@etherboot.org>
Date: Thu, 1 Feb 2007 05:48:56 +0000
Subject: [PATCH] Make context sizes available for statically-allocated
 structures

---
 src/crypto/axtls_sha1.c |  2 +-
 src/crypto/md5.c        | 12 +-----------
 src/include/gpxe/md5.h  | 14 ++++++++++++++
 src/include/gpxe/sha1.h |  4 ++++
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/crypto/axtls_sha1.c b/src/crypto/axtls_sha1.c
index 17c08797..b44fe7fe 100644
--- a/src/crypto/axtls_sha1.c
+++ b/src/crypto/axtls_sha1.c
@@ -17,7 +17,7 @@ static void sha1_final ( void *ctx, void *out ) {
 
 struct crypto_algorithm sha1_algorithm = {
 	.name		= "sha1",
-	.ctxsize	= sizeof ( SHA1_CTX ),
+	.ctxsize	= SHA1_CTX_SIZE,
 	.blocksize	= 64,
 	.digestsize	= SHA1_SIZE,
 	.init		= sha1_init,
diff --git a/src/crypto/md5.c b/src/crypto/md5.c
index 94ab69a2..09378e20 100644
--- a/src/crypto/md5.c
+++ b/src/crypto/md5.c
@@ -26,16 +26,6 @@
 #include <gpxe/crypto.h>
 #include <gpxe/md5.h>
 
-#define MD5_DIGEST_SIZE		16
-#define MD5_BLOCK_WORDS		16
-#define MD5_HASH_WORDS		4
-
-struct md5_ctx {
-	u32 hash[MD5_HASH_WORDS];
-	u32 block[MD5_BLOCK_WORDS];
-	u64 byte_count;
-};
-
 #define __md5step __attribute__ (( regparm ( 3 ) ))
 
 struct md5_step {
@@ -236,7 +226,7 @@ static void md5_final(void *context, void *out)
 
 struct crypto_algorithm md5_algorithm = {
 	.name		= "md5",
-	.ctxsize	= sizeof ( struct md5_ctx ),
+	.ctxsize	= MD5_CTX_SIZE,
 	.blocksize	= ( MD5_BLOCK_WORDS * 4 ),
 	.digestsize	= MD5_DIGEST_SIZE,
 	.init		= md5_init,
diff --git a/src/include/gpxe/md5.h b/src/include/gpxe/md5.h
index f82c9462..304a0e64 100644
--- a/src/include/gpxe/md5.h
+++ b/src/include/gpxe/md5.h
@@ -3,6 +3,20 @@
 
 struct crypto_algorithm;
 
+#include <stdint.h>
+
+#define MD5_DIGEST_SIZE		16
+#define MD5_BLOCK_WORDS		16
+#define MD5_HASH_WORDS		4
+
+struct md5_ctx {
+	u32 hash[MD5_HASH_WORDS];
+	u32 block[MD5_BLOCK_WORDS];
+	u64 byte_count;
+};
+
+#define MD5_CTX_SIZE sizeof ( struct md5_ctx )
+
 extern struct crypto_algorithm md5_algorithm;
 
 #endif /* _GPXE_MD5_H */
diff --git a/src/include/gpxe/sha1.h b/src/include/gpxe/sha1.h
index 1425d54c..0a811018 100644
--- a/src/include/gpxe/sha1.h
+++ b/src/include/gpxe/sha1.h
@@ -1,8 +1,12 @@
 #ifndef _GPXE_SHA1_H
 #define _GPXE_SHA1_H
 
+#include "crypto/axtls/crypto.h"
+
 struct crypto_algorithm;
 
+#define SHA1_CTX_SIZE sizeof ( SHA1_CTX )
+
 extern struct crypto_algorithm sha1_algorithm;
 
 #endif /* _GPXE_SHA1_H */