X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=1796c4bbcc7a83a304d794d3426466c19e2ef0ee;hb=210b5ceeeebdf742a74dcf95a0a13d69623ee001;hp=7ceba36051629e1185262e26cd3803d67d9e089e;hpb=03582eb669494cb778ebea7b0fe3b1b841335750;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index 7ceba360..1796c4bb 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -29,6 +29,7 @@
 #include "control.h"
 #include "device.h"
 #include "digest.h"
+#include "ecdsa.h"
 #include "graph.h"
 #include "logger.h"
 #include "net.h"
@@ -44,6 +45,43 @@
 char *myport;
 static struct event device_ev;
 
+bool read_ecdsa_public_key(connection_t *c) {
+	FILE *fp;
+	char *fname;
+	char *p;
+	bool result;
+
+	/* First, check for simple ECDSAPublicKey statement */
+
+	if(get_config_string(lookup_config(c->config_tree, "ECDSAPublicKey"), &p)) {
+		result = ecdsa_set_base64_public_key(&c->ecdsa, p);
+		free(p);
+		return result;
+	}
+
+	/* Else, check for ECDSAPublicKeyFile statement and read it */
+
+	if(!get_config_string(lookup_config(c->config_tree, "ECDSAPublicKeyFile"), &fname))
+		xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
+
+	fp = fopen(fname, "r");
+
+	if(!fp) {
+		logger(LOG_ERR, "Error reading ECDSA public key file `%s': %s",
+			   fname, strerror(errno));
+		free(fname);
+		return false;
+	}
+
+	result = ecdsa_read_pem_public_key(&c->ecdsa, fp);
+	fclose(fp);
+
+	if(!result) 
+		logger(LOG_ERR, "Reading ECDSA public key file `%s' failed: %s", fname, strerror(errno));
+	free(fname);
+	return result;
+}
+
 bool read_rsa_public_key(connection_t *c) {
 	FILE *fp;
 	char *fname;
@@ -81,6 +119,47 @@ bool read_rsa_public_key(connection_t *c) {
 	return result;
 }
 
+static bool read_ecdsa_private_key(void) {
+	FILE *fp;
+	char *fname;
+	bool result;
+
+	/* Check for PrivateKeyFile statement and read it */
+
+	if(!get_config_string(lookup_config(config_tree, "ECDSAPrivateKeyFile"), &fname))
+		xasprintf(&fname, "%s/ecdsa_key.priv", confbase);
+
+	fp = fopen(fname, "r");
+
+	if(!fp) {
+		logger(LOG_ERR, "Error reading ECDSA private key file `%s': %s",
+			   fname, strerror(errno));
+		free(fname);
+		return false;
+	}
+
+#if !defined(HAVE_MINGW) && !defined(HAVE_CYGWIN)
+	struct stat s;
+
+	if(fstat(fileno(fp), &s)) {
+		logger(LOG_ERR, "Could not stat ECDSA private key file `%s': %s'", fname, strerror(errno));
+		free(fname);
+		return false;
+	}
+
+	if(s.st_mode & ~0100700)
+		logger(LOG_WARNING, "Warning: insecure file permissions for ECDSA private key file `%s'!", fname);
+#endif
+
+	result = ecdsa_read_pem_private_key(&myself->connection->ecdsa, fp);
+	fclose(fp);
+
+	if(!result) 
+		logger(LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", fname, strerror(errno));
+	free(fname);
+	return result;
+}
+
 static bool read_rsa_private_key(void) {
 	FILE *fp;
 	char *fname;
@@ -260,6 +339,9 @@ static bool setup_myself(void) {
 	read_config_file(config_tree, fname);
 	free(fname);
 
+	if(!read_ecdsa_private_key())
+		return false;
+
 	if(!read_rsa_private_key())
 		return false;