Fix a few style issues

This commit is contained in:
Manuel Pégourié-Gonnard 2019-06-12 10:18:26 +02:00
parent 8794a4290d
commit ec1c222947
5 changed files with 6 additions and 6 deletions

View file

@ -566,7 +566,7 @@
#endif #endif
#if defined(MBEDTLS_SSL_TLS_C) && \ #if defined(MBEDTLS_SSL_TLS_C) && \
(!defined(MBEDTLS_SSL_PROTO_TLS) && !defined(MBEDTLS_SSL_PROTO_DTLS)) ( !defined(MBEDTLS_SSL_PROTO_TLS) && !defined(MBEDTLS_SSL_PROTO_DTLS) )
#error "MBEDTLS_SSL_TLS_C defined, but neither TLS or DTLS is active" #error "MBEDTLS_SSL_TLS_C defined, but neither TLS or DTLS is active"
#endif #endif

View file

@ -1525,7 +1525,7 @@
* Enable this and MBEDTLS_SSL_PROTO_TLS1_2 to enable TLS 1.2; * Enable this and MBEDTLS_SSL_PROTO_TLS1_2 to enable TLS 1.2;
* enable this and MBEDTLS_SSL_PROTO_TLS1_1 to enable TLS 1.1; * enable this and MBEDTLS_SSL_PROTO_TLS1_1 to enable TLS 1.1;
* enable this and MBEDTLS_SSL_PROTO_TLS1 to enable TLS 1.0; * enable this and MBEDTLS_SSL_PROTO_TLS1 to enable TLS 1.0;
* and/or this and MBEDTLS_SSL_PROTO_SSL3 to enable SSL 3.0 (deprecated). * and/or this and MBEDTLS_SSL_PROTO_SSL3 to enable SSL 3.0 (deprecated).
* *
* \see MBEDTLS_SSL_PROTO_DTLS * \see MBEDTLS_SSL_PROTO_DTLS
* *

View file

@ -270,7 +270,7 @@
* Goals for these helpers: * Goals for these helpers:
* - generate minimal code, eg don't test if mode is DTLS in a DTLS-only build * - generate minimal code, eg don't test if mode is DTLS in a DTLS-only build
* - make the flow clear to the compiler, so that in TLS and DTLS combined * - make the flow clear to the compiler, so that in TLS and DTLS combined
* builds, when there are two branches, it knows exactly one of them is taken * builds, when there are two branches, it knows exactly one of them is taken
* - preserve readability * - preserve readability
* *
* There are three macros: * There are three macros:

View file

@ -1663,7 +1663,7 @@ read_record_header:
{ {
ciph_offset = 35 + sess_len; ciph_offset = 35 + sess_len;
} }
#endif #endif /* MBEDTLS_SSL_PROTO_TLS */
ciph_len = ( buf[ciph_offset + 0] << 8 ) ciph_len = ( buf[ciph_offset + 0] << 8 )
| ( buf[ciph_offset + 1] ); | ( buf[ciph_offset + 1] );

View file

@ -4216,7 +4216,7 @@ int mbedtls_ssl_prepare_handshake_record( mbedtls_ssl_context *ssl )
return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE ); return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE );
} }
} }
#endif #endif /* MBEDTLS_SSL_PROTO_TLS */
return( 0 ); return( 0 );
} }
@ -10847,7 +10847,7 @@ void mbedtls_ssl_read_version( int *major, int *minor, int transport,
*major = ver[0]; *major = ver[0];
*minor = ver[1]; *minor = ver[1];
} }
#endif #endif /* MBEDTLS_SSL_PROTO_TLS */
} }
int mbedtls_ssl_set_calc_verify_md( mbedtls_ssl_context *ssl, int md ) int mbedtls_ssl_set_calc_verify_md( mbedtls_ssl_context *ssl, int md )