extensions: renamed _gnutls_hello_ext_*sdata to _gnutls_hello_ext_*priv

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

18 files changed, 82 insertions, 82 deletions

diff --git a/lib/auth/srp_kx.c b/lib/auth/srp_kx.c
index da7b2ba69b..896afe4e62 100644
--- a/lib/auth/srp_kx.c
+++ b/lib/auth/srp_kx.c
@@ -128,7 +128,7 @@ _gnutls_gen_srp_server_kx(gnutls_session_t session,
 	unsigned init_pos;
 
 	ret =
-	    _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SRP,
+	    _gnutls_hello_ext_get_priv(session, GNUTLS_EXTENSION_SRP,
 					 &epriv);
 	if (ret < 0) {		/* peer didn't send a username */
 		gnutls_assert();
@@ -253,7 +253,7 @@ _gnutls_gen_srp_client_kx(gnutls_session_t session,
 	srp_ext_st *priv;
 
 	ret =
-	    _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SRP,
+	    _gnutls_hello_ext_get_priv(session, GNUTLS_EXTENSION_SRP,
 					 &epriv);
 	if (ret < 0) {		/* peer didn't send a username */
 		gnutls_assert();
@@ -840,7 +840,7 @@ _gnutls_proc_srp_server_kx(gnutls_session_t session, uint8_t * data,
 	srp_ext_st *priv;
 
 	ret =
-	    _gnutls_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SRP,
+	    _gnutls_hello_ext_get_priv(session, GNUTLS_EXTENSION_SRP,
 					 &epriv);
 	if (ret < 0) {
 		gnutls_assert();
diff --git a/lib/ext/alpn.c b/lib/ext/alpn.c
index 67c0e1d43c..bac3ccb68f 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_hello_ext_get_sdata(session, GNUTLS_EXTENSION_ALPN,
+	    _gnutls_hello_ext_get_priv(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_hello_ext_get_sdata(session, GNUTLS_EXTENSION_ALPN,
+	    _gnutls_hello_ext_get_priv(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_hello_ext_get_sdata(session, GNUTLS_EXTENSION_ALPN,
+	    _gnutls_hello_ext_get_priv(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_hello_ext_get_sdata(session, GNUTLS_EXTENSION_ALPN,
+	    _gnutls_hello_ext_get_priv(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_hello_ext_set_sdata(session,
+		_gnutls_hello_ext_set_priv(session,
 					     GNUTLS_EXTENSION_ALPN, epriv);
 	} else
 		priv = epriv;
diff --git a/lib/ext/etm.c b/lib/ext/etm.c
index 1972411903..ca4638b7e9 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_hello_ext_set_sdata(session,
+		_gnutls_hello_ext_set_priv(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_hello_ext_get_sdata(session,
+			ret = _gnutls_hello_ext_get_priv(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 143c096ed5..0772ec5e1f 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_hello_ext_set_sdata(session, GNUTLS_EXTENSION_HEARTBEAT,
+	_gnutls_hello_ext_set_priv(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_hello_ext_get_sdata
+	if (_gnutls_hello_ext_get_priv
 	    (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_hello_ext_get_sdata
+	if (_gnutls_hello_ext_get_priv
 	    (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_hello_ext_set_sdata(session, GNUTLS_EXTENSION_HEARTBEAT,
+	_gnutls_hello_ext_set_priv(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_hello_ext_get_sdata
+	if (_gnutls_hello_ext_get_priv
 	    (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 81a499e998..9fbd94e72d 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_hello_ext_get_sdata(session,
+			ret = _gnutls_hello_ext_get_priv(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_hello_ext_get_sdata(session,
+		ret = _gnutls_hello_ext_get_priv(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_hello_ext_set_sdata(session,
+	_gnutls_hello_ext_set_priv(session,
 				     GNUTLS_EXTENSION_MAX_RECORD_SIZE,
 				     epriv);
 
diff --git a/lib/ext/safe_renegotiation.c b/lib/ext/safe_renegotiation.c
index 459bb2eef8..7fb80b4dc4 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_hello_ext_get_sdata(session,
+	ret = _gnutls_hello_ext_get_priv(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_hello_ext_get_sdata(session,
+	ret = _gnutls_hello_ext_get_priv(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_hello_ext_get_sdata(session,
+	ret = _gnutls_hello_ext_get_priv(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_hello_ext_set_sdata(session,
+		_gnutls_hello_ext_set_priv(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_hello_ext_get_sdata(session,
+	ret = _gnutls_hello_ext_get_priv(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_hello_ext_set_sdata(session,
+		_gnutls_hello_ext_set_priv(session,
 					     GNUTLS_EXTENSION_SAFE_RENEGOTIATION,
 					     epriv);
 
@@ -284,7 +284,7 @@ _gnutls_sr_recv_params(gnutls_session_t session,
 		return 0;
 	}
 
-	ret = _gnutls_hello_ext_get_sdata(session,
+	ret = _gnutls_hello_ext_get_priv(session,
 					   GNUTLS_EXTENSION_SAFE_RENEGOTIATION,
 					   &epriv);
 	if (ret < 0
@@ -303,7 +303,7 @@ _gnutls_sr_recv_params(gnutls_session_t session,
 		}
 		epriv = priv;
 
-		_gnutls_hello_ext_set_sdata(session,
+		_gnutls_hello_ext_set_priv(session,
 					     GNUTLS_EXTENSION_SAFE_RENEGOTIATION,
 					     epriv);
 	} else {
@@ -357,7 +357,7 @@ _gnutls_sr_send_params(gnutls_session_t session,
 		return 0;
 	}
 
-	ret = _gnutls_hello_ext_get_sdata(session,
+	ret = _gnutls_hello_ext_get_priv(session,
 					   GNUTLS_EXTENSION_SAFE_RENEGOTIATION,
 					   &epriv);
 	if (ret < 0) {
@@ -372,7 +372,7 @@ _gnutls_sr_send_params(gnutls_session_t session,
 		}
 		epriv = priv;
 
-		_gnutls_hello_ext_set_sdata(session,
+		_gnutls_hello_ext_set_priv(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_hello_ext_get_sdata(session,
+	ret = _gnutls_hello_ext_get_priv(session,
 					   GNUTLS_EXTENSION_SAFE_RENEGOTIATION,
 					   &epriv);
 	if (ret < 0) {
diff --git a/lib/ext/server_name.c b/lib/ext/server_name.c
index 9515f15308..e640e57a52 100644
--- a/lib/ext/server_name.c
+++ b/lib/ext/server_name.c
@@ -111,7 +111,7 @@ _gnutls_server_name_recv_params(gnutls_session_t session,
 				name.data = (void*)p;
 				name.size = len;
 
-				_gnutls_hello_ext_unset_sdata(session, GNUTLS_EXTENSION_SERVER_NAME);
+				_gnutls_hello_ext_unset_priv(session, GNUTLS_EXTENSION_SERVER_NAME);
 				return _gnutls_hello_ext_set_datum(session,
 					     GNUTLS_EXTENSION_SERVER_NAME,
 					     &name);
@@ -273,7 +273,7 @@ _gnutls_server_name_set_raw(gnutls_session_t session,
 		return GNUTLS_E_INVALID_REQUEST;
 	}
 
-	_gnutls_hello_ext_unset_sdata(session, GNUTLS_EXTENSION_SERVER_NAME);
+	_gnutls_hello_ext_unset_priv(session, GNUTLS_EXTENSION_SERVER_NAME);
 
 	dname.data = (void*)name;
 	dname.size = name_length;
@@ -322,7 +322,7 @@ gnutls_server_name_set(gnutls_session_t session,
 	}
 
 	if (name_length == 0) { /* unset extension */
-		_gnutls_hello_ext_unset_sdata(session, GNUTLS_EXTENSION_SERVER_NAME);
+		_gnutls_hello_ext_unset_priv(session, GNUTLS_EXTENSION_SERVER_NAME);
 		return 0;
 	}
 
diff --git a/lib/ext/session_ticket.c b/lib/ext/session_ticket.c
index 9490a80f74..7e0a0b2f8d 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_hello_ext_get_sdata(session,
+	    _gnutls_hello_ext_get_priv(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_hello_ext_get_sdata(session,
+	    _gnutls_hello_ext_get_priv(session,
 					 GNUTLS_EXTENSION_SESSION_TICKET,
 					 &epriv);
 	if (ret >= 0)
@@ -411,7 +411,7 @@ session_ticket_send_params(gnutls_session_t session,
 		}
 	} else {
 		ret =
-		    _gnutls_hello_ext_get_resumed_sdata(session,
+		    _gnutls_hello_ext_get_resumed_priv(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_hello_ext_set_sdata(session,
+	_gnutls_hello_ext_set_priv(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_hello_ext_set_sdata(session,
+	_gnutls_hello_ext_set_priv(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_hello_ext_get_sdata(session,
+		    _gnutls_hello_ext_get_priv(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_hello_ext_get_sdata(session,
+	    _gnutls_hello_ext_get_priv(session,
 					 GNUTLS_EXTENSION_SESSION_TICKET,
 					 &epriv);
 	if (ret < 0) {
diff --git a/lib/ext/signature.c b/lib/ext/signature.c
index 70bf36c476..21ffac2b85 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_hello_ext_set_sdata(session,
+	_gnutls_hello_ext_set_priv(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_hello_ext_get_sdata(session,
+	    _gnutls_hello_ext_get_priv(session,
 					 GNUTLS_EXTENSION_SIGNATURE_ALGORITHMS,
 					 &epriv);
 	priv = epriv;
@@ -462,7 +462,7 @@ gnutls_sign_algorithm_get_requested(gnutls_session_t session,
 		return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 
 	ret =
-	    _gnutls_hello_ext_get_sdata(session,
+	    _gnutls_hello_ext_get_priv(session,
 					 GNUTLS_EXTENSION_SIGNATURE_ALGORITHMS,
 					 &epriv);
 	if (ret < 0) {
diff --git a/lib/ext/srp.c b/lib/ext/srp.c
index ece6a752e1..2c1ab90d1a 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_hello_ext_set_sdata(session,
+			_gnutls_hello_ext_set_priv(session,
 						     GNUTLS_EXTENSION_SRP,
 						     epriv);
 		}
@@ -172,7 +172,7 @@ _gnutls_srp_send_params(gnutls_session_t session,
 		}
 
 		epriv = priv;
-		_gnutls_hello_ext_set_sdata(session,
+		_gnutls_hello_ext_set_priv(session,
 					     GNUTLS_EXTENSION_SRP,
 					     epriv);
 
@@ -203,7 +203,7 @@ _gnutls_srp_send_params(gnutls_session_t session,
 		}
 
 		epriv = priv;
-		_gnutls_hello_ext_set_sdata(session,
+		_gnutls_hello_ext_set_priv(session,
 					     GNUTLS_EXTENSION_SRP,
 					     epriv);
 
diff --git a/lib/ext/srtp.c b/lib/ext/srtp.c
index 81da960584..811d5419b5 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_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SRTP,
+	    _gnutls_hello_ext_get_priv(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_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SRTP,
+	    _gnutls_hello_ext_get_priv(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_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SRTP,
+	    _gnutls_hello_ext_get_priv(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_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SRTP,
+	    _gnutls_hello_ext_get_priv(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_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SRTP,
+	    _gnutls_hello_ext_get_priv(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_hello_ext_set_sdata(session,
+		_gnutls_hello_ext_set_priv(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_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SRTP,
+	    _gnutls_hello_ext_get_priv(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_hello_ext_set_sdata(session,
+		_gnutls_hello_ext_set_priv(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_hello_ext_get_sdata(session, GNUTLS_EXTENSION_SRTP,
+	    _gnutls_hello_ext_get_priv(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_hello_ext_set_sdata(session,
+		_gnutls_hello_ext_set_priv(session,
 					     GNUTLS_EXTENSION_SRTP, epriv);
 
 	return 0;
diff --git a/lib/ext/status_request.c b/lib/ext/status_request.c
index 19838f790d..bf01748283 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_hello_ext_get_sdata(session,
+	ret = _gnutls_hello_ext_get_priv(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_hello_ext_set_sdata(session,
+		_gnutls_hello_ext_set_priv(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_hello_ext_get_sdata(session,
+	ret = _gnutls_hello_ext_get_priv(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_hello_ext_set_sdata(session,
+	_gnutls_hello_ext_set_priv(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_hello_ext_get_sdata(session,
+	ret = _gnutls_hello_ext_get_priv(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_hello_ext_get_sdata(session,
+		    _gnutls_hello_ext_get_priv(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_hello_ext_get_sdata(session,
+	    _gnutls_hello_ext_get_priv(session,
 					 GNUTLS_EXTENSION_STATUS_REQUEST,
 					 &epriv);
 	if (ret < 0)
diff --git a/lib/hello_ext.c b/lib/hello_ext.c
index 5bafa97f6c..4a4b2cc675 100644
--- a/lib/hello_ext.c
+++ b/lib/hello_ext.c
@@ -424,7 +424,7 @@ static int pack_extension(gnutls_session_t session, const hello_ext_entry_st *ex
 	int rval = 0;
 
 	ret =
-	    _gnutls_hello_ext_get_sdata(session, extp->gid,
+	    _gnutls_hello_ext_get_priv(session, extp->gid,
 					 &data);
 	if (ret >= 0 && extp->pack_func != NULL) {
 		BUFFER_APPEND_NUM(packed, extp->gid);
@@ -558,7 +558,7 @@ unset_ext_data(gnutls_session_t session, const struct hello_ext_entry_st *ext, u
 }
 
 void
-_gnutls_hello_ext_unset_sdata(gnutls_session_t session,
+_gnutls_hello_ext_unset_priv(gnutls_session_t session,
 			      extensions_t id)
 {
 	const struct hello_ext_entry_st *ext;
@@ -581,7 +581,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_hello_ext_sdata_deinit(gnutls_session_t session)
+void _gnutls_hello_ext_priv_deinit(gnutls_session_t session)
 {
 	unsigned int i;
 	const struct hello_ext_entry_st *ext;
@@ -603,7 +603,7 @@ void _gnutls_hello_ext_sdata_deinit(gnutls_session_t session)
  * private pointer, to allow API additions by individual extensions.
  */
 void
-_gnutls_hello_ext_set_sdata(gnutls_session_t session, extensions_t id,
+_gnutls_hello_ext_set_priv(gnutls_session_t session, extensions_t id,
 			     gnutls_ext_priv_data_t data)
 {
 	const struct hello_ext_entry_st *ext;
@@ -623,7 +623,7 @@ _gnutls_hello_ext_set_sdata(gnutls_session_t session, extensions_t id,
 }
 
 int
-_gnutls_hello_ext_get_sdata(gnutls_session_t session,
+_gnutls_hello_ext_get_priv(gnutls_session_t session,
 			    extensions_t id, gnutls_ext_priv_data_t * data)
 {
 	if (session->internals.ext_data[id].set != 0) {
@@ -636,7 +636,7 @@ _gnutls_hello_ext_get_sdata(gnutls_session_t session,
 }
 
 int
-_gnutls_hello_ext_get_resumed_sdata(gnutls_session_t session,
+_gnutls_hello_ext_get_resumed_priv(gnutls_session_t session,
 				    extensions_t id,
 				    gnutls_ext_priv_data_t * data)
 {
@@ -853,7 +853,7 @@ gnutls_ext_set_data(gnutls_session_t session, unsigned tls_id,
 	if (id == GNUTLS_EXTENSION_INVALID)
 		return;
 
-	_gnutls_hello_ext_set_sdata(session, id, data);
+	_gnutls_hello_ext_set_priv(session, id, data);
 }
 
 /**
@@ -876,7 +876,7 @@ gnutls_ext_get_data(gnutls_session_t session,
 	if (id == GNUTLS_EXTENSION_INVALID)
 		return gnutls_assert_val(GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE);
 
-	return _gnutls_hello_ext_get_sdata(session, id, data);
+	return _gnutls_hello_ext_get_priv(session, id, data);
 }
 
 /**
diff --git a/lib/hello_ext.h b/lib/hello_ext.h
index 13c0515588..577775d08a 100644
--- a/lib/hello_ext.h
+++ b/lib/hello_ext.h
@@ -38,17 +38,17 @@ int _gnutls_gen_hello_extensions(gnutls_session_t session,
 int _gnutls_hello_ext_init(void);
 void _gnutls_hello_ext_deinit(void);
 
-void _gnutls_hello_ext_sdata_deinit(gnutls_session_t session);
+void _gnutls_hello_ext_priv_deinit(gnutls_session_t session);
 
 /* functions to be used by extensions internally
  */
-void _gnutls_hello_ext_unset_sdata(gnutls_session_t session,
+void _gnutls_hello_ext_unset_priv(gnutls_session_t session,
 				    extensions_t ext);
-void _gnutls_hello_ext_set_sdata(gnutls_session_t session, extensions_t ext,
+void _gnutls_hello_ext_set_priv(gnutls_session_t session, extensions_t ext,
 				  gnutls_ext_priv_data_t);
-int _gnutls_hello_ext_get_sdata(gnutls_session_t session, extensions_t ext,
+int _gnutls_hello_ext_get_priv(gnutls_session_t session, extensions_t ext,
 				 gnutls_ext_priv_data_t *);
-int _gnutls_hello_ext_get_resumed_sdata(gnutls_session_t session,
+int _gnutls_hello_ext_get_resumed_priv(gnutls_session_t session,
 					 extensions_t ext,
 					 gnutls_ext_priv_data_t * data);
 
diff --git a/lib/hello_ext_lib.c b/lib/hello_ext_lib.c
index 547f63a391..5ee433b24e 100644
--- a/lib/hello_ext_lib.c
+++ b/lib/hello_ext_lib.c
@@ -43,7 +43,7 @@ _gnutls_hello_ext_set_datum(gnutls_session_t session,
 {
 	gnutls_ext_priv_data_t epriv;
 
-	if (_gnutls_hello_ext_get_sdata(session, id, &epriv) >= 0)
+	if (_gnutls_hello_ext_get_priv(session, id, &epriv) >= 0)
 		return gnutls_assert_val(GNUTLS_E_RECEIVED_ILLEGAL_PARAMETER);
 
 	if (data->size >= UINT16_MAX)
@@ -56,7 +56,7 @@ _gnutls_hello_ext_set_datum(gnutls_session_t session,
 	_gnutls_write_uint16(data->size, epriv);
 	memcpy(((uint8_t*)epriv)+2, data->data, data->size);
 
-	_gnutls_hello_ext_set_sdata(session, id, epriv);
+	_gnutls_hello_ext_set_priv(session, id, epriv);
 
 	return 0;
 }
@@ -68,7 +68,7 @@ _gnutls_hello_ext_get_datum(gnutls_session_t session,
 	gnutls_ext_priv_data_t epriv;
 	int ret;
 
-	ret = _gnutls_hello_ext_get_sdata(session, id, &epriv);
+	ret = _gnutls_hello_ext_get_priv(session, id, &epriv);
 	if (ret < 0 || epriv == NULL)
 		return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
 
@@ -85,7 +85,7 @@ _gnutls_hello_ext_get_resumed_datum(gnutls_session_t session,
 	gnutls_ext_priv_data_t epriv;
 	int ret;
 
-	ret = _gnutls_hello_ext_get_resumed_sdata(session, id, &epriv);
+	ret = _gnutls_hello_ext_get_resumed_priv(session, id, &epriv);
 	if (ret < 0 || epriv == NULL)
 		return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
 
diff --git a/lib/hello_ext_lib.h b/lib/hello_ext_lib.h
index 9ae2be8572..7d01caff80 100644
--- a/lib/hello_ext_lib.h
+++ b/lib/hello_ext_lib.h
@@ -43,7 +43,7 @@ _gnutls_hello_ext_get_resumed_datum(gnutls_session_t session,
 /* clear up any set data for the extension */
 #if 0 /* defined in hello_ext.h */
 void
-_gnutls_hello_ext_unset_sdata(gnutls_session_t session,
+_gnutls_hello_ext_unset_priv(gnutls_session_t session,
                               extensions_t id);
 #endif
 
diff --git a/lib/priority.c b/lib/priority.c
index 14254ab0fb..30693b6edd 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_hello_ext_unset_sdata(session, GNUTLS_EXTENSION_SESSION_TICKET);
+		_gnutls_hello_ext_unset_priv(session, GNUTLS_EXTENSION_SESSION_TICKET);
 	}
 
 	if (session->internals.priorities->protocol.algorithms == 0 ||
diff --git a/lib/state.c b/lib/state.c
index 19e6a69391..e696a05db4 100644
--- a/lib/state.c
+++ b/lib/state.c
@@ -399,7 +399,7 @@ void gnutls_deinit(gnutls_session_t session)
 
 	_gnutls_handshake_internal_state_clear(session);
 	_gnutls_handshake_io_buffer_clear(session);
-	_gnutls_hello_ext_sdata_deinit(session);
+	_gnutls_hello_ext_priv_deinit(session);
 
 	for (i = 0; i < MAX_EPOCH_INDEX; i++)
 		if (session->record_parameters[i] != NULL) {