From: Nikos Mavrogiannopoulos Date: Wed, 20 Sep 2017 09:46:55 +0000 (+0200) Subject: extensions: renamed hello extension handling functions appropriately X-Git-Tag: gnutls_3_6_3~398 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=8d876c7fab04952aaddb8974ce5cb40cd9e2fb2f;p=thirdparty%2Fgnutls.git extensions: renamed hello extension handling functions appropriately Signed-off-by: Nikos Mavrogiannopoulos --- diff --git a/lib/auth/srp_kx.c b/lib/auth/srp_kx.c index 0b92fe36ec..582434aa91 100644 --- a/lib/auth/srp_kx.c +++ b/lib/auth/srp_kx.c @@ -127,7 +127,7 @@ _gnutls_gen_srp_server_kx(gnutls_session_t session, srp_ext_st *priv; ret = - _gnutls_ext_get_session_data(session, GNUTLS_EXTENSION_SRP, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SRP, &epriv); if (ret < 0) { /* peer didn't send a username */ gnutls_assert(); @@ -250,7 +250,7 @@ _gnutls_gen_srp_client_kx(gnutls_session_t session, srp_ext_st *priv; ret = - _gnutls_ext_get_session_data(session, GNUTLS_EXTENSION_SRP, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SRP, &epriv); if (ret < 0) { /* peer didn't send a username */ gnutls_assert(); @@ -882,7 +882,7 @@ _gnutls_proc_srp_server_kx(gnutls_session_t session, uint8_t * data, srp_ext_st *priv; ret = - _gnutls_ext_get_session_data(session, GNUTLS_EXTENSION_SRP, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SRP, &epriv); if (ret < 0) { gnutls_assert(); diff --git a/lib/ext/alpn.c b/lib/ext/alpn.c index 59ec3a3b22..67c0e1d43c 100644 --- a/lib/ext/alpn.c +++ b/lib/ext/alpn.c @@ -62,7 +62,7 @@ _gnutls_alpn_recv_params(gnutls_session_t session, int selected_protocol_index; ret = - _gnutls_ext_get_session_data(session, GNUTLS_EXTENSION_ALPN, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_ALPN, &epriv); if (ret < 0) return 0; @@ -150,7 +150,7 @@ _gnutls_alpn_send_params(gnutls_session_t session, gnutls_ext_priv_data_t epriv; ret = - _gnutls_ext_get_session_data(session, GNUTLS_EXTENSION_ALPN, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_ALPN, &epriv); if (ret < 0) return 0; @@ -239,7 +239,7 @@ gnutls_alpn_get_selected_protocol(gnutls_session_t session, gnutls_ext_priv_data_t epriv; ret = - _gnutls_ext_get_session_data(session, GNUTLS_EXTENSION_ALPN, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_ALPN, &epriv); if (ret < 0) { gnutls_assert(); @@ -288,7 +288,7 @@ gnutls_alpn_set_protocols(gnutls_session_t session, unsigned i; ret = - _gnutls_ext_get_session_data(session, GNUTLS_EXTENSION_ALPN, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_ALPN, &epriv); if (ret < 0) { priv = gnutls_calloc(1, sizeof(*priv)); @@ -297,7 +297,7 @@ gnutls_alpn_set_protocols(gnutls_session_t session, return GNUTLS_E_MEMORY_ERROR; } epriv = priv; - _gnutls_ext_set_session_data(session, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_ALPN, epriv); } else priv = epriv; diff --git a/lib/ext/etm.c b/lib/ext/etm.c index eda7f457ee..dcdf9e22a1 100644 --- a/lib/ext/etm.c +++ b/lib/ext/etm.c @@ -72,7 +72,7 @@ _gnutls_ext_etm_recv_params(gnutls_session_t session, return 0; epriv = (void*)(intptr_t)1; - _gnutls_ext_set_session_data(session, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_ETM, epriv); @@ -121,7 +121,7 @@ _gnutls_ext_etm_send_params(gnutls_session_t session, if (c == NULL || (c->type == CIPHER_AEAD || c->type == CIPHER_STREAM)) return 0; - ret = _gnutls_ext_get_session_data(session, + ret = _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_ETM, &epriv); if (ret < 0 || ((intptr_t)epriv) == 0) diff --git a/lib/ext/heartbeat.c b/lib/ext/heartbeat.c index 32a3c29c43..2e3bb9fd5e 100644 --- a/lib/ext/heartbeat.c +++ b/lib/ext/heartbeat.c @@ -56,7 +56,7 @@ void gnutls_heartbeat_enable(gnutls_session_t session, unsigned int type) gnutls_ext_priv_data_t epriv; epriv = (void*)(intptr_t)type; - _gnutls_ext_set_session_data(session, GNUTLS_EXTENSION_HEARTBEAT, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_HEARTBEAT, epriv); } @@ -79,7 +79,7 @@ unsigned gnutls_heartbeat_allowed(gnutls_session_t session, unsigned int type) if (session->internals.handshake_in_progress != 0) return 0; /* not allowed */ - if (_gnutls_ext_get_session_data + if (_gnutls_hello_ext_get_sdata (session, GNUTLS_EXTENSION_HEARTBEAT, &epriv) < 0) return 0; /* Not enabled */ @@ -444,7 +444,7 @@ _gnutls_heartbeat_recv_params(gnutls_session_t session, unsigned policy; gnutls_ext_priv_data_t epriv; - if (_gnutls_ext_get_session_data + if (_gnutls_hello_ext_get_sdata (session, GNUTLS_EXTENSION_HEARTBEAT, &epriv) < 0) { if (session->security_parameters.entity == GNUTLS_CLIENT) return @@ -467,7 +467,7 @@ _gnutls_heartbeat_recv_params(gnutls_session_t session, gnutls_assert_val(GNUTLS_E_RECEIVED_ILLEGAL_PARAMETER); epriv = (void*)(intptr_t)policy; - _gnutls_ext_set_session_data(session, GNUTLS_EXTENSION_HEARTBEAT, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_HEARTBEAT, epriv); return 0; @@ -480,7 +480,7 @@ _gnutls_heartbeat_send_params(gnutls_session_t session, gnutls_ext_priv_data_t epriv; uint8_t p; - if (_gnutls_ext_get_session_data + if (_gnutls_hello_ext_get_sdata (session, GNUTLS_EXTENSION_HEARTBEAT, &epriv) < 0) return 0; /* nothing to send - not enabled */ diff --git a/lib/ext/max_record.c b/lib/ext/max_record.c index 5b70aba5f2..13e6dfa549 100644 --- a/lib/ext/max_record.c +++ b/lib/ext/max_record.c @@ -100,7 +100,7 @@ _gnutls_max_record_recv_params(gnutls_session_t session, } else { /* CLIENT SIDE - we must check if the sent record size is the right one */ if (data_size > 0) { - ret = _gnutls_ext_get_session_data(session, + ret = _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_MAX_RECORD_SIZE, &epriv); if (ret < 0) { @@ -145,7 +145,7 @@ _gnutls_max_record_send_params(gnutls_session_t session, if (session->security_parameters.entity == GNUTLS_CLIENT) { gnutls_ext_priv_data_t epriv; - ret = _gnutls_ext_get_session_data(session, + ret = _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_MAX_RECORD_SIZE, &epriv); if (ret < 0) { /* it is ok not to have it */ @@ -305,7 +305,7 @@ ssize_t gnutls_record_set_max_size(gnutls_session_t session, size_t size) session->security_parameters.max_record_send_size = size; epriv = (void *)(intptr_t)size; - _gnutls_ext_set_session_data(session, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_MAX_RECORD_SIZE, epriv); diff --git a/lib/ext/safe_renegotiation.c b/lib/ext/safe_renegotiation.c index 2ab3ad8c4a..459bb2eef8 100644 --- a/lib/ext/safe_renegotiation.c +++ b/lib/ext/safe_renegotiation.c @@ -58,7 +58,7 @@ _gnutls_ext_sr_finished(gnutls_session_t session, void *vdata, return 0; } - ret = _gnutls_ext_get_session_data(session, + ret = _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SAFE_RENEGOTIATION, &epriv); if (ret < 0) { @@ -103,7 +103,7 @@ int _gnutls_ext_sr_verify(gnutls_session_t session) return 0; } - ret = _gnutls_ext_get_session_data(session, + ret = _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SAFE_RENEGOTIATION, &epriv); if (ret >= 0) @@ -203,7 +203,7 @@ int _gnutls_ext_sr_recv_cs(gnutls_session_t session) sr_ext_st *priv; gnutls_ext_priv_data_t epriv; - ret = _gnutls_ext_get_session_data(session, + ret = _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SAFE_RENEGOTIATION, &epriv); if (ret < 0) { @@ -225,7 +225,7 @@ int _gnutls_ext_sr_recv_cs(gnutls_session_t session) _gnutls_hello_ext_save_sr(session); if (set != 0) - _gnutls_ext_set_session_data(session, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_SAFE_RENEGOTIATION, epriv); @@ -238,7 +238,7 @@ int _gnutls_ext_sr_send_cs(gnutls_session_t session) sr_ext_st *priv; gnutls_ext_priv_data_t epriv; - ret = _gnutls_ext_get_session_data(session, + ret = _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SAFE_RENEGOTIATION, &epriv); if (ret < 0) { @@ -255,7 +255,7 @@ int _gnutls_ext_sr_send_cs(gnutls_session_t session) } if (set != 0) - _gnutls_ext_set_session_data(session, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_SAFE_RENEGOTIATION, epriv); @@ -284,7 +284,7 @@ _gnutls_sr_recv_params(gnutls_session_t session, return 0; } - ret = _gnutls_ext_get_session_data(session, + ret = _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SAFE_RENEGOTIATION, &epriv); if (ret < 0 @@ -303,7 +303,7 @@ _gnutls_sr_recv_params(gnutls_session_t session, } epriv = priv; - _gnutls_ext_set_session_data(session, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_SAFE_RENEGOTIATION, epriv); } else { @@ -357,7 +357,7 @@ _gnutls_sr_send_params(gnutls_session_t session, return 0; } - ret = _gnutls_ext_get_session_data(session, + ret = _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SAFE_RENEGOTIATION, &epriv); if (ret < 0) { @@ -372,7 +372,7 @@ _gnutls_sr_send_params(gnutls_session_t session, } epriv = priv; - _gnutls_ext_set_session_data(session, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_SAFE_RENEGOTIATION, epriv); } else @@ -436,7 +436,7 @@ unsigned gnutls_safe_renegotiation_status(gnutls_session_t session) sr_ext_st *priv; gnutls_ext_priv_data_t epriv; - ret = _gnutls_ext_get_session_data(session, + ret = _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SAFE_RENEGOTIATION, &epriv); if (ret < 0) { diff --git a/lib/ext/server_name.c b/lib/ext/server_name.c index 649e4d7d02..15b37d3158 100644 --- a/lib/ext/server_name.c +++ b/lib/ext/server_name.c @@ -129,7 +129,7 @@ _gnutls_server_name_recv_params(gnutls_session_t session, GNUTLS_NAME_DNS; epriv = priv; - _gnutls_ext_set_session_data(session, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_SERVER_NAME, epriv); return 0; @@ -156,7 +156,7 @@ _gnutls_server_name_send_params(gnutls_session_t session, gnutls_ext_priv_data_t epriv; ret = - _gnutls_ext_get_session_data(session, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SERVER_NAME, &epriv); if (ret < 0) @@ -254,7 +254,7 @@ gnutls_server_name_get(gnutls_session_t session, void *data, return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE; ret = - _gnutls_ext_get_session_data(session, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SERVER_NAME, &epriv); if (ret < 0) { @@ -305,7 +305,7 @@ _gnutls_server_name_set_raw(gnutls_session_t session, } ret = - _gnutls_ext_get_session_data(session, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SERVER_NAME, &epriv); if (ret < 0) { @@ -331,7 +331,7 @@ _gnutls_server_name_set_raw(gnutls_session_t session, priv->name_length = name_length; if (set != 0) - _gnutls_ext_set_session_data(session, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_SERVER_NAME, epriv); @@ -375,7 +375,7 @@ gnutls_server_name_set(gnutls_session_t session, } if (name_length == 0) { /* unset extension */ - _gnutls_ext_unset_session_data(session, GNUTLS_EXTENSION_SERVER_NAME); + _gnutls_hello_ext_unset_sdata(session, GNUTLS_EXTENSION_SERVER_NAME); return 0; } @@ -454,16 +454,16 @@ unsigned _gnutls_server_name_matches_resumed(gnutls_session_t session) gnutls_ext_priv_data_t epriv; ret = - _gnutls_ext_get_session_data(session, - GNUTLS_EXTENSION_SERVER_NAME, - &epriv); + _gnutls_hello_ext_get_sdata(session, + GNUTLS_EXTENSION_SERVER_NAME, + &epriv); if (ret < 0) /* no server name in this session */ priv1 = NULL; else priv1 = epriv; ret = - _gnutls_ext_get_resumed_session_data(session, + _gnutls_hello_ext_get_resumed_sdata(session, GNUTLS_EXTENSION_SERVER_NAME, &epriv); if (ret < 0) /* no server name in extensions */ diff --git a/lib/ext/session_ticket.c b/lib/ext/session_ticket.c index 459f39bcdb..7a3b3bfd32 100644 --- a/lib/ext/session_ticket.c +++ b/lib/ext/session_ticket.c @@ -298,7 +298,7 @@ session_ticket_recv_params(gnutls_session_t session, int ret; ret = - _gnutls_ext_get_session_data(session, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SESSION_TICKET, &epriv); if (ret < 0) { @@ -396,7 +396,7 @@ session_ticket_send_params(gnutls_session_t session, int ret; ret = - _gnutls_ext_get_session_data(session, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SESSION_TICKET, &epriv); if (ret >= 0) @@ -411,7 +411,7 @@ session_ticket_send_params(gnutls_session_t session, } } else { ret = - _gnutls_ext_get_resumed_session_data(session, + _gnutls_hello_ext_get_resumed_sdata(session, GNUTLS_EXTENSION_SESSION_TICKET, &epriv); if (ret >= 0) @@ -562,7 +562,7 @@ int gnutls_session_ticket_enable_client(gnutls_session_t session) priv->session_ticket_enable = 1; epriv = priv; - _gnutls_ext_set_session_data(session, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_SESSION_TICKET, epriv); @@ -606,7 +606,7 @@ gnutls_session_ticket_enable_server(gnutls_session_t session, memcpy(&priv->key, key->data, key->size); priv->session_ticket_enable = 1; - _gnutls_ext_set_session_data(session, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_SESSION_TICKET, epriv); @@ -627,7 +627,7 @@ int _gnutls_send_new_session_ticket(gnutls_session_t session, int again) if (again == 0) { ret = - _gnutls_ext_get_session_data(session, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SESSION_TICKET, &epriv); if (ret < 0) @@ -717,7 +717,7 @@ int _gnutls_recv_new_session_ticket(gnutls_session_t session) gnutls_ext_priv_data_t epriv; ret = - _gnutls_ext_get_session_data(session, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SESSION_TICKET, &epriv); if (ret < 0) { diff --git a/lib/ext/signature.c b/lib/ext/signature.c index 1301d821d9..0fb057e050 100644 --- a/lib/ext/signature.c +++ b/lib/ext/signature.c @@ -172,7 +172,7 @@ _gnutls_sign_algorithm_parse_data(gnutls_session_t session, } epriv = priv; - _gnutls_ext_set_session_data(session, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_SIGNATURE_ALGORITHMS, epriv); @@ -290,7 +290,7 @@ _gnutls_session_get_sign_algo(gnutls_session_t session, cert_algo = gnutls_pubkey_get_pk_algorithm(cert->pubkey, NULL); ret = - _gnutls_ext_get_session_data(session, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SIGNATURE_ALGORITHMS, &epriv); priv = epriv; @@ -451,7 +451,7 @@ gnutls_sign_algorithm_get_requested(gnutls_session_t session, return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR); ret = - _gnutls_ext_get_session_data(session, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SIGNATURE_ALGORITHMS, &epriv); if (ret < 0) { diff --git a/lib/ext/srp.c b/lib/ext/srp.c index d6f87b5d4c..756483dce7 100644 --- a/lib/ext/srp.c +++ b/lib/ext/srp.c @@ -93,7 +93,7 @@ _gnutls_srp_recv_params(gnutls_session_t session, const uint8_t * data, } epriv = priv; - _gnutls_ext_set_session_data(session, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_SRP, epriv); } @@ -172,7 +172,7 @@ _gnutls_srp_send_params(gnutls_session_t session, } epriv = priv; - _gnutls_ext_set_session_data(session, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_SRP, epriv); @@ -203,7 +203,7 @@ _gnutls_srp_send_params(gnutls_session_t session, } epriv = priv; - _gnutls_ext_set_session_data(session, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_SRP, epriv); diff --git a/lib/ext/srtp.c b/lib/ext/srtp.c index 1931327d65..81da960584 100644 --- a/lib/ext/srtp.c +++ b/lib/ext/srtp.c @@ -174,7 +174,7 @@ _gnutls_srtp_recv_params(gnutls_session_t session, uint16_t profile; ret = - _gnutls_ext_get_session_data(session, GNUTLS_EXTENSION_SRTP, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SRTP, &epriv); if (ret < 0) return 0; @@ -240,7 +240,7 @@ _gnutls_srtp_send_params(gnutls_session_t session, gnutls_ext_priv_data_t epriv; ret = - _gnutls_ext_get_session_data(session, GNUTLS_EXTENSION_SRTP, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SRTP, &epriv); if (ret < 0) return 0; @@ -314,7 +314,7 @@ gnutls_srtp_get_selected_profile(gnutls_session_t session, gnutls_ext_priv_data_t epriv; ret = - _gnutls_ext_get_session_data(session, GNUTLS_EXTENSION_SRTP, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SRTP, &epriv); if (ret < 0) { gnutls_assert(); @@ -353,7 +353,7 @@ int gnutls_srtp_get_mki(gnutls_session_t session, gnutls_datum_t * mki) gnutls_ext_priv_data_t epriv; ret = - _gnutls_ext_get_session_data(session, GNUTLS_EXTENSION_SRTP, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SRTP, &epriv); if (ret < 0) return @@ -394,7 +394,7 @@ gnutls_srtp_set_mki(gnutls_session_t session, const gnutls_datum_t * mki) gnutls_ext_priv_data_t epriv; ret = - _gnutls_ext_get_session_data(session, GNUTLS_EXTENSION_SRTP, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SRTP, &epriv); if (ret < 0) { priv = gnutls_calloc(1, sizeof(*priv)); @@ -403,7 +403,7 @@ gnutls_srtp_set_mki(gnutls_session_t session, const gnutls_datum_t * mki) return GNUTLS_E_MEMORY_ERROR; } epriv = priv; - _gnutls_ext_set_session_data(session, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_SRTP, epriv); } else priv = epriv; @@ -439,7 +439,7 @@ gnutls_srtp_set_profile(gnutls_session_t session, gnutls_ext_priv_data_t epriv; ret = - _gnutls_ext_get_session_data(session, GNUTLS_EXTENSION_SRTP, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SRTP, &epriv); if (ret < 0) { priv = gnutls_calloc(1, sizeof(*priv)); @@ -448,7 +448,7 @@ gnutls_srtp_set_profile(gnutls_session_t session, return GNUTLS_E_MEMORY_ERROR; } epriv = priv; - _gnutls_ext_set_session_data(session, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_SRTP, epriv); } else priv = epriv; @@ -487,7 +487,7 @@ gnutls_srtp_set_profile_direct(gnutls_session_t session, gnutls_srtp_profile_t id; ret = - _gnutls_ext_get_session_data(session, GNUTLS_EXTENSION_SRTP, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SRTP, &epriv); if (ret < 0) { set = 1; @@ -521,7 +521,7 @@ gnutls_srtp_set_profile_direct(gnutls_session_t session, } while (col != NULL); if (set != 0) - _gnutls_ext_set_session_data(session, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_SRTP, epriv); return 0; diff --git a/lib/ext/status_request.c b/lib/ext/status_request.c index 8a3515d199..3a12e9cd40 100644 --- a/lib/ext/status_request.c +++ b/lib/ext/status_request.c @@ -206,7 +206,7 @@ _gnutls_status_request_send_params(gnutls_session_t session, if (_gnutls_get_cred(session, GNUTLS_CRD_CERTIFICATE) == NULL) return 0; - ret = _gnutls_ext_get_session_data(session, + ret = _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_STATUS_REQUEST, &epriv); @@ -221,7 +221,7 @@ _gnutls_status_request_send_params(gnutls_session_t session, if (priv == NULL) return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR); - _gnutls_ext_set_session_data(session, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_STATUS_REQUEST, epriv); @@ -237,7 +237,7 @@ _gnutls_status_request_recv_params(gnutls_session_t session, status_request_ext_st *priv; int ret; - ret = _gnutls_ext_get_session_data(session, + ret = _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_STATUS_REQUEST, &epriv); if (ret < 0 || epriv == NULL) /* it is ok not to have it */ @@ -288,7 +288,7 @@ gnutls_ocsp_status_request_enable_client(gnutls_session_t session, if (priv == NULL) return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR); - _gnutls_ext_set_session_data(session, + _gnutls_hello_ext_set_sdata(session, GNUTLS_EXTENSION_STATUS_REQUEST, epriv); @@ -321,7 +321,7 @@ gnutls_ocsp_status_request_get(gnutls_session_t session, if (session->security_parameters.entity == GNUTLS_SERVER) return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST); - ret = _gnutls_ext_get_session_data(session, + ret = _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_STATUS_REQUEST, &epriv); if (ret < 0) @@ -557,7 +557,7 @@ _gnutls_send_server_certificate_status(gnutls_session_t session, int again) if (again == 0) { ret = - _gnutls_ext_get_session_data(session, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_STATUS_REQUEST, &epriv); if (ret < 0) @@ -599,7 +599,7 @@ int _gnutls_recv_server_certificate_status(gnutls_session_t session) gnutls_ext_priv_data_t epriv; ret = - _gnutls_ext_get_session_data(session, + _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_STATUS_REQUEST, &epriv); if (ret < 0) diff --git a/lib/extensions.c b/lib/extensions.c index 8f33a33df5..340f65508e 100644 --- a/lib/extensions.c +++ b/lib/extensions.c @@ -357,12 +357,12 @@ _gnutls_gen_hello_extensions(gnutls_session_t session, } /* Global deinit and init of global extensions */ -int _gnutls_ext_init(void) +int _gnutls_hello_ext_init(void) { return GNUTLS_E_SUCCESS; } -void _gnutls_ext_deinit(void) +void _gnutls_hello_ext_deinit(void) { unsigned i; for (i = 0; extfunc[i] != NULL; i++) { @@ -403,7 +403,7 @@ static int pack_extension(gnutls_session_t session, const hello_ext_entry_st *ex int rval = 0; ret = - _gnutls_ext_get_session_data(session, extp->gid, + _gnutls_hello_ext_get_sdata(session, extp->gid, &data); if (ret >= 0 && extp->pack_func != NULL) { BUFFER_APPEND_NUM(packed, extp->gid); @@ -428,7 +428,7 @@ static int pack_extension(gnutls_session_t session, const hello_ext_entry_st *ex return rval; } -int _gnutls_ext_pack(gnutls_session_t session, gnutls_buffer_st *packed) +int _gnutls_hello_ext_pack(gnutls_session_t session, gnutls_buffer_st *packed) { unsigned int i; int ret; @@ -485,7 +485,7 @@ _gnutls_ext_set_resumed_session_data(gnutls_session_t session, } } -int _gnutls_ext_unpack(gnutls_session_t session, gnutls_buffer_st * packed) +int _gnutls_hello_ext_unpack(gnutls_session_t session, gnutls_buffer_st * packed) { int i, ret; gnutls_ext_priv_data_t data; @@ -541,7 +541,7 @@ unset_ext_data(gnutls_session_t session, const struct hello_ext_entry_st *ext, u } void -_gnutls_ext_unset_session_data(gnutls_session_t session, +_gnutls_hello_ext_unset_sdata(gnutls_session_t session, extensions_t id) { int i; @@ -570,7 +570,7 @@ static void unset_resumed_ext_data(gnutls_session_t session, const struct hello_ /* Deinitializes all data that are associated with TLS extensions. */ -void _gnutls_ext_free_session_data(gnutls_session_t session) +void _gnutls_hello_ext_sdata_deinit(gnutls_session_t session) { unsigned int i; const struct hello_ext_entry_st *ext; @@ -591,7 +591,7 @@ void _gnutls_ext_free_session_data(gnutls_session_t session) * private pointer, to allow API additions by individual extensions. */ void -_gnutls_ext_set_session_data(gnutls_session_t session, extensions_t id, +_gnutls_hello_ext_set_sdata(gnutls_session_t session, extensions_t id, gnutls_ext_priv_data_t data) { unsigned int i; @@ -615,7 +615,7 @@ _gnutls_ext_set_session_data(gnutls_session_t session, extensions_t id, } int -_gnutls_ext_get_session_data(gnutls_session_t session, +_gnutls_hello_ext_get_sdata(gnutls_session_t session, extensions_t id, gnutls_ext_priv_data_t * data) { int i; @@ -633,7 +633,7 @@ _gnutls_ext_get_session_data(gnutls_session_t session, } int -_gnutls_ext_get_resumed_session_data(gnutls_session_t session, +_gnutls_hello_ext_get_resumed_sdata(gnutls_session_t session, extensions_t id, gnutls_ext_priv_data_t * data) { @@ -852,7 +852,7 @@ gnutls_ext_set_data(gnutls_session_t session, unsigned tls_id, if (id == 0) return; - _gnutls_ext_set_session_data(session, id, data); + _gnutls_hello_ext_set_sdata(session, id, data); } /** @@ -875,5 +875,5 @@ gnutls_ext_get_data(gnutls_session_t session, if (id == 0) return gnutls_assert_val(GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE); - return _gnutls_ext_get_session_data(session, id, data); + return _gnutls_hello_ext_get_sdata(session, id, data); } diff --git a/lib/extensions.h b/lib/extensions.h index 8868d69766..884ce86490 100644 --- a/lib/extensions.h +++ b/lib/extensions.h @@ -25,6 +25,8 @@ #include +/* Functions for hello extension parsing. + */ int _gnutls_parse_hello_extensions(gnutls_session_t session, gnutls_ext_flags_t msg, gnutls_ext_parse_type_t parse_type, @@ -33,26 +35,26 @@ 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); +int _gnutls_hello_ext_init(void); +void _gnutls_hello_ext_deinit(void); -void _gnutls_ext_free_session_data(gnutls_session_t session); +void _gnutls_hello_ext_sdata_deinit(gnutls_session_t session); /* functions to be used by extensions internally */ -void _gnutls_ext_unset_session_data(gnutls_session_t session, +void _gnutls_hello_ext_unset_sdata(gnutls_session_t session, extensions_t ext); -void _gnutls_ext_set_session_data(gnutls_session_t session, extensions_t ext, +void _gnutls_hello_ext_set_sdata(gnutls_session_t session, extensions_t ext, gnutls_ext_priv_data_t); -int _gnutls_ext_get_session_data(gnutls_session_t session, extensions_t ext, +int _gnutls_hello_ext_get_sdata(gnutls_session_t session, extensions_t ext, gnutls_ext_priv_data_t *); -int _gnutls_ext_get_resumed_session_data(gnutls_session_t session, +int _gnutls_hello_ext_get_resumed_sdata(gnutls_session_t session, extensions_t ext, gnutls_ext_priv_data_t * data); /* for session packing */ -int _gnutls_ext_pack(gnutls_session_t session, gnutls_buffer_st * packed); -int _gnutls_ext_unpack(gnutls_session_t session, +int _gnutls_hello_ext_pack(gnutls_session_t session, gnutls_buffer_st * packed); +int _gnutls_hello_ext_unpack(gnutls_session_t session, gnutls_buffer_st * packed); inline static const char *ext_msg_validity_to_str(gnutls_ext_flags_t msg) diff --git a/lib/global.c b/lib/global.c index d31d5bcae9..389778e022 100644 --- a/lib/global.c +++ b/lib/global.c @@ -28,7 +28,7 @@ #include #include -#include /* for _gnutls_ext_init */ +#include /* for _gnutls_hello_ext_init */ #include /* for _gnutls_supplemental_deinit */ #include #include @@ -310,7 +310,7 @@ static int _gnutls_global_init(unsigned constructor) } /* Initialize the default TLS extensions */ - ret = _gnutls_ext_init(); + ret = _gnutls_hello_ext_init(); if (ret < 0) { gnutls_assert(); goto out; @@ -412,7 +412,7 @@ static void _gnutls_global_deinit(unsigned destructor) _gnutls_system_key_deinit(); gnutls_crypto_deinit(); _gnutls_rnd_deinit(); - _gnutls_ext_deinit(); + _gnutls_hello_ext_deinit(); asn1_delete_structure(&_gnutls_gnutls_asn); asn1_delete_structure(&_gnutls_pkix1_asn); diff --git a/lib/priority.c b/lib/priority.c index e038f5b7f1..207d8f06cf 100644 --- a/lib/priority.c +++ b/lib/priority.c @@ -589,7 +589,7 @@ gnutls_priority_set(gnutls_session_t session, gnutls_priority_t priority) if (priority->no_tickets != 0) { /* when PFS is explicitly requested, disable session tickets */ - _gnutls_ext_unset_session_data(session, GNUTLS_EXTENSION_SESSION_TICKET); + _gnutls_hello_ext_unset_sdata(session, GNUTLS_EXTENSION_SESSION_TICKET); } if (session->internals.priorities->protocol.algorithms == 0 || diff --git a/lib/session_pack.c b/lib/session_pack.c index 6cc5d15c7b..6153434d2b 100644 --- a/lib/session_pack.c +++ b/lib/session_pack.c @@ -150,7 +150,7 @@ _gnutls_session_pack(gnutls_session_t session, goto fail; } - ret = _gnutls_ext_pack(session, &sb); + ret = _gnutls_hello_ext_pack(session, &sb); if (ret < 0) { gnutls_assert(); goto fail; @@ -256,7 +256,7 @@ _gnutls_session_unpack(gnutls_session_t session, goto error; } - ret = _gnutls_ext_unpack(session, &sb); + ret = _gnutls_hello_ext_unpack(session, &sb); if (ret < 0) { gnutls_assert(); goto error; diff --git a/lib/state.c b/lib/state.c index f762fc7481..700c633957 100644 --- a/lib/state.c +++ b/lib/state.c @@ -377,7 +377,7 @@ void gnutls_deinit(gnutls_session_t session) _gnutls_handshake_internal_state_clear(session); _gnutls_handshake_io_buffer_clear(session); - _gnutls_ext_free_session_data(session); + _gnutls_hello_ext_sdata_deinit(session); for (i = 0; i < MAX_EPOCH_INDEX; i++) if (session->record_parameters[i] != NULL) {