summaryrefslogtreecommitdiff
path: root/src/tools/irm
diff options
context:
space:
mode:
authorSander Vrijders <[email protected]>2017-08-10 19:57:33 +0000
committerdimitri staessens <[email protected]>2017-08-10 19:57:33 +0000
commit2b42b1e1121dfd715a78502a3652d326330b8160 (patch)
tree072770c8575c0f5d8248ff5a4a3afa4388fe455c /src/tools/irm
parentf3d2ce1e668dfcf6b5088bf448b29f96d0ddaa76 (diff)
parentcf18d69d1e8b238c82940b4ea8173436bd53a1ce (diff)
downloadouroboros-2b42b1e1121dfd715a78502a3652d326330b8160.tar.gz
ouroboros-2b42b1e1121dfd715a78502a3652d326330b8160.zip
Merged in sandervrijders/ouroboros/be-clang (pull request #547)
lib, ipcpd, tools: Fix enum assignments
Diffstat (limited to 'src/tools/irm')
-rw-r--r--src/tools/irm/irm_ipcp_bootstrap.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/tools/irm/irm_ipcp_bootstrap.c b/src/tools/irm/irm_ipcp_bootstrap.c
index 571bff8b..48a31f08 100644
--- a/src/tools/irm/irm_ipcp_bootstrap.c
+++ b/src/tools/irm/irm_ipcp_bootstrap.c
@@ -29,7 +29,6 @@
#endif
#include <ouroboros/irm.h>
#include <ouroboros/ipcp.h>
-#include <ouroboros/hash.h>
#include "irm_ops.h"
#include "irm_utils.h"
@@ -52,7 +51,7 @@
#define DEFAULT_DT_GAM COMPLETE
#define DEFAULT_RM_GAM COMPLETE
#define DEFAULT_ROUTING LINK_STATE
-#define DEFAULT_HASH_ALGO HASH_SHA3_256
+#define DEFAULT_HASH_ALGO DIR_HASH_SHA3_256
#define ADDR_AUTH_FLAT "flat"
#define DT_GAM_COMPLETE "complete"
#define RM_GAM_COMPLETE "complete"
@@ -122,13 +121,13 @@ int do_bootstrap_ipcp(int argc, char ** argv)
name = *(argv + 1);
} else if (matches(*argv, "hash") == 0) {
if (strcmp(*(argv + 1), SHA3_224) == 0)
- hash_algo = HASH_SHA3_224;
+ hash_algo = DIR_HASH_SHA3_224;
else if (strcmp(*(argv + 1), SHA3_256) == 0)
- hash_algo = HASH_SHA3_256;
+ hash_algo = DIR_HASH_SHA3_256;
else if (strcmp(*(argv + 1), SHA3_384) == 0)
- hash_algo = HASH_SHA3_384;
+ hash_algo = DIR_HASH_SHA3_384;
else if (strcmp(*(argv + 1), SHA3_512) == 0)
- hash_algo = HASH_SHA3_512;
+ hash_algo = DIR_HASH_SHA3_512;
else
goto unknown_param;
} else if (matches(*argv, "ip") == 0) {