X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_key.c;h=1d1bee15810b64b93dd973cfb1a2625027631f38;hb=8c10a4131f19dc27b0bc56ef48ae481d1fa03cb0;hp=4398e528884fb1a93ffe1444675cf087afaad567;hpb=b2701c7c54b11cda71461c5dbbc985476bf5b221;p=tinc diff --git a/src/protocol_key.c b/src/protocol_key.c index 4398e528..1d1bee15 100644 --- a/src/protocol_key.c +++ b/src/protocol_key.c @@ -35,7 +35,7 @@ void send_key_changed(void) { #ifndef DISABLE_LEGACY - send_request(everyone, "%d %x %s", KEY_CHANGED, rand(), myself->name); + send_request(everyone, "%d %x %s", KEY_CHANGED, prng(UINT32_MAX), myself->name); /* Immediately send new keys to directly connected nodes to keep UDP mappings alive */ @@ -383,11 +383,11 @@ bool send_ans_key(node_t *to) { to->status.validkey_in = true; - return send_request(to->nexthop->connection, "%d %s %s %s %d %d %zu %d", ANS_KEY, + return send_request(to->nexthop->connection, "%d %s %s %s %d %d %lu %d", ANS_KEY, myself->name, to->name, key, cipher_get_nid(to->incipher), digest_get_nid(to->indigest), - digest_length(to->indigest), + (unsigned long)digest_length(to->indigest), to->incompression); #endif } @@ -399,11 +399,11 @@ bool ans_key_h(connection_t *c, const char *request) { char address[MAX_STRING_SIZE] = ""; char port[MAX_STRING_SIZE] = ""; int cipher, digest; - size_t maclength; + unsigned long maclength; int compression; node_t *from, *to; - if(sscanf(request, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %zu %d "MAX_STRING" "MAX_STRING, + if(sscanf(request, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %lu %d "MAX_STRING" "MAX_STRING, from_name, to_name, key, &cipher, &digest, &maclength, &compression, address, port) < 7) { logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ANS_KEY", c->name,