diff options
Diffstat (limited to 'lib/gnutls_constate.c')
| -rw-r--r-- | lib/gnutls_constate.c | 120 |
1 files changed, 62 insertions, 58 deletions
diff --git a/lib/gnutls_constate.c b/lib/gnutls_constate.c index 3658949042..5b2678f4e4 100644 --- a/lib/gnutls_constate.c +++ b/lib/gnutls_constate.c @@ -386,7 +386,7 @@ _gnutls_set_write_keys (gnutls_session_t session) gnutls_free(dst->extensions.oprfi_client); \ gnutls_free(dst->extensions.oprfi_server); \ memcpy(&dst->extensions.server_names, &src->extensions, sizeof(src->extensions)); \ - memset(&src->extensions, 0, sizeof(src->extensions)) /* avoid duplicate free's */ + memset(&src->extensions, 0, sizeof(src->extensions)) /* avoid duplicate free's */ #define CPY_COMMON dst->entity = src->entity; \ dst->kx_algorithm = src->kx_algorithm; \ @@ -419,7 +419,7 @@ _gnutls_cpy_write_security_parameters (security_parameters_st * dst, security_parameters_st * src) { CPY_COMMON; - CPY_EXTENSIONS; /* only do once */ + CPY_EXTENSIONS; /* only do once */ dst->write_bulk_cipher_algorithm = src->write_bulk_cipher_algorithm; dst->write_mac_algorithm = src->write_mac_algorithm; @@ -468,35 +468,35 @@ _gnutls_read_connection_state_init (gnutls_session_t session) { rc = _gnutls_set_read_cipher (session, _gnutls_cipher_suite_get_cipher_algo - (&session->security_parameters. - current_cipher_suite)); + (&session-> + security_parameters.current_cipher_suite)); if (rc < 0) return rc; rc = _gnutls_set_read_mac (session, _gnutls_cipher_suite_get_mac_algo - (&session->security_parameters. - current_cipher_suite)); + (&session-> + security_parameters.current_cipher_suite)); if (rc < 0) return rc; rc = _gnutls_set_kx (session, _gnutls_cipher_suite_get_kx_algo - (&session->security_parameters. - current_cipher_suite)); + (&session-> + security_parameters.current_cipher_suite)); if (rc < 0) return rc; rc = _gnutls_set_read_compression (session, - session->internals. - compression_method); + session-> + internals.compression_method); if (rc < 0) return rc; } else { /* RESUME_TRUE */ _gnutls_cpy_read_security_parameters (&session->security_parameters, - &session->internals. - resumed_security_parameters); + &session-> + internals.resumed_security_parameters); } @@ -507,8 +507,8 @@ _gnutls_read_connection_state_init (gnutls_session_t session) _gnutls_handshake_log ("HSK[%p]: Cipher Suite: %s\n", session, _gnutls_cipher_suite_get_name - (&session->security_parameters. - current_cipher_suite)); + (&session-> + security_parameters.current_cipher_suite)); if (_gnutls_compression_is_ok (session->security_parameters.read_compression_algorithm) != 0) @@ -536,8 +536,8 @@ _gnutls_read_connection_state_init (gnutls_session_t session) mac_size = - _gnutls_hash_get_algo_len (session->security_parameters. - read_mac_algorithm); + _gnutls_hash_get_algo_len (session-> + security_parameters.read_mac_algorithm); _gnutls_handshake_log ("HSK[%p]: Initializing internal [read] cipher sessions\n", session); @@ -548,8 +548,8 @@ _gnutls_read_connection_state_init (gnutls_session_t session) /* initialize cipher session */ rc = _gnutls_cipher_init (&session->connection_state.read_cipher_state, - session-> - security_parameters.read_bulk_cipher_algorithm, + session->security_parameters. + read_bulk_cipher_algorithm, &session->cipher_specs.client_write_key, &session->cipher_specs.client_write_IV); if (rc < 0 @@ -566,10 +566,11 @@ _gnutls_read_connection_state_init (gnutls_session_t session) if (mac_size > 0) { if (_gnutls_sset_datum (&session->connection_state.read_mac_secret, - session->cipher_specs. - client_write_mac_secret.data, - session->cipher_specs. - client_write_mac_secret.size) < 0) + session-> + cipher_specs.client_write_mac_secret.data, + session-> + cipher_specs.client_write_mac_secret.size) < + 0) { gnutls_assert (); return GNUTLS_E_MEMORY_ERROR; @@ -581,8 +582,8 @@ _gnutls_read_connection_state_init (gnutls_session_t session) case GNUTLS_CLIENT: rc = _gnutls_cipher_init (&session->connection_state.read_cipher_state, - session-> - security_parameters.read_bulk_cipher_algorithm, + session->security_parameters. + read_bulk_cipher_algorithm, &session->cipher_specs.server_write_key, &session->cipher_specs.server_write_IV); @@ -600,10 +601,11 @@ _gnutls_read_connection_state_init (gnutls_session_t session) if (mac_size > 0) { if (_gnutls_sset_datum (&session->connection_state.read_mac_secret, - session->cipher_specs. - server_write_mac_secret.data, - session->cipher_specs. - server_write_mac_secret.size) < 0) + session-> + cipher_specs.server_write_mac_secret.data, + session-> + cipher_specs.server_write_mac_secret.size) < + 0) { gnutls_assert (); return GNUTLS_E_MEMORY_ERROR; @@ -618,8 +620,8 @@ _gnutls_read_connection_state_init (gnutls_session_t session) } session->connection_state.read_compression_state = - _gnutls_comp_init (session->security_parameters. - read_compression_algorithm, 1); + _gnutls_comp_init (session-> + security_parameters.read_compression_algorithm, 1); if (session->connection_state.read_compression_state == GNUTLS_COMP_FAILED) { @@ -650,35 +652,35 @@ _gnutls_write_connection_state_init (gnutls_session_t session) { rc = _gnutls_set_write_cipher (session, _gnutls_cipher_suite_get_cipher_algo - (&session->security_parameters. - current_cipher_suite)); + (&session-> + security_parameters.current_cipher_suite)); if (rc < 0) return rc; rc = _gnutls_set_write_mac (session, _gnutls_cipher_suite_get_mac_algo - (&session->security_parameters. - current_cipher_suite)); + (&session-> + security_parameters.current_cipher_suite)); if (rc < 0) return rc; rc = _gnutls_set_kx (session, _gnutls_cipher_suite_get_kx_algo - (&session->security_parameters. - current_cipher_suite)); + (&session-> + security_parameters.current_cipher_suite)); if (rc < 0) return rc; rc = _gnutls_set_write_compression (session, - session->internals. - compression_method); + session-> + internals.compression_method); if (rc < 0) return rc; } else { /* RESUME_TRUE */ _gnutls_cpy_write_security_parameters (&session->security_parameters, - &session->internals. - resumed_security_parameters); + &session-> + internals.resumed_security_parameters); } rc = _gnutls_set_write_keys (session); @@ -687,8 +689,8 @@ _gnutls_write_connection_state_init (gnutls_session_t session) _gnutls_handshake_log ("HSK[%p]: Cipher Suite: %s\n", session, _gnutls_cipher_suite_get_name - (&session->security_parameters. - current_cipher_suite)); + (&session-> + security_parameters.current_cipher_suite)); if (_gnutls_compression_is_ok (session->security_parameters.write_compression_algorithm) != 0) @@ -718,8 +720,8 @@ _gnutls_write_connection_state_init (gnutls_session_t session) 0); mac_size = - _gnutls_hash_get_algo_len (session->security_parameters. - write_mac_algorithm); + _gnutls_hash_get_algo_len (session-> + security_parameters.write_mac_algorithm); _gnutls_handshake_log ("HSK[%p]: Initializing internal [write] cipher sessions\n", session); @@ -730,8 +732,8 @@ _gnutls_write_connection_state_init (gnutls_session_t session) /* initialize cipher session */ rc = _gnutls_cipher_init (&session->connection_state.write_cipher_state, - session->security_parameters. - write_bulk_cipher_algorithm, + session-> + security_parameters.write_bulk_cipher_algorithm, &session->cipher_specs.server_write_key, &session->cipher_specs.server_write_IV); @@ -750,10 +752,11 @@ _gnutls_write_connection_state_init (gnutls_session_t session) if (mac_size > 0) { if (_gnutls_sset_datum (&session->connection_state.write_mac_secret, - session->cipher_specs. - server_write_mac_secret.data, - session->cipher_specs. - server_write_mac_secret.size) < 0) + session-> + cipher_specs.server_write_mac_secret.data, + session-> + cipher_specs.server_write_mac_secret.size) < + 0) { gnutls_assert (); return GNUTLS_E_MEMORY_ERROR; @@ -766,8 +769,8 @@ _gnutls_write_connection_state_init (gnutls_session_t session) case GNUTLS_CLIENT: rc = _gnutls_cipher_init (&session->connection_state.write_cipher_state, - session->security_parameters. - write_bulk_cipher_algorithm, + session-> + security_parameters.write_bulk_cipher_algorithm, &session->cipher_specs.client_write_key, &session->cipher_specs.client_write_IV); @@ -784,10 +787,11 @@ _gnutls_write_connection_state_init (gnutls_session_t session) if (mac_size > 0) { if (_gnutls_sset_datum (&session->connection_state.write_mac_secret, - session->cipher_specs. - client_write_mac_secret.data, - session->cipher_specs. - client_write_mac_secret.size) < 0) + session-> + cipher_specs.client_write_mac_secret.data, + session-> + cipher_specs.client_write_mac_secret.size) < + 0) { gnutls_assert (); return GNUTLS_E_MEMORY_ERROR; @@ -803,8 +807,8 @@ _gnutls_write_connection_state_init (gnutls_session_t session) session->connection_state.write_compression_state = - _gnutls_comp_init (session->security_parameters. - write_compression_algorithm, 0); + _gnutls_comp_init (session-> + security_parameters.write_compression_algorithm, 0); if (session->connection_state.write_compression_state == GNUTLS_COMP_FAILED) { |