ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-05-11 09:22:05 +08:00
Code Issues Releases Wiki Activity

Fix dependency issues

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2015-05-11 12:54:52 +02:00
parent fd862b14c5
commit 8b431fbbec
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/ssl_srv.c
View File

@ -2725,9 +2725,12 @@ static int ssl_write_certificate_request( mbedtls_ssl_context *ssl )
* opaque DistinguishedName<1..2^16-1>; * opaque DistinguishedName<1..2^16-1>;
*/ */
p += 2; p += 2;
crt = ssl->handshake->sni_ca_chain != NULL ? #if defined(MBEDTLS_SSL_SERVER_NAME_INDICATION)
ssl->handshake->sni_ca_chain : if( ssl->handshake->sni_ca_chain != NULL )
ssl->conf->ca_chain; crt = ssl->handshake->sni_ca_chain;
else
#endif
crt = ssl->conf->ca_chain;
total_dn_size = 0; total_dn_size = 0;
while( crt != NULL && crt->version != 0 ) while( crt != NULL && crt->version != 0 )

4
library/ssl_tls.c
View File

@ -4032,12 +4032,14 @@ int mbedtls_ssl_parse_certificate( mbedtls_ssl_context *ssl )
mbedtls_x509_crt *ca_chain; mbedtls_x509_crt *ca_chain;
mbedtls_x509_crl *ca_crl; mbedtls_x509_crl *ca_crl;
#if defined(MBEDTLS_SSL_SERVER_NAME_INDICATION)
if( ssl->handshake->sni_ca_chain != NULL ) if( ssl->handshake->sni_ca_chain != NULL )
{ {
ca_chain = ssl->handshake->sni_ca_chain; ca_chain = ssl->handshake->sni_ca_chain;
ca_crl = ssl->handshake->sni_ca_crl; ca_crl = ssl->handshake->sni_ca_crl;
} }
else else
#endif
{ {
ca_chain = ssl->conf->ca_chain; ca_chain = ssl->conf->ca_chain;
ca_crl = ssl->conf->ca_crl; ca_crl = ssl->conf->ca_crl;
@ -6616,7 +6618,9 @@ void mbedtls_ssl_config_init( mbedtls_ssl_config *conf )
int mbedtls_ssl_config_defaults( mbedtls_ssl_config *conf, int mbedtls_ssl_config_defaults( mbedtls_ssl_config *conf,
int endpoint, int transport ) int endpoint, int transport )
{ {
#if defined(MBEDTLS_DHM_C) && defined(MBEDTLS_SSL_SRV_C)
int ret; int ret;
#endif
conf->endpoint = endpoint; conf->endpoint = endpoint;
conf->transport = transport; conf->transport = transport;