diff options
| author | Sander Vrijders <sander.vrijders@ugent.be> | 2017-12-03 21:30:31 +0100 |
|---|---|---|
| committer | Dimitri Staessens <dimitri.staessens@ugent.be> | 2017-12-04 16:23:55 +0100 |
| commit | a1b982bf4c052360cd854b9e4c97592893692701 (patch) | |
| tree | c9db1dae875b5e901b37e6f198729a5e25dc443b /src/tools | |
| parent | 961bb67e7dd120d19742ef5c51fbd80c2a18cb12 (diff) | |
| download | ouroboros-a1b982bf4c052360cd854b9e4c97592893692701.tar.gz ouroboros-a1b982bf4c052360cd854b9e4c97592893692701.zip | |
ipcpd: Make hash algorithm configurable
This makes the hashing algorithm configurable once more for the local
and the shim-eth-llc, since their scope is so small that it is up to
the network administrator to select a correct algorithm for the whole
network.
Signed-off-by: Sander Vrijders <sander.vrijders@ugent.be>
Signed-off-by: Dimitri Staessens <dimitri.staessens@ugent.be>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/irm/irm_ipcp_bootstrap.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/tools/irm/irm_ipcp_bootstrap.c b/src/tools/irm/irm_ipcp_bootstrap.c index acd3779e..728d3d11 100644 --- a/src/tools/irm/irm_ipcp_bootstrap.c +++ b/src/tools/irm/irm_ipcp_bootstrap.c @@ -102,9 +102,16 @@ static void usage(void) " [dns <DDNS IP address in dotted notation>" " (default: none)]\n\n" "if TYPE == " SHIM_ETH_LLC "\n" - " if_name <interface name>\n", + " if_name <interface name>\n" + " [hash [ALGORITHM] (default: %s)]\n" + "where ALGORITHM = {" SHA3_224 " " SHA3_256 " " + SHA3_384 " " SHA3_512 "}\n\n" + "if TYPE == " LOCAL "\n" + " [hash [ALGORITHM] (default: %s)]\n" + "where ALGORITHM = {" SHA3_224 " " SHA3_256 " " + SHA3_384 " " SHA3_512 "}\n\n", DEFAULT_ADDR_SIZE, DEFAULT_FD_SIZE, FLAT_RANDOM_ADDR_AUTH, - LINK_STATE_ROUTING, SIMPLE_PFF, SHA3_256); + LINK_STATE_ROUTING, SIMPLE_PFF, SHA3_256, SHA3_256, SHA3_256); } int do_bootstrap_ipcp(int argc, @@ -203,6 +210,8 @@ int do_bootstrap_ipcp(int argc, } strcpy(conf.dif_info.dif_name, dif_name); + if (strcmp(ipcp_type, SHIM_UDP) != 0) + conf.dif_info.dir_hash_algo = hash_algo; if (strcmp(ipcp_type, NORMAL) == 0) { conf.type = IPCP_NORMAL; @@ -212,7 +221,6 @@ int do_bootstrap_ipcp(int argc, conf.addr_auth_type = addr_auth_type; conf.routing_type = routing_type; conf.pff_type = pff_type; - conf.dif_info.dir_hash_algo = hash_algo; } else if (strcmp(ipcp_type, SHIM_UDP) == 0) { conf.type = IPCP_SHIM_UDP; if (ip_addr == 0) { |