X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_setup.c;h=5bbaa7996b561707df82c4779267617eaf0e9be8;hp=e101d9de0c7d9ac1c1e9418cec730f952e7b4aaf;hb=da3078c63a3b658573f6e2f986f69ed4d7993b3a;hpb=4aadb9500d9198f9c271deb048a2d36000bfae34

diff --git a/src/net_setup.c b/src/net_setup.c
index e101d9de..5bbaa799 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net_setup.c,v 1.1.2.38 2003/07/22 21:13:23 guus Exp $
+    $Id: net_setup.c,v 1.1.2.41 2003/07/30 11:50:45 guus Exp $
 */
 
 #include "system.h"
@@ -202,7 +202,7 @@ bool setup_myself(void)
 	char *name, *hostname, *mode, *afname, *cipher, *digest;
 	char *address = NULL;
 	char *envp[5];
-	struct addrinfo hint, *ai, *aip;
+	struct addrinfo *ai, *aip, hint = {0};
 	bool choice;
 	int i, err;
 
@@ -362,8 +362,10 @@ bool setup_myself(void)
 
 	keyexpires = now + keylifetime;
 	
-	EVP_CIPHER_CTX_init(&packet_ctx);
-	EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
+	if(myself->cipher) {
+		EVP_CIPHER_CTX_init(&packet_ctx);
+		EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
+	}
 
 	/* Check if we want to use message authentication codes... */
 
@@ -442,8 +444,6 @@ bool setup_myself(void)
 
 	/* Open sockets */
 
-	memset(&hint, 0, sizeof(hint));
-
 	get_config_string(lookup_config(config_tree, "BindToAddress"), &address);
 
 	hint.ai_family = addressfamily;