Crypto related cleanups.

Moved Bunch of functions from net_crypto to crypto_core.

decrypt_data_fast and decrypt_data_symmetric were the same thing
therefore, removed decrypt_data_fast.

Replaced all the crypto_secretbox_* defines with the equivalent
crypto_box_* one.

New define: crypto_box_KEYBYTES that is equal to
crypto_box_BEFORENMBYTES.

1 files changed, 4 insertions, 4 deletions

diff --git a/toxcore/ping.c b/toxcore/ping.c
index e43c3b1a..b0928d95 100644
--- a/toxcore/ping.c
+++ b/toxcore/ping.c
@@ -168,7 +168,7 @@ int send_ping_request(PING *ping, IP_Port ipp, uint8_t *client_id)
     new_nonce(pk + 1 + CLIENT_ID_SIZE); // Generate new nonce
 
 
-    rc = encrypt_data_fast(shared_key,
+    rc = encrypt_data_symmetric(shared_key,
                            pk + 1 + CLIENT_ID_SIZE,
                            (uint8_t *) &ping_id, sizeof(ping_id),
                            pk + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES);
@@ -193,7 +193,7 @@ static int send_ping_response(PING *ping, IP_Port ipp, uint8_t *client_id, uint6
     new_nonce(pk + 1 + CLIENT_ID_SIZE); // Generate new nonce
 
     // Encrypt ping_id using recipient privkey
-    rc = encrypt_data_fast(shared_encryption_key,
+    rc = encrypt_data_symmetric(shared_encryption_key,
                            pk + 1 + CLIENT_ID_SIZE,
                            (uint8_t *) &ping_id, sizeof(ping_id),
                            pk + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES );
@@ -222,7 +222,7 @@ static int handle_ping_request(void *_dht, IP_Port source, uint8_t *packet, uint
 
     // Decrypt ping_id
     DHT_get_shared_key_recv(dht, shared_key, packet + 1);
-    rc = decrypt_data_fast(shared_key,
+    rc = decrypt_data_symmetric(shared_key,
                            packet + 1 + CLIENT_ID_SIZE,
                            packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES,
                            sizeof(ping_id) + crypto_box_MACBYTES,
@@ -259,7 +259,7 @@ static int handle_ping_response(void *_dht, IP_Port source, uint8_t *packet, uin
 
     --ping_index;
     // Decrypt ping_id
-    rc = decrypt_data_fast(ping->pings[ping_index].shared_key,
+    rc = decrypt_data_symmetric(ping->pings[ping_index].shared_key,
                            packet + 1 + CLIENT_ID_SIZE,
                            packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES,
                            sizeof(ping_id) + crypto_box_MACBYTES,