X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=a542ca9ea922813b75cc741f24dbe8d1f2550c9c;hb=3fba80174dbe29bcfe0d121a2a1d2e61be5ee57b;hp=70062f3f59f87ed0d158011fe12bbf4616857d91;hpb=30ef2a981e1d62692b3a2363e0b3a0e8711d9604;p=tinc

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 70062f3f..a542ca9e 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -43,12 +43,16 @@
 bool send_id(connection_t *c) {
 	gettimeofday(&c->start, NULL);
 
-	int minor = myself->connection->protocol_minor;
-	if(c->config_tree && !read_ecdsa_public_key(c))
-		minor = 1;
+	int minor = 0;
 
-	return send_request(c, "%d %s %d.%d", ID, myself->connection->name,
-						myself->connection->protocol_major, minor);
+	if(experimental) {
+		if(c->config_tree && !read_ecdsa_public_key(c))
+			minor = 1;
+		else
+			minor = myself->connection->protocol_minor;
+	}
+
+	return send_request(c, "%d %s %d.%d", ID, myself->connection->name, myself->connection->protocol_major, minor);
 }
 
 bool id_h(connection_t *c, char *request) {
@@ -106,6 +110,9 @@ bool id_h(connection_t *c, char *request) {
 		return send_ack(c);
 	}
 
+	if(!experimental)
+		c->protocol_minor = 0;
+
 	if(!c->config_tree) {
 		init_configuration(&c->config_tree);
 
@@ -115,11 +122,11 @@ bool id_h(connection_t *c, char *request) {
 			return false;
 		}
 
-		if(c->protocol_minor >= 2)
+		if(experimental && c->protocol_minor >= 2)
 			if(!read_ecdsa_public_key(c))
 				return false;
 	} else {
-		if(!ecdsa_active(&c->ecdsa))
+		if(c->protocol_minor && !ecdsa_active(&c->ecdsa))
 			c->protocol_minor = 1;
 	}
 
@@ -136,24 +143,19 @@ bool send_metakey_ec(connection_t *c) {
 
 	size_t siglen = ecdsa_size(&myself->connection->ecdsa);
 
-	char key[ECDH_SIZE];
-	char sig[siglen];
+	char key[(ECDH_SIZE + siglen) * 2 + 1];
 
 	// TODO: include nonce? Use relevant parts of SSH or TLS protocol
 
 	if(!ecdh_generate_public(&c->ecdh, key))
 		return false;
 
-	if(!ecdsa_sign(&myself->connection->ecdsa, key, ECDH_SIZE, sig))
+	if(!ecdsa_sign(&myself->connection->ecdsa, key, ECDH_SIZE, key + ECDH_SIZE))
 		return false;
 
-	char out[MAX_STRING_SIZE];
-
-	bin2hex(key, out, ECDH_SIZE);
-	bin2hex(sig, out + ECDH_SIZE * 2, siglen);
-	out[(ECDH_SIZE + siglen) * 2] = 0;
+	b64encode(key, key, ECDH_SIZE + siglen);
 	
-	bool result = send_request(c, "%d %s", METAKEY, out);
+	return send_request(c, "%d %s", METAKEY, key);
 }
 
 bool send_metakey(connection_t *c) {
@@ -191,7 +193,6 @@ bool send_metakey(connection_t *c) {
 
 	ifdebug(SCARY_THINGS) {
 		bin2hex(key, hexkey, len);
-		hexkey[len * 2] = '\0';
 		logger(LOG_DEBUG, "Generated random meta key (unencrypted): %s", hexkey);
 	}
 
@@ -210,7 +211,6 @@ bool send_metakey(connection_t *c) {
 	/* Convert the encrypted random data to a hexadecimal formatted string */
 
 	bin2hex(enckey, hexkey, len);
-	hexkey[len * 2] = '\0';
 
 	/* Send the meta key */
 
@@ -225,31 +225,28 @@ bool send_metakey(connection_t *c) {
 
 static bool metakey_ec_h(connection_t *c, const char *request) {
 	size_t siglen = ecdsa_size(&c->ecdsa);
-	char in[MAX_STRING_SIZE];
 	char key[MAX_STRING_SIZE];
-	char sig[siglen];
 
 	logger(LOG_DEBUG, "Got ECDH metakey from %s", c->name);
 
-	if(sscanf(request, "%*d " MAX_STRING, in) != 1) {
+	if(sscanf(request, "%*d " MAX_STRING, key) != 1) {
 		logger(LOG_ERR, "Got bad %s from %s (%s)", "METAKEY", c->name, c->hostname);
 		return false;
 	}
 
-	if(strlen(in) != (ECDH_SIZE + siglen) * 2) {
-		logger(LOG_ERR, "Possible intruder %s (%s): %s %d != %d", c->name, c->hostname, "wrong keylength", strlen(in) / 2, (ECDH_SIZE + siglen));
+	int inlen = b64decode(key, key, sizeof key);
+
+	if(inlen != (ECDH_SIZE + siglen)) {
+		logger(LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong keylength");
 		return false;
 	}
 
-	hex2bin(in, key, ECDH_SIZE);
-	hex2bin(in + ECDH_SIZE * 2, sig, siglen);
-
-	if(!ecdsa_verify(&c->ecdsa, key, ECDH_SIZE, sig)) {
+	if(!ecdsa_verify(&c->ecdsa, key, ECDH_SIZE, key + ECDH_SIZE)) {
 		logger(LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "invalid ECDSA signature");
 		return false;
 	}
 
-	char shared[ECDH_SHARED_SIZE * 2 + 1];
+	char shared[ECDH_SHARED_SIZE];
 
 	if(!ecdh_compute_shared(&c->ecdh, key, shared))
 		return false;
@@ -287,14 +284,10 @@ static bool metakey_ec_h(connection_t *c, const char *request) {
 
 	free(seed);
 
-	bin2hex(shared, shared, ECDH_SHARED_SIZE);
-	shared[ECDH_SHARED_SIZE * 2] = 0;
-	logger(LOG_DEBUG, "Shared secret is %s", shared);
-
-	cipher_set_key(&c->incipher, mykey, true);
+	cipher_set_key(&c->incipher, mykey, false);
 	digest_set_key(&c->indigest, mykey + mykeylen, mykeylen);
 
-	cipher_set_key(&c->outcipher, hiskey, false);
+	cipher_set_key(&c->outcipher, hiskey, true);
 	digest_set_key(&c->outdigest, hiskey + hiskeylen, hiskeylen);
 
 	c->status.decryptin = true;
@@ -319,17 +312,17 @@ bool metakey_h(connection_t *c, char *request) {
 		return false;
 	}
 
+	/* Convert the challenge from hexadecimal back to binary */
+
+	int inlen = hex2bin(hexkey, enckey, sizeof enckey);
+
 	/* Check if the length of the meta key is all right */
 
-	if(strlen(hexkey) != len * 2) {
+	if(inlen != len) {
 		logger(LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong keylength");
 		return false;
 	}
 
-	/* Convert the challenge from hexadecimal back to binary */
-
-	hex2bin(hexkey, enckey, len);
-
 	/* Decrypt the meta key */
 
 	if(!rsa_private_decrypt(&myself->connection->rsa, enckey, len, key)) {
@@ -339,7 +332,6 @@ bool metakey_h(connection_t *c, char *request) {
 
 	ifdebug(SCARY_THINGS) {
 		bin2hex(key, hexkey, len);
-		hexkey[len * 2] = '\0';
 		logger(LOG_DEBUG, "Received random meta key (unencrypted): %s", hexkey);
 	}
 
@@ -376,7 +368,6 @@ bool send_challenge(connection_t *c) {
 	/* Convert to hex */
 
 	bin2hex(c->hischallenge, buffer, len);
-	buffer[len * 2] = '\0';
 
 	/* Send the challenge */
 
@@ -394,17 +385,17 @@ bool challenge_h(connection_t *c, char *request) {
 		return false;
 	}
 
+	/* Convert the challenge from hexadecimal back to binary */
+
+	int inlen = hex2bin(buffer, buffer, sizeof buffer);
+
 	/* Check if the length of the challenge is all right */
 
-	if(strlen(buffer) != len * 2) {
+	if(inlen != len) {
 		logger(LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong challenge length");
 		return false;
 	}
 
-	/* Convert the challenge from hexadecimal back to binary */
-
-	hex2bin(buffer, buffer, len);
-
 	c->allow_request = CHAL_REPLY;
 
 	/* Calculate the hash from the challenge we received */
@@ -414,7 +405,6 @@ bool challenge_h(connection_t *c, char *request) {
 	/* Convert the hash to a hexadecimal formatted string */
 
 	bin2hex(digest, buffer, digestlen);
-	buffer[digestlen * 2] = '\0';
 
 	/* Send the reply */
 
@@ -430,16 +420,17 @@ bool chal_reply_h(connection_t *c, char *request) {
 		return false;
 	}
 
+	/* Convert the hash to binary format */
+
+	int inlen = hex2bin(hishash, hishash, sizeof hishash);
+
 	/* Check if the length of the hash is all right */
 
-	if(strlen(hishash) != digest_length(&c->outdigest) * 2) {
+	if(inlen != digest_length(&c->outdigest)) {
 		logger(LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong challenge reply length");
 		return false;
 	}
 
-	/* Convert the hash to binary format */
-
-	hex2bin(hishash, hishash, digest_length(&c->outdigest));
 
 	/* Verify the hash */
 
@@ -555,7 +546,7 @@ static bool upgrade_h(connection_t *c, char *request) {
 	}
 
 	logger(LOG_INFO, "Got ECDSA public key from %s (%s), upgrading!", c->name, c->hostname);
-	append_connection_config(c, "ECDSAPublicKey", pubkey);
+	append_config_file(c->name, "ECDSAPublicKey", pubkey);
 	c->allow_request = TERMREQ;
 	return send_termreq(c);
 }
@@ -660,7 +651,7 @@ bool ack_h(connection_t *c, char *request) {
 	if(tunnelserver)
 		send_add_edge(c, c->edge);
 	else
-		send_add_edge(broadcast, c->edge);
+		send_add_edge(everyone, c->edge);
 
 	/* Run MST and SSSP algorithms */