yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-10-18 14:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor improvements to Camellia module and documentation

Browse source
This commit is contained in:
Hanno Becker 2018-12-19 13:42:05 +00:00
parent 1e2f3ed08f
commit 70ded3602c
2 changed files with 38 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
include/mbedtls/camellia.h
View file

@ -89,7 +89,7 @@ void mbedtls_camellia_init( mbedtls_camellia_context *ctx );
void mbedtls_camellia_free( mbedtls_camellia_context *ctx ); void mbedtls_camellia_free( mbedtls_camellia_context *ctx );
/** /**
* \brief Perform a CAMELLIA key schedule (encryption). * \brief Perform a CAMELLIA key schedule operation for encryption.
* *
* \param ctx The CAMELLIA context to use. This must be initialized. * \param ctx The CAMELLIA context to use. This must be initialized.
* \param key The encryption key to use. This must be a readable buffer * \param key The encryption key to use. This must be a readable buffer
@ -105,7 +105,7 @@ int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx,
unsigned int keybits ); unsigned int keybits );
/** /**
* \brief Perform a CAMELLIA key schedule (decryption). * \brief Perform a CAMELLIA key schedule operation for decryption.
* *
* \param ctx The CAMELLIA context to use. This must be initialized. * \param ctx The CAMELLIA context to use. This must be initialized.
* \param key The decryption key. This must be a readable buffer * \param key The decryption key. This must be a readable buffer
@ -121,7 +121,7 @@ int mbedtls_camellia_setkey_dec( mbedtls_camellia_context *ctx,
unsigned int keybits ); unsigned int keybits );
/** /**
* \brief Perform a CAMELLIA-ECB block encryption/decryption. * \brief Perform a CAMELLIA-ECB block encryption/decryption operation.
* *
* \param ctx The CAMELLIA context to use. This must be initialized * \param ctx The CAMELLIA context to use. This must be initialized
* and bound to a key. * and bound to a key.
@ -142,7 +142,7 @@ int mbedtls_camellia_crypt_ecb( mbedtls_camellia_context *ctx,
#if defined(MBEDTLS_CIPHER_MODE_CBC) #if defined(MBEDTLS_CIPHER_MODE_CBC)
/** /**
* \brief Perform a CAMELLIA-CBC buffer encryption/decryption. * \brief Perform a CAMELLIA-CBC buffer encryption/decryption operation.
* *
* \note Upon exit, the content of the IV is updated so that you can * \note Upon exit, the content of the IV is updated so that you can
* call the function same function again on the following * call the function same function again on the following
@ -157,7 +157,7 @@ int mbedtls_camellia_crypt_ecb( mbedtls_camellia_context *ctx,
* \param mode The mode of operation. This must be either * \param mode The mode of operation. This must be either
* #MBEDTLS_CAMELLIA_ENCRYPT or #MBEDTLS_CAMELLIA_DECRYPT. * #MBEDTLS_CAMELLIA_ENCRYPT or #MBEDTLS_CAMELLIA_DECRYPT.
* \param length The length in Bytes of the input data \p input. * \param length The length in Bytes of the input data \p input.
* This must be a multiple of \c 16. * This must be a multiple of \c 16 Bytes.
* \param iv The initialization vector. This must be a read/write buffer * \param iv The initialization vector. This must be a read/write buffer
* of length \c 16 Bytes. It is updated to allow streaming * of length \c 16 Bytes. It is updated to allow streaming
* use as explained above. * use as explained above.
@ -179,13 +179,14 @@ int mbedtls_camellia_crypt_cbc( mbedtls_camellia_context *ctx,
#if defined(MBEDTLS_CIPHER_MODE_CFB) #if defined(MBEDTLS_CIPHER_MODE_CFB)
/** /**
* \brief Perform a CAMELLIA-CFB128 buffer encryption/decryption. * \brief Perform a CAMELLIA-CFB128 buffer encryption/decryption
* operation.
* *
* \note Due to the nature of CFB you should use the same key * \note Due to the nature of CFB mode, you should use the same
* schedule for both encryption and decryption. So a * key for both encryption and decryption. In particular, calls
* context initialized with mbedtls_camellia_setkey_enc() * to this function should be preceded by a key-schedule via
* for both #MBEDTLS_CAMELLIA_ENCRYPT and * mbedtls_camellia_setkey_enc() regardless of whether \p mode
* #MBEDTLS_CAMELLIA_DECRYPT. * is #MBEDTLS_CAMELLIA_ENCRYPT or #MBEDTLS_CAMELLIA_DECRYPT.
* *
* \note Upon exit, the content of the IV is updated so that you can * \note Upon exit, the content of the IV is updated so that you can
* call the function same function again on the following * call the function same function again on the following
@ -225,13 +226,13 @@ int mbedtls_camellia_crypt_cfb128( mbedtls_camellia_context *ctx,
#if defined(MBEDTLS_CIPHER_MODE_CTR) #if defined(MBEDTLS_CIPHER_MODE_CTR)
/** /**
* \brief CAMELLIA-CTR buffer encryption/decryption * \brief Perform a CAMELLIA-CTR buffer encryption/decryption operation.
* *
* \note Due to the nature of CTR you should use the same key * *note Due to the nature of CTR mode, you should use the same
* schedule for both encryption and decryption. So a * key for both encryption and decryption. In particular, calls
* context initialized with mbedtls_camellia_setkey_enc() * to this function should be preceded by a key-schedule via
* for both #MBEDTLS_CAMELLIA_ENCRYPT and * mbedtls_camellia_setkey_enc() regardless of whether \p mode
* #MBEDTLS_CAMELLIA_DECRYPT. * is #MBEDTLS_CAMELLIA_ENCRYPT or #MBEDTLS_CAMELLIA_DECRYPT.
* *
* \warning You must never reuse a nonce value with the same key. Doing so * \warning You must never reuse a nonce value with the same key. Doing so
* would void the encryption for the two messages encrypted with * would void the encryption for the two messages encrypted with
@ -254,21 +255,22 @@ int mbedtls_camellia_crypt_cfb128( mbedtls_camellia_context *ctx,
* per-message nonce, handled by yourself, and the second one * per-message nonce, handled by yourself, and the second one
* updated by this function internally. * updated by this function internally.
* *
* For example, you might reserve the first 12 bytes for the * For example, you might reserve the first \c 12 Bytes for the
* per-message nonce, and the last 4 bytes for internal use. In that * per-message nonce, and the last \c 4 Bytes for internal use.
* case, before calling this function on a new message you need to * In that case, before calling this function on a new message you
* set the first 12 bytes of \p nonce_counter to your chosen nonce * need to set the first \c 12 Bytes of \p nonce_counter to your
* value, the last 4 to 0, and \p nc_off to 0 (which will cause \p * chosen nonce value, the last four to \c 0, and \p nc_off to \c 0
* stream_block to be ignored). That way, you can encrypt at most * (which will cause \p stream_block to be ignored). That way, you
* 2**96 messages of up to 2**32 blocks each with the same key. * can encrypt at most \c 2**96 messages of up to \c 2**32 blocks
* each with the same key.
* *
* The per-message nonce (or information sufficient to reconstruct * The per-message nonce (or information sufficient to reconstruct
* it) needs to be communicated with the ciphertext and must be unique. * it) needs to be communicated with the ciphertext and must be.
* unique. The recommended way to ensure uniqueness is to use a message * unique. The recommended way to ensure uniqueness is to use a
* counter. An alternative is to generate random nonces, but this * message counter. An alternative is to generate random nonces,
* limits the number of messages that can be securely encrypted: * but this limits the number of messages that can be securely
* for example, with 96-bit random nonces, you should not encrypt * encrypted: for example, with 96-bit random nonces, you should
* more than 2**32 messages with the same key. * not encrypt more than 2**32 messages with the same key.
* *
* Note that for both stategies, sizes are measured in blocks and * Note that for both stategies, sizes are measured in blocks and
* that a CAMELLIA block is \c 16 bytes. * that a CAMELLIA block is \c 16 bytes.

11
library/camellia.c
View file

@ -353,6 +353,7 @@ int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx,
uint32_t SIGMA[6][2]; uint32_t SIGMA[6][2];
uint32_t KC[16]; uint32_t KC[16];
uint32_t TK[20]; uint32_t TK[20];
CAMELLIA_VALIDATE_RET( ctx != NULL ); CAMELLIA_VALIDATE_RET( ctx != NULL );
CAMELLIA_VALIDATE_RET( key != NULL ); CAMELLIA_VALIDATE_RET( key != NULL );
@ -570,11 +571,11 @@ int mbedtls_camellia_crypt_ecb( mbedtls_camellia_context *ctx,
* Camellia-CBC buffer encryption/decryption * Camellia-CBC buffer encryption/decryption
*/ */
int mbedtls_camellia_crypt_cbc( mbedtls_camellia_context *ctx, int mbedtls_camellia_crypt_cbc( mbedtls_camellia_context *ctx,
int mode, int mode,
size_t length, size_t length,
unsigned char iv[16], unsigned char iv[16],
const unsigned char *input, const unsigned char *input,
unsigned char *output ) unsigned char *output )
{ {
int i; int i;
unsigned char temp[16]; unsigned char temp[16];