Change digest functionarity files and relative global variables from

archive_crypto to archive_digest.

diff --git a/Makefile.am b/Makefile.am
index 14113d8364c6b0030ddf46392e55dbece465c0b9..d098b76b7079a246a921612b72491de28607e832 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,10 +98,10 @@ libarchive_la_SOURCES= \
        libarchive/archive_cmdline.c \
        libarchive/archive_cmdline_private.h \
        libarchive/archive_crc32.h \
-       libarchive/archive_crypto.c \
-       libarchive/archive_crypto_private.h \
        libarchive/archive_cryptor.c \
        libarchive/archive_cryptor_private.h \
+       libarchive/archive_digest.c \
+       libarchive/archive_digest_private.h \
        libarchive/archive_endian.h \
        libarchive/archive_entry.c \
        libarchive/archive_entry.h \
@@ -327,7 +327,7 @@ libarchive_test_SOURCES= \
        libarchive/test/test_archive_api_feature.c \
        libarchive/test/test_archive_clear_error.c \
        libarchive/test/test_archive_cmdline.c \
-       libarchive/test/test_archive_crypto.c \
+       libarchive/test/test_archive_digest.c \
        libarchive/test/test_archive_getdate.c \
        libarchive/test/test_archive_match_owner.c \
        libarchive/test/test_archive_match_path.c \

diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
index 5ae8a75d5bceded52b8c069bafd2607e62b5f8ac..b696ae17ba0979a9956f6c38cda76aa63dc6fe2f 100644 (file)
--- a/libarchive/CMakeLists.txt
+++ b/libarchive/CMakeLists.txt
@@ -18,10 +18,10 @@ SET(libarchive_SOURCES
   archive_cmdline.c
   archive_cmdline_private.h
   archive_crc32.h
-  archive_crypto.c
-  archive_crypto_private.h
   archive_cryptor.c
   archive_cryptor_private.h
+  archive_digest.c
+  archive_digest_private.h
   archive_endian.h
   archive_entry.c
   archive_entry.h

diff --git a/libarchive/archive_crypto.c b/libarchive/archive_digest.c
similarity index 99%
rename from libarchive/archive_crypto.c
rename to libarchive/archive_digest.c
index 0efdf7c39f141821e09065389fa0cfa5513d599a..f009d317aeef856ccd12dc446c02fdc2f82e0dab 100644 (file)
--- a/libarchive/archive_crypto.c
+++ b/libarchive/archive_digest.c
@@ -28,7 +28,7 @@
 #include "archive_platform.h"
 
 #include "archive.h"
-#include "archive_crypto_private.h"
+#include "archive_digest_private.h"
 
 /* In particular, force the configure probe to break if it tries
  * to test a combination of OpenSSL and libmd. */
@@ -1216,8 +1216,8 @@ __archive_stub_sha512final(archive_sha512_ctx *ctx, void *md)
 
 #endif
 
-/* NOTE: Crypto functions are set based on availability and by the following
- * order of preference.
+/* NOTE: Message Digest functions are set based on availability and by the
+ * following order of preference.
  * 1. libc
  * 2. libc2
  * 3. libc3
@@ -1227,7 +1227,7 @@ __archive_stub_sha512final(archive_sha512_ctx *ctx, void *md)
  * 7. libmd
  * 8. Windows API
  */
-const struct archive_crypto __archive_crypto =
+const struct archive_digest __archive_digest =
 {
 /* MD5 */
 #if defined(ARCHIVE_CRYPTO_MD5_LIBC)

diff --git a/libarchive/archive_crypto_private.h b/libarchive/archive_digest_private.h
similarity index 93%
rename from libarchive/archive_crypto_private.h
rename to libarchive/archive_digest_private.h
index f8b1fb3c3f54810e78cdafa986a74335b89d410d..77fad5806fdd5a14ba890aa93f52d72e3cd01f03 100644 (file)
--- a/libarchive/archive_crypto_private.h
+++ b/libarchive/archive_digest_private.h
@@ -264,11 +264,11 @@ typedef unsigned char archive_sha512_ctx;
 #define ARCHIVE_HAS_MD5
 #endif
 #define archive_md5_init(ctx)\
-  __archive_crypto.md5init(ctx)
+  __archive_digest.md5init(ctx)
 #define archive_md5_final(ctx, md)\
-  __archive_crypto.md5final(ctx, md)
+  __archive_digest.md5final(ctx, md)
 #define archive_md5_update(ctx, buf, n)\
-  __archive_crypto.md5update(ctx, buf, n)
+  __archive_digest.md5update(ctx, buf, n)
 
 #if defined(ARCHIVE_CRYPTO_RMD160_LIBC) ||\
   defined(ARCHIVE_CRYPTO_RMD160_NETTLE) ||\
@@ -276,11 +276,11 @@ typedef unsigned char archive_sha512_ctx;
 #define ARCHIVE_HAS_RMD160
 #endif
 #define archive_rmd160_init(ctx)\
-  __archive_crypto.rmd160init(ctx)
+  __archive_digest.rmd160init(ctx)
 #define archive_rmd160_final(ctx, md)\
-  __archive_crypto.rmd160final(ctx, md)
+  __archive_digest.rmd160final(ctx, md)
 #define archive_rmd160_update(ctx, buf, n)\
-  __archive_crypto.rmd160update(ctx, buf, n)
+  __archive_digest.rmd160update(ctx, buf, n)
 
 #if defined(ARCHIVE_CRYPTO_SHA1_LIBC) ||\
   defined(ARCHIVE_CRYPTO_SHA1_LIBMD) ||        \
@@ -291,11 +291,11 @@ typedef unsigned char archive_sha512_ctx;
 #define ARCHIVE_HAS_SHA1
 #endif
 #define archive_sha1_init(ctx)\
-  __archive_crypto.sha1init(ctx)
+  __archive_digest.sha1init(ctx)
 #define archive_sha1_final(ctx, md)\
-  __archive_crypto.sha1final(ctx, md)
+  __archive_digest.sha1final(ctx, md)
 #define archive_sha1_update(ctx, buf, n)\
-  __archive_crypto.sha1update(ctx, buf, n)
+  __archive_digest.sha1update(ctx, buf, n)
 
 #if defined(ARCHIVE_CRYPTO_SHA256_LIBC) ||\
   defined(ARCHIVE_CRYPTO_SHA256_LIBC2) ||\
@@ -308,11 +308,11 @@ typedef unsigned char archive_sha512_ctx;
 #define ARCHIVE_HAS_SHA256
 #endif
 #define archive_sha256_init(ctx)\
-  __archive_crypto.sha256init(ctx)
+  __archive_digest.sha256init(ctx)
 #define archive_sha256_final(ctx, md)\
-  __archive_crypto.sha256final(ctx, md)
+  __archive_digest.sha256final(ctx, md)
 #define archive_sha256_update(ctx, buf, n)\
-  __archive_crypto.sha256update(ctx, buf, n)
+  __archive_digest.sha256update(ctx, buf, n)
 
 #if defined(ARCHIVE_CRYPTO_SHA384_LIBC) ||\
   defined(ARCHIVE_CRYPTO_SHA384_LIBC2) ||\
@@ -324,11 +324,11 @@ typedef unsigned char archive_sha512_ctx;
 #define ARCHIVE_HAS_SHA384
 #endif
 #define archive_sha384_init(ctx)\
-  __archive_crypto.sha384init(ctx)
+  __archive_digest.sha384init(ctx)
 #define archive_sha384_final(ctx, md)\
-  __archive_crypto.sha384final(ctx, md)
+  __archive_digest.sha384final(ctx, md)
 #define archive_sha384_update(ctx, buf, n)\
-  __archive_crypto.sha384update(ctx, buf, n)
+  __archive_digest.sha384update(ctx, buf, n)
 
 #if defined(ARCHIVE_CRYPTO_SHA512_LIBC) ||\
   defined(ARCHIVE_CRYPTO_SHA512_LIBC2) ||\
@@ -341,14 +341,14 @@ typedef unsigned char archive_sha512_ctx;
 #define ARCHIVE_HAS_SHA512
 #endif
 #define archive_sha512_init(ctx)\
-  __archive_crypto.sha512init(ctx)
+  __archive_digest.sha512init(ctx)
 #define archive_sha512_final(ctx, md)\
-  __archive_crypto.sha512final(ctx, md)
+  __archive_digest.sha512final(ctx, md)
 #define archive_sha512_update(ctx, buf, n)\
-  __archive_crypto.sha512update(ctx, buf, n)
+  __archive_digest.sha512update(ctx, buf, n)
 
-/* Minimal interface to crypto functionality for internal use in libarchive */
-struct archive_crypto
+/* Minimal interface to digest functionality for internal use in libarchive */
+struct archive_digest
 {
   /* Message Digest */
   int (*md5init)(archive_md5_ctx *ctx);
@@ -371,6 +371,6 @@ struct archive_crypto
   int (*sha512final)(archive_sha512_ctx *, void *);
 };
 
-extern const struct archive_crypto __archive_crypto;
+extern const struct archive_digest __archive_digest;
 
 #endif

diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c
index f0e240c1644e653e3587544e40428a89f770f6e1..19c1b780ea2156aec9a044304ea61f35507e2035 100644 (file)
--- a/libarchive/archive_read_support_format_xar.c
+++ b/libarchive/archive_read_support_format_xar.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #include "archive.h"
-#include "archive_crypto_private.h"
+#include "archive_digest_private.h"
 #include "archive_endian.h"
 #include "archive_entry.h"
 #include "archive_entry_locale.h"

diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c
index f2ec5f2a918f0b0d76f836e66562df8de3c0ecb2..a243c2116a2e074387d82db5186a36ae987651cc 100644 (file)
--- a/libarchive/archive_read_support_format_zip.c
+++ b/libarchive/archive_read_support_format_zip.c
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_zip.c 201102
 #endif
 
 #include "archive.h"
-#include "archive_crypto_private.h"
+#include "archive_digest_private.h"
 #include "archive_cryptor_private.h"
 #include "archive_endian.h"
 #include "archive_entry.h"

diff --git a/libarchive/archive_write_set_format_mtree.c b/libarchive/archive_write_set_format_mtree.c
index 3e97adc5bda8af0d0f172cc7453732efb07aefa0..1692395aa01e9cc6b01a77eb076d5d7adb3ccf8e 100644 (file)
--- a/libarchive/archive_write_set_format_mtree.c
+++ b/libarchive/archive_write_set_format_mtree.c
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_mtree.c 201171
 #include <string.h>
 
 #include "archive.h"
-#include "archive_crypto_private.h"
+#include "archive_digest_private.h"
 #include "archive_entry.h"
 #include "archive_private.h"
 #include "archive_rb.h"

diff --git a/libarchive/archive_write_set_format_xar.c b/libarchive/archive_write_set_format_xar.c
index 79667e563d7aa9844ca24634461899f09397d322..2ff12369dcd8f82955fa040b7b02fe14324ca007 100644 (file)
--- a/libarchive/archive_write_set_format_xar.c
+++ b/libarchive/archive_write_set_format_xar.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #include "archive.h"
-#include "archive_crypto_private.h"
+#include "archive_digest_private.h"
 #include "archive_endian.h"
 #include "archive_entry.h"
 #include "archive_entry_locale.h"

diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt
index 57a561f2e4beedd8d6868cdd5b622faac52cc931..e97963df5261a4c8fcc5ea02caeb8bd0873169eb 100644 (file)
--- a/libarchive/test/CMakeLists.txt
+++ b/libarchive/test/CMakeLists.txt
@@ -17,7 +17,7 @@ IF(ENABLE_TEST)
     test_archive_api_feature.c
     test_archive_clear_error.c
     test_archive_cmdline.c
-    test_archive_crypto.c
+    test_archive_digest.c
     test_archive_getdate.c
     test_archive_match_owner.c
     test_archive_match_path.c

diff --git a/libarchive/test/test_archive_crypto.c b/libarchive/test/test_archive_digest.c
similarity index 98%
rename from libarchive/test/test_archive_crypto.c
rename to libarchive/test/test_archive_digest.c
index a4bf4ec6df5a30dba5bff4eadfb88fdba6a078f7..a8654ae1f60c9a2f6ea1d483a057a6c3d0278a7e 100644 (file)
--- a/libarchive/test/test_archive_crypto.c
+++ b/libarchive/test/test_archive_digest.c
@@ -25,10 +25,10 @@
  */
 #include "test.h"
 
-/* Sanity test of internal crypto functionality */
+/* Sanity test of internal digest functionality */
 
 #define __LIBARCHIVE_BUILD 1
-#include "archive_crypto_private.h"
+#include "archive_digest_private.h"
 
 DEFINE_TEST(test_archive_md5)
 {