mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-25 19:15:41 +01:00
Merge remote-tracking branch 'public/pr/2281' into development
This commit is contained in:
commit
6be67a6518
@ -72,52 +72,68 @@ mbedtls_camellia_context;
|
|||||||
#endif /* MBEDTLS_CAMELLIA_ALT */
|
#endif /* MBEDTLS_CAMELLIA_ALT */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Initialize CAMELLIA context
|
* \brief Initialize a CAMELLIA context.
|
||||||
*
|
*
|
||||||
* \param ctx CAMELLIA context to be initialized
|
* \param ctx The CAMELLIA context to be initialized.
|
||||||
|
* This must not be \c NULL.
|
||||||
*/
|
*/
|
||||||
void mbedtls_camellia_init( mbedtls_camellia_context *ctx );
|
void mbedtls_camellia_init( mbedtls_camellia_context *ctx );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Clear CAMELLIA context
|
* \brief Clear a CAMELLIA context.
|
||||||
*
|
*
|
||||||
* \param ctx CAMELLIA context to be cleared
|
* \param ctx The CAMELLIA context to be cleared. This may be \c NULL,
|
||||||
|
* in which case this function returns immediately. If it is not
|
||||||
|
* \c NULL, it must be initialized.
|
||||||
*/
|
*/
|
||||||
void mbedtls_camellia_free( mbedtls_camellia_context *ctx );
|
void mbedtls_camellia_free( mbedtls_camellia_context *ctx );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief CAMELLIA key schedule (encryption)
|
* \brief Perform a CAMELLIA key schedule operation for encryption.
|
||||||
*
|
*
|
||||||
* \param ctx CAMELLIA context to be initialized
|
* \param ctx The CAMELLIA context to use. This must be initialized.
|
||||||
* \param key encryption key
|
* \param key The encryption key to use. This must be a readable buffer
|
||||||
* \param keybits must be 128, 192 or 256
|
* of size \p keybits Bits.
|
||||||
|
* \param keybits The length of \p key in Bits. This must be either \c 128,
|
||||||
|
* \c 192 or \c 256.
|
||||||
*
|
*
|
||||||
* \return 0 if successful, or MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA
|
* \return \c 0 if successful.
|
||||||
|
* \return A negative error code on failure.
|
||||||
*/
|
*/
|
||||||
int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned char *key,
|
int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx,
|
||||||
unsigned int keybits );
|
const unsigned char *key,
|
||||||
|
unsigned int keybits );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief CAMELLIA key schedule (decryption)
|
* \brief Perform a CAMELLIA key schedule operation for decryption.
|
||||||
*
|
*
|
||||||
* \param ctx CAMELLIA context to be initialized
|
* \param ctx The CAMELLIA context to use. This must be initialized.
|
||||||
* \param key decryption key
|
* \param key The decryption key. This must be a readable buffer
|
||||||
* \param keybits must be 128, 192 or 256
|
* of size \p keybits Bits.
|
||||||
|
* \param keybits The length of \p key in Bits. This must be either \c 128,
|
||||||
|
* \c 192 or \c 256.
|
||||||
*
|
*
|
||||||
* \return 0 if successful, or MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA
|
* \return \c 0 if successful.
|
||||||
|
* \return A negative error code on failure.
|
||||||
*/
|
*/
|
||||||
int mbedtls_camellia_setkey_dec( mbedtls_camellia_context *ctx, const unsigned char *key,
|
int mbedtls_camellia_setkey_dec( mbedtls_camellia_context *ctx,
|
||||||
unsigned int keybits );
|
const unsigned char *key,
|
||||||
|
unsigned int keybits );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief CAMELLIA-ECB block encryption/decryption
|
* \brief Perform a CAMELLIA-ECB block encryption/decryption operation.
|
||||||
*
|
*
|
||||||
* \param ctx CAMELLIA context
|
* \param ctx The CAMELLIA context to use. This must be initialized
|
||||||
* \param mode MBEDTLS_CAMELLIA_ENCRYPT or MBEDTLS_CAMELLIA_DECRYPT
|
* and bound to a key.
|
||||||
* \param input 16-byte input block
|
* \param mode The mode of operation. This must be either
|
||||||
* \param output 16-byte output block
|
* #MBEDTLS_CAMELLIA_ENCRYPT or #MBEDTLS_CAMELLIA_DECRYPT.
|
||||||
|
* \param input The input block. This must be a readable buffer
|
||||||
|
* of size \c 16 Bytes.
|
||||||
|
* \param output The output block. This must be a writable buffer
|
||||||
|
* of size \c 16 Bytes.
|
||||||
*
|
*
|
||||||
* \return 0 if successful
|
* \return \c 0 if successful.
|
||||||
|
* \return A negative error code on failure.
|
||||||
*/
|
*/
|
||||||
int mbedtls_camellia_crypt_ecb( mbedtls_camellia_context *ctx,
|
int mbedtls_camellia_crypt_ecb( mbedtls_camellia_context *ctx,
|
||||||
int mode,
|
int mode,
|
||||||
@ -126,9 +142,7 @@ int mbedtls_camellia_crypt_ecb( mbedtls_camellia_context *ctx,
|
|||||||
|
|
||||||
#if defined(MBEDTLS_CIPHER_MODE_CBC)
|
#if defined(MBEDTLS_CIPHER_MODE_CBC)
|
||||||
/**
|
/**
|
||||||
* \brief CAMELLIA-CBC buffer encryption/decryption
|
* \brief Perform a CAMELLIA-CBC buffer encryption/decryption operation.
|
||||||
* Length should be a multiple of the block
|
|
||||||
* size (16 bytes)
|
|
||||||
*
|
*
|
||||||
* \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
|
||||||
@ -138,15 +152,22 @@ int mbedtls_camellia_crypt_ecb( mbedtls_camellia_context *ctx,
|
|||||||
* IV, you should either save it manually or use the cipher
|
* IV, you should either save it manually or use the cipher
|
||||||
* module instead.
|
* module instead.
|
||||||
*
|
*
|
||||||
* \param ctx CAMELLIA context
|
* \param ctx The CAMELLIA context to use. This must be initialized
|
||||||
* \param mode MBEDTLS_CAMELLIA_ENCRYPT or MBEDTLS_CAMELLIA_DECRYPT
|
* and bound to a key.
|
||||||
* \param length length of the input data
|
* \param mode The mode of operation. This must be either
|
||||||
* \param iv initialization vector (updated after use)
|
* #MBEDTLS_CAMELLIA_ENCRYPT or #MBEDTLS_CAMELLIA_DECRYPT.
|
||||||
* \param input buffer holding the input data
|
* \param length The length in Bytes of the input data \p input.
|
||||||
* \param output buffer holding the output data
|
* This must be a multiple of \c 16 Bytes.
|
||||||
|
* \param iv The initialization vector. This must be a read/write buffer
|
||||||
|
* of length \c 16 Bytes. It is updated to allow streaming
|
||||||
|
* use as explained above.
|
||||||
|
* \param input The buffer holding the input data. This must point to a
|
||||||
|
* readable buffer of length \p length Bytes.
|
||||||
|
* \param output The buffer holding the output data. This must point to a
|
||||||
|
* writable buffer of length \p length Bytes.
|
||||||
*
|
*
|
||||||
* \return 0 if successful, or
|
* \return \c 0 if successful.
|
||||||
* MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH
|
* \return A negative error code on failure.
|
||||||
*/
|
*/
|
||||||
int mbedtls_camellia_crypt_cbc( mbedtls_camellia_context *ctx,
|
int mbedtls_camellia_crypt_cbc( mbedtls_camellia_context *ctx,
|
||||||
int mode,
|
int mode,
|
||||||
@ -158,11 +179,14 @@ int mbedtls_camellia_crypt_cbc( mbedtls_camellia_context *ctx,
|
|||||||
|
|
||||||
#if defined(MBEDTLS_CIPHER_MODE_CFB)
|
#if defined(MBEDTLS_CIPHER_MODE_CFB)
|
||||||
/**
|
/**
|
||||||
* \brief 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 schedule for
|
* \note Due to the nature of CFB mode, you should use the same
|
||||||
* both encryption and decryption. So a context initialized with
|
* key for both encryption and decryption. In particular, calls
|
||||||
* mbedtls_camellia_setkey_enc() for both MBEDTLS_CAMELLIA_ENCRYPT and CAMELLIE_DECRYPT.
|
* to this function should be preceded by a key-schedule via
|
||||||
|
* mbedtls_camellia_setkey_enc() regardless of whether \p mode
|
||||||
|
* 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
|
||||||
@ -172,16 +196,24 @@ int mbedtls_camellia_crypt_cbc( mbedtls_camellia_context *ctx,
|
|||||||
* IV, you should either save it manually or use the cipher
|
* IV, you should either save it manually or use the cipher
|
||||||
* module instead.
|
* module instead.
|
||||||
*
|
*
|
||||||
* \param ctx CAMELLIA context
|
* \param ctx The CAMELLIA context to use. This must be initialized
|
||||||
* \param mode MBEDTLS_CAMELLIA_ENCRYPT or MBEDTLS_CAMELLIA_DECRYPT
|
* and bound to a key.
|
||||||
* \param length length of the input data
|
* \param mode The mode of operation. This must be either
|
||||||
* \param iv_off offset in IV (updated after use)
|
* #MBEDTLS_CAMELLIA_ENCRYPT or #MBEDTLS_CAMELLIA_DECRYPT.
|
||||||
* \param iv initialization vector (updated after use)
|
* \param length The length of the input data \p input. Any value is allowed.
|
||||||
* \param input buffer holding the input data
|
* \param iv_off The current offset in the IV. This must be smaller
|
||||||
* \param output buffer holding the output data
|
* than \c 16 Bytes. It is updated after this call to allow
|
||||||
|
* the aforementioned streaming usage.
|
||||||
|
* \param iv The initialization vector. This must be a read/write buffer
|
||||||
|
* of length \c 16 Bytes. It is updated after this call to
|
||||||
|
* allow the aforementioned streaming usage.
|
||||||
|
* \param input The buffer holding the input data. This must be a readable
|
||||||
|
* buffer of size \p length Bytes.
|
||||||
|
* \param output The buffer to hold the output data. This must be a writable
|
||||||
|
* buffer of length \p length Bytes.
|
||||||
*
|
*
|
||||||
* \return 0 if successful, or
|
* \return \c 0 if successful.
|
||||||
* MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA.
|
* \return A negative error code on failure.
|
||||||
*/
|
*/
|
||||||
int mbedtls_camellia_crypt_cfb128( mbedtls_camellia_context *ctx,
|
int mbedtls_camellia_crypt_cfb128( mbedtls_camellia_context *ctx,
|
||||||
int mode,
|
int mode,
|
||||||
@ -194,11 +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 schedule for
|
* *note Due to the nature of CTR mode, you should use the same
|
||||||
* both encryption and decryption. So a context initialized with
|
* key for both encryption and decryption. In particular, calls
|
||||||
* mbedtls_camellia_setkey_enc() for both MBEDTLS_CAMELLIA_ENCRYPT and MBEDTLS_CAMELLIA_DECRYPT.
|
* to this function should be preceded by a key-schedule via
|
||||||
|
* mbedtls_camellia_setkey_enc() regardless of whether \p mode
|
||||||
|
* 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
|
||||||
@ -221,41 +255,49 @@ 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
|
||||||
* 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 16 bytes.
|
* that a CAMELLIA block is \c 16 Bytes.
|
||||||
*
|
*
|
||||||
* \warning Upon return, \p stream_block contains sensitive data. Its
|
* \warning Upon return, \p stream_block contains sensitive data. Its
|
||||||
* content must not be written to insecure storage and should be
|
* content must not be written to insecure storage and should be
|
||||||
* securely discarded as soon as it's no longer needed.
|
* securely discarded as soon as it's no longer needed.
|
||||||
*
|
*
|
||||||
* \param ctx CAMELLIA context
|
* \param ctx The CAMELLIA context to use. This must be initialized
|
||||||
* \param length The length of the data
|
* and bound to a key.
|
||||||
* \param nc_off The offset in the current stream_block (for resuming
|
* \param length The length of the input data \p input in Bytes.
|
||||||
|
* Any value is allowed.
|
||||||
|
* \param nc_off The offset in the current \p stream_block (for resuming
|
||||||
* within current cipher stream). The offset pointer to
|
* within current cipher stream). The offset pointer to
|
||||||
* should be 0 at the start of a stream.
|
* should be \c 0 at the start of a stream. It is updated
|
||||||
* \param nonce_counter The 128-bit nonce and counter.
|
* at the end of this call.
|
||||||
* \param stream_block The saved stream-block for resuming. Is overwritten
|
* \param nonce_counter The 128-bit nonce and counter. This must be a read/write
|
||||||
* by the function.
|
* buffer of length \c 16 Bytes.
|
||||||
* \param input The input data stream
|
* \param stream_block The saved stream-block for resuming. This must be a
|
||||||
* \param output The output data stream
|
* read/write buffer of length \c 16 Bytes.
|
||||||
|
* \param input The input data stream. This must be a readable buffer of
|
||||||
|
* size \p length Bytes.
|
||||||
|
* \param output The output data stream. This must be a writable buffer
|
||||||
|
* of size \p length Bytes.
|
||||||
*
|
*
|
||||||
* \return 0 if successful
|
* \return \c 0 if successful.
|
||||||
|
* \return A negative error code on failure.
|
||||||
*/
|
*/
|
||||||
int mbedtls_camellia_crypt_ctr( mbedtls_camellia_context *ctx,
|
int mbedtls_camellia_crypt_ctr( mbedtls_camellia_context *ctx,
|
||||||
size_t length,
|
size_t length,
|
||||||
|
@ -49,6 +49,12 @@
|
|||||||
|
|
||||||
#if !defined(MBEDTLS_CAMELLIA_ALT)
|
#if !defined(MBEDTLS_CAMELLIA_ALT)
|
||||||
|
|
||||||
|
/* Parameter validation macros */
|
||||||
|
#define CAMELLIA_VALIDATE_RET( cond ) \
|
||||||
|
MBEDTLS_INTERNAL_VALIDATE_RET( cond, MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA )
|
||||||
|
#define CAMELLIA_VALIDATE( cond ) \
|
||||||
|
MBEDTLS_INTERNAL_VALIDATE( cond )
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* 32-bit integer manipulation macros (big endian)
|
* 32-bit integer manipulation macros (big endian)
|
||||||
*/
|
*/
|
||||||
@ -321,6 +327,7 @@ static void camellia_feistel( const uint32_t x[2], const uint32_t k[2],
|
|||||||
|
|
||||||
void mbedtls_camellia_init( mbedtls_camellia_context *ctx )
|
void mbedtls_camellia_init( mbedtls_camellia_context *ctx )
|
||||||
{
|
{
|
||||||
|
CAMELLIA_VALIDATE( ctx != NULL );
|
||||||
memset( ctx, 0, sizeof( mbedtls_camellia_context ) );
|
memset( ctx, 0, sizeof( mbedtls_camellia_context ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -335,8 +342,9 @@ void mbedtls_camellia_free( mbedtls_camellia_context *ctx )
|
|||||||
/*
|
/*
|
||||||
* Camellia key schedule (encryption)
|
* Camellia key schedule (encryption)
|
||||||
*/
|
*/
|
||||||
int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned char *key,
|
int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx,
|
||||||
unsigned int keybits )
|
const unsigned char *key,
|
||||||
|
unsigned int keybits )
|
||||||
{
|
{
|
||||||
int idx;
|
int idx;
|
||||||
size_t i;
|
size_t i;
|
||||||
@ -346,6 +354,9 @@ int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned c
|
|||||||
uint32_t KC[16];
|
uint32_t KC[16];
|
||||||
uint32_t TK[20];
|
uint32_t TK[20];
|
||||||
|
|
||||||
|
CAMELLIA_VALIDATE_RET( ctx != NULL );
|
||||||
|
CAMELLIA_VALIDATE_RET( key != NULL );
|
||||||
|
|
||||||
RK = ctx->rk;
|
RK = ctx->rk;
|
||||||
|
|
||||||
memset( t, 0, 64 );
|
memset( t, 0, 64 );
|
||||||
@ -440,14 +451,17 @@ int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned c
|
|||||||
/*
|
/*
|
||||||
* Camellia key schedule (decryption)
|
* Camellia key schedule (decryption)
|
||||||
*/
|
*/
|
||||||
int mbedtls_camellia_setkey_dec( mbedtls_camellia_context *ctx, const unsigned char *key,
|
int mbedtls_camellia_setkey_dec( mbedtls_camellia_context *ctx,
|
||||||
unsigned int keybits )
|
const unsigned char *key,
|
||||||
|
unsigned int keybits )
|
||||||
{
|
{
|
||||||
int idx, ret;
|
int idx, ret;
|
||||||
size_t i;
|
size_t i;
|
||||||
mbedtls_camellia_context cty;
|
mbedtls_camellia_context cty;
|
||||||
uint32_t *RK;
|
uint32_t *RK;
|
||||||
uint32_t *SK;
|
uint32_t *SK;
|
||||||
|
CAMELLIA_VALIDATE_RET( ctx != NULL );
|
||||||
|
CAMELLIA_VALIDATE_RET( key != NULL );
|
||||||
|
|
||||||
mbedtls_camellia_init( &cty );
|
mbedtls_camellia_init( &cty );
|
||||||
|
|
||||||
@ -495,6 +509,11 @@ int mbedtls_camellia_crypt_ecb( mbedtls_camellia_context *ctx,
|
|||||||
{
|
{
|
||||||
int NR;
|
int NR;
|
||||||
uint32_t *RK, X[4];
|
uint32_t *RK, X[4];
|
||||||
|
CAMELLIA_VALIDATE_RET( ctx != NULL );
|
||||||
|
CAMELLIA_VALIDATE_RET( mode == MBEDTLS_CAMELLIA_ENCRYPT ||
|
||||||
|
mode == MBEDTLS_CAMELLIA_DECRYPT );
|
||||||
|
CAMELLIA_VALIDATE_RET( input != NULL );
|
||||||
|
CAMELLIA_VALIDATE_RET( output != NULL );
|
||||||
|
|
||||||
( (void) mode );
|
( (void) mode );
|
||||||
|
|
||||||
@ -552,14 +571,20 @@ 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];
|
||||||
|
CAMELLIA_VALIDATE_RET( ctx != NULL );
|
||||||
|
CAMELLIA_VALIDATE_RET( mode == MBEDTLS_CAMELLIA_ENCRYPT ||
|
||||||
|
mode == MBEDTLS_CAMELLIA_DECRYPT );
|
||||||
|
CAMELLIA_VALIDATE_RET( iv != NULL );
|
||||||
|
CAMELLIA_VALIDATE_RET( length == 0 || input != NULL );
|
||||||
|
CAMELLIA_VALIDATE_RET( length == 0 || output != NULL );
|
||||||
|
|
||||||
if( length % 16 )
|
if( length % 16 )
|
||||||
return( MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH );
|
return( MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH );
|
||||||
@ -614,7 +639,18 @@ int mbedtls_camellia_crypt_cfb128( mbedtls_camellia_context *ctx,
|
|||||||
unsigned char *output )
|
unsigned char *output )
|
||||||
{
|
{
|
||||||
int c;
|
int c;
|
||||||
size_t n = *iv_off;
|
size_t n;
|
||||||
|
CAMELLIA_VALIDATE_RET( ctx != NULL );
|
||||||
|
CAMELLIA_VALIDATE_RET( mode == MBEDTLS_CAMELLIA_ENCRYPT ||
|
||||||
|
mode == MBEDTLS_CAMELLIA_DECRYPT );
|
||||||
|
CAMELLIA_VALIDATE_RET( iv != NULL );
|
||||||
|
CAMELLIA_VALIDATE_RET( iv_off != NULL );
|
||||||
|
CAMELLIA_VALIDATE_RET( length == 0 || input != NULL );
|
||||||
|
CAMELLIA_VALIDATE_RET( length == 0 || output != NULL );
|
||||||
|
|
||||||
|
n = *iv_off;
|
||||||
|
if( n >= 16 )
|
||||||
|
return( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA );
|
||||||
|
|
||||||
if( mode == MBEDTLS_CAMELLIA_DECRYPT )
|
if( mode == MBEDTLS_CAMELLIA_DECRYPT )
|
||||||
{
|
{
|
||||||
@ -662,7 +698,17 @@ int mbedtls_camellia_crypt_ctr( mbedtls_camellia_context *ctx,
|
|||||||
unsigned char *output )
|
unsigned char *output )
|
||||||
{
|
{
|
||||||
int c, i;
|
int c, i;
|
||||||
size_t n = *nc_off;
|
size_t n;
|
||||||
|
CAMELLIA_VALIDATE_RET( ctx != NULL );
|
||||||
|
CAMELLIA_VALIDATE_RET( nonce_counter != NULL );
|
||||||
|
CAMELLIA_VALIDATE_RET( stream_block != NULL );
|
||||||
|
CAMELLIA_VALIDATE_RET( nc_off != NULL );
|
||||||
|
CAMELLIA_VALIDATE_RET( length == 0 || input != NULL );
|
||||||
|
CAMELLIA_VALIDATE_RET( length == 0 || output != NULL );
|
||||||
|
|
||||||
|
n = *nc_off;
|
||||||
|
if( n >= 16 )
|
||||||
|
return( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA );
|
||||||
|
|
||||||
while( length-- )
|
while( length-- )
|
||||||
{
|
{
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
Camellia - Valid parameters
|
||||||
|
camellia_valid_param:
|
||||||
|
|
||||||
|
Camellia - Invalid parameters
|
||||||
|
camellia_invalid_param:
|
||||||
|
|
||||||
Camellia-128-ECB Encrypt RFC3713 #1
|
Camellia-128-ECB Encrypt RFC3713 #1
|
||||||
camellia_encrypt_ecb:"0123456789abcdeffedcba9876543210":"0123456789abcdeffedcba9876543210":"67673138549669730857065648eabe43":0
|
camellia_encrypt_ecb:"0123456789abcdeffedcba9876543210":"0123456789abcdeffedcba9876543210":"67673138549669730857065648eabe43":0
|
||||||
|
|
||||||
|
@ -7,6 +7,172 @@
|
|||||||
* END_DEPENDENCIES
|
* END_DEPENDENCIES
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/* BEGIN_CASE */
|
||||||
|
void camellia_valid_param( )
|
||||||
|
{
|
||||||
|
TEST_VALID_PARAM( mbedtls_camellia_free( NULL ) );
|
||||||
|
}
|
||||||
|
/* END_CASE */
|
||||||
|
|
||||||
|
/* BEGIN_CASE depends_on:MBEDTLS_CHECK_PARAMS:!MBEDTLS_PARAM_FAILED_ALT */
|
||||||
|
void camellia_invalid_param( )
|
||||||
|
{
|
||||||
|
mbedtls_camellia_context ctx;
|
||||||
|
unsigned char buf[16] = { 0 };
|
||||||
|
const size_t valid_keybits = 128;
|
||||||
|
const int invalid_mode = 42;
|
||||||
|
const int valid_mode = MBEDTLS_CAMELLIA_ENCRYPT;
|
||||||
|
size_t off;
|
||||||
|
((void) off);
|
||||||
|
|
||||||
|
TEST_INVALID_PARAM( mbedtls_camellia_init( NULL ) );
|
||||||
|
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_setkey_enc( NULL,
|
||||||
|
buf,
|
||||||
|
valid_keybits ) );
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_setkey_enc( &ctx,
|
||||||
|
NULL,
|
||||||
|
valid_keybits ) );
|
||||||
|
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_setkey_dec( NULL,
|
||||||
|
buf,
|
||||||
|
valid_keybits ) );
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_setkey_dec( &ctx,
|
||||||
|
NULL,
|
||||||
|
valid_keybits ) );
|
||||||
|
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_ecb( NULL,
|
||||||
|
valid_mode,
|
||||||
|
buf, buf ) );
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_ecb( &ctx,
|
||||||
|
invalid_mode,
|
||||||
|
buf, buf ) );
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_ecb( &ctx,
|
||||||
|
valid_mode,
|
||||||
|
NULL, buf ) );
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_ecb( &ctx,
|
||||||
|
valid_mode,
|
||||||
|
buf, NULL ) );
|
||||||
|
|
||||||
|
#if defined(MBEDTLS_CIPHER_MODE_CBC)
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_cbc( NULL,
|
||||||
|
valid_mode,
|
||||||
|
sizeof( buf ),
|
||||||
|
buf, buf, buf ) );
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_cbc( &ctx,
|
||||||
|
invalid_mode,
|
||||||
|
sizeof( buf ),
|
||||||
|
buf, buf, buf ) );
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_cbc( &ctx,
|
||||||
|
valid_mode,
|
||||||
|
sizeof( buf ),
|
||||||
|
NULL, buf, buf ) );
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_cbc( &ctx,
|
||||||
|
valid_mode,
|
||||||
|
sizeof( buf ),
|
||||||
|
buf, NULL, buf ) );
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_cbc( &ctx,
|
||||||
|
valid_mode,
|
||||||
|
sizeof( buf ),
|
||||||
|
buf, buf, NULL ) );
|
||||||
|
#endif /* MBEDTLS_CIPHER_MODE_CBC */
|
||||||
|
|
||||||
|
#if defined(MBEDTLS_CIPHER_MODE_CFB)
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_cfb128( NULL,
|
||||||
|
valid_mode,
|
||||||
|
sizeof( buf ),
|
||||||
|
&off, buf,
|
||||||
|
buf, buf ) );
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_cfb128( &ctx,
|
||||||
|
invalid_mode,
|
||||||
|
sizeof( buf ),
|
||||||
|
&off, buf,
|
||||||
|
buf, buf ) );
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_cfb128( &ctx,
|
||||||
|
valid_mode,
|
||||||
|
sizeof( buf ),
|
||||||
|
NULL, buf,
|
||||||
|
buf, buf ) );
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_cfb128( &ctx,
|
||||||
|
valid_mode,
|
||||||
|
sizeof( buf ),
|
||||||
|
&off, NULL,
|
||||||
|
buf, buf ) );
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_cfb128( &ctx,
|
||||||
|
valid_mode,
|
||||||
|
sizeof( buf ),
|
||||||
|
&off, buf,
|
||||||
|
NULL, buf ) );
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_cfb128( &ctx,
|
||||||
|
valid_mode,
|
||||||
|
sizeof( buf ),
|
||||||
|
&off, buf,
|
||||||
|
buf, NULL ) );
|
||||||
|
#endif /* MBEDTLS_CIPHER_MODE_CFB */
|
||||||
|
|
||||||
|
#if defined(MBEDTLS_CIPHER_MODE_CTR)
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_ctr( NULL,
|
||||||
|
sizeof( buf ),
|
||||||
|
&off,
|
||||||
|
buf, buf,
|
||||||
|
buf, buf ) );
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_ctr( &ctx,
|
||||||
|
sizeof( buf ),
|
||||||
|
NULL,
|
||||||
|
buf, buf,
|
||||||
|
buf, buf ) );
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_ctr( &ctx,
|
||||||
|
sizeof( buf ),
|
||||||
|
&off,
|
||||||
|
NULL, buf,
|
||||||
|
buf, buf ) );
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_ctr( &ctx,
|
||||||
|
sizeof( buf ),
|
||||||
|
&off,
|
||||||
|
buf, NULL,
|
||||||
|
buf, buf ) );
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_ctr( &ctx,
|
||||||
|
sizeof( buf ),
|
||||||
|
&off,
|
||||||
|
buf, buf,
|
||||||
|
NULL, buf ) );
|
||||||
|
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
|
||||||
|
mbedtls_camellia_crypt_ctr( &ctx,
|
||||||
|
sizeof( buf ),
|
||||||
|
&off,
|
||||||
|
buf, buf,
|
||||||
|
buf, NULL ) );
|
||||||
|
#endif /* MBEDTLS_CIPHER_MODE_CTR */
|
||||||
|
|
||||||
|
exit:
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
/* END_CASE */
|
||||||
|
|
||||||
/* BEGIN_CASE */
|
/* BEGIN_CASE */
|
||||||
void camellia_encrypt_ecb( data_t * key_str, data_t * src_str,
|
void camellia_encrypt_ecb( data_t * key_str, data_t * src_str,
|
||||||
data_t * hex_dst_string, int setkey_result )
|
data_t * hex_dst_string, int setkey_result )
|
||||||
|
Loading…
Reference in New Issue
Block a user