diff options
author | dubslow <bunslow@gmail.com> | 2014-10-12 02:29:34 -0500 |
---|---|---|
committer | dubslow <bunslow@gmail.com> | 2014-10-12 02:29:34 -0500 |
commit | 458a09f6ab289afa1e475f388988d88e07dcb8b0 (patch) | |
tree | d85f2cb7780a5d36a4f43d3af028cdcaa947d5fe /toxencryptsave/toxencryptsave.h | |
parent | ccfd777e35812a914dd0025487f219d5f503a1bd (diff) | |
parent | 0444ca18dff821943aac9bc3a59207b2d0dea33f (diff) |
Merge branch 'master' of https://github.com/irungentoo/toxcore
Diffstat (limited to 'toxencryptsave/toxencryptsave.h')
-rw-r--r-- | toxencryptsave/toxencryptsave.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/toxencryptsave/toxencryptsave.h b/toxencryptsave/toxencryptsave.h index 6abcca42..2fb6a8c5 100644 --- a/toxencryptsave/toxencryptsave.h +++ b/toxencryptsave/toxencryptsave.h | |||
@@ -61,7 +61,7 @@ uint32_t tox_encrypted_size(const Tox *tox); | |||
61 | * returns 0 on success | 61 | * returns 0 on success |
62 | * returns -1 on failure | 62 | * returns -1 on failure |
63 | */ | 63 | */ |
64 | int tox_derive_key_from_pass(uint8_t* passphrase, uint32_t pplength, uint8_t* out_key); | 64 | int tox_derive_key_from_pass(uint8_t *passphrase, uint32_t pplength, uint8_t *out_key); |
65 | 65 | ||
66 | /* Encrypt arbitrary with a key produced by tox_derive_key_from_pass. The output | 66 | /* Encrypt arbitrary with a key produced by tox_derive_key_from_pass. The output |
67 | * array must be at least data_len + TOX_PASS_ENCRYPTION_EXTRA_LENGTH bytes long. | 67 | * array must be at least data_len + TOX_PASS_ENCRYPTION_EXTRA_LENGTH bytes long. |
@@ -73,7 +73,7 @@ int tox_derive_key_from_pass(uint8_t* passphrase, uint32_t pplength, uint8_t* ou | |||
73 | * returns 0 on success | 73 | * returns 0 on success |
74 | * returns -1 on failure | 74 | * returns -1 on failure |
75 | */ | 75 | */ |
76 | int tox_pass_key_encrypt(uint8_t* data, uint32_t data_len, const uint8_t* key, uint8_t* out); | 76 | int tox_pass_key_encrypt(uint8_t *data, uint32_t data_len, const uint8_t *key, uint8_t *out); |
77 | 77 | ||
78 | /* Encrypts the given data with the given passphrase. The output array must be | 78 | /* Encrypts the given data with the given passphrase. The output array must be |
79 | * at least data_len + TOX_PASS_ENCRYPTION_EXTRA_LENGTH bytes long. This delegates | 79 | * at least data_len + TOX_PASS_ENCRYPTION_EXTRA_LENGTH bytes long. This delegates |
@@ -84,7 +84,7 @@ int tox_pass_key_encrypt(uint8_t* data, uint32_t data_len, const uint8_t* key, u | |||
84 | * returns 0 on success | 84 | * returns 0 on success |
85 | * returns -1 on failure | 85 | * returns -1 on failure |
86 | */ | 86 | */ |
87 | int tox_pass_encrypt(uint8_t* data, uint32_t data_len, uint8_t* passphrase, uint32_t pplength, uint8_t* out); | 87 | int tox_pass_encrypt(uint8_t *data, uint32_t data_len, uint8_t *passphrase, uint32_t pplength, uint8_t *out); |
88 | 88 | ||
89 | /* Save the messenger data encrypted with the given password. | 89 | /* Save the messenger data encrypted with the given password. |
90 | * data must be at least tox_encrypted_size(). | 90 | * data must be at least tox_encrypted_size(). |
@@ -111,7 +111,7 @@ int tox_pass_key_decrypt(const uint8_t* data, uint32_t length, const uint8_t* ke | |||
111 | * returns the length of the output data (== data_len - TOX_PASS_ENCRYPTION_EXTRA_LENGTH) on success | 111 | * returns the length of the output data (== data_len - TOX_PASS_ENCRYPTION_EXTRA_LENGTH) on success |
112 | * returns -1 on failure | 112 | * returns -1 on failure |
113 | */ | 113 | */ |
114 | int tox_pass_decrypt(const uint8_t* data, uint32_t length, uint8_t* passphrase, uint32_t pplength, uint8_t* out); | 114 | int tox_pass_decrypt(const uint8_t *data, uint32_t length, uint8_t *passphrase, uint32_t pplength, uint8_t *out); |
115 | 115 | ||
116 | /* Load the messenger from encrypted data of size length. | 116 | /* Load the messenger from encrypted data of size length. |
117 | * | 117 | * |