summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri@ouroboros.rocks>2023-02-19 13:18:52 +0100
committerSander Vrijders <sander@ouroboros.rocks>2023-02-23 14:01:00 +0100
commit59703c95fb529386574a334c9cff7cd5d4f16255 (patch)
treea9d0b25b10a2c737410bb9f4fce00504ab51dbbe /include
parent269f25d3bac5ab871d8044935eacc15cfeadeec6 (diff)
downloadouroboros-59703c95fb529386574a334c9cff7cd5d4f16255.tar.gz
ouroboros-59703c95fb529386574a334c9cff7cd5d4f16255.zip
lib: Refactor hash internals
The internal hash enum now matches the public one w.r.t. directory hash policies. This removes some unnecessary conversion. Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks> Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
Diffstat (limited to 'include')
-rw-r--r--include/ouroboros/hash.h23
-rw-r--r--include/ouroboros/ipcp.h2
2 files changed, 7 insertions, 18 deletions
diff --git a/include/ouroboros/hash.h b/include/ouroboros/hash.h
index 248da12d..70d2eba0 100644
--- a/include/ouroboros/hash.h
+++ b/include/ouroboros/hash.h
@@ -26,30 +26,19 @@
#include "config.h"
#include <ouroboros/endian.h>
+#include <ouroboros/ipcp.h>
-#ifdef HAVE_LIBGCRYPT
-#include <gcrypt.h>
-#endif
#include <stdint.h>
#include <stddef.h>
/* Hash algorithms */
enum hash_algo {
-#ifdef HAVE_LIBGCRYPT
- HASH_CRC32 = GCRY_MD_CRC32,
- HASH_MD5 = GCRY_MD_MD5,
- HASH_SHA3_224 = GCRY_MD_SHA3_224,
- HASH_SHA3_256 = GCRY_MD_SHA3_256,
- HASH_SHA3_384 = GCRY_MD_SHA3_384,
- HASH_SHA3_512 = GCRY_MD_SHA3_512
-#else
- HASH_CRC32 = 0,
+ HASH_SHA3_224 = DIR_HASH_SHA3_224,
+ HASH_SHA3_256 = DIR_HASH_SHA3_256,
+ HASH_SHA3_384 = DIR_HASH_SHA3_384,
+ HASH_SHA3_512 = DIR_HASH_SHA3_512,
+ HASH_CRC32,
HASH_MD5,
- HASH_SHA3_224,
- HASH_SHA3_256,
- HASH_SHA3_384,
- HASH_SHA3_512
-#endif
};
#define HASH_FMT "%02x%02x%02x%02x"
diff --git a/include/ouroboros/ipcp.h b/include/ouroboros/ipcp.h
index e2ae0c0e..49deeffd 100644
--- a/include/ouroboros/ipcp.h
+++ b/include/ouroboros/ipcp.h
@@ -57,7 +57,7 @@ enum pol_cong_avoid {
};
enum pol_dir_hash {
- DIR_HASH_SHA3_224 = 0,
+ DIR_HASH_SHA3_224,
DIR_HASH_SHA3_256,
DIR_HASH_SHA3_384,
DIR_HASH_SHA3_512