lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-28 00:21:48 +03:00
Code Activity

Rename ecdh_curve_list to curve_list

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard
2014-02-04 13:58:39 +01:00
parent 5de2580563
commit de05390c85
4 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
library/ssl_srv.c
View File

@ -2106,12 +2106,12 @@ static int ssl_write_server_key_exchange( ssl_context *ssl )
* } ServerECDHParams;
*/
ecp_group_id grp_id;
#if defined(POLARSSL_SSL_SET_ECDH_CURVES)
#if defined(POLARSSL_SSL_SET_CURVES)
unsigned int pref_idx, curv_idx, found;
/* Match our preference list against the agreed curves */
for( pref_idx = 0, found = 0;
ssl->ecdh_curve_list[pref_idx] != POLARSSL_ECP_DP_NONE;
ssl->curve_list[pref_idx] != POLARSSL_ECP_DP_NONE;
pref_idx++ )
{
/* Look through the agreed curve list */
@ -2120,7 +2120,7 @@ static int ssl_write_server_key_exchange( ssl_context *ssl )
curv_idx++ )
{
if (ssl->handshake->curves[curv_idx]->grp_id ==
ssl->ecdh_curve_list[pref_idx] )
ssl->curve_list[pref_idx] )
{
/* We found our most preferred curve */
found = 1;
@ -2130,18 +2130,18 @@ static int ssl_write_server_key_exchange( ssl_context *ssl )
/* Exit the search if we have found our curve */
if( found == 1 )
{
break;
}
}
/* If we haven't found any allowed / preferred curve,
* ssl->ecdh_curve_list[pref_idx] will contain POLARSSL_ECP_DP_NONE and
/*
* If we haven't found any allowed / preferred curve,
* ssl->curve_list[pref_idx] will contain POLARSSL_ECP_DP_NONE and
* ecp_use_known_dp() will fail.
*/
grp_id = ssl->ecdh_curve_list[pref_idx];
grp_id = ssl->curve_list[pref_idx];
#else
grp_id = ssl->handshake->curves[0]->grp_id;
#endif /* POLARSSL_SSL_SET_ECDH_CURVES */
#endif /* POLARSSL_SSL_SET_CURVES */
if( ( ret = ecp_use_known_dp( &ssl->handshake->ecdh_ctx.grp,
grp_id ) ) != 0 )