Don't dereference myself->incipher if it's NULL.

This fixes #142 on GitHub.

diff --git a/NEWS b/NEWS
index 34c6f1f5b5fc64c2a19647babeacf33c97afaf9d..028cc9cd1d4f82343c017e8b37b282e6b983d591 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Version 1.0.32               not released yet
+
+ * Fix segmentation fault when using Cipher = none.
+
 Version 1.0.31               January 15 2017
 
  * Remove ExecStop in tinc@.service.

diff --git a/src/net_setup.c b/src/net_setup.c
index d7668885e7f76ca6965f9bfbf3b6ab80a47bb1df..2371f7ee099c5390800ec484387867d874bf0c75 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -1,7 +1,7 @@
 /*
     net_setup.c -- Setup.
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2016 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2017 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
                   2010      Brandon Black <blblack@gmail.com>
 
@@ -660,9 +660,12 @@ static bool setup_myself(void) {
        /* We need to use a stream mode for the meta protocol. Use AES for this,
           but try to match the key size with the one from the cipher selected
           by Cipher.
+
+          If Cipher is set to none, still use a low level of encryption for the
+          meta protocol.
        */
 
-       int keylen = EVP_CIPHER_key_length(myself->incipher);
+       int keylen = myself->incipher ? EVP_CIPHER_key_length(myself->incipher) : 0;
        if(keylen <= 16)
                myself->connection->outcipher = EVP_aes_128_cfb();
        else if(keylen <= 24)