diff options
author | iphydf <iphydf@users.noreply.github.com> | 2018-02-04 00:06:47 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2018-02-04 00:36:31 +0000 |
commit | f41c11c34e04e6d7a04cb20f79bc2643c0e33dd1 (patch) | |
tree | d6de2568920dc521d4d57680ac396dc5d5212859 /toxcore/onion_announce.c | |
parent | 99bfb9a4f2b15d3b5a9fe3878df2eb5e55c428aa (diff) |
Use more ubuntu packages; remove hstox for now.
Since trusty has more up-to-date packages, we can remove some of the
custom install code. Also, we're not using hstox at the moment, so there
is no need to slow down the builds for now.
Diffstat (limited to 'toxcore/onion_announce.c')
-rw-r--r-- | toxcore/onion_announce.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toxcore/onion_announce.c b/toxcore/onion_announce.c index 585e78a1..34e04dcd 100644 --- a/toxcore/onion_announce.c +++ b/toxcore/onion_announce.c | |||
@@ -87,7 +87,7 @@ int create_announce_request(uint8_t *packet, uint16_t max_packet_length, const u | |||
87 | } | 87 | } |
88 | 88 | ||
89 | uint8_t plain[ONION_PING_ID_SIZE + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_PUBLIC_KEY_SIZE + | 89 | uint8_t plain[ONION_PING_ID_SIZE + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_PUBLIC_KEY_SIZE + |
90 | ONION_ANNOUNCE_SENDBACK_DATA_LENGTH]; | 90 | ONION_ANNOUNCE_SENDBACK_DATA_LENGTH]; |
91 | memcpy(plain, ping_id, ONION_PING_ID_SIZE); | 91 | memcpy(plain, ping_id, ONION_PING_ID_SIZE); |
92 | memcpy(plain + ONION_PING_ID_SIZE, client_id, CRYPTO_PUBLIC_KEY_SIZE); | 92 | memcpy(plain + ONION_PING_ID_SIZE, client_id, CRYPTO_PUBLIC_KEY_SIZE); |
93 | memcpy(plain + ONION_PING_ID_SIZE + CRYPTO_PUBLIC_KEY_SIZE, data_public_key, CRYPTO_PUBLIC_KEY_SIZE); | 93 | memcpy(plain + ONION_PING_ID_SIZE + CRYPTO_PUBLIC_KEY_SIZE, data_public_key, CRYPTO_PUBLIC_KEY_SIZE); |
@@ -375,7 +375,7 @@ static int handle_announce_request(void *object, IP_Port source, const uint8_t * | |||
375 | get_shared_key(&onion_a->shared_keys_recv, shared_key, dht_get_self_secret_key(onion_a->dht), packet_public_key); | 375 | get_shared_key(&onion_a->shared_keys_recv, shared_key, dht_get_self_secret_key(onion_a->dht), packet_public_key); |
376 | 376 | ||
377 | uint8_t plain[ONION_PING_ID_SIZE + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_PUBLIC_KEY_SIZE + | 377 | uint8_t plain[ONION_PING_ID_SIZE + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_PUBLIC_KEY_SIZE + |
378 | ONION_ANNOUNCE_SENDBACK_DATA_LENGTH]; | 378 | ONION_ANNOUNCE_SENDBACK_DATA_LENGTH]; |
379 | int len = decrypt_data_symmetric(shared_key, packet + 1, packet + 1 + CRYPTO_NONCE_SIZE + CRYPTO_PUBLIC_KEY_SIZE, | 379 | int len = decrypt_data_symmetric(shared_key, packet + 1, packet + 1 + CRYPTO_NONCE_SIZE + CRYPTO_PUBLIC_KEY_SIZE, |
380 | ONION_PING_ID_SIZE + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_PUBLIC_KEY_SIZE + ONION_ANNOUNCE_SENDBACK_DATA_LENGTH + | 380 | ONION_PING_ID_SIZE + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_PUBLIC_KEY_SIZE + ONION_ANNOUNCE_SENDBACK_DATA_LENGTH + |
381 | CRYPTO_MAC_SIZE, plain); | 381 | CRYPTO_MAC_SIZE, plain); |