mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-25 00:02:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unify internal/external TLS protocol version enums

Browse Source 
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
This commit is contained in:
Glenn Strauss 2022-03-14 11:12:57 -04:00
parent a91b68564c
commit dff84620a0
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog.d/mbedtls_tlsver_enum.txt Normal file
View File

@ -0,0 +1,2 @@
Features
* Unify internal/external TLS protocol version enums

16
include/mbedtls/ssl.h
View File

@ -1099,6 +1099,14 @@ mbedtls_dtls_srtp_info;
#endif /* MBEDTLS_SSL_DTLS_SRTP */ #endif /* MBEDTLS_SSL_DTLS_SRTP */
/** Human-friendly representation of the (D)TLS protocol version. */
typedef enum
{
MBEDTLS_SSL_VERSION_UNKNOWN, /*!< Context not in use or version not yet negotiated. */
MBEDTLS_SSL_VERSION_TLS1_2 = 0x0303, /*!< (D)TLS 1.2 */
MBEDTLS_SSL_VERSION_TLS1_3 = 0x0304, /*!< (D)TLS 1.3 */
} mbedtls_ssl_protocol_version;
/* /*
* This structure is used for storing current session data. * This structure is used for storing current session data.
* *
@ -1161,14 +1169,6 @@ struct mbedtls_ssl_session
#endif #endif
}; };
/** Human-friendly representation of the (D)TLS protocol version. */
typedef enum
{
MBEDTLS_SSL_VERSION_UNKNOWN, /*!< Context not in use or version not yet negotiated. */
MBEDTLS_SSL_VERSION_1_2, /*!< (D)TLS 1.2 */
MBEDTLS_SSL_VERSION_1_3, /*!< (D)TLS 1.3 */
} mbedtls_ssl_protocol_version;
/* /*
* Identifiers for PRFs used in various versions of TLS. * Identifiers for PRFs used in various versions of TLS.
*/ */

4
library/ssl_tls.c
View File

@ -2328,9 +2328,9 @@ mbedtls_ssl_protocol_version mbedtls_ssl_get_version_number(
switch( ssl->minor_ver ) switch( ssl->minor_ver )
{ {
case MBEDTLS_SSL_MINOR_VERSION_3: case MBEDTLS_SSL_MINOR_VERSION_3:
return( MBEDTLS_SSL_VERSION_1_2 ); return( MBEDTLS_SSL_VERSION_TLS1_2 );
case MBEDTLS_SSL_MINOR_VERSION_4: case MBEDTLS_SSL_MINOR_VERSION_4:
return( MBEDTLS_SSL_VERSION_1_3 ); return( MBEDTLS_SSL_VERSION_TLS1_3 );
default: default:
return( MBEDTLS_SSL_VERSION_UNKNOWN ); return( MBEDTLS_SSL_VERSION_UNKNOWN );
} }

4
tests/suites/test_suite_ssl.function
View File

@ -1879,12 +1879,12 @@ int check_ssl_version( int expected_negotiated_version,
switch( expected_negotiated_version ) switch( expected_negotiated_version )
{ {
case MBEDTLS_SSL_MINOR_VERSION_3: case MBEDTLS_SSL_MINOR_VERSION_3:
TEST_EQUAL( version_number, MBEDTLS_SSL_VERSION_1_2 ); TEST_EQUAL( version_number, MBEDTLS_SSL_VERSION_TLS1_2 );
TEST_ASSERT( strcmp( version_string, "TLSv1.2" ) == 0 ); TEST_ASSERT( strcmp( version_string, "TLSv1.2" ) == 0 );
break; break;
case MBEDTLS_SSL_MINOR_VERSION_4: case MBEDTLS_SSL_MINOR_VERSION_4:
TEST_EQUAL( version_number, MBEDTLS_SSL_VERSION_1_3 ); TEST_EQUAL( version_number, MBEDTLS_SSL_VERSION_TLS1_3 );
TEST_ASSERT( strcmp( version_string, "TLSv1.3" ) == 0 ); TEST_ASSERT( strcmp( version_string, "TLSv1.3" ) == 0 );
break; break;