remove tox_avatar_hash

3 files changed, 15 insertions, 36 deletions

diff --git a/testing/test_avatars.c b/testing/test_avatars.c
index fc7e9d6f..a7bc9cd8 100644
--- a/testing/test_avatars.c
+++ b/testing/test_avatars.c
@@ -222,7 +222,7 @@ static int load_user_avatar(Tox *tox, char *base_dir, int friendnum,
     }
 
     *datalen = ret;
-    tox_avatar_hash(tox, hash, data, *datalen);
+    tox_hash(tox, hash, data, *datalen);
 
     return 0;
 }
@@ -305,7 +305,7 @@ static void friend_avatar_info_cb(Tox *tox, int32_t n, uint8_t format, uint8_t *
     char *base_dir = (char *) ud;
     uint8_t addr[TOX_CLIENT_ID_SIZE];
     char addr_str[2 * TOX_CLIENT_ID_SIZE + 1];
-    char hash_str[2 * TOX_AVATAR_HASH_LENGTH + 1];
+    char hash_str[2 * TOX_HASH_LENGTH + 1];
 
     if (tox_get_client_id(tox, n, addr) == 0) {
         byte_to_hex_str(addr, TOX_CLIENT_ID_SIZE, addr_str);
@@ -315,7 +315,7 @@ static void friend_avatar_info_cb(Tox *tox, int32_t n, uint8_t format, uint8_t *
         printf("Receiving avatar information from friend number %u.\n", n);
     }
 
-    byte_to_hex_str(hash, TOX_AVATAR_HASH_LENGTH, hash_str);
+    byte_to_hex_str(hash, TOX_HASH_LENGTH, hash_str);
     DEBUG("format=%u, hash=%s", format, hash_str);
 
     if (format == TOX_AVATAR_FORMAT_NONE) {
@@ -333,13 +333,13 @@ static void friend_avatar_info_cb(Tox *tox, int32_t n, uint8_t format, uint8_t *
          */
         uint32_t cur_av_len;
         uint8_t cur_av_data[TOX_AVATAR_MAX_DATA_LENGTH];
-        uint8_t cur_av_hash[TOX_AVATAR_HASH_LENGTH];
+        uint8_t cur_av_hash[TOX_HASH_LENGTH];
         int ret;
 
         ret = load_user_avatar(tox, base_dir, n, format, cur_av_hash, cur_av_data, &cur_av_len);
 
         if (ret != 0
-                && memcpy(cur_av_hash, hash, TOX_AVATAR_HASH_LENGTH) != 0) {
+                && memcpy(cur_av_hash, hash, TOX_HASH_LENGTH) != 0) {
             printf(" -> Cached avatar is outdated. Requesting avatar data.\n");
             tox_request_avatar_data(tox, n);
         } else {
@@ -355,7 +355,7 @@ static void friend_avatar_data_cb(Tox *tox, int32_t n, uint8_t format,
     char *base_dir = (char *) ud;
     uint8_t addr[TOX_CLIENT_ID_SIZE];
     char addr_str[2 * TOX_CLIENT_ID_SIZE + 1];
-    char hash_str[2 * TOX_AVATAR_HASH_LENGTH + 1];
+    char hash_str[2 * TOX_HASH_LENGTH + 1];
 
     if (tox_get_client_id(tox, n, addr) == 0) {
         byte_to_hex_str(addr, TOX_CLIENT_ID_SIZE, addr_str);
@@ -365,7 +365,7 @@ static void friend_avatar_data_cb(Tox *tox, int32_t n, uint8_t format,
         printf("Receiving avatar data from friend number %u.\n", n);
     }
 
-    byte_to_hex_str(hash, TOX_AVATAR_HASH_LENGTH, hash_str);
+    byte_to_hex_str(hash, TOX_HASH_LENGTH, hash_str);
     DEBUG("format=%u, datalen=%d, hash=%s\n", format, datalen, hash_str);
 
     delete_user_avatar(tox, base_dir, n);
@@ -505,14 +505,14 @@ static void print_avatar_info(Tox *tox)
 {
     uint8_t format;
     uint8_t data[TOX_AVATAR_MAX_DATA_LENGTH];
-    uint8_t hash[TOX_AVATAR_HASH_LENGTH];
+    uint8_t hash[TOX_HASH_LENGTH];
     uint32_t data_length;
-    char hash_str[2 * TOX_AVATAR_HASH_LENGTH + 1];
+    char hash_str[2 * TOX_HASH_LENGTH + 1];
 
     int ret = tox_get_self_avatar(tox, &format, data, &data_length, sizeof(data), hash);
     DEBUG("tox_get_self_avatar returned %d", ret);
     DEBUG("format: %d, data_length: %d", format, data_length);
-    byte_to_hex_str(hash, TOX_AVATAR_HASH_LENGTH, hash_str);
+    byte_to_hex_str(hash, TOX_HASH_LENGTH, hash_str);
     DEBUG("hash: %s", hash_str);
 }
 
diff --git a/toxcore/tox.c b/toxcore/tox.c
index 819a67dd..21854de4 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -831,11 +831,6 @@ int tox_hash(const Tox *tox, uint8_t *hash, const uint8_t *data, const uint32_t
     return m_hash(hash, data, datalen);
 }
 
-int tox_avatar_hash(const Tox *tox, uint8_t *hash, const uint8_t *data, const uint32_t datalen)
-{
-    return m_hash(hash, data, datalen);
-}
-
 int tox_request_avatar_info(const Tox *tox, const int32_t friendnumber)
 {
     const Messenger *m = tox;
diff --git a/toxcore/tox.h b/toxcore/tox.h
index c5484fba..d285e3fc 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -38,8 +38,7 @@ extern "C" {
 #define TOX_MAX_STATUSMESSAGE_LENGTH 1007
 #define TOX_CLIENT_ID_SIZE 32
 #define TOX_AVATAR_MAX_DATA_LENGTH 16384
-#define TOX_AVATAR_HASH_LENGTH /*crypto_hash_sha256_BYTES*/ 32
-#define TOX_HASH_LENGTH TOX_AVATAR_HASH_LENGTH
+#define TOX_HASH_LENGTH /*crypto_hash_sha256_BYTES*/ 32
 
 #define TOX_FRIEND_ADDRESS_SIZE (TOX_CLIENT_ID_SIZE + sizeof(uint32_t) + sizeof(uint16_t))
 
@@ -614,34 +613,19 @@ int tox_get_self_avatar(const Tox *tox, uint8_t *format, uint8_t *buf, uint32_t
 
 /* Generates a cryptographic hash of the given data.
  * This function may be used by clients for any purpose, but is provided primarily for
- * validating cached avatars.
+ * validating cached avatars. This use is highly recommended to avoid unnecessary avatar
+ * updates.
  * This function is a wrapper to internal message-digest functions.
  *
  * Arguments:
  *  hash - destination buffer for the hash data, it must be exactly TOX_HASH_LENGTH bytes long.
  *  data - data to be hashed;
- *  datalen - length of the data;
+ *  datalen - length of the data; for avatars, should be TOX_AVATAR_MAX_DATA_LENGTH
  *
  * returns 0 on success
  * returns -1 on failure.
  */
-int m_hash(uint8_t *hash, const uint8_t *data, const uint32_t datalen);
-
-/* Generates a cryptographic hash of the given avatar data.
- * This function is a wrapper to tox_hash and specifically provided
- * to generate hashes from user avatars that may be memcmp()ed with the values returned by the
- * other avatar functions. It is specially important to validate cached avatars.
- *
- * Arguments:
- *  hash - destination buffer for the hash data, it must be exactly TOX_AVATAR_HASH_LENGTH bytes long.
- *  data - avatar image data;
- *  datalen - length of the avatar image data; it must be <= MAX_AVATAR_DATA_LENGTH.
- *
- * returns 0 on success
- * returns -1 on failure.
- */
-int tox_avatar_hash(const Tox *tox, uint8_t *hash, const uint8_t *data, const uint32_t datalen);
-
+int tox_hash(const Tox *tox, uint8_t *hash, const uint8_t *data, const uint32_t datalen);
 
 /* Request avatar information from a friend.
  * Asks a friend to provide their avatar information (image format and hash). The friend may