Allow "none" for Cipher and Digest again.

diff --git a/src/net_setup.c b/src/net_setup.c
index 421315b8fbf5eb2d77114177cab13307f5381154..6157993cccd3deabdf7eee7aafbfb5b9e5ae3ea8 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -747,7 +747,9 @@ static bool setup_myself(void) {
        if(!get_config_string(lookup_config(config_tree, "Cipher"), &cipher))
                cipher = xstrdup("blowfish");
 
-       if(!(myself->incipher = cipher_open_by_name(cipher))) {
+       if(!strcasecmp(cipher, "none")) {
+               myself->incipher = NULL;
+       } else if(!(myself->incipher = cipher_open_by_name(cipher))) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized cipher type!");
                return false;
        }
@@ -769,7 +771,9 @@ static bool setup_myself(void) {
        if(!get_config_string(lookup_config(config_tree, "Digest"), &digest))
                digest = xstrdup("sha1");
 
-       if(!(myself->indigest = digest_open_by_name(digest, maclength))) {
+       if(!strcasecmp(digest, "none")) {
+               myself->indigest = NULL;
+       } else if(!(myself->indigest = digest_open_by_name(digest, maclength))) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized digest type!");
                return false;
        }

diff --git a/src/protocol_key.c b/src/protocol_key.c
index a3cf3f51b5965b90923b525494593a971f611e08..e41ec42223f149782bc98c90ca5f832311632175 100644 (file)
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -395,14 +395,22 @@ bool ans_key_h(connection_t *c, const char *request) {
 
        /* Check and lookup cipher and digest algorithms */
 
-       if(!(from->outcipher = cipher_open_by_nid(cipher))) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses unknown cipher!", from->name, from->hostname);
-               return false;
+       if(cipher) {
+               if(!(from->outcipher = cipher_open_by_nid(cipher))) {
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses unknown cipher!", from->name, from->hostname);
+                       return false;
+               }
+       } else {
+               from->outcipher = NULL;
        }
 
-       if(!(from->outdigest = digest_open_by_nid(digest, maclength))) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses unknown digest!", from->name, from->hostname);
-               return false;
+       if(digest) {
+               if(!(from->outdigest = digest_open_by_nid(digest, maclength))) {
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses unknown digest!", from->name, from->hostname);
+                       return false;
+               }
+       } else {
+               from->outdigest = NULL;
        }
 
        if(maclength != digest_length(from->outdigest)) {