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 3297bbbeecf5ffb64d4655055d79bd16b7c85387..c24a3f23ef3a4fdcd953b3862d69fd181f79dfa1 100644 (file)
--- 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 735e631e64b05667dcee613384a3897443a72dfc..d8c59a06b3484cec9a9a8d526dfcdf4932d92e73 100644 (file)
--- 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