TeamHepta/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-05-09 03:04:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixup: Add missing TinyCrypt guards

Browse Source
This commit is contained in:
Hanno Becker
2019-08-23 12:01:45 +01:00
parent 8239fad855
commit 88889c618e
7 changed files with 64 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
programs/ssl/ssl_server2.c
View File

@@ -2610,7 +2610,7 @@ int main( int argc, char *argv[] )
}
key_cert_init = 2;
#endif /* MBEDTLS_RSA_C */
#if defined(MBEDTLS_ECDSA_C)
#if defined(MBEDTLS_ECDSA_C) || defined(MBEDTLS_USE_TINYCRYPT)
if( ( ret = mbedtls_x509_crt_parse( &srvcert2,
(const unsigned char *) mbedtls_test_srv_crt_ec,
mbedtls_test_srv_crt_ec_len ) ) != 0 )
@@ -2628,7 +2628,7 @@ int main( int argc, char *argv[] )
goto exit;
}
key_cert_init2 = 2;
#endif /* MBEDTLS_ECDSA_C */
#endif /* MBEDTLS_ECDSA_C || MBEDTLS_USE_TINYCRYPT */
#endif /* MBEDTLS_CERTS_C */
}
@@ -3070,7 +3070,7 @@ int main( int argc, char *argv[] )
mbedtls_ssl_conf_curves( &conf, curve_list );
}
#endif /* !MBEDTLS_SSL_CONF_SINGLE_EC */
#endif /* MBEDTLS_ECP_C */
#endif /* MBEDTLS_ECP_C*/
#if defined(MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED)
if( strlen( opt.psk ) != 0 && strlen( opt.psk_identity ) != 0 )