X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=462ff10339ce3b9a761caa5f812a2ed4781f0f5e;hb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;hp=5d4e9157cefdc1df31b76f2b869f1c2ae162ae78;hpb=0b8b23e0dd7219344543f135ca0aeba8a4a42d48;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index 5d4e9157..462ff103 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -167,7 +167,7 @@ bool read_rsa_public_key(connection_t *c) {
 	result = rsa_read_pem_public_key(&c->rsa, fp);
 	fclose(fp);
 
-	if(!result) 
+	if(!result)
 		logger(DEBUG_ALWAYS, LOG_ERR, "Reading RSA public key file `%s' failed: %s", fname, strerror(errno));
 	free(fname);
 	return result;
@@ -207,7 +207,7 @@ static bool read_ecdsa_private_key(void) {
 	result = ecdsa_read_pem_private_key(&myself->connection->ecdsa, fp);
 	fclose(fp);
 
-	if(!result) 
+	if(!result)
 		logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", fname, strerror(errno));
 	free(fname);
 	return result;
@@ -263,7 +263,7 @@ static bool read_rsa_private_key(void) {
 	result = rsa_read_pem_private_key(&myself->connection->rsa, fp);
 	fclose(fp);
 
-	if(!result) 
+	if(!result)
 		logger(DEBUG_ALWAYS, LOG_ERR, "Reading RSA private key file `%s' failed: %s", fname, strerror(errno));
 	free(fname);
 	return result;
@@ -398,7 +398,7 @@ bool setup_myself_reloadable(void) {
 	scriptinterpreter = NULL;
 	get_config_string(lookup_config(config_tree, "ScriptsInterpreter"), &scriptinterpreter);
 
-	
+
 	free(scriptextension);
 	if(!get_config_string(lookup_config(config_tree, "ScriptsExtension"), &scriptextension))
 #ifdef HAVE_MINGW
@@ -480,7 +480,7 @@ bool setup_myself_reloadable(void) {
 
 	get_config_bool(lookup_config(config_tree, "DirectOnly"), &directonly);
 	get_config_bool(lookup_config(config_tree, "LocalDiscovery"), &localdiscovery);
-	
+
 	if(get_config_string(lookup_config(config_tree, "Mode"), &rmode)) {
 		if(!strcasecmp(rmode, "router"))
 			routing_mode = RMODE_ROUTER;
@@ -680,6 +680,8 @@ static bool setup_myself(void) {
 		return false;
 	}
 
+	free(cipher);
+
 	regenerate_key();
 
 	/* Check if we want to use message authentication codes... */
@@ -700,6 +702,8 @@ static bool setup_myself(void) {
 		return false;
 	}
 
+	free(digest);
+
 	/* Compression */
 
 	if(get_config_int(lookup_config(config_tree, "Compression"), &myself->incompression)) {
@@ -803,7 +807,7 @@ static bool setup_myself(void) {
 			listen_socket[i].tcp = i + 3;
 
 #ifdef FD_CLOEXEC
-		        fcntl(i + 3, F_SETFD, FD_CLOEXEC);
+			fcntl(i + 3, F_SETFD, FD_CLOEXEC);
 #endif
 
 			listen_socket[i].udp = setup_vpn_in_socket(&sa);