X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsptps.c;h=a1fd5e75c05bc5d306d637166bdef5267416d019;hb=fd3ec60757a84b7551e03b3a48dd30f35015c448;hp=7bd271b936ba2591d39a926762d8a5b8d6870977;hpb=dece2db78e2c4ccd6e617e69195754639b086170;p=tinc diff --git a/src/sptps.c b/src/sptps.c index 7bd271b9..a1fd5e75 100644 --- a/src/sptps.c +++ b/src/sptps.c @@ -204,7 +204,7 @@ static bool generate_key_material(sptps_t *s, const char *shared, size_t len) { // Create the HMAC seed, which is "key expansion" + session label + server nonce + client nonce char seed[s->labellen + 64 + 13]; - strcpy(seed, "key expansion"); + memcpy(seed, "key expansion", 13); if(s->initiator) { memcpy(seed + 13, s->mykex + 1, 32); memcpy(seed + 45, s->hiskex + 1, 32); @@ -547,8 +547,6 @@ size_t sptps_receive_data(sptps_t *s, const void *data, size_t len) { memcpy(s->inbuf + s->buflen, data, toread); total_read += toread; s->buflen += toread; - len -= toread; - data += toread; // If we don't have a whole record, exit. if(s->buflen < s->reclen + (s->instate ? 19UL : 3UL))