1 files changed, 20 insertions, 14 deletions

diff --git a/toxencryptsave/toxencryptsave.c b/toxencryptsave/toxencryptsave.c
index f4fdbe61..89c47a03 100644
--- a/toxencryptsave/toxencryptsave.c
+++ b/toxencryptsave/toxencryptsave.c
@@ -43,7 +43,7 @@
 uint32_t tox_encrypted_size(const Tox *tox)
 {
     return tox_size(tox) + crypto_box_MACBYTES + crypto_box_NONCEBYTES
-            + crypto_pwhash_scryptsalsa208sha256_SALTBYTES + TOX_ENC_SAVE_MAGIC_LENGTH;
+           + crypto_pwhash_scryptsalsa208sha256_SALTBYTES + TOX_ENC_SAVE_MAGIC_LENGTH;
 }
 
 /* Save the messenger data encrypted with the given password.
@@ -55,8 +55,8 @@ uint32_t tox_encrypted_size(const Tox *tox)
 int tox_encrypted_save(const Tox *tox, uint8_t *data, uint8_t *passphrase, uint32_t pplength)
 {
     if (pplength == 0)
-         return -1;
-    
+        return -1;
+
     /* First derive a key from the password */
     /* http://doc.libsodium.org/key_derivation/README.html */
     /* note that, according to the documentation, a generic pwhash interface will be created
@@ -66,12 +66,13 @@ int tox_encrypted_save(const Tox *tox, uint8_t *data, uint8_t *passphrase, uint3
     randombytes(salt, sizeof salt);
 
     if (crypto_pwhash_scryptsalsa208sha256(
-            key, sizeof(key), passphrase, pplength, salt,
-            crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE * 2, /* slightly stronger */
-            crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE) != 0) { 
+                key, sizeof(key), passphrase, pplength, salt,
+                crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE * 2, /* slightly stronger */
+                crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE) != 0) {
         /* out of memory most likely */
         return -1;
     }
+
     /* calling sodium_memzero segfaults, but printing passphrase works, so... libsodium bug?
      * ...eh, it's not segfaulting anywhere else, so I'll assume pebkac...
     sodium_memzero(passphrase, pplength); /* wipe plaintext pw */
@@ -80,7 +81,7 @@ int tox_encrypted_save(const Tox *tox, uint8_t *data, uint8_t *passphrase, uint3
     uint32_t temp_size = tox_size(tox);
     uint8_t temp_data[temp_size];
     tox_save(tox, temp_data);
-    
+
     /* the output data consists of, in order:
      * magic number, salt, nonce, mac, enc_data
      * where the mac is automatically prepended by the encrypt()
@@ -102,7 +103,7 @@ int tox_encrypted_save(const Tox *tox, uint8_t *data, uint8_t *passphrase, uint3
 
     /* now encrypt */
     if (encrypt_data_symmetric(key, nonce, temp_data, temp_size, data)
-           != temp_size + crypto_box_MACBYTES) {
+            != temp_size + crypto_box_MACBYTES) {
         return -1;
     }
 
@@ -116,36 +117,41 @@ int tox_encrypted_save(const Tox *tox, uint8_t *data, uint8_t *passphrase, uint3
  */
 int tox_encrypted_load(Tox *tox, const uint8_t *data, uint32_t length, uint8_t *passphrase, uint32_t pplength)
 {
-    if (length <= crypto_box_MACBYTES + crypto_box_NONCEBYTES + crypto_pwhash_scryptsalsa208sha256_SALTBYTES + TOX_ENC_SAVE_MAGIC_LENGTH)
+    if (length <= crypto_box_MACBYTES + crypto_box_NONCEBYTES + crypto_pwhash_scryptsalsa208sha256_SALTBYTES +
+            TOX_ENC_SAVE_MAGIC_LENGTH)
         return -1;
 
     if (memcmp(data, TOX_ENC_SAVE_MAGIC_NUMBER, TOX_ENC_SAVE_MAGIC_LENGTH) != 0)
         return -1;
+
     data += TOX_ENC_SAVE_MAGIC_LENGTH;
 
     uint32_t decrypt_length = length - crypto_box_MACBYTES - crypto_box_NONCEBYTES
                               - crypto_pwhash_scryptsalsa208sha256_SALTBYTES - TOX_ENC_SAVE_MAGIC_LENGTH;
     uint8_t salt[crypto_pwhash_scryptsalsa208sha256_SALTBYTES];
     uint8_t nonce[crypto_box_NONCEBYTES];
-    
+
     memcpy(salt, data, crypto_pwhash_scryptsalsa208sha256_SALTBYTES);
     data += crypto_pwhash_scryptsalsa208sha256_SALTBYTES;
     memcpy(nonce, data, crypto_box_NONCEBYTES);
     data += crypto_box_NONCEBYTES;
-    
+
     /* derive the key */
     uint8_t key[crypto_box_KEYBYTES];
+
     if (crypto_pwhash_scryptsalsa208sha256(
-            key, sizeof(key), passphrase, pplength, salt,
-            crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE * 2, /* slightly stronger */
-            crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE) != 0) { 
+                key, sizeof(key), passphrase, pplength, salt,
+                crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE * 2, /* slightly stronger */
+                crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE) != 0) {
         /* out of memory most likely */
         return -1;
     }
+
     /* sodium_memzero(passphrase, pplength); /* wipe plaintext pw */
 
     /* decrypt the data */
     uint8_t temp_data[decrypt_length];
+
     if (decrypt_data_symmetric(key, nonce, data, decrypt_length + crypto_box_MACBYTES, temp_data)
             != decrypt_length) {
         return -1;