Move the definitions related to hash in archive_windows.h into archive_hash.h

SVN-Revision: 2385

diff --git a/libarchive/archive_hash.h b/libarchive/archive_hash.h
index c0d7eb757cd62a8ff26760980c53dfe9b22b1b39..5910c788942475f7220d3cd228caee919e726bd9 100644 (file)
--- a/libarchive/archive_hash.h
+++ b/libarchive/archive_hash.h
@@ -50,7 +50,21 @@
  *
  * OpenSSL:
  * - MD5, SHA1 and SHA2 in libcrypto: with _ after algorithm name
+ *
+ * Windows:
+ * - MD5, SHA1 and SHA2 in archive_windows.c: with _ after algorithm name
+ *   and __la_ prefix.
  */
+#if defined(ARCHIVE_HASH_MD5_WIN)    ||\
+      defined(ARCHIVE_HASH_SHA1_WIN)   || defined(ARCHIVE_HASH_SHA256_WIN) ||\
+      defined(ARCHIVE_HASH_SHA384_WIN) || defined(ARCHIVE_HASH_SHA512_WIN)
+#include <wincrypt.h>
+typedef struct {
+       int             valid;
+       HCRYPTPROV      cryptProv;
+       HCRYPTHASH      hash;
+} Digest_CTX;
+#endif
 
 #if defined(ARCHIVE_HASH_MD5_LIBC)
 #  include <md5.h>
@@ -68,7 +82,11 @@ typedef MD5_CTX archive_md5_ctx;
 #  define archive_md5_update(ctx, buf, n)      MD5_Update(ctx, buf, n)
 #elif defined(ARCHIVE_HASH_MD5_WIN)
 #  define ARCHIVE_HAS_MD5
-typedef MD5_CTX archive_md5_ctx;
+#  define MD5_DIGEST_LENGTH    16
+typedef Digest_CTX archive_md5_ctx;
+extern void __la_MD5_Init(Digest_CTX *);
+extern void __la_MD5_Final(unsigned char *, Digest_CTX *);
+extern void __la_MD5_Update(Digest_CTX *, const unsigned char *, size_t);
 #  define archive_md5_init(ctx)                        __la_MD5_Init(ctx)
 #  define archive_md5_final(ctx, buf)          __la_MD5_Final(buf, ctx)
 #  define archive_md5_update(ctx, buf, n)      __la_MD5_Update(ctx, buf, n)
@@ -106,7 +124,11 @@ typedef SHA_CTX archive_sha1_ctx;
 #  define archive_sha1_update(ctx, buf, n)     SHA1_Update(ctx, buf, n)
 #elif defined(ARCHIVE_HASH_SHA1_WIN)
 #  define ARCHIVE_HAS_SHA1
-typedef SHA1_CTX archive_sha1_ctx;
+#  define SHA1_DIGEST_LENGTH   20
+typedef Digest_CTX archive_sha1_ctx;
+extern void __la_SHA1_Init(Digest_CTX *);
+extern void __la_SHA1_Final(unsigned char *, Digest_CTX *);
+extern void __la_SHA1_Update(Digest_CTX *, const unsigned char *, size_t);
 #  define archive_sha1_init(ctx)               __la_SHA1_Init(ctx)
 #  define archive_sha1_final(ctx, buf)         __la_SHA1_Final(buf, ctx)
 #  define archive_sha1_update(ctx, buf, n)     __la_SHA1_Update(ctx, buf, n)
@@ -142,7 +164,11 @@ typedef SHA256_CTX archive_sha256_ctx;
 #  define archive_sha256_update(ctx, buf, n)   SHA256_Update(ctx, buf, n)
 #elif defined(ARCHIVE_HASH_SHA256_WIN)
 #  define ARCHIVE_HAS_SHA256
-typedef SHA256_CTX archive_sha256_ctx;
+#  define SHA256_DIGEST_LENGTH 32
+typedef Digest_CTX archive_sha256_ctx;
+extern void __la_SHA256_Init(Digest_CTX *);
+extern void __la_SHA256_Final(unsigned char *, Digest_CTX *);
+extern void __la_SHA256_Update(Digest_CTX *, const unsigned char *, size_t);
 #  define archive_sha256_init(ctx)             __la_SHA256_Init(ctx)
 #  define archive_sha256_final(ctx, buf)       __la_SHA256_Final(buf, ctx)
 #  define archive_sha256_update(ctx, buf, n)   __la_SHA256_Update(ctx, buf, n)
@@ -178,7 +204,11 @@ typedef SHA512_CTX archive_sha384_ctx;
 #  define archive_sha384_update(ctx, buf, n)   SHA384_Update(ctx, buf, n)
 #elif defined(ARCHIVE_HASH_SHA384_WIN)
 #  define ARCHIVE_HAS_SHA384
-typedef SHA512_CTX archive_sha384_ctx;
+#  define SHA384_DIGEST_LENGTH 48
+typedef Digest_CTX archive_sha384_ctx;
+extern void __la_SHA384_Init(Digest_CTX *);
+extern void __la_SHA384_Final(unsigned char *, Digest_CTX *);
+extern void __la_SHA384_Update(Digest_CTX *, const unsigned char *, size_t);
 #  define archive_sha384_init(ctx)             __la_SHA384_Init(ctx)
 #  define archive_sha384_final(ctx, buf)       __la_SHA384_Final(buf, ctx)
 #  define archive_sha384_update(ctx, buf, n)   __la_SHA384_Update(ctx, buf, n)
@@ -214,7 +244,11 @@ typedef SHA512_CTX archive_sha512_ctx;
 #  define archive_sha512_update(ctx, buf, n)   SHA512_Update(ctx, buf, n)
 #elif defined(ARCHIVE_HASH_SHA512_WIN)
 #  define ARCHIVE_HAS_SHA512
-typedef SHA512_CTX archive_sha512_ctx;
+#  define SHA512_DIGEST_LENGTH 64
+typedef Digest_CTX archive_sha512_ctx;
+extern void __la_SHA512_Init(Digest_CTX *);
+extern void __la_SHA512_Final(unsigned char *, Digest_CTX *);
+extern void __la_SHA512_Update(Digest_CTX *, const unsigned char *, size_t);
 #  define archive_sha512_init(ctx)             __la_SHA512_Init(ctx)
 #  define archive_sha512_final(ctx, buf)       __la_SHA512_Final(buf, ctx)
 #  define archive_sha512_update(ctx, buf, n)   __la_SHA512_Update(ctx, buf, n)

diff --git a/libarchive/archive_windows.c b/libarchive/archive_windows.c
index b002d9d6233afb7036c3c79c2598547953c17af4..84606579c46e80240f1aa289d880f6e0c58ce93f 100644 (file)
--- a/libarchive/archive_windows.c
+++ b/libarchive/archive_windows.c
@@ -48,6 +48,7 @@
 
 #include "archive_platform.h"
 #include "archive_private.h"
+#include "archive_hash.h"
 #include <ctype.h>
 #include <errno.h>
 #include <stddef.h>
@@ -1177,9 +1178,9 @@ la_dosmaperr(unsigned long e)
        return;
 }
 
-#if defined(ARCHIVE_HASH_MD5_WIN) ||\
-    defined(ARCHIVE_HASH_SHA1)    || defined(ARCHIVE_HASH_SHA256_WIN) ||\
-    defined(ARCHIVE_HASH_SHA384)  || defined(ARCHIVE_HASH_SHA512_WIN)
+#if defined(ARCHIVE_HASH_MD5_WIN)    ||\
+    defined(ARCHIVE_HASH_SHA1_WIN)   || defined(ARCHIVE_HASH_SHA256_WIN) ||\
+    defined(ARCHIVE_HASH_SHA384_WIN) || defined(ARCHIVE_HASH_SHA512_WIN)
 /*
  * Message digest functions.
  */

diff --git a/libarchive/archive_windows.h b/libarchive/archive_windows.h
index 8a5f37fae316cbc1d886d2d12b7ac7387fb51657..90b138ca1035d6bdf71106f40b46ad76149218b3 100644 (file)
--- a/libarchive/archive_windows.h
+++ b/libarchive/archive_windows.h
@@ -299,39 +299,6 @@ struct _timeval64i32 {
 #define __timeval _timeval64i32
 #endif
 
-/* Message digest define */
-#if defined(ARCHIVE_HASH_MD5_WIN)    ||\
-    defined(ARCHIVE_HASH_SHA1_WIN)   || defined(ARCHIVE_HASH_SHA256_WIN) ||\
-    defined(ARCHIVE_HASH_SHA384_WIN) || defined(ARCHIVE_HASH_SHA512_WIN)
-#include <wincrypt.h>
-typedef struct {
-       int             valid;
-       HCRYPTPROV cryptProv;
-       HCRYPTHASH hash;
-} Digest_CTX;
-#endif
-
-#if defined(ARCHIVE_HASH_MD5_WIN)
-#define MD5_DIGEST_LENGTH      16
-#define MD5_CTX Digest_CTX
-#endif
-#if defined(ARCHIVE_HASH_SHA1_WIN)
-#define SHA1_DIGEST_LENGTH     20
-#define SHA1_CTX Digest_CTX
-#endif
-#if defined(ARCHIVE_HASH_SHA256_WIN)
-#define SHA256_DIGEST_LENGTH   32
-#define SHA256_CTX Digest_CTX
-#endif
-#if defined(ARCHIVE_HASH_SHA384_WIN)
-#define SHA384_DIGEST_LENGTH   48
-#define SHA384_CTX Digest_CTX
-#endif
-#if defined(ARCHIVE_HASH_SHA512_WIN)
-#define SHA512_DIGEST_LENGTH   64
-#define SHA512_CTX Digest_CTX
-#endif
-
 /* End of Win32 definitions. */
 
 /* Tell libarchive code that we have simulations for these. */
@@ -375,36 +342,4 @@ extern ssize_t      __la_write(int fd, const void *buf, size_t nbytes);
 #define WIFEXITED(sts)         ((sts & 0x100) == 0)
 #define WEXITSTATUS(sts)       (sts & 0x0FF)
 
-/* Message digest function */
-#if defined(ARCHIVE_HASH_MD5_WIN)
-extern void     __la_MD5_Init(Digest_CTX *ctx);
-extern void     __la_MD5_Update(Digest_CTX *ctx, const unsigned char *buf,
-                    size_t len);
-extern void     __la_MD5_Final(unsigned char *buf, Digest_CTX *ctx);
-#endif
-#if defined(ARCHIVE_HASH_SHA1_WIN)
-extern void     __la_SHA1_Init(Digest_CTX *ctx);
-extern void     __la_SHA1_Update(Digest_CTX *ctx, const unsigned char *buf,
-                    size_t len);
-extern void     __la_SHA1_Final(unsigned char *buf, Digest_CTX *ctx);
-#endif
-#if defined(ARCHIVE_HASH_SHA256_WIN)
-extern void     __la_SHA256_Init(Digest_CTX *ctx);
-extern void     __la_SHA256_Update(Digest_CTX *ctx, const unsigned char *buf,
-                    size_t len);
-extern void     __la_SHA256_Final(unsigned char *buf, Digest_CTX *ctx);
-#endif
-#if defined(ARCHIVE_HASH_SHA384_WIN)
-extern void     __la_SHA384_Init(Digest_CTX *ctx);
-extern void     __la_SHA384_Update(Digest_CTX *ctx, const unsigned char *buf,
-                    size_t len);
-extern void     __la_SHA384_Final(unsigned char *buf, Digest_CTX *ctx);
-#endif
-#if defined(ARCHIVE_HASH_SHA512_WIN)
-extern void     __la_SHA512_Init(Digest_CTX *ctx);
-extern void     __la_SHA512_Update(Digest_CTX *ctx, const unsigned char *buf,
-                    size_t len);
-extern void     __la_SHA512_Final(unsigned char *buf, Digest_CTX *ctx);
-#endif
-
 #endif /* LIBARCHIVE_ARCHIVE_WINDOWS_H_INCLUDED */