yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-23 06:45:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor improvements

Browse source
This commit is contained in:
Hanno Becker 2018-12-12 14:00:26 +00:00
parent ae2ff02ff1
commit e463c42902
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/mbedtls/chacha20.h
View file

@ -82,7 +82,8 @@ mbedtls_chacha20_context;
* to \c mbedtls_chacha20_update(), and finally to * to \c mbedtls_chacha20_update(), and finally to
* \c mbedtls_chacha20_free(). * \c mbedtls_chacha20_free().
* *
* \param ctx The ChaCha20 context to initialize. Must not be \c NULL. * \param ctx The ChaCha20 context to initialize.
* This must not be \c NULL.
*/ */
void mbedtls_chacha20_init( mbedtls_chacha20_context *ctx ); void mbedtls_chacha20_init( mbedtls_chacha20_context *ctx );
@ -90,7 +91,9 @@ void mbedtls_chacha20_init( mbedtls_chacha20_context *ctx );
* \brief This function releases and clears the specified ChaCha20 context. * \brief This function releases and clears the specified ChaCha20 context.
* *
* \param ctx The ChaCha20 context to clear. May be \c NULL, * \param ctx The ChaCha20 context to clear. May be \c NULL,
* in which case this function is a no-op. * in which case this function is a no-op. If it is not
* \c NULL, it must point to an initialized context.
*
*/ */
void mbedtls_chacha20_free( mbedtls_chacha20_context *ctx ); void mbedtls_chacha20_free( mbedtls_chacha20_context *ctx );
@ -103,7 +106,7 @@ void mbedtls_chacha20_free( mbedtls_chacha20_context *ctx );
* \c mbedtls_chacha_update(). * \c mbedtls_chacha_update().
* *
* \param ctx The ChaCha20 context to which the key should be bound. * \param ctx The ChaCha20 context to which the key should be bound.
* Must be initialized. * It must be initialized.
* \param key The encryption/decryption key. Must be 32 bytes in length. * \param key The encryption/decryption key. Must be 32 bytes in length.
* *
* \return \c 0 on success. * \return \c 0 on success.
@ -123,7 +126,7 @@ int mbedtls_chacha20_setkey( mbedtls_chacha20_context *ctx,
* messages encrypted with the same nonce and key. * messages encrypted with the same nonce and key.
* *
* \param ctx The ChaCha20 context to which the nonce should be bound. * \param ctx The ChaCha20 context to which the nonce should be bound.
* Must be initialized. * It must be initialized and bound to a key.
* \param nonce The nonce. Must be 12 bytes in size. * \param nonce The nonce. Must be 12 bytes in size.
* \param counter The initial counter value. This is usually 0. * \param counter The initial counter value. This is usually 0.
* *
@ -153,7 +156,7 @@ int mbedtls_chacha20_starts( mbedtls_chacha20_context* ctx,
* key and nonce. * key and nonce.
* *
* \param ctx The ChaCha20 context to use for encryption or decryption. * \param ctx The ChaCha20 context to use for encryption or decryption.
* Must be initialized. * It must be initialized and bound to a key and nonce.
* \param size The length of the input data in bytes. * \param size The length of the input data in bytes.
* \param input The buffer holding the input data. * \param input The buffer holding the input data.
* This pointer can be \c NULL if `size == 0`. * This pointer can be \c NULL if `size == 0`.

2
library/chachapoly.c
View file

@ -179,9 +179,7 @@ int mbedtls_chachapoly_update_aad( mbedtls_chachapoly_context *ctx,
CHACHAPOLY_VALIDATE_RET( aad_len == 0 || aad != NULL ); CHACHAPOLY_VALIDATE_RET( aad_len == 0 || aad != NULL );
if( ctx->state != CHACHAPOLY_STATE_AAD ) if( ctx->state != CHACHAPOLY_STATE_AAD )
{
return( MBEDTLS_ERR_CHACHAPOLY_BAD_STATE ); return( MBEDTLS_ERR_CHACHAPOLY_BAD_STATE );
}
ctx->aad_len += aad_len; ctx->aad_len += aad_len;