lib: Move sha context and result size to new header

This is to prepare for SHA3 inclusion
dovecot · Nov 8, 2016 · 6868400 · 6868400
1 parent 1007721
commit 6868400
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
@@ -269,6 +269,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
@@ -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
@@ -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;