X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsptps.c;h=2d02b6677b50bd7c5730df33297a79982aaa218c;hb=3a316823b971396a428f020f401b9fe41252d98d;hp=7bd271b936ba2591d39a926762d8a5b8d6870977;hpb=dece2db78e2c4ccd6e617e69195754639b086170;p=tinc

diff --git a/src/sptps.c b/src/sptps.c
index 7bd271b9..2d02b667 100644
--- a/src/sptps.c
+++ b/src/sptps.c
@@ -178,11 +178,11 @@ static bool send_sig(sptps_t *s) {
 	memcpy(msg + 1 + 2 * (33 + keylen), s->label, s->labellen);
 
 	// Sign the result.
-	if(!ecdsa_sign(s->mykey, msg, sizeof msg, sig))
+	if(!ecdsa_sign(s->mykey, msg, sizeof(msg), sig))
 		return error(s, EINVAL, "Failed to sign SIG record");
 
 	// Send the SIG exchange record.
-	return send_record_priv(s, SPTPS_HANDSHAKE, sig, sizeof sig);
+	return send_record_priv(s, SPTPS_HANDSHAKE, sig, sizeof(sig));
 }
 
 // Generate key material from the shared secret created from the ECDHE key exchange.
@@ -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);
@@ -284,7 +284,7 @@ static bool receive_sig(sptps_t *s, const char *data, uint16_t len) {
 	memcpy(msg + 1 + 2 * (33 + keylen), s->label, s->labellen);
 
 	// Verify signature.
-	if(!ecdsa_verify(s->hiskey, msg, sizeof msg, data))
+	if(!ecdsa_verify(s->hiskey, msg, sizeof(msg), data))
 		return error(s, EIO, "Failed to verify SIG record");
 
 	// Compute shared secret.
@@ -294,7 +294,7 @@ static bool receive_sig(sptps_t *s, const char *data, uint16_t len) {
 	s->ecdh = NULL;
 
 	// Generate key material from shared secret.
-	if(!generate_key_material(s, shared, sizeof shared))
+	if(!generate_key_material(s, shared, sizeof(shared)))
 		return false;
 
 	free(s->mykex);
@@ -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))
@@ -589,7 +587,7 @@ size_t sptps_receive_data(sptps_t *s, const void *data, size_t len) {
 // Start a SPTPS session.
 bool sptps_start(sptps_t *s, void *handle, bool initiator, bool datagram, ecdsa_t *mykey, ecdsa_t *hiskey, const void *label, size_t labellen, send_data_t send_data, receive_record_t receive_record) {
 	// Initialise struct sptps
-	memset(s, 0, sizeof *s);
+	memset(s, 0, sizeof(*s));
 
 	s->handle = handle;
 	s->initiator = initiator;
@@ -638,6 +636,6 @@ bool sptps_stop(sptps_t *s) {
 	free(s->key);
 	free(s->label);
 	free(s->late);
-	memset(s, 0, sizeof *s);
+	memset(s, 0, sizeof(*s));
 	return true;
 }