From: Richard Levitte <levitte@openssl.org>
Date: Sun, 30 May 2004 16:58:33 +0000 (+0000)
Subject: SHA224_Update() and SHA224_Final() aren't implemented, and since
X-Git-Tag: BEN_FIPS_TEST_6~14^2~221
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=af2bf07404f393a9b7425a943918830ae08413d3;p=oweals%2Fopenssl.git

SHA224_Update() and SHA224_Final() aren't implemented, and since
SHA224() uses SHA256_Update() and SHA256_Final() instead, let's just
create aliases in form of macros.

make update
---

diff --git a/crypto/sha/sha.h b/crypto/sha/sha.h
index 35c89375a2..f4dd5277c2 100644
--- a/crypto/sha/sha.h
+++ b/crypto/sha/sha.h
@@ -89,12 +89,12 @@ extern "C" {
 #define SHA_LONG unsigned int
 #endif
 
-#define SHA_LBLOCK	16
+#define SHA_LBLOCK	16U
 #define SHA_CBLOCK	(SHA_LBLOCK*4)	/* SHA treats input data as a
 					 * contiguous array of 32 bit
 					 * wide big-endian values. */
 #define SHA_LAST_BLOCK  (SHA_CBLOCK-8)
-#define SHA_DIGEST_LENGTH 20
+#define SHA_DIGEST_LENGTH 20U
 
 typedef struct SHAstate_st
 	{
@@ -135,8 +135,13 @@ typedef struct SHA256state_st
 
 #ifndef OPENSSL_NO_SHA256
 int SHA224_Init(SHA256_CTX *c);
+#if 0
 int SHA224_Update(SHA256_CTX *c, const void *data, size_t len);
 int SHA224_Final(unsigned char *md, SHA256_CTX *c);
+#else
+#define SHA224_Update(c,data,len)	SHA256_Update((c),(data),(len))
+#define SHA224_Final(md,c)	SHA256_Final((md),(c))
+#endif
 unsigned char *SHA224(const unsigned char *d, size_t n,unsigned char *md);
 int SHA256_Init(SHA256_CTX *c);
 int SHA256_Update(SHA256_CTX *c, const void *data, size_t len);
diff --git a/util/libeay.num b/util/libeay.num
index b6dab24003..40c9117225 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -3213,8 +3213,8 @@ SHA512_Update                           3615	EXIST::FUNCTION:SHA,SHA512
 SHA256_Init                             3616	EXIST::FUNCTION:SHA,SHA256
 SHA224                                  3617	EXIST::FUNCTION:SHA,SHA256
 SHA384_Update                           3618	EXIST::FUNCTION:SHA,SHA512
-SHA224_Final                            3619	EXIST::FUNCTION:SHA,SHA256
-SHA224_Update                           3620	EXIST::FUNCTION:SHA,SHA256
+SHA224_Final                            3619	NOEXIST::FUNCTION:
+SHA224_Update                           3620	NOEXIST::FUNCTION:
 SHA512_Final                            3621	EXIST::FUNCTION:SHA,SHA512
 SHA224_Init                             3622	EXIST::FUNCTION:SHA,SHA256
 SHA512_Init                             3623	EXIST::FUNCTION:SHA,SHA512