X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_setup.c;h=3ab91a0529613f314504b767da95f5052fb6aaf4;hp=3695e18e6aedcba572a4c0b337726304ad886f24;hb=7ed25590257b6ed33dfa879d187a09b0d790794f;hpb=721e4caee0f7c6e003c297c95fb6d93bd4102219

diff --git a/src/net_setup.c b/src/net_setup.c
index 3695e18e..3ab91a05 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.40 2003/07/29 22:59:00 guus Exp $
+    $Id: net_setup.c,v 1.1.2.43 2003/08/14 14:21:35 guus Exp $
 */
 
 #include "system.h"
@@ -149,6 +149,7 @@ bool read_rsa_private_key(void)
 {
 	FILE *fp;
 	char *fname, *key;
+	struct stat s;
 
 	cp();
 
@@ -164,32 +165,39 @@ bool read_rsa_private_key(void)
 	if(!get_config_string(lookup_config(config_tree, "PrivateKeyFile"), &fname))
 		asprintf(&fname, "%s/rsa_key.priv", confbase);
 
-	if(is_safe_path(fname)) {
-		fp = fopen(fname, "r");
+	fp = fopen(fname, "r");
 
-		if(!fp) {
-			logger(LOG_ERR, _("Error reading RSA private key file `%s': %s"),
-				   fname, strerror(errno));
-			free(fname);
-			return false;
-		}
+	if(!fp) {
+		logger(LOG_ERR, _("Error reading RSA private key file `%s': %s"),
+			   fname, strerror(errno));
+		free(fname);
+		return false;
+	}
 
+#if !defined(HAVE_MINGW) && !defined(HAVE_CYGWIN)
+	if(fstat(fileno(fp), &s)) {
+		logger(LOG_ERR, _("Could not stat RSA private key file `%s': %s'"),
+				fname, strerror(errno));
 		free(fname);
-		myself->connection->rsa_key =
-			PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
-		fclose(fp);
+		return false;
+	}
 
-		if(!myself->connection->rsa_key) {
-			logger(LOG_ERR, _("Reading RSA private key file `%s' failed: %s"),
-				   fname, strerror(errno));
-			return false;
-		}
+	if(s.st_mode & ~0100700)
+		logger(LOG_WARNING, _("Warning: insecure file permissions for RSA private key file `%s'!"), fname);
+#endif
 
-		return true;
+	myself->connection->rsa_key = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
+	fclose(fp);
+
+	if(!myself->connection->rsa_key) {
+		logger(LOG_ERR, _("Reading RSA private key file `%s' failed: %s"),
+			   fname, strerror(errno));
+		free(fname);
+		return false;
 	}
 
 	free(fname);
-	return false;
+	return true;
 }
 
 /*
@@ -202,7 +210,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;
 
@@ -446,12 +454,10 @@ bool setup_myself(void)
 
 	get_config_string(lookup_config(config_tree, "BindToAddress"), &address);
 
-	hint = (struct addrinfo) {
-		.ai_family = addressfamily,
-		.ai_socktype = SOCK_STREAM,
-		.ai_protocol = IPPROTO_TCP,
-		.ai_flags = AI_PASSIVE,
-	};
+	hint.ai_family = addressfamily;
+	hint.ai_socktype = SOCK_STREAM;
+	hint.ai_protocol = IPPROTO_TCP;
+	hint.ai_flags = AI_PASSIVE;
 
 	err = getaddrinfo(address, myport, &hint, &ai);