From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Thu, 3 Dec 2009 12:58:29 +0000 (-0500)
Subject: CALG_SHA256, CALG_SHA384 and CALG_SHA512 are wrong name.
X-Git-Tag: v2.8.0~121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2eaaa8f604dd4af1c546b95e2070d3e40bad018;p=thirdparty%2Flibarchive.git

CALG_SHA256, CALG_SHA384 and CALG_SHA512 are wrong name.
Use CALG_SHA_256, CALG_SHA_384 and CALG_SHA_512 instead.

SVN-Revision: 1696
---

diff --git a/libarchive/archive_windows.c b/libarchive/archive_windows.c
index 3297bbbee..c24a3f23e 100644
--- a/libarchive/archive_windows.c
+++ b/libarchive/archive_windows.c
@@ -1233,20 +1233,20 @@ DIGEST_FINAL(SHA1, SHA1_DIGEST_LENGTH)
 /*
  * SHA256 nor SHA384 nor SHA512 are not supported on Windows XP and Windows 2000.
  */
-#ifdef CALG_SHA256
-DIGEST_INIT(SHA256, CALG_SHA256)
+#ifdef CALG_SHA_256
+DIGEST_INIT(SHA256, CALG_SHA_256)
 DIGEST_UPDATE(SHA256)
 DIGEST_FINAL(SHA256, SHA256_DIGEST_LENGTH)
 #endif
 
-#ifdef CALG_SHA384
-DIGEST_INIT(SHA384, CALG_SHA384)
+#ifdef CALG_SHA_384
+DIGEST_INIT(SHA384, CALG_SHA_384)
 DIGEST_UPDATE(SHA384)
 DIGEST_FINAL(SHA384, SHA384_DIGEST_LENGTH)
 #endif
 
-#ifdef CALG_SHA512
-DIGEST_INIT(SHA512, CALG_SHA512)
+#ifdef CALG_SHA_512
+DIGEST_INIT(SHA512, CALG_SHA_512)
 DIGEST_UPDATE(SHA512)
 DIGEST_FINAL(SHA512, SHA384_DIGEST_LENGTH)
 #endif
diff --git a/libarchive/archive_windows.h b/libarchive/archive_windows.h
index 735e631e6..d8c59a06b 100644
--- a/libarchive/archive_windows.h
+++ b/libarchive/archive_windows.h
@@ -322,17 +322,17 @@ typedef struct {
 #define HAVE_SHA1 1
 #define SHA1_CTX Digest_CTX
 #endif
-#ifdef CALG_SHA256
+#ifdef CALG_SHA_256
 #define SHA256_DIGEST_LENGTH	32
 #define HAVE_SHA256 1
 #define SHA256_CTX Digest_CTX
 #endif
-#ifdef CALG_SHA384
+#ifdef CALG_SHA_384
 #define SHA384_DIGEST_LENGTH	48
 #define HAVE_SHA384 1
 #define SHA384_CTX Digest_CTX
 #endif
-#ifdef CALG_SHA512
+#ifdef CALG_SHA_512
 #define SHA512_DIGEST_LENGTH	64
 #define HAVE_SHA512 1
 #define SHA512_CTX Digest_CTX