A bit of new api work done.

3 files changed, 8 insertions, 5 deletions

diff --git a/toxencryptsave/defines.h b/toxencryptsave/defines.h
new file mode 100644
index 00000000..e3fca073
--- /dev/null
+++ b/toxencryptsave/defines.h
@@ -0,0 +1,2 @@
+#define TOX_ENC_SAVE_MAGIC_NUMBER "toxEsave"
+#define TOX_ENC_SAVE_MAGIC_LENGTH 8
diff --git a/toxencryptsave/toxencryptsave.c b/toxencryptsave/toxencryptsave.c
index 9172f512..13a34dea 100644
--- a/toxencryptsave/toxencryptsave.c
+++ b/toxencryptsave/toxencryptsave.c
@@ -26,6 +26,7 @@
 #endif
 
 #include "toxencryptsave.h"
+#include "defines.h"
 #include "../toxcore/crypto_core.h"
 #include "../toxcore/tox.h"
 
@@ -64,7 +65,7 @@ int tox_pass_salt_length()
 /*  return size of the messenger data (for encrypted saving). */
 uint32_t tox_encrypted_size(const Tox *tox)
 {
-    return tox_size(tox) + TOX_PASS_ENCRYPTION_EXTRA_LENGTH;
+    return tox_save_size(tox) + TOX_PASS_ENCRYPTION_EXTRA_LENGTH;
 }
 
 /* This retrieves the salt used to encrypt the given data, which can then be passed to
@@ -203,7 +204,7 @@ int tox_pass_encrypt(const uint8_t *data, uint32_t data_len, uint8_t *passphrase
 int tox_encrypted_save(const Tox *tox, uint8_t *data, uint8_t *passphrase, uint32_t pplength)
 {
     /* first get plain save data */
-    uint32_t temp_size = tox_size(tox);
+    uint32_t temp_size = tox_save_size(tox);
     uint8_t temp_data[temp_size];
     tox_save(tox, temp_data);
 
@@ -220,7 +221,7 @@ int tox_encrypted_save(const Tox *tox, uint8_t *data, uint8_t *passphrase, uint3
 int tox_encrypted_key_save(const Tox *tox, uint8_t *data, uint8_t *key)
 {
     /* first get plain save data */
-    uint32_t temp_size = tox_size(tox);
+    uint32_t temp_size = tox_save_size(tox);
     uint8_t temp_data[temp_size];
     tox_save(tox, temp_data);
 
diff --git a/toxencryptsave/toxencryptsave.h b/toxencryptsave/toxencryptsave.h
index 169f736c..da13f312 100644
--- a/toxencryptsave/toxencryptsave.h
+++ b/toxencryptsave/toxencryptsave.h
@@ -30,8 +30,8 @@ extern "C" {
 
 #include <stdint.h>
 
-#ifndef __TOX_DEFINED__
-#define __TOX_DEFINED__
+#ifndef TOX_DEFINED
+#define TOX_DEFINED
 typedef struct Tox Tox;
 #endif