X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsptps.c;h=ff7c4168e0410b3564ceb32e74fce0da780b4f4a;hb=e5e96882c3825cee81ff163490b2f39fad3192b8;hp=fa1594db842dc95555e9056d6df035010530c630;hpb=3a4fe104a06b73fd19c550546e7c65a59ff2afe3;p=tinc

diff --git a/src/sptps.c b/src/sptps.c
index fa1594db..ff7c4168 100644
--- a/src/sptps.c
+++ b/src/sptps.c
@@ -159,13 +159,14 @@ static bool send_sig(sptps_t *s) {
 	size_t keylen = ECDH_SIZE;
 	size_t siglen = ecdsa_size(&s->mykey);
 
-	// Concatenate both KEX messages, plus tag indicating if it is from the connection originator
-	char msg[(1 + 32 + keylen) * 2 + 1];
+	// Concatenate both KEX messages, plus tag indicating if it is from the connection originator, plus label
+	char msg[(1 + 32 + keylen) * 2 + 1 + s->labellen];
 	char sig[siglen];
 
 	msg[0] = s->initiator;
 	memcpy(msg + 1, s->mykex, 1 + 32 + keylen);
-	memcpy(msg + 2 + 32 + keylen, s->hiskex, 1 + 32 + keylen);
+	memcpy(msg + 1 + 33 + keylen, s->hiskex, 1 + 32 + keylen);
+	memcpy(msg + 1 + 2 * (33 + keylen), s->label, s->labellen);
 
 	// Sign the result.
 	if(!ecdsa_sign(&s->mykey, msg, sizeof msg, sig))
@@ -275,11 +276,12 @@ static bool receive_sig(sptps_t *s, const char *data, uint16_t len) {
 		return error(s, EIO, "Invalid KEX record length");
 
 	// Concatenate both KEX messages, plus tag indicating if it is from the connection originator
-	char msg[(1 + 32 + keylen) * 2 + 1];
+	char msg[(1 + 32 + keylen) * 2 + 1 + s->labellen];
 
 	msg[0] = !s->initiator;
 	memcpy(msg + 1, s->hiskex, 1 + 32 + keylen);
-	memcpy(msg + 2 + 32 + keylen, s->mykex, 1 + 32 + keylen);
+	memcpy(msg + 1 + 33 + keylen, s->mykex, 1 + 32 + keylen);
+	memcpy(msg + 1 + 2 * (33 + keylen), s->label, s->labellen);
 
 	// Verify signature.
 	if(!ecdsa_verify(&s->hiskey, msg, sizeof msg, data))
@@ -301,7 +303,7 @@ static bool receive_sig(sptps_t *s, const char *data, uint16_t len) {
 	s->hiskex = NULL;
 
 	// Send cipher change record
-	if(!send_ack(s))
+	if(s->outstate && !send_ack(s))
 		return false;
 
 	// TODO: only set new keys after ACK has been set/received
@@ -319,8 +321,6 @@ static bool receive_sig(sptps_t *s, const char *data, uint16_t len) {
 			return false;
 	}
 
-	s->outstate = true;
-
 	return true;
 }
 
@@ -352,7 +352,16 @@ static bool receive_handshake(sptps_t *s, const char *data, uint16_t len) {
 			// If we already sent our secondary public ECDH key, we expect the peer to send his.
 			if(!receive_sig(s, data, len))
 				return false;
-			s->state = SPTPS_ACK;
+			if(s->outstate)
+				s->state = SPTPS_ACK;
+			else {
+				s->outstate = true;
+				if(!receive_ack(s, NULL, 0))
+					return false;
+				s->receive_record(s->handle, SPTPS_HANDSHAKE, NULL, 0);
+				s->state = SPTPS_SECONDARY_KEX;
+			}
+
 			return true;
 		case SPTPS_ACK:
 			// We expect a handshake message to indicate transition to the new keys.
@@ -567,9 +576,14 @@ bool sptps_stop(sptps_t *s) {
 	// Clean up any resources.
 	ecdh_free(&s->ecdh);
 	free(s->inbuf);
+	s->inbuf = NULL;
 	free(s->mykex);
+	s->mykex = NULL;
 	free(s->hiskex);
+	s->hiskex = NULL;
 	free(s->key);
+	s->key = NULL;
 	free(s->label);
+	s->label = NULL;
 	return true;
 }