AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace explicit IDs with table look-ups

Browse Source 
That's a first step towards merging symmetric version of different functions
This commit is contained in:
Manuel Pégourié-Gonnard 2015-08-14 11:10:39 +02:00
parent 5f18829609
commit e0ad57b0b3
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mbedtls/ecjpake.h
View File

@ -31,7 +31,7 @@ extern "C" {
#endif #endif
typedef enum { typedef enum {
MBEDTLS_ECJPAKE_CLIENT, MBEDTLS_ECJPAKE_CLIENT = 0,
MBEDTLS_ECJPAKE_SERVER, MBEDTLS_ECJPAKE_SERVER,
} mbedtls_ecjpake_role; } mbedtls_ecjpake_role;

31
library/ecjpake.c
View File

@ -36,6 +36,17 @@
#include <string.h> #include <string.h>
/*
* Convert a mbedtls_ecjpake_role to identifier string
*/
static const char * const ecjpake_id[] = {
"client",
"server"
};
#define ID_MINE ( ecjpake_id[ ctx->role ] )
#define ID_PEER ( ecjpake_id[ 1 - ctx->role ] )
/* /*
* Initialize context * Initialize context
*/ */
@ -460,7 +471,7 @@ int mbedtls_ecjpake_tls_read_client_ext( mbedtls_ecjpake_context *ctx,
size_t len ) size_t len )
{ {
return( ecjpake_kkpp_read( ctx->md_info, &ctx->grp, &ctx->grp.G, return( ecjpake_kkpp_read( ctx->md_info, &ctx->grp, &ctx->grp.G,
&ctx->X1, &ctx->X2, "client", &ctx->X1, &ctx->X2, ID_PEER,
buf, len ) ); buf, len ) );
} }
@ -472,7 +483,7 @@ int mbedtls_ecjpake_tls_read_server_ext( mbedtls_ecjpake_context *ctx,
size_t len ) size_t len )
{ {
return( ecjpake_kkpp_read( ctx->md_info, &ctx->grp, &ctx->grp.G, return( ecjpake_kkpp_read( ctx->md_info, &ctx->grp, &ctx->grp.G,
&ctx->X3, &ctx->X4, "server", &ctx->X3, &ctx->X4, ID_PEER,
buf, len ) ); buf, len ) );
} }
@ -486,7 +497,7 @@ int mbedtls_ecjpake_tls_write_client_ext( mbedtls_ecjpake_context *ctx,
{ {
return( ecjpake_kkpp_write( ctx->md_info, &ctx->grp, &ctx->grp.G, return( ecjpake_kkpp_write( ctx->md_info, &ctx->grp, &ctx->grp.G,
&ctx->xa, &ctx->X1, &ctx->xb, &ctx->X2, &ctx->xa, &ctx->X1, &ctx->xb, &ctx->X2,
"client", buf, len, olen, f_rng, p_rng ) ); ID_MINE, buf, len, olen, f_rng, p_rng ) );
} }
/* /*
@ -499,7 +510,7 @@ int mbedtls_ecjpake_tls_write_server_ext( mbedtls_ecjpake_context *ctx,
{ {
return( ecjpake_kkpp_write( ctx->md_info, &ctx->grp, &ctx->grp.G, return( ecjpake_kkpp_write( ctx->md_info, &ctx->grp, &ctx->grp.G,
&ctx->xa, &ctx->X3, &ctx->xb, &ctx->X4, &ctx->xa, &ctx->X3, &ctx->xb, &ctx->X4,
"server", buf, len, olen, f_rng, p_rng ) ); ID_MINE, buf, len, olen, f_rng, p_rng ) );
} }
/* /*
@ -556,7 +567,7 @@ int mbedtls_ecjpake_tls_read_server_params( mbedtls_ecjpake_context *ctx,
*/ */
MBEDTLS_MPI_CHK( mbedtls_ecp_tls_read_group( &grp, &p, len ) ); MBEDTLS_MPI_CHK( mbedtls_ecp_tls_read_group( &grp, &p, len ) );
MBEDTLS_MPI_CHK( ecjpake_kkp_read( ctx->md_info, &ctx->grp, MBEDTLS_MPI_CHK( ecjpake_kkp_read( ctx->md_info, &ctx->grp,
&GB, &ctx->Xp, "server", &p, end ) ); &GB, &ctx->Xp, ID_PEER, &p, end ) );
if( p != end ) if( p != end )
{ {
@ -632,7 +643,7 @@ int mbedtls_ecjpake_tls_write_server_params( mbedtls_ecjpake_context *ctx,
p += ec_len; p += ec_len;
MBEDTLS_MPI_CHK( ecjpake_zkp_write( ctx->md_info, &ctx->grp, MBEDTLS_MPI_CHK( ecjpake_zkp_write( ctx->md_info, &ctx->grp,
&GB, &xs, &Xs, "server", &GB, &xs, &Xs, ID_MINE,
&p, end, f_rng, p_rng ) ); &p, end, f_rng, p_rng ) );
*olen = p - buf; *olen = p - buf;
@ -674,7 +685,7 @@ int mbedtls_ecjpake_tls_read_client_params( mbedtls_ecjpake_context *ctx,
* } CLientECJPAKEParams; * } CLientECJPAKEParams;
*/ */
MBEDTLS_MPI_CHK( ecjpake_kkp_read( ctx->md_info, &ctx->grp, MBEDTLS_MPI_CHK( ecjpake_kkp_read( ctx->md_info, &ctx->grp,
&GA, &ctx->Xp, "client", &p, end ) ); &GA, &ctx->Xp, ID_PEER, &p, end ) );
if( p != end ) if( p != end )
{ {
@ -732,7 +743,7 @@ int mbedtls_ecjpake_tls_write_client_params( mbedtls_ecjpake_context *ctx,
p += ec_len; p += ec_len;
MBEDTLS_MPI_CHK( ecjpake_zkp_write( ctx->md_info, &ctx->grp, MBEDTLS_MPI_CHK( ecjpake_zkp_write( ctx->md_info, &ctx->grp,
&GA, &xc, &Xc, "client", &GA, &xc, &Xc, ID_MINE,
&p, end, f_rng, p_rng ) ); &p, end, f_rng, p_rng ) );
*olen = p - buf; *olen = p - buf;
@ -798,6 +809,10 @@ cleanup:
return( ret ); return( ret );
} }
#undef ID_MINE
#undef ID_PEER
#if defined(MBEDTLS_SELF_TEST) #if defined(MBEDTLS_SELF_TEST)
#if defined(MBEDTLS_PLATFORM_C) #if defined(MBEDTLS_PLATFORM_C)