diff options
| author | George Hazan <ghazan@miranda.im> | 2020-05-03 12:35:27 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-05-03 12:35:27 +0300 |
| commit | e85b4c67372900013faa7793db0f7e664d5bca2e (patch) | |
| tree | a30aea519d9c2672ed4a50d32a6ad43acd285497 /protocols/Tox/libtox/src/toxencryptsave | |
| parent | cb012794fa0ed74ed57607048dcafc6b06419ba7 (diff) | |
fixes #2374 (Update libtox to 0.2.12)
Diffstat (limited to 'protocols/Tox/libtox/src/toxencryptsave')
3 files changed, 3 insertions, 3 deletions
diff --git a/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c index e2de3e5f74..3aab156f9d 100644 --- a/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c +++ b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c @@ -201,7 +201,7 @@ crypto_pwhash_scryptsalsa208sha256_str_verify(const char str[crypto_pwhash_scryp return -1; } escrypt_free_local(&escrypt_local); - ret = crypto_memcmp(wanted, str, sizeof wanted); + ret = crypto_memcmp((const uint8_t *) wanted, (const uint8_t *) str, sizeof wanted); crypto_memzero(wanted, sizeof wanted); return ret; diff --git a/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c index 7f01523861..38a536a61a 100644 --- a/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c +++ b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c @@ -398,4 +398,4 @@ escrypt_kdf_sse(escrypt_local_t * local, #endif /* ISO C requires a translation unit to contain at least one declaration */ -extern int non_empty_tu_decl; +typedef int non_empty_tu_decl; diff --git a/protocols/Tox/libtox/src/toxencryptsave/defines.h b/protocols/Tox/libtox/src/toxencryptsave/defines.h index 0bc1d9ed5e..8a490344a7 100644 --- a/protocols/Tox/libtox/src/toxencryptsave/defines.h +++ b/protocols/Tox/libtox/src/toxencryptsave/defines.h @@ -1,7 +1,7 @@ #ifndef C_TOXCORE_TOXENCRYPTSAVE_DEFINES_H #define C_TOXCORE_TOXENCRYPTSAVE_DEFINES_H -#define TOX_ENC_SAVE_MAGIC_NUMBER "toxEsave" +#define TOX_ENC_SAVE_MAGIC_NUMBER ((const uint8_t *)"toxEsave") #define TOX_ENC_SAVE_MAGIC_LENGTH 8 #endif |