diff options
Diffstat (limited to 'lib/ext/ext_master_secret.c')
| -rw-r--r-- | lib/ext/ext_master_secret.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/lib/ext/ext_master_secret.c b/lib/ext/ext_master_secret.c index bc704e6b6a..a438cd7b18 100644 --- a/lib/ext/ext_master_secret.c +++ b/lib/ext/ext_master_secret.c @@ -30,10 +30,10 @@ #include <ext/ext_master_secret.h> static int _gnutls_ext_master_secret_recv_params(gnutls_session_t session, - const uint8_t * data, - size_t data_size); + const uint8_t * data, + size_t data_size); static int _gnutls_ext_master_secret_send_params(gnutls_session_t session, - gnutls_buffer_st * extdata); + gnutls_buffer_st * extdata); const hello_ext_entry_st ext_mod_ext_master_secret = { .name = "Extended Master Secret", @@ -41,8 +41,9 @@ const hello_ext_entry_st ext_mod_ext_master_secret = { .gid = GNUTLS_EXTENSION_EXT_MASTER_SECRET, .client_parse_point = GNUTLS_EXT_MANDATORY, .server_parse_point = GNUTLS_EXT_MANDATORY, - .validity = GNUTLS_EXT_FLAG_TLS|GNUTLS_EXT_FLAG_DTLS | GNUTLS_EXT_FLAG_CLIENT_HELLO | - GNUTLS_EXT_FLAG_TLS12_SERVER_HELLO, + .validity = + GNUTLS_EXT_FLAG_TLS | GNUTLS_EXT_FLAG_DTLS | + GNUTLS_EXT_FLAG_CLIENT_HELLO | GNUTLS_EXT_FLAG_TLS12_SERVER_HELLO, .recv_func = _gnutls_ext_master_secret_recv_params, .send_func = _gnutls_ext_master_secret_send_params, .pack_func = NULL, @@ -55,8 +56,9 @@ const hello_ext_entry_st ext_mod_ext_master_secret = { static inline unsigned have_only_ssl3_enabled(gnutls_session_t session) { if (session->internals.priorities->protocol.num_priorities == 1 && - session->internals.priorities->protocol.priorities[0] == GNUTLS_SSL3) - return 1; + session->internals.priorities->protocol.priorities[0] == + GNUTLS_SSL3) + return 1; return 0; } #endif @@ -68,7 +70,7 @@ static inline unsigned have_only_ssl3_enabled(gnutls_session_t session) */ static int _gnutls_ext_master_secret_recv_params(gnutls_session_t session, - const uint8_t * data, size_t _data_size) + const uint8_t * data, size_t _data_size) { ssize_t data_size = _data_size; @@ -81,7 +83,6 @@ _gnutls_ext_master_secret_recv_params(gnutls_session_t session, if (data_size != 0) { return gnutls_assert_val(GNUTLS_E_UNEXPECTED_PACKET_LENGTH); } - #ifdef ENABLE_SSL3 if (session->security_parameters.entity == GNUTLS_CLIENT) { const version_entry_st *ver = get_version(session); @@ -91,7 +92,7 @@ _gnutls_ext_master_secret_recv_params(gnutls_session_t session, if (ver->id != GNUTLS_SSL3) session->security_parameters.ext_master_secret = 1; - /* do not enable ext master secret if SSL 3.0 is the only protocol supported by server */ + /* do not enable ext master secret if SSL 3.0 is the only protocol supported by server */ } else if (!have_only_ssl3_enabled(session)) #endif session->security_parameters.ext_master_secret = 1; @@ -103,32 +104,32 @@ _gnutls_ext_master_secret_recv_params(gnutls_session_t session, */ static int _gnutls_ext_master_secret_send_params(gnutls_session_t session, - gnutls_buffer_st * extdata) + gnutls_buffer_st * extdata) { if ((session->internals.flags & GNUTLS_NO_EXTENSIONS) || session->internals.priorities->no_extensions != 0 || session->internals.no_ext_master_secret != 0) { - session->security_parameters.ext_master_secret = 0; - return 0; + session->security_parameters.ext_master_secret = 0; + return 0; } /* this function sends the client extension data */ #ifdef ENABLE_SSL3 if (session->security_parameters.entity == GNUTLS_CLIENT) { if (have_only_ssl3_enabled(session)) - return 0; /* this extension isn't available for SSL 3.0 */ + return 0; /* this extension isn't available for SSL 3.0 */ return GNUTLS_E_INT_RET_0; - } else { /* server side */ + } else { /* server side */ const version_entry_st *ver = get_version(session); if (unlikely(ver == NULL)) return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR); - if (ver->id != GNUTLS_SSL3 && session->security_parameters.ext_master_secret != 0) + if (ver->id != GNUTLS_SSL3 + && session->security_parameters.ext_master_secret != 0) return GNUTLS_E_INT_RET_0; } - return 0; #else if (session->security_parameters.entity == GNUTLS_CLIENT || @@ -152,4 +153,3 @@ unsigned gnutls_session_ext_master_secret_status(gnutls_session_t session) { return session->security_parameters.ext_master_secret; } - |