diff options
| author | Hanno Becker <hanno.becker@arm.com> | 2019-02-05 13:20:55 +0000 |
|---|---|---|
| committer | Hanno Becker <hanno.becker@arm.com> | 2019-02-26 14:38:09 +0000 |
| commit | 214899390089dceb8c481787eacc43cdda750d62 (patch) | |
| tree | 76a1e41efa80d2a67dc9eadd7195bcdd86936f76 | |
| parent | 6bdfab2cccaf91d8546b471a8e4e4d2979635caa (diff) | |
| download | mbedtls-214899390089dceb8c481787eacc43cdda750d62.zip mbedtls-214899390089dceb8c481787eacc43cdda750d62.tar.gz mbedtls-214899390089dceb8c481787eacc43cdda750d62.tar.bz2 | |
Use helper macro to detect whether some ciphersuite uses CRTs
| -rw-r--r-- | library/ssl_tls.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/library/ssl_tls.c b/library/ssl_tls.c index 8653afc..fdd3e7c 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -5557,13 +5557,7 @@ int mbedtls_ssl_send_alert_message( mbedtls_ssl_context *ssl, /* * Handshake functions */ -#if !defined(MBEDTLS_KEY_EXCHANGE_RSA_ENABLED) && \ - !defined(MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED) && \ - !defined(MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED) && \ - !defined(MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED) && \ - !defined(MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED) && \ - !defined(MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED) && \ - !defined(MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED) +#if !defined(MBEDTLS_KEY_EXCHANGE__WITH_CERT__ENABLED) /* No certificate support -> dummy functions */ int mbedtls_ssl_write_certificate( mbedtls_ssl_context *ssl ) { @@ -5605,7 +5599,7 @@ int mbedtls_ssl_parse_certificate( mbedtls_ssl_context *ssl ) return( MBEDTLS_ERR_SSL_INTERNAL_ERROR ); } -#else +#else /* MBEDTLS_KEY_EXCHANGE__WITH_CERT__ENABLED */ /* Some certificate support -> implement write and parse */ int mbedtls_ssl_write_certificate( mbedtls_ssl_context *ssl ) @@ -6189,13 +6183,7 @@ exit: ssl->state++; return( ret ); } -#endif /* !MBEDTLS_KEY_EXCHANGE_RSA_ENABLED - !MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED - !MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED - !MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED - !MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED - !MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED - !MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED */ +#endif /* MBEDTLS_KEY_EXCHANGE__WITH_CERT__ENABLED */ int mbedtls_ssl_write_change_cipher_spec( mbedtls_ssl_context *ssl ) { |