Allow Cipher and Digest "none".

[tinc] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index f3322c7..b8d4ee8 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -514,14 +514,22 @@ bool metakey_h(connection_t *c, const char *request) {
 
        /* Check and lookup cipher and digest algorithms */
 
-       if(!(c->incipher = cipher_open_by_nid(cipher)) || !cipher_set_key_from_rsa(c->incipher, key, len, false)) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of cipher from %s (%s)", c->name, c->hostname);
-               return false;
+       if(cipher) {
+               if(!(c->incipher = cipher_open_by_nid(cipher)) || !cipher_set_key_from_rsa(c->incipher, key, len, false)) {
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of cipher from %s (%s)", c->name, c->hostname);
+                       return false;
+               }
+       } else {
+               c->incipher = NULL;
        }
 
-       if(!(c->indigest = digest_open_by_nid(digest, -1))) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of digest from %s (%s)", c->name, c->hostname);
-               return false;
+       if(digest) {
+               if(!(c->indigest = digest_open_by_nid(digest, -1))) {
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of digest from %s (%s)", c->name, c->hostname);
+                       return false;
+               }
+       } else {
+               c->indigest = NULL;
        }
 
        c->status.decryptin = true;