yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-26 12:05:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add context-using functions for Hello extensions

Browse Source 
Also re-order functions in the header so that they appear in the order they're
use, ie free() last.
This commit is contained in:
Manuel Pégourié-Gonnard 2015-08-12 20:50:31 +02:00
parent 7af8bc1007
commit 4e8bc78ad9
2 changed files with 134 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
include/mbedtls/ecjpake.h
View File

@ -52,13 +52,6 @@ typedef struct
*/ */
void mbedtls_ecjpake_init( mbedtls_ecjpake_context *ctx ); void mbedtls_ecjpake_init( mbedtls_ecjpake_context *ctx );
/*
* \brief Free a context's content
*
* \param ctx context to free
*/
void mbedtls_ecjpake_free( mbedtls_ecjpake_context *ctx );
/* /*
* \brief Set up a context for use * \brief Set up a context for use
* *
@ -76,6 +69,79 @@ int mbedtls_ecjpake_setup( mbedtls_ecjpake_context *ctx,
mbedtls_md_type_t hash, mbedtls_md_type_t hash,
mbedtls_ecp_group_id curve ); mbedtls_ecp_group_id curve );
/*
* \brief Generate and write contents of ClientHello extension
* (excluding extension type and length bytes)
*
* \param ctx Context to use
* \param buf Buffer to write the contents to
* \param len Buffer size
* \param olen Will be updated with the number of bytes written
* \param f_rng RNG function
* \param p_rng RNG parameter
*
* \return 0 if successfull,
* a negative error code otherwise
*/
int mbedtls_ecjpake_tls_write_client_ext( mbedtls_ecjpake_context *ctx,
unsigned char *buf, size_t len, size_t *olen,
int (*f_rng)(void *, unsigned char *, size_t),
void *p_rng );
/*
* \brief Read and process contents of the ClientHello extension
* (excluding extension type and length bytes)
*
* \param ctx Context to use
* \param buf Pointer to extension contents
* \param len Extension length
*
* \return 0 if successfull,
* a negative error code otherwise
*/
int mbedtls_ecjpake_tls_read_client_ext( mbedtls_ecjpake_context *ctx,
const unsigned char *buf,
size_t len );
/*
* \brief Generate and write contents of ServerHello extension
* (excluding extension type and length bytes)
*
* \param ctx Context to use
* \param buf Buffer to write the contents to
* \param len Buffer size
* \param olen Will be updated with the number of bytes written
* \param f_rng RNG function
* \param p_rng RNG parameter
*
* \return 0 if successfull,
* a negative error code otherwise
*/
int mbedtls_ecjpake_tls_write_server_ext( mbedtls_ecjpake_context *ctx,
unsigned char *buf, size_t len, size_t *olen,
int (*f_rng)(void *, unsigned char *, size_t),
void *p_rng );
/*
* \brief Read and process contents of the ServerHello extension
* (excluding extension type and length bytes)
*
* \param ctx Context to use
* \param buf Pointer to extension contents
* \param len Extension length
*
* \return 0 if successfull,
* a negative error code otherwise
*/
int mbedtls_ecjpake_tls_read_server_ext( mbedtls_ecjpake_context *ctx,
const unsigned char *buf,
size_t len );
/*
* \brief Free a context's content
*
* \param ctx context to free
*/
void mbedtls_ecjpake_free( mbedtls_ecjpake_context *ctx );
#if defined(MBEDTLS_SELF_TEST) #if defined(MBEDTLS_SELF_TEST)
/** /**
* \brief Checkup routine * \brief Checkup routine

88
library/ecjpake.c
View File

@ -437,6 +437,56 @@ cleanup:
return( ret ); return( ret );
} }
/*
* Read the contents of the ClientHello extension
*/
int mbedtls_ecjpake_tls_read_client_ext( mbedtls_ecjpake_context *ctx,
const unsigned char *buf,
size_t len )
{
return( ecjpake_kkpp_read( ctx->md_info, &ctx->grp, &ctx->grp.G,
&ctx->X1, &ctx->X2, "client",
buf, len ) );
}
/*
* Read the contents of the ServerHello extension
*/
int mbedtls_ecjpake_tls_read_server_ext( mbedtls_ecjpake_context *ctx,
const unsigned char *buf,
size_t len )
{
return( ecjpake_kkpp_read( ctx->md_info, &ctx->grp, &ctx->grp.G,
&ctx->X3, &ctx->X4, "server",
buf, len ) );
}
/*
* Generate the contents of the ClientHello extension
*/
int mbedtls_ecjpake_tls_write_client_ext( mbedtls_ecjpake_context *ctx,
unsigned char *buf, size_t len, size_t *olen,
int (*f_rng)(void *, unsigned char *, size_t),
void *p_rng )
{
return( ecjpake_kkpp_write( ctx->md_info, &ctx->grp, &ctx->grp.G,
&ctx->xa, &ctx->X1, &ctx->xb, &ctx->X2,
"client", buf, len, olen, f_rng, p_rng ) );
}
/*
* Generate the contents of the ServerHello extension
*/
int mbedtls_ecjpake_tls_write_server_ext( mbedtls_ecjpake_context *ctx,
unsigned char *buf, size_t len, size_t *olen,
int (*f_rng)(void *, unsigned char *, size_t),
void *p_rng )
{
return( ecjpake_kkpp_write( ctx->md_info, &ctx->grp, &ctx->grp.G,
&ctx->xa, &ctx->X3, &ctx->xb, &ctx->X4,
"server", buf, len, olen, f_rng, p_rng ) );
}
#if defined(MBEDTLS_SELF_TEST) #if defined(MBEDTLS_SELF_TEST)
#if defined(MBEDTLS_PLATFORM_C) #if defined(MBEDTLS_PLATFORM_C)
@ -522,36 +572,27 @@ static int ecjpake_lgc( void *p, unsigned char *out, size_t len )
int mbedtls_ecjpake_self_test( int verbose ) int mbedtls_ecjpake_self_test( int verbose )
{ {
int ret; int ret;
mbedtls_ecp_group grp; mbedtls_ecjpake_context ctx;
mbedtls_ecp_point Xa, Xb;
mbedtls_mpi xa, xb;
const mbedtls_md_info_t *md_info;
unsigned char buf[1000]; unsigned char buf[1000];
size_t len; size_t len;
mbedtls_ecp_group_init( &grp ); mbedtls_ecjpake_init( &ctx );
mbedtls_ecp_point_init( &Xa );
mbedtls_ecp_point_init( &Xb );
mbedtls_mpi_init( &xa );
mbedtls_mpi_init( &xb );
/* Common to all tests */ /* Common to all tests */
md_info = mbedtls_md_info_from_type( MBEDTLS_MD_SHA256 ); TEST_ASSERT( mbedtls_ecjpake_setup( &ctx, MBEDTLS_MD_SHA256,
MBEDTLS_MPI_CHK( mbedtls_ecp_group_load( &grp, MBEDTLS_ECP_DP_SECP256R1 ) ); MBEDTLS_ECP_DP_SECP256R1 ) == 0 );
if( verbose != 0 ) if( verbose != 0 )
mbedtls_printf( " ECJPAKE test #1 (kkpp read): " ); mbedtls_printf( " ECJPAKE test #1 (client ext read): " );
TEST_ASSERT( ecjpake_kkpp_read( md_info, &grp, &grp.G, TEST_ASSERT( mbedtls_ecjpake_tls_read_client_ext( &ctx,
&Xa, &Xb, "client",
ecjpake_test_kkpp, ecjpake_test_kkpp,
sizeof( ecjpake_test_kkpp ) ) == 0 ); sizeof( ecjpake_test_kkpp ) ) == 0 );
/* Corrupt message */ /* Corrupt message */
memcpy( buf, ecjpake_test_kkpp, sizeof( ecjpake_test_kkpp ) ); memcpy( buf, ecjpake_test_kkpp, sizeof( ecjpake_test_kkpp ) );
buf[sizeof( ecjpake_test_kkpp ) - 1]--; buf[sizeof( ecjpake_test_kkpp ) - 1]--;
TEST_ASSERT( ecjpake_kkpp_read( md_info, &grp, &grp.G, TEST_ASSERT( mbedtls_ecjpake_tls_read_client_ext( &ctx,
&Xa, &Xb, "client",
buf, sizeof( ecjpake_test_kkpp ) ) buf, sizeof( ecjpake_test_kkpp ) )
== MBEDTLS_ERR_ECP_VERIFY_FAILED ); == MBEDTLS_ERR_ECP_VERIFY_FAILED );
@ -559,26 +600,19 @@ int mbedtls_ecjpake_self_test( int verbose )
mbedtls_printf( "passed\n" ); mbedtls_printf( "passed\n" );
if( verbose != 0 ) if( verbose != 0 )
mbedtls_printf( " ECJPAKE test #2 (kkpp write/read): " ); mbedtls_printf( " ECJPAKE test #2 (client ext write/read): " );
TEST_ASSERT( ecjpake_kkpp_write( md_info, &grp, &grp.G, TEST_ASSERT( mbedtls_ecjpake_tls_write_client_ext( &ctx,
&xa, &Xa, &xb, &Xb, "client",
buf, sizeof( buf ), &len, buf, sizeof( buf ), &len,
ecjpake_lgc, NULL ) == 0 ); ecjpake_lgc, NULL ) == 0 );
TEST_ASSERT( ecjpake_kkpp_read( md_info, &grp, &grp.G, TEST_ASSERT( mbedtls_ecjpake_tls_read_client_ext( &ctx, buf, len ) == 0 );
&Xa, &Xb, "client",
buf, len ) == 0 );
if( verbose != 0 ) if( verbose != 0 )
mbedtls_printf( "passed\n" ); mbedtls_printf( "passed\n" );
cleanup: cleanup:
mbedtls_ecp_group_free( &grp ); mbedtls_ecjpake_free( &ctx );
mbedtls_ecp_point_free( &Xa );
mbedtls_ecp_point_free( &Xb );
mbedtls_mpi_free( &xa );
mbedtls_mpi_free( &xb );
if( ret != 0 ) if( ret != 0 )
{ {