lib: Move sha context and result size to new header

This is to prepare for SHA3 inclusion

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 55758e0e8032ce9bd34bbfb8e572314f09cef12f..4a6b9f3857d12d7593c24bd23f317db866d436f0 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -266,6 +266,7 @@ headers = \
        safe-mkstemp.h \
        sendfile-util.h \
        seq-range-array.h \
+       sha-common.h \
        sha1.h \
        sha2.h \
        sort.h \

diff --git a/src/lib/sha-common.h b/src/lib/sha-common.h
new file mode 100644 (file)
index 0000000..47c58fe
--- /dev/null
+++ b/src/lib/sha-common.h
@@ -0,0 +1,9 @@
+#ifndef SHA_COMMON
+
+#define SHA256_RESULTLEN (256 / 8)
+#define SHA256_BLOCK_SIZE (512 / 8)
+
+#define SHA512_RESULTLEN (512 / 8)
+#define SHA512_BLOCK_SIZE (1024 / 8)
+
+#endif

diff --git a/src/lib/sha2.h b/src/lib/sha2.h
index b04f93ae5a0d0076ca4684ce0e55a8b0ac180418..5d9d2f0b04a7074aea27f8e9a04cabcb6923f6da 100644 (file)
--- a/src/lib/sha2.h
+++ b/src/lib/sha2.h
@@ -35,12 +35,7 @@
 #define SHA2_H
 
 #include "hash-method.h"
-
-#define SHA256_RESULTLEN (256 / 8)
-#define SHA256_BLOCK_SIZE (512 / 8)
-
-#define SHA512_RESULTLEN (512 / 8)
-#define SHA512_BLOCK_SIZE (1024 / 8)
+#include "sha-common.h"
 
 struct sha256_ctx {
        size_t tot_len;