diff options
| author | mannol <eniz_vukovic@hotmail.com> | 2015-03-22 00:21:49 +0100 |
|---|---|---|
| committer | mannol <eniz_vukovic@hotmail.com> | 2015-03-22 00:22:40 +0100 |
| commit | a4fae8ffd49e298cd87e13be2496faf77e492bd9 (patch) | |
| tree | 285ed6e22db90db713dc6938160d24e3857c6e5f /toxencryptsave | |
| parent | 4f76a8c89eea77ebc190a324ad128e3c7dda298c (diff) | |
| parent | 4ad76497881ee2a623acdedcf0ac10406208b716 (diff) | |
Started testing transfer
Diffstat (limited to 'toxencryptsave')
| -rw-r--r-- | toxencryptsave/toxencryptsave.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toxencryptsave/toxencryptsave.c b/toxencryptsave/toxencryptsave.c index b6453a89..9172f512 100644 --- a/toxencryptsave/toxencryptsave.c +++ b/toxencryptsave/toxencryptsave.c | |||
| @@ -121,7 +121,7 @@ int tox_derive_key_with_salt(uint8_t *passphrase, uint32_t pplength, uint8_t *sa | |||
| 121 | /* note that, according to the documentation, a generic pwhash interface will be created | 121 | /* note that, according to the documentation, a generic pwhash interface will be created |
| 122 | * once the pwhash competition (https://password-hashing.net/) is over */ | 122 | * once the pwhash competition (https://password-hashing.net/) is over */ |
| 123 | if (crypto_pwhash_scryptsalsa208sha256( | 123 | if (crypto_pwhash_scryptsalsa208sha256( |
| 124 | key, sizeof(key), passkey, sizeof(passkey), salt, | 124 | key, sizeof(key), (char *)passkey, sizeof(passkey), salt, |
| 125 | crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE * 2, /* slightly stronger */ | 125 | crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE * 2, /* slightly stronger */ |
| 126 | crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE) != 0) { | 126 | crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE) != 0) { |
| 127 | /* out of memory most likely */ | 127 | /* out of memory most likely */ |
| @@ -280,7 +280,7 @@ int tox_pass_decrypt(const uint8_t *data, uint32_t length, uint8_t *passphrase, | |||
| 280 | 280 | ||
| 281 | if (crypto_pwhash_scryptsalsa208sha256( | 281 | if (crypto_pwhash_scryptsalsa208sha256( |
| 282 | key + crypto_pwhash_scryptsalsa208sha256_SALTBYTES, | 282 | key + crypto_pwhash_scryptsalsa208sha256_SALTBYTES, |
| 283 | crypto_box_KEYBYTES, passkey, sizeof(passkey), salt, | 283 | crypto_box_KEYBYTES, (char *)passkey, sizeof(passkey), salt, |
| 284 | crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE * 2, /* slightly stronger */ | 284 | crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE * 2, /* slightly stronger */ |
| 285 | crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE) != 0) { | 285 | crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE) != 0) { |
| 286 | /* out of memory most likely */ | 286 | /* out of memory most likely */ |