X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fsptps.c;fp=src%2Fsptps.c;h=267a47f1f30f2484cbab4a6830f2bff06f4ebd0f;hp=ed1f67ff95afd11ac1adfd6f6b95edcca72bf7de;hb=38d695b115920c9fb78b596acde817244d0519a6;hpb=c4deb6c20dceb73c0ac6baa2eb901434584e6191

diff --git a/src/sptps.c b/src/sptps.c
index ed1f67ff..267a47f1 100644
--- a/src/sptps.c
+++ b/src/sptps.c
@@ -374,10 +374,15 @@ static bool receive_sig(sptps_t *s, const char *data, uint16_t len) {
 
 // Force another Key EXchange (for testing purposes).
 bool sptps_force_kex(sptps_t *s) {
-	if(!s->outstate || s->state != SPTPS_SECONDARY_KEX) {
+	if(!s->outstate || s->state < SPTPS_SECONDARY_KEX) {
 		return error(s, EINVAL, "Cannot force KEX in current state");
 	}
 
+	if(s->state > SPTPS_SECONDARY_KEX) {
+		// We are already in the middle of a secondary key exchange
+		return true;
+	}
+
 	s->state = SPTPS_KEX;
 	return send_kex(s);
 }