Add and use SHA1_HASH_STRING_LEN constant

[wimlib] / include / wimlib / sha1.h

diff --git a/include/wimlib/sha1.h b/include/wimlib/sha1.h
index 2a6d6a32cca8f437661e154ca91d11cfd045af7f..e1def3d9f2cb274c9bd282fe47bba9fdfc55447e 100644 (file)
--- a/include/wimlib/sha1.h
+++ b/include/wimlib/sha1.h
@@ -1,34 +1,52 @@
 /*
  * sha1.h
  *
- * The author dedicates this file to the public domain.
- * You can do whatever you want with this file.
+ * Copyright 2022 Eric Biggers
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #ifndef _WIMLIB_SHA1_H
 #define _WIMLIB_SHA1_H
 
+#include <string.h>
+
 #include "wimlib/types.h"
 #include "wimlib/util.h"
 
-#include <string.h>
-
 #define SHA1_HASH_SIZE 20
 
 extern const u8 zero_hash[SHA1_HASH_SIZE];
 
+#define SHA1_HASH_STRING_LEN   (2 * SHA1_HASH_SIZE + 1)
+extern void
+sprint_hash(const u8 hash[SHA1_HASH_SIZE], tchar strbuf[SHA1_HASH_STRING_LEN]);
+
 static inline void
 copy_hash(u8 dest[SHA1_HASH_SIZE], const u8 src[SHA1_HASH_SIZE])
 {
        memcpy(dest, src, SHA1_HASH_SIZE);
 }
 
-static inline void
-random_hash(u8 hash[SHA1_HASH_SIZE])
-{
-       randomize_byte_array(hash, SHA1_HASH_SIZE);
-}
-
 static inline int
 hashes_cmp(const u8 h1[SHA1_HASH_SIZE], const u8 h2[SHA1_HASH_SIZE])
 {
@@ -41,24 +59,12 @@ hashes_equal(const u8 h1[SHA1_HASH_SIZE], const u8 h2[SHA1_HASH_SIZE])
        return !hashes_cmp(h1, h2);
 }
 
-static inline void
-print_hash(const u8 hash[SHA1_HASH_SIZE], FILE *out)
-{
-       print_byte_field(hash, SHA1_HASH_SIZE, out);
-}
-
 static inline bool
 is_zero_hash(const u8 *hash)
 {
        return (hash == zero_hash || hashes_equal(hash, zero_hash));
 }
 
-static inline void
-zero_out_hash(u8 hash[SHA1_HASH_SIZE])
-{
-       copy_hash(hash, zero_hash);
-}
-
 #ifdef WITH_LIBCRYPTO
 
 #include <openssl/sha.h>
@@ -68,9 +74,9 @@ zero_out_hash(u8 hash[SHA1_HASH_SIZE])
 #define sha1_final    SHA1_Final
 
 static inline void
-sha1_buffer(const void *buffer, size_t len, u8 hash[SHA1_HASH_SIZE])
+sha1(const void *data, size_t len, u8 hash[SHA1_HASH_SIZE])
 {
-       SHA1(buffer, len, hash);
+       SHA1(data, len, hash);
 }
 
 #else /* WITH_LIBCRYPTO */
@@ -91,7 +97,7 @@ extern void
 sha1_final(u8 hash[SHA1_HASH_SIZE], SHA_CTX *ctx);
 
 extern void
-sha1_buffer(const void *buffer, size_t len, u8 hash[SHA1_HASH_SIZE]);
+sha1(const void *data, size_t len, u8 hash[SHA1_HASH_SIZE]);
 
 #endif /* !WITH_LIBCRYPTO */