1
0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00

Merge dependency fixes

This commit is contained in:
Paul Bakker
2014-04-30 16:50:59 +02:00
6 changed files with 46 additions and 38 deletions

View File

@ -4770,8 +4770,6 @@ md_type_t ssl_md_alg_from_hash( unsigned char hash )
}
}
#endif
#if defined(POLARSSL_SSL_SET_CURVES)
/*
* Check is a curve proposed by the peer is in our list.
@ -4869,3 +4867,5 @@ int ssl_check_cert_usage( const x509_crt *cert,
return( 0 );
}
#endif /* POLARSSL_X509_CRT_PARSE_C */
#endif /* POLARSSL_SSL_TLS_C */

View File

@ -739,7 +739,7 @@ int x509_time_future( const x509_time *from )
*/
int x509_self_test( int verbose )
{
#if defined(POLARSSL_CERTS_C) && defined(POLARSSL_MD5_C)
#if defined(POLARSSL_CERTS_C) && defined(POLARSSL_SHA1_C)
int ret;
int flags;
x509_crt cacert;