fix function name conversion issues
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index 9cf1e4f..016dfe1 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -949,7 +949,7 @@
int mbedtls_ssl_handshake_server_step( mbedtls_ssl_context *ssl );
void mbedtls_ssl_handshake_wrapup( mbedtls_ssl_context *ssl );
#if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL)
-int mbedtls_ssl_handshake_client_step_tls1_3( mbedtls_ssl_context *ssl );
+int mbedtls_ssl_tls13_handshake_client_step( mbedtls_ssl_context *ssl );
int mbedtls_ssl_handshake_server_step_tls1_3( mbedtls_ssl_context *ssl );
#endif
@@ -1385,24 +1385,24 @@
#if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL)
static inline void mbedtls_ssl_handshake_set_state( mbedtls_ssl_context* ssl,
- int state )
+ mbedtls_ssl_states state )
{
ssl->state = state;
}
-int mbedtls_ssl_start_handshake_msg( mbedtls_ssl_context *ssl,
+int mbedtls_ssl_tls13_start_handshake_msg( mbedtls_ssl_context *ssl,
unsigned hs_type,
unsigned char **buf,
size_t *buflen );
-int mbedtls_ssl_finish_handshake_msg( mbedtls_ssl_context *ssl,
+int mbedtls_ssl_tls13_finish_handshake_msg( mbedtls_ssl_context *ssl,
size_t buf_len,
size_t msg_len );
-void mbedtls_ssl_add_hs_hdr_to_checksum( mbedtls_ssl_context *ssl,
+void mbedtls_ssl_tls13_add_hs_hdr_to_checksum( mbedtls_ssl_context *ssl,
unsigned hs_type,
size_t total_hs_len );
#if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED)
-int mbedtls_ssl_write_signature_algorithms_ext( mbedtls_ssl_context *ssl,
+int mbedtls_ssl_tls13_write_signature_algorithms_ext( mbedtls_ssl_context *ssl,
unsigned char *buf, unsigned char *end,
size_t *olen);
#endif /* MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED */
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 1c8c7bd..831cc52 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -5181,7 +5181,7 @@
{
#if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL)
if( mbedtls_ssl_conf_is_tls13_only( ssl->conf ) )
- ret = mbedtls_ssl_handshake_client_step_tls1_3( ssl );
+ ret = mbedtls_ssl_tls13_handshake_client_step( ssl );
#endif /* MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL */
#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c
index 8996e8a..ceb692e 100644
--- a/library/ssl_tls13_client.c
+++ b/library/ssl_tls13_client.c
@@ -33,9 +33,9 @@
#define CLIENT_HELLO_RAND_BYTES_LEN 32
#define CLIENT_HELLO_VERSION_LEN 2
/* Main entry point; orchestrates the other functions */
-static int ssl_client_hello_process( mbedtls_ssl_context *ssl );
+static int ssl_tls13_write_client_hello( mbedtls_ssl_context *ssl );
-int mbedtls_ssl_handshake_client_step_tls1_3( mbedtls_ssl_context *ssl )
+int mbedtls_ssl_tls13_handshake_client_step( mbedtls_ssl_context *ssl )
{
int ret = 0;
@@ -54,7 +54,7 @@
break;
case MBEDTLS_SSL_CLIENT_HELLO:
- ret = ssl_client_hello_process( ssl );
+ ret = ssl_tls13_write_client_hello( ssl );
break;
case MBEDTLS_SSL_SERVER_HELLO:
@@ -72,13 +72,13 @@
}
-static int ssl_client_hello_prepare( mbedtls_ssl_context *ssl );
-static int ssl_client_hello_write_partial( mbedtls_ssl_context *ssl,
+static int ssl_tls13_prepare_client_hello( mbedtls_ssl_context *ssl );
+static int ssl_tls13_write_exts_client_hello( mbedtls_ssl_context *ssl,
unsigned char *buf, size_t buflen,
size_t *len_with_binders );
-static int ssl_client_hello_postprocess( mbedtls_ssl_context *ssl );
+static int ssl_tls13_finalize_client_hello( mbedtls_ssl_context *ssl );
-static int ssl_client_hello_process( mbedtls_ssl_context *ssl )
+static int ssl_tls13_write_client_hello( mbedtls_ssl_context *ssl )
{
int ret = 0;
unsigned char *buf;
@@ -86,21 +86,21 @@
MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> write client hello" ) );
- MBEDTLS_SSL_PROC_CHK( ssl_client_hello_prepare, ( ssl ) );
+ MBEDTLS_SSL_PROC_CHK( ssl_tls13_prepare_client_hello, ( ssl ) );
- MBEDTLS_SSL_PROC_CHK( mbedtls_ssl_start_handshake_msg,
+ MBEDTLS_SSL_PROC_CHK( mbedtls_ssl_tls13_start_handshake_msg,
( ssl, MBEDTLS_SSL_HS_CLIENT_HELLO,
&buf, &buf_len ) );
- MBEDTLS_SSL_PROC_CHK( ssl_client_hello_write_partial,
+ MBEDTLS_SSL_PROC_CHK( ssl_tls13_write_exts_client_hello,
( ssl, buf, buf_len, &msg_len ) );
- mbedtls_ssl_add_hs_hdr_to_checksum( ssl, MBEDTLS_SSL_HS_CLIENT_HELLO,
+ mbedtls_ssl_tls13_add_hs_hdr_to_checksum( ssl, MBEDTLS_SSL_HS_CLIENT_HELLO,
msg_len );
ssl->handshake->update_checksum( ssl, buf, 0 );
- MBEDTLS_SSL_PROC_CHK( ssl_client_hello_postprocess, ( ssl ) );
- MBEDTLS_SSL_PROC_CHK( mbedtls_ssl_finish_handshake_msg,
+ MBEDTLS_SSL_PROC_CHK( ssl_tls13_finalize_client_hello, ( ssl ) );
+ MBEDTLS_SSL_PROC_CHK( mbedtls_ssl_tls13_finish_handshake_msg,
( ssl, buf_len, msg_len ) );
cleanup:
@@ -111,7 +111,7 @@
return ret;
}
-static int ssl_client_hello_prepare( mbedtls_ssl_context *ssl )
+static int ssl_tls13_prepare_client_hello( mbedtls_ssl_context *ssl )
{
int ret;
@@ -126,7 +126,7 @@
return( 0 );
}
-static int ssl_client_hello_postprocess( mbedtls_ssl_context* ssl )
+static int ssl_tls13_finalize_client_hello( mbedtls_ssl_context* ssl )
{
mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_SERVER_HELLO );
@@ -135,26 +135,26 @@
/* Write extensions */
-static int ssl_write_supported_versions_ext( mbedtls_ssl_context *ssl,
+static int ssl_tls13_write_supported_versions_ext( mbedtls_ssl_context *ssl,
unsigned char *buf,
unsigned char *end,
size_t *olen );
#if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED)
-static int ssl_write_supported_groups_ext( mbedtls_ssl_context *ssl,
+static int ssl_tls13_write_supported_groups_ext( mbedtls_ssl_context *ssl,
unsigned char *buf,
unsigned char *end,
size_t *olen );
-static int ssl_write_key_shares_ext( mbedtls_ssl_context *ssl,
+static int ssl_tls13_write_key_shares_ext( mbedtls_ssl_context *ssl,
unsigned char *buf,
unsigned char *end,
size_t *olen );
#endif /* MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED */
-static int ssl_client_hello_write_partial( mbedtls_ssl_context *ssl,
+static int ssl_tls13_write_exts_client_hello( mbedtls_ssl_context *ssl,
unsigned char *buf, size_t buflen,
size_t *len_with_binders )
{
@@ -337,7 +337,7 @@
* For cTLS we only need to provide it if there is more than one version
* and currently there is only one.
*/
- ssl_write_supported_versions_ext( ssl, buf, end, &cur_ext_len );
+ ssl_tls13_write_supported_versions_ext( ssl, buf, end, &cur_ext_len );
total_ext_len += cur_ext_len;
buf += cur_ext_len;
@@ -345,7 +345,7 @@
/* The supported_groups and the key_share extensions are
* REQUIRED for ECDHE ciphersuites.
*/
- ret = ssl_write_supported_groups_ext( ssl, buf, end, &cur_ext_len );
+ ret = ssl_tls13_write_supported_groups_ext( ssl, buf, end, &cur_ext_len );
if( ret != 0 )
return( ret );
@@ -354,7 +354,8 @@
/* The supported_signature_algorithms extension is REQUIRED for
* certificate authenticated ciphersuites. */
- ret = mbedtls_ssl_write_signature_algorithms_ext( ssl, buf, end, &cur_ext_len );
+ ret = mbedtls_ssl_tls13_write_signature_algorithms_ext( ssl, buf,
+ end, &cur_ext_len );
if( ret != 0 )
return( ret );
@@ -369,7 +370,7 @@
* 3 ) Or, in case all ciphers are supported ( which includes #1 and #2 from above )
*/
- ret = ssl_write_key_shares_ext( ssl, buf, end, &cur_ext_len );
+ ret = ssl_tls13_write_key_shares_ext( ssl, buf, end, &cur_ext_len );
if( ret != 0 )
return( ret );
@@ -393,13 +394,13 @@
}
/*
- * ssl_write_supported_versions_ext():
+ * ssl_tls13_write_supported_versions_ext():
*
* struct {
* ProtocolVersion versions<2..254>;
* } SupportedVersions;
*/
-static int ssl_write_supported_versions_ext( mbedtls_ssl_context *ssl,
+static int ssl_tls13_write_supported_versions_ext( mbedtls_ssl_context *ssl,
unsigned char *buf,
unsigned char *end,
size_t *olen )
@@ -438,7 +439,7 @@
#if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED)
-static int ssl_write_supported_groups_ext( mbedtls_ssl_context *ssl,
+static int ssl_tls13_write_supported_groups_ext( mbedtls_ssl_context *ssl,
unsigned char *buf,
unsigned char *end,
size_t *olen )
@@ -450,7 +451,7 @@
return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE );
}
-static int ssl_write_key_shares_ext( mbedtls_ssl_context *ssl,
+static int ssl_tls13_write_key_shares_ext( mbedtls_ssl_context *ssl,
unsigned char *buf,
unsigned char *end,
size_t *olen )
diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c
index 4a0493a..be44141 100644
--- a/library/ssl_tls13_generic.c
+++ b/library/ssl_tls13_generic.c
@@ -27,7 +27,7 @@
#include "ssl_misc.h"
-int mbedtls_ssl_start_handshake_msg( mbedtls_ssl_context *ssl,
+int mbedtls_ssl_tls13_start_handshake_msg( mbedtls_ssl_context *ssl,
unsigned hs_type,
unsigned char **buf,
size_t *buflen )
@@ -41,7 +41,7 @@
return( 0 );
}
-int mbedtls_ssl_finish_handshake_msg( mbedtls_ssl_context *ssl,
+int mbedtls_ssl_tls13_finish_handshake_msg( mbedtls_ssl_context *ssl,
size_t buf_len,
size_t msg_len )
{
@@ -55,7 +55,7 @@
return( ret );
}
-void mbedtls_ssl_add_hs_hdr_to_checksum( mbedtls_ssl_context *ssl,
+void mbedtls_ssl_tls13_add_hs_hdr_to_checksum( mbedtls_ssl_context *ssl,
unsigned hs_type,
size_t total_hs_len )
{
@@ -73,7 +73,7 @@
#if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED)
/*
- * mbedtls_ssl_write_signature_algorithms_ext( )
+ * mbedtls_ssl_tls13_write_signature_algorithms_ext( )
*
* enum {
* ....
@@ -90,7 +90,7 @@
* Only if we handle at least one key exchange that needs signatures.
*/
-int mbedtls_ssl_write_signature_algorithms_ext( mbedtls_ssl_context *ssl,
+int mbedtls_ssl_tls13_write_signature_algorithms_ext( mbedtls_ssl_context *ssl,
unsigned char* buf,
unsigned char* end,
size_t* olen )