diff options
author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-09-20 11:30:12 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2018-02-19 15:29:34 +0100 |
commit | e62213a66b74586647fbf374a2e3e46cd7145d8d (patch) | |
tree | c14db65cdd004f1e6518a1511cd619087f2b9ea5 | |
parent | 377410a805eb078eefd43def58c01fbf564ff667 (diff) | |
download | gnutls-e62213a66b74586647fbf374a2e3e46cd7145d8d.tar.gz |
extension: renamed functions to reflect purpose
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-rw-r--r-- | lib/extensions.c | 4 | ||||
-rw-r--r-- | lib/extensions.h | 16 | ||||
-rw-r--r-- | lib/handshake.c | 22 |
3 files changed, 21 insertions, 21 deletions
diff --git a/lib/extensions.c b/lib/extensions.c index c338f6fc0c..33dbbf083c 100644 --- a/lib/extensions.c +++ b/lib/extensions.c @@ -230,7 +230,7 @@ int hello_ext_parse(void *_ctx, uint16_t tls_id, const uint8_t *data, int data_s } int -_gnutls_parse_extensions(gnutls_session_t session, +_gnutls_parse_hello_extensions(gnutls_session_t session, gnutls_ext_flags_t msg, gnutls_ext_parse_type_t parse_type, const uint8_t * data, int data_size) @@ -311,7 +311,7 @@ int hello_ext_send(void *_ctx, gnutls_buffer_st *buf) } int -_gnutls_gen_extensions(gnutls_session_t session, +_gnutls_gen_hello_extensions(gnutls_session_t session, gnutls_buffer_st * buf, gnutls_ext_flags_t msg, gnutls_ext_parse_type_t parse_type) diff --git a/lib/extensions.h b/lib/extensions.h index 364ec3b349..5c0d421462 100644 --- a/lib/extensions.h +++ b/lib/extensions.h @@ -25,14 +25,14 @@ #include <gnutls/gnutls.h> -int _gnutls_parse_extensions(gnutls_session_t session, - gnutls_ext_flags_t msg, - gnutls_ext_parse_type_t parse_type, - const uint8_t * data, int data_size); -int _gnutls_gen_extensions(gnutls_session_t session, - gnutls_buffer_st * extdata, - gnutls_ext_flags_t msg, - gnutls_ext_parse_type_t); +int _gnutls_parse_hello_extensions(gnutls_session_t session, + gnutls_ext_flags_t msg, + gnutls_ext_parse_type_t parse_type, + const uint8_t * data, int data_size); +int _gnutls_gen_hello_extensions(gnutls_session_t session, + gnutls_buffer_st * extdata, + gnutls_ext_flags_t msg, + gnutls_ext_parse_type_t); int _gnutls_ext_init(void); void _gnutls_ext_deinit(void); diff --git a/lib/handshake.c b/lib/handshake.c index 9b35ebe228..3c1526f730 100644 --- a/lib/handshake.c +++ b/lib/handshake.c @@ -544,7 +544,7 @@ read_client_hello(gnutls_session_t session, uint8_t * data, * resumed ones. */ ret = - _gnutls_parse_extensions(session, GNUTLS_EXT_FLAG_CLIENT_HELLO, + _gnutls_parse_hello_extensions(session, GNUTLS_EXT_FLAG_CLIENT_HELLO, GNUTLS_EXT_MANDATORY, ext_ptr, ext_size); if (ret < 0) { @@ -585,7 +585,7 @@ read_client_hello(gnutls_session_t session, uint8_t * data, * Unconditionally try to parse extensions; safe renegotiation uses them in * sslv3 and higher, even though sslv3 doesn't officially support them. */ - ret = _gnutls_parse_extensions(session, GNUTLS_EXT_FLAG_CLIENT_HELLO, + ret = _gnutls_parse_hello_extensions(session, GNUTLS_EXT_FLAG_CLIENT_HELLO, GNUTLS_EXT_APPLICATION, ext_ptr, ext_size); /* len is the rest of the parsed length */ @@ -603,7 +603,7 @@ read_client_hello(gnutls_session_t session, uint8_t * data, /* Session tickets are parsed in this point */ ret = - _gnutls_parse_extensions(session, GNUTLS_EXT_FLAG_CLIENT_HELLO, + _gnutls_parse_hello_extensions(session, GNUTLS_EXT_FLAG_CLIENT_HELLO, GNUTLS_EXT_TLS, ext_ptr, ext_size); if (ret < 0) { gnutls_assert(); @@ -658,7 +658,7 @@ read_client_hello(gnutls_session_t session, uint8_t * data, /* call extensions that are intended to be parsed after the ciphersuite/cert * are known. */ ret = - _gnutls_parse_extensions(session, GNUTLS_EXT_FLAG_CLIENT_HELLO, + _gnutls_parse_hello_extensions(session, GNUTLS_EXT_FLAG_CLIENT_HELLO, _GNUTLS_EXT_TLS_POST_CS, ext_ptr, ext_size); if (ret < 0) { gnutls_assert(); @@ -1572,7 +1572,7 @@ read_server_hello(gnutls_session_t session, DECR_LEN(len, 2 + 1); ret = - _gnutls_parse_extensions(session, GNUTLS_EXT_FLAG_TLS12_SERVER_HELLO, + _gnutls_parse_hello_extensions(session, GNUTLS_EXT_FLAG_TLS12_SERVER_HELLO, GNUTLS_EXT_MANDATORY, &data[pos], len); if (ret < 0) { @@ -1610,7 +1610,7 @@ read_server_hello(gnutls_session_t session, /* Parse extensions in order. */ ret = - _gnutls_parse_extensions(session, + _gnutls_parse_hello_extensions(session, ext_parse_flag, GNUTLS_EXT_MANDATORY, &data[pos], len); @@ -1618,7 +1618,7 @@ read_server_hello(gnutls_session_t session, return gnutls_assert_val(ret); ret = - _gnutls_parse_extensions(session, + _gnutls_parse_hello_extensions(session, ext_parse_flag, GNUTLS_EXT_APPLICATION, &data[pos], len); @@ -1626,7 +1626,7 @@ read_server_hello(gnutls_session_t session, return gnutls_assert_val(ret); ret = - _gnutls_parse_extensions(session, + _gnutls_parse_hello_extensions(session, ext_parse_flag, GNUTLS_EXT_TLS, &data[pos], len); @@ -1634,7 +1634,7 @@ read_server_hello(gnutls_session_t session, return gnutls_assert_val(ret); ret = - _gnutls_parse_extensions(session, + _gnutls_parse_hello_extensions(session, ext_parse_flag, _GNUTLS_EXT_TLS_POST_CS, &data[pos], len); @@ -1835,7 +1835,7 @@ static int send_client_hello(gnutls_session_t session, int again) } ret = - _gnutls_gen_extensions(session, &extdata, + _gnutls_gen_hello_extensions(session, &extdata, GNUTLS_EXT_FLAG_CLIENT_HELLO, type); if (ret < 0) { @@ -1900,7 +1900,7 @@ static int send_server_hello(gnutls_session_t session, int again) ext_parse_flag = GNUTLS_EXT_FLAG_TLS12_SERVER_HELLO; ret = - _gnutls_gen_extensions(session, &extdata, + _gnutls_gen_hello_extensions(session, &extdata, ext_parse_flag, (session->internals.resumed == RESUME_TRUE) ? |