Don't try to handle incoming data if sptps_start() has not been called yet.

[tinc] / src / sptps.c

diff --git a/src/sptps.c b/src/sptps.c
index 5d0d456..7206934 100644 (file)
--- a/src/sptps.c
+++ b/src/sptps.c
@@ -319,6 +319,7 @@ static bool receive_sig(sptps_t *s, const char *data, uint16_t len) {
        char shared[ECDH_SHARED_SIZE];
        if(!ecdh_compute_shared(s->ecdh, s->hiskex + 1 + 32, shared))
                return false;
+       s->ecdh = NULL;
 
        // Generate key material from shared secret.
        if(!generate_key_material(s, shared, sizeof shared))
@@ -519,6 +520,9 @@ static bool sptps_receive_data_datagram(sptps_t *s, const char *data, size_t len
 
 // Receive incoming data. Check if it contains a complete record, if so, handle it.
 bool sptps_receive_data(sptps_t *s, const char *data, size_t len) {
+       if(!s->state)
+               return error(s, EIO, "Invalid session state");
+
        if(s->datagram)
                return sptps_receive_data_datagram(s, data, len);