diff options
Diffstat (limited to 'toxcore/net_crypto.c')
-rw-r--r-- | toxcore/net_crypto.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c index 13f73550..84276c62 100644 --- a/toxcore/net_crypto.c +++ b/toxcore/net_crypto.c | |||
@@ -81,7 +81,7 @@ static int create_cookie_request(const Net_Crypto *c, uint8_t *packet, uint8_t * | |||
81 | 81 | ||
82 | DHT_get_shared_key_sent(c->dht, shared_key, dht_public_key); | 82 | DHT_get_shared_key_sent(c->dht, shared_key, dht_public_key); |
83 | uint8_t nonce[crypto_box_NONCEBYTES]; | 83 | uint8_t nonce[crypto_box_NONCEBYTES]; |
84 | new_nonce(nonce); | 84 | random_nonce(nonce); |
85 | packet[0] = NET_PACKET_COOKIE_REQUEST; | 85 | packet[0] = NET_PACKET_COOKIE_REQUEST; |
86 | memcpy(packet + 1, c->dht->self_public_key, crypto_box_PUBLICKEYBYTES); | 86 | memcpy(packet + 1, c->dht->self_public_key, crypto_box_PUBLICKEYBYTES); |
87 | memcpy(packet + 1 + crypto_box_PUBLICKEYBYTES, nonce, crypto_box_NONCEBYTES); | 87 | memcpy(packet + 1 + crypto_box_PUBLICKEYBYTES, nonce, crypto_box_NONCEBYTES); |
@@ -106,7 +106,7 @@ static int create_cookie(uint8_t *cookie, const uint8_t *bytes, const uint8_t *e | |||
106 | uint64_t temp_time = unix_time(); | 106 | uint64_t temp_time = unix_time(); |
107 | memcpy(contents, &temp_time, sizeof(temp_time)); | 107 | memcpy(contents, &temp_time, sizeof(temp_time)); |
108 | memcpy(contents + sizeof(temp_time), bytes, COOKIE_DATA_LENGTH); | 108 | memcpy(contents + sizeof(temp_time), bytes, COOKIE_DATA_LENGTH); |
109 | new_nonce(cookie); | 109 | random_nonce(cookie); |
110 | int len = encrypt_data_symmetric(encryption_key, cookie, contents, sizeof(contents), cookie + crypto_box_NONCEBYTES); | 110 | int len = encrypt_data_symmetric(encryption_key, cookie, contents, sizeof(contents), cookie + crypto_box_NONCEBYTES); |
111 | 111 | ||
112 | if (len != COOKIE_LENGTH - crypto_box_NONCEBYTES) { | 112 | if (len != COOKIE_LENGTH - crypto_box_NONCEBYTES) { |
@@ -165,7 +165,7 @@ static int create_cookie_response(const Net_Crypto *c, uint8_t *packet, const ui | |||
165 | 165 | ||
166 | memcpy(plain + COOKIE_LENGTH, request_plain + COOKIE_DATA_LENGTH, sizeof(uint64_t)); | 166 | memcpy(plain + COOKIE_LENGTH, request_plain + COOKIE_DATA_LENGTH, sizeof(uint64_t)); |
167 | packet[0] = NET_PACKET_COOKIE_RESPONSE; | 167 | packet[0] = NET_PACKET_COOKIE_RESPONSE; |
168 | new_nonce(packet + 1); | 168 | random_nonce(packet + 1); |
169 | int len = encrypt_data_symmetric(shared_key, packet + 1, plain, sizeof(plain), packet + 1 + crypto_box_NONCEBYTES); | 169 | int len = encrypt_data_symmetric(shared_key, packet + 1, plain, sizeof(plain), packet + 1 + crypto_box_NONCEBYTES); |
170 | 170 | ||
171 | if (len != COOKIE_RESPONSE_LENGTH - (1 + crypto_box_NONCEBYTES)) { | 171 | if (len != COOKIE_RESPONSE_LENGTH - (1 + crypto_box_NONCEBYTES)) { |
@@ -331,7 +331,7 @@ static int create_crypto_handshake(const Net_Crypto *c, uint8_t *packet, const u | |||
331 | return -1; | 331 | return -1; |
332 | } | 332 | } |
333 | 333 | ||
334 | new_nonce(packet + 1 + COOKIE_LENGTH); | 334 | random_nonce(packet + 1 + COOKIE_LENGTH); |
335 | int len = encrypt_data(peer_real_pk, c->self_secret_key, packet + 1 + COOKIE_LENGTH, plain, sizeof(plain), | 335 | int len = encrypt_data(peer_real_pk, c->self_secret_key, packet + 1 + COOKIE_LENGTH, plain, sizeof(plain), |
336 | packet + 1 + COOKIE_LENGTH + crypto_box_NONCEBYTES); | 336 | packet + 1 + COOKIE_LENGTH + crypto_box_NONCEBYTES); |
337 | 337 | ||