Clarify code using PSK callback

This commit is contained in:
Manuel Pégourié-Gonnard 2014-07-08 14:15:55 +02:00
parent 0698f7c21a
commit d27680bd5e

View File

@ -2635,11 +2635,10 @@ static int ssl_parse_client_psk_identity( ssl_context *ssl, unsigned char **p,
if( ssl->f_psk != NULL ) if( ssl->f_psk != NULL )
{ {
if( ( ret != ssl->f_psk( ssl->p_psk, ssl, *p, n ) ) != 0 ) if( ssl->f_psk( ssl->p_psk, ssl, *p, n ) != 0 )
ret = POLARSSL_ERR_SSL_UNKNOWN_IDENTITY; ret = POLARSSL_ERR_SSL_UNKNOWN_IDENTITY;
} }
else
if( ret == 0 )
{ {
/* Identity is not a big secret since clients send it in the clear, /* Identity is not a big secret since clients send it in the clear,
* but treat it carefully anyway, just in case */ * but treat it carefully anyway, just in case */
@ -2664,9 +2663,8 @@ static int ssl_parse_client_psk_identity( ssl_context *ssl, unsigned char **p,
} }
*p += n; *p += n;
ret = 0;
return( ret ); return( 0 );
} }
#endif /* POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED */ #endif /* POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED */