StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

cleanup: Add explicit array sizes to toxencryptsave.

Browse Source 
Also mark arrays as `[]` instead of `*`.
This commit is contained in:
iphydf 2024-01-05 20:41:44 +00:00
parent ef33cb4de0
commit 226b23be12
No known key found for this signature in database
GPG Key ID: 3855DBA2D74403C9
2 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
toxencryptsave/toxencryptsave.c
View File

@ -79,7 +79,9 @@ void tox_pass_key_free(Tox_Pass_Key *key)
* *
* @return true on success. * @return true on success.
*/ */
bool tox_get_salt(const uint8_t *ciphertext, uint8_t *salt, Tox_Err_Get_Salt *error) bool tox_get_salt(
const uint8_t ciphertext[TOX_PASS_ENCRYPTION_EXTRA_LENGTH],
uint8_t salt[TOX_PASS_SALT_LENGTH], Tox_Err_Get_Salt *error)
{ {
if (ciphertext == nullptr || salt == nullptr) { if (ciphertext == nullptr || salt == nullptr) {
SET_ERROR_PARAMETER(error, TOX_ERR_GET_SALT_NULL); SET_ERROR_PARAMETER(error, TOX_ERR_GET_SALT_NULL);
@ -112,8 +114,9 @@ bool tox_get_salt(const uint8_t *ciphertext, uint8_t *salt, Tox_Err_Get_Salt *er
* *
* @return new symmetric key on success, NULL on failure. * @return new symmetric key on success, NULL on failure.
*/ */
Tox_Pass_Key *tox_pass_key_derive(const uint8_t *passphrase, size_t passphrase_len, Tox_Pass_Key *tox_pass_key_derive(
Tox_Err_Key_Derivation *error) const uint8_t passphrase[], size_t passphrase_len,
Tox_Err_Key_Derivation *error)
{ {
const Random *rng = system_random(); const Random *rng = system_random();
@ -136,8 +139,9 @@ Tox_Pass_Key *tox_pass_key_derive(const uint8_t *passphrase, size_t passphrase_l
* *
* @return new symmetric key on success, NULL on failure. * @return new symmetric key on success, NULL on failure.
*/ */
Tox_Pass_Key *tox_pass_key_derive_with_salt(const uint8_t *passphrase, size_t passphrase_len, Tox_Pass_Key *tox_pass_key_derive_with_salt(
const uint8_t *salt, Tox_Err_Key_Derivation *error) const uint8_t passphrase[], size_t passphrase_len,
const uint8_t salt[TOX_PASS_SALT_LENGTH], Tox_Err_Key_Derivation *error)
{ {
if (salt == nullptr || (passphrase == nullptr && passphrase_len != 0)) { if (salt == nullptr || (passphrase == nullptr && passphrase_len != 0)) {
SET_ERROR_PARAMETER(error, TOX_ERR_KEY_DERIVATION_NULL); SET_ERROR_PARAMETER(error, TOX_ERR_KEY_DERIVATION_NULL);
@ -189,8 +193,8 @@ Tox_Pass_Key *tox_pass_key_derive_with_salt(const uint8_t *passphrase, size_t pa
* *
* @return true on success. * @return true on success.
*/ */
bool tox_pass_key_encrypt(const Tox_Pass_Key *key, const uint8_t *plaintext, size_t plaintext_len, bool tox_pass_key_encrypt(const Tox_Pass_Key *key, const uint8_t plaintext[], size_t plaintext_len,
uint8_t *ciphertext, Tox_Err_Encryption *error) uint8_t ciphertext[], Tox_Err_Encryption *error)
{ {
const Random *rng = system_random(); const Random *rng = system_random();
@ -250,8 +254,8 @@ bool tox_pass_key_encrypt(const Tox_Pass_Key *key, const uint8_t *plaintext, siz
* *
* @return true on success. * @return true on success.
*/ */
bool tox_pass_encrypt(const uint8_t *plaintext, size_t plaintext_len, const uint8_t *passphrase, size_t passphrase_len, bool tox_pass_encrypt(const uint8_t plaintext[], size_t plaintext_len, const uint8_t passphrase[], size_t passphrase_len,
uint8_t *ciphertext, Tox_Err_Encryption *error) uint8_t ciphertext[], Tox_Err_Encryption *error)
{ {
Tox_Err_Key_Derivation err; Tox_Err_Key_Derivation err;
Tox_Pass_Key *key = tox_pass_key_derive(passphrase, passphrase_len, &err); Tox_Pass_Key *key = tox_pass_key_derive(passphrase, passphrase_len, &err);
@ -281,8 +285,8 @@ bool tox_pass_encrypt(const uint8_t *plaintext, size_t plaintext_len, const uint
* *
* @return true on success. * @return true on success.
*/ */
bool tox_pass_key_decrypt(const Tox_Pass_Key *key, const uint8_t *ciphertext, size_t ciphertext_len, bool tox_pass_key_decrypt(const Tox_Pass_Key *key, const uint8_t ciphertext[], size_t ciphertext_len,
uint8_t *plaintext, Tox_Err_Decryption *error) uint8_t plaintext[], Tox_Err_Decryption *error)
{ {
if (ciphertext_len <= TOX_PASS_ENCRYPTION_EXTRA_LENGTH) { if (ciphertext_len <= TOX_PASS_ENCRYPTION_EXTRA_LENGTH) {
SET_ERROR_PARAMETER(error, TOX_ERR_DECRYPTION_INVALID_LENGTH); SET_ERROR_PARAMETER(error, TOX_ERR_DECRYPTION_INVALID_LENGTH);
@ -333,8 +337,8 @@ bool tox_pass_key_decrypt(const Tox_Pass_Key *key, const uint8_t *ciphertext, si
* *
* @return true on success. * @return true on success.
*/ */
bool tox_pass_decrypt(const uint8_t *ciphertext, size_t ciphertext_len, const uint8_t *passphrase, bool tox_pass_decrypt(const uint8_t ciphertext[], size_t ciphertext_len, const uint8_t passphrase[],
size_t passphrase_len, uint8_t *plaintext, Tox_Err_Decryption *error) size_t passphrase_len, uint8_t plaintext[], Tox_Err_Decryption *error)
{ {
if (ciphertext_len <= TOX_PASS_ENCRYPTION_EXTRA_LENGTH) { if (ciphertext_len <= TOX_PASS_ENCRYPTION_EXTRA_LENGTH) {
SET_ERROR_PARAMETER(error, TOX_ERR_DECRYPTION_INVALID_LENGTH); SET_ERROR_PARAMETER(error, TOX_ERR_DECRYPTION_INVALID_LENGTH);
@ -382,7 +386,7 @@ bool tox_pass_decrypt(const uint8_t *ciphertext, size_t ciphertext_len, const ui
* *
* @return true if the data is encrypted by this module. * @return true if the data is encrypted by this module.
*/ */
bool tox_is_data_encrypted(const uint8_t *data) bool tox_is_data_encrypted(const uint8_t data[TOX_PASS_ENCRYPTION_EXTRA_LENGTH])
{ {
return memcmp(data, TOX_ENC_SAVE_MAGIC_NUMBER, TOX_ENC_SAVE_MAGIC_LENGTH) == 0; return memcmp(data, TOX_ENC_SAVE_MAGIC_NUMBER, TOX_ENC_SAVE_MAGIC_LENGTH) == 0;
} }

30
toxencryptsave/toxencryptsave.h
View File

@ -186,8 +186,8 @@ typedef enum Tox_Err_Decryption {
* *
* @return true on success. * @return true on success.
*/ */
bool tox_pass_encrypt(const uint8_t *plaintext, size_t plaintext_len, const uint8_t *passphrase, size_t passphrase_len, bool tox_pass_encrypt(const uint8_t plaintext[], size_t plaintext_len, const uint8_t passphrase[], size_t passphrase_len,
uint8_t *ciphertext, Tox_Err_Encryption *error); uint8_t ciphertext[], Tox_Err_Encryption *error);
/** /**
* Decrypts the given data with the given passphrase. * Decrypts the given data with the given passphrase.
@ -203,8 +203,8 @@ bool tox_pass_encrypt(const uint8_t *plaintext, size_t plaintext_len, const uint
* *
* @return true on success. * @return true on success.
*/ */
bool tox_pass_decrypt(const uint8_t *ciphertext, size_t ciphertext_len, const uint8_t *passphrase, bool tox_pass_decrypt(const uint8_t ciphertext[], size_t ciphertext_len, const uint8_t passphrase[],
size_t passphrase_len, uint8_t *plaintext, Tox_Err_Decryption *error); size_t passphrase_len, uint8_t plaintext[], Tox_Err_Decryption *error);
/******************************************************************************* /*******************************************************************************
@ -255,7 +255,8 @@ void tox_pass_key_free(Tox_Pass_Key *key);
* *
* @return new symmetric key on success, NULL on failure. * @return new symmetric key on success, NULL on failure.
*/ */
Tox_Pass_Key *tox_pass_key_derive(const uint8_t *passphrase, size_t passphrase_len, Tox_Pass_Key *tox_pass_key_derive(
const uint8_t passphrase[], size_t passphrase_len,
Tox_Err_Key_Derivation *error); Tox_Err_Key_Derivation *error);
/** /**
@ -267,8 +268,9 @@ Tox_Pass_Key *tox_pass_key_derive(const uint8_t *passphrase, size_t passphrase_l
* *
* @return new symmetric key on success, NULL on failure. * @return new symmetric key on success, NULL on failure.
*/ */
Tox_Pass_Key *tox_pass_key_derive_with_salt(const uint8_t *passphrase, size_t passphrase_len, Tox_Pass_Key *tox_pass_key_derive_with_salt(
const uint8_t *salt, Tox_Err_Key_Derivation *error); const uint8_t passphrase[], size_t passphrase_len,
const uint8_t salt[TOX_PASS_SALT_LENGTH], Tox_Err_Key_Derivation *error);
/** /**
* Encrypt a plain text with a key produced by tox_pass_key_derive or tox_pass_key_derive_with_salt. * Encrypt a plain text with a key produced by tox_pass_key_derive or tox_pass_key_derive_with_salt.
@ -282,8 +284,8 @@ Tox_Pass_Key *tox_pass_key_derive_with_salt(const uint8_t *passphrase, size_t pa
* *
* @return true on success. * @return true on success.
*/ */
bool tox_pass_key_encrypt(const Tox_Pass_Key *key, const uint8_t *plaintext, size_t plaintext_len, bool tox_pass_key_encrypt(const Tox_Pass_Key *key, const uint8_t plaintext[], size_t plaintext_len,
uint8_t *ciphertext, Tox_Err_Encryption *error); uint8_t ciphertext[], Tox_Err_Encryption *error);
/** /**
* This is the inverse of tox_pass_key_encrypt, also using only keys produced by * This is the inverse of tox_pass_key_encrypt, also using only keys produced by
@ -295,8 +297,8 @@ bool tox_pass_key_encrypt(const Tox_Pass_Key *key, const uint8_t *plaintext, siz
* *
* @return true on success. * @return true on success.
*/ */
bool tox_pass_key_decrypt(const Tox_Pass_Key *key, const uint8_t *ciphertext, size_t ciphertext_len, bool tox_pass_key_decrypt(const Tox_Pass_Key *key, const uint8_t ciphertext[], size_t ciphertext_len,
uint8_t *plaintext, Tox_Err_Decryption *error); uint8_t plaintext[], Tox_Err_Decryption *error);
typedef enum Tox_Err_Get_Salt { typedef enum Tox_Err_Get_Salt {
@ -338,7 +340,9 @@ typedef enum Tox_Err_Get_Salt {
* *
* @return true on success. * @return true on success.
*/ */
bool tox_get_salt(const uint8_t *ciphertext, uint8_t *salt, Tox_Err_Get_Salt *error); bool tox_get_salt(
const uint8_t ciphertext[TOX_PASS_ENCRYPTION_EXTRA_LENGTH],
uint8_t salt[TOX_PASS_SALT_LENGTH], Tox_Err_Get_Salt *error);
/** /**
* Determines whether or not the given data is encrypted by this module. * Determines whether or not the given data is encrypted by this module.
@ -354,7 +358,7 @@ bool tox_get_salt(const uint8_t *ciphertext, uint8_t *salt, Tox_Err_Get_Salt *er
* *
* @return true if the data is encrypted by this module. * @return true if the data is encrypted by this module.
*/ */
bool tox_is_data_encrypted(const uint8_t *data); bool tox_is_data_encrypted(const uint8_t data[TOX_PASS_ENCRYPTION_EXTRA_LENGTH]);
#ifdef __cplusplus #ifdef __cplusplus