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 <[email protected]>
Signed-off-by: Sander Vrijders <[email protected]>

1 files changed, 2 insertions, 20 deletions

diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c
index 1e777637..5d9c6e7a 100644
--- a/src/ipcpd/ipcp.c
+++ b/src/ipcpd/ipcp.c
@@ -288,6 +288,8 @@ static void handle_bootstrap(ipcp_config_msg_t * conf_msg,
 
         ipcp_type = conf_msg->ipcp_type;
 
+        conf.layer_info.dir_hash_algo = conf_msg->layer_info->dir_hash_algo;
+
         switch(ipcp_type) {
         case IPCP_LOCAL:
                 break;
@@ -322,26 +324,6 @@ static void handle_bootstrap(ipcp_config_msg_t * conf_msg,
                 return;
         }
 
-        /* UDP and broadcast use fixed hash algorithm. */
-        if (ipcp_type != IPCP_UDP && ipcp_type != IPCP_BROADCAST) {
-                switch(conf_msg->layer_info->dir_hash_algo) {
-                case DIR_HASH_SHA3_224:
-                        conf.layer_info.dir_hash_algo = HASH_SHA3_224;
-                        break;
-                case DIR_HASH_SHA3_256:
-                        conf.layer_info.dir_hash_algo = HASH_SHA3_256;
-                        break;
-                case DIR_HASH_SHA3_384:
-                        conf.layer_info.dir_hash_algo = HASH_SHA3_384;
-                        break;
-                case DIR_HASH_SHA3_512:
-                        conf.layer_info.dir_hash_algo = HASH_SHA3_512;
-                        break;
-                default:
-                        assert(false);
-                }
-        }
-
         ret_msg->result = ipcpi.ops->ipcp_bootstrap(&conf);
         if (ret_msg->result == 0) {
                 layer_info_msg->layer_name = strdup(conf.layer_info.layer_name);