yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix some more variables names

Browse source 
Signed-off-by: Xiaofei Bai <xiaofei.bai@arm.com>
This commit is contained in:
Xiaofei Bai 2021-11-23 06:31:16 +00:00
parent b7972840fd
commit 89b526da3e
3 changed files with 40 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
library/ecdh.c
View file

@ -731,7 +731,8 @@ int mbedtls_ecdh_calc_secret( mbedtls_ecdh_context *ctx, size_t *olen,
#if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL) #if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL)
static int ecdh_tls13_make_params_internal( mbedtls_ecdh_context_mbed *ctx, static int ecdh_tls13_make_params_internal( mbedtls_ecdh_context_mbed *ctx,
size_t *olen, int point_format, unsigned char *buf, size_t blen, size_t *olen, int point_format,
unsigned char *buf, size_t buf_len,
int ( *f_rng )( void *, unsigned char *, size_t), void *p_rng ) int ( *f_rng )( void *, unsigned char *, size_t), void *p_rng )
{ {
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
@ -744,7 +745,7 @@ static int ecdh_tls13_make_params_internal( mbedtls_ecdh_context_mbed *ctx,
return( ret ); return( ret );
ret = mbedtls_ecp_point_write_binary( &ctx->grp, &ctx->Q, point_format, ret = mbedtls_ecp_point_write_binary( &ctx->grp, &ctx->Q, point_format,
olen, buf, blen ); olen, buf, buf_len );
if( ret != 0 ) if( ret != 0 )
return( ret ); return( ret );
@ -752,7 +753,7 @@ static int ecdh_tls13_make_params_internal( mbedtls_ecdh_context_mbed *ctx,
} }
int mbedtls_ecdh_tls13_make_params( mbedtls_ecdh_context *ctx, size_t *olen, int mbedtls_ecdh_tls13_make_params( mbedtls_ecdh_context *ctx, size_t *olen,
unsigned char *buf, size_t blen, unsigned char *buf, size_t buf_len,
int ( *f_rng )( void *, unsigned char *, size_t ), int ( *f_rng )( void *, unsigned char *, size_t ),
void *p_rng ) void *p_rng )
{ {
@ -769,7 +770,7 @@ int mbedtls_ecdh_tls13_make_params( mbedtls_ecdh_context *ctx, size_t *olen,
#if defined(MBEDTLS_ECDH_LEGACY_CONTEXT) #if defined(MBEDTLS_ECDH_LEGACY_CONTEXT)
return( ecdh_tls13_make_params_internal( ctx, olen, ctx->point_format, return( ecdh_tls13_make_params_internal( ctx, olen, ctx->point_format,
buf, blen, f_rng, p_rng ) ); buf, buf_len, f_rng, p_rng ) );
#else #else
switch( ctx->var ) switch( ctx->var )
{ {
@ -779,7 +780,7 @@ int mbedtls_ecdh_tls13_make_params( mbedtls_ecdh_context *ctx, size_t *olen,
#endif #endif
case MBEDTLS_ECDH_VARIANT_MBEDTLS_2_0: case MBEDTLS_ECDH_VARIANT_MBEDTLS_2_0:
return( ecdh_tls13_make_params_internal( &ctx->ctx.mbed_ecdh, olen, return( ecdh_tls13_make_params_internal( &ctx->ctx.mbed_ecdh, olen,
ctx->point_format, buf, blen, ctx->point_format, buf, buf_len,
f_rng, p_rng ) ); f_rng, p_rng ) );
default: default:
return MBEDTLS_ERR_ECP_BAD_INPUT_DATA; return MBEDTLS_ERR_ECP_BAD_INPUT_DATA;

2
library/ssl_misc.h
View file

@ -1640,7 +1640,7 @@ int mbedtls_ssl_tls13_fetch_handshake_msg( mbedtls_ssl_context *ssl,
int mbedtls_ssl_tls13_start_handshake_msg( mbedtls_ssl_context *ssl, int mbedtls_ssl_tls13_start_handshake_msg( mbedtls_ssl_context *ssl,
unsigned hs_type, unsigned hs_type,
unsigned char **buf, unsigned char **buf,
size_t *buflen ); size_t *buf_len );
/* /*
* Handler of TLS 1.3 server certificate message * Handler of TLS 1.3 server certificate message

38
library/ssl_tls13_keys.h
View file

@ -96,16 +96,16 @@ extern const struct mbedtls_ssl_tls13_labels_struct mbedtls_ssl_tls13_labels;
* \param hash_alg The identifier for the hash algorithm to use. * \param hash_alg The identifier for the hash algorithm to use.
* \param secret The \c Secret argument to \c HKDF-Expand-Label. * \param secret The \c Secret argument to \c HKDF-Expand-Label.
* This must be a readable buffer of length \p slen Bytes. * This must be a readable buffer of length \p slen Bytes.
* \param slen The length of \p secret in Bytes. * \param secret_len The length of \p secret in Bytes.
* \param label The \c Label argument to \c HKDF-Expand-Label. * \param label The \c Label argument to \c HKDF-Expand-Label.
* This must be a readable buffer of length \p llen Bytes. * This must be a readable buffer of length \p llen Bytes.
* \param llen The length of \p label in Bytes. * \param label_len The length of \p label in Bytes.
* \param ctx The \c Context argument to \c HKDF-Expand-Label. * \param ctx The \c Context argument to \c HKDF-Expand-Label.
* This must be a readable buffer of length \p clen Bytes. * This must be a readable buffer of length \p clen Bytes.
* \param clen The length of \p context in Bytes. * \param ctx_len The length of \p context in Bytes.
* \param buf The destination buffer to hold the expanded secret. * \param buf The destination buffer to hold the expanded secret.
* This must be a writable buffer of length \p blen Bytes. * This must be a writable buffer of length \p blen Bytes.
* \param blen The desired size of the expanded secret in Bytes. * \param buf_len The desired size of the expanded secret in Bytes.
* *
* \returns \c 0 on success. * \returns \c 0 on success.
* \return A negative error code on failure. * \return A negative error code on failure.
@ -113,10 +113,10 @@ extern const struct mbedtls_ssl_tls13_labels_struct mbedtls_ssl_tls13_labels;
int mbedtls_ssl_tls13_hkdf_expand_label( int mbedtls_ssl_tls13_hkdf_expand_label(
mbedtls_md_type_t hash_alg, mbedtls_md_type_t hash_alg,
const unsigned char *secret, size_t slen, const unsigned char *secret, size_t secret_len,
const unsigned char *label, size_t llen, const unsigned char *label, size_t label_len,
const unsigned char *ctx, size_t clen, const unsigned char *ctx, size_t ctx_len,
unsigned char *buf, size_t blen ); unsigned char *buf, size_t buf_len );
/** /**
* \brief This function is part of the TLS 1.3 key schedule. * \brief This function is part of the TLS 1.3 key schedule.
@ -136,7 +136,7 @@ int mbedtls_ssl_tls13_hkdf_expand_label(
* This must be a readable buffer of size \p slen Bytes * This must be a readable buffer of size \p slen Bytes
* \param server_secret The server traffic secret. * \param server_secret The server traffic secret.
* This must be a readable buffer of size \p slen Bytes * This must be a readable buffer of size \p slen Bytes
* \param slen Length of the secrets \p client_secret and * \param secret_len Length of the secrets \p client_secret and
* \p server_secret in Bytes. * \p server_secret in Bytes.
* \param key_len The desired length of the key to be extracted in Bytes. * \param key_len The desired length of the key to be extracted in Bytes.
* \param iv_len The desired length of the IV to be extracted in Bytes. * \param iv_len The desired length of the IV to be extracted in Bytes.
@ -150,8 +150,8 @@ int mbedtls_ssl_tls13_hkdf_expand_label(
int mbedtls_ssl_tls13_make_traffic_keys( int mbedtls_ssl_tls13_make_traffic_keys(
mbedtls_md_type_t hash_alg, mbedtls_md_type_t hash_alg,
const unsigned char *client_secret, const unsigned char *client_secret,
const unsigned char *server_secret, const unsigned char *server_secret, size_t secret_len,
size_t slen, size_t key_len, size_t iv_len, size_t key_len, size_t iv_len,
mbedtls_ssl_key_set *keys ); mbedtls_ssl_key_set *keys );
@ -172,14 +172,14 @@ int mbedtls_ssl_tls13_make_traffic_keys(
* applications of HKDF. * applications of HKDF.
* \param secret The \c Secret argument to the \c Derive-Secret function. * \param secret The \c Secret argument to the \c Derive-Secret function.
* This must be a readable buffer of length \p slen Bytes. * This must be a readable buffer of length \p slen Bytes.
* \param slen The length of \p secret in Bytes. * \param secret_len The length of \p secret in Bytes.
* \param label The \c Label argument to the \c Derive-Secret function. * \param label The \c Label argument to the \c Derive-Secret function.
* This must be a readable buffer of length \p llen Bytes. * This must be a readable buffer of length \p llen Bytes.
* \param llen The length of \p label in Bytes. * \param label_len The length of \p label in Bytes.
* \param ctx The hash of the \c Messages argument to the * \param ctx The hash of the \c Messages argument to the
* \c Derive-Secret function, or the \c Messages argument * \c Derive-Secret function, or the \c Messages argument
* itself, depending on \p context_already_hashed. * itself, depending on \p context_already_hashed.
* \param clen The length of \p hash. * \param ctx_len The length of \p hash.
* \param ctx_hashed This indicates whether the \p ctx contains the hash of * \param ctx_hashed This indicates whether the \p ctx contains the hash of
* the \c Messages argument in the application of the * the \c Messages argument in the application of the
* \c Derive-Secret function * \c Derive-Secret function
@ -190,18 +190,18 @@ int mbedtls_ssl_tls13_make_traffic_keys(
* \param dstbuf The target buffer to write the output of * \param dstbuf The target buffer to write the output of
* \c Derive-Secret to. This must be a writable buffer of * \c Derive-Secret to. This must be a writable buffer of
* size \p buflen Bytes. * size \p buflen Bytes.
* \param buflen The length of \p dstbuf in Bytes. * \param dstbuf_len The length of \p dstbuf in Bytes.
* *
* \returns \c 0 on success. * \returns \c 0 on success.
* \returns A negative error code on failure. * \returns A negative error code on failure.
*/ */
int mbedtls_ssl_tls13_derive_secret( int mbedtls_ssl_tls13_derive_secret(
mbedtls_md_type_t hash_alg, mbedtls_md_type_t hash_alg,
const unsigned char *secret, size_t slen, const unsigned char *secret, size_t secret_len,
const unsigned char *label, size_t llen, const unsigned char *label, size_t label_len,
const unsigned char *ctx, size_t clen, const unsigned char *ctx, size_t ctx_len,
int ctx_hashed, int ctx_hashed,
unsigned char *dstbuf, size_t buflen ); unsigned char *dstbuf, size_t dstbuf_len );
/** /**
* \brief Derive TLS 1.3 early data key material from early secret. * \brief Derive TLS 1.3 early data key material from early secret.