marked all extensions structures as constant

31 files changed, 48 insertions, 48 deletions

diff --git a/lib/ext/alpn.c b/lib/ext/alpn.c
index 699c0b5614..e0e9df6e4e 100644
--- a/lib/ext/alpn.c
+++ b/lib/ext/alpn.c
@@ -37,7 +37,7 @@ static int _gnutls_alpn_pack(extension_priv_data_t _priv,
 static void _gnutls_alpn_deinit_data(extension_priv_data_t priv);
 
 
-extension_entry_st ext_mod_alpn = {
+const extension_entry_st ext_mod_alpn = {
 	.name = "ALPN",
 	.type = GNUTLS_EXTENSION_ALPN,
 	.parse_type = GNUTLS_EXT_APPLICATION,
diff --git a/lib/ext/alpn.h b/lib/ext/alpn.h
index b79ecdd961..60d5266ef6 100644
--- a/lib/ext/alpn.h
+++ b/lib/ext/alpn.h
@@ -34,6 +34,6 @@ typedef struct {
 	unsigned flags;
 } alpn_ext_st;
 
-extern extension_entry_st ext_mod_alpn;
+extern const extension_entry_st ext_mod_alpn;
 
 #endif
diff --git a/lib/ext/cert_type.c b/lib/ext/cert_type.c
index 408ac07764..585e3f19e2 100644
--- a/lib/ext/cert_type.c
+++ b/lib/ext/cert_type.c
@@ -44,7 +44,7 @@ static int _gnutls_cert_type_recv_params(gnutls_session_t session,
 static int _gnutls_cert_type_send_params(gnutls_session_t session,
 					 gnutls_buffer_st * extdata);
 
-extension_entry_st ext_mod_cert_type = {
+const extension_entry_st ext_mod_cert_type = {
 	.name = "CERT TYPE",
 	.type = GNUTLS_EXTENSION_CERT_TYPE,
 	.parse_type = GNUTLS_EXT_TLS,
diff --git a/lib/ext/cert_type.h b/lib/ext/cert_type.h
index b78cc13adc..8b41f586c0 100644
--- a/lib/ext/cert_type.h
+++ b/lib/ext/cert_type.h
@@ -25,6 +25,6 @@
 
 #include <extensions.h>
 
-extern extension_entry_st ext_mod_cert_type;
+extern const extension_entry_st ext_mod_cert_type;
 
 #endif
diff --git a/lib/ext/dumbfw.c b/lib/ext/dumbfw.c
index b4c850e212..8c6973310f 100644
--- a/lib/ext/dumbfw.c
+++ b/lib/ext/dumbfw.c
@@ -35,7 +35,7 @@
 static int _gnutls_dumbfw_send_params(gnutls_session_t session,
 				    gnutls_buffer_st * extdata);
 
-extension_entry_st ext_mod_dumbfw = {
+const extension_entry_st ext_mod_dumbfw = {
 	.name = "DUMBFW",
 	.type = GNUTLS_EXTENSION_DUMBFW,
 	.parse_type = GNUTLS_EXT_APPLICATION,
diff --git a/lib/ext/dumbfw.h b/lib/ext/dumbfw.h
index e6a14fc886..a3bd756eb8 100644
--- a/lib/ext/dumbfw.h
+++ b/lib/ext/dumbfw.h
@@ -22,6 +22,6 @@
 
 #include <extensions.h>
 
-extern extension_entry_st ext_mod_dumbfw;
+extern const extension_entry_st ext_mod_dumbfw;
 
 #endif
diff --git a/lib/ext/ecc.c b/lib/ext/ecc.c
index 2d785353cb..d8cfbeb108 100644
--- a/lib/ext/ecc.c
+++ b/lib/ext/ecc.c
@@ -45,7 +45,7 @@ static int _gnutls_supported_ecc_pf_send_params(gnutls_session_t session,
 						gnutls_buffer_st *
 						extdata);
 
-extension_entry_st ext_mod_supported_ecc = {
+const extension_entry_st ext_mod_supported_ecc = {
 	.name = "SUPPORTED ECC",
 	.type = GNUTLS_EXTENSION_SUPPORTED_ECC,
 	.parse_type = GNUTLS_EXT_TLS,
@@ -57,7 +57,7 @@ extension_entry_st ext_mod_supported_ecc = {
 	.deinit_func = NULL
 };
 
-extension_entry_st ext_mod_supported_ecc_pf = {
+const extension_entry_st ext_mod_supported_ecc_pf = {
 	.name = "SUPPORTED ECC POINT FORMATS",
 	.type = GNUTLS_EXTENSION_SUPPORTED_ECC_PF,
 	.parse_type = GNUTLS_EXT_TLS,
diff --git a/lib/ext/ecc.h b/lib/ext/ecc.h
index 357fa87c4d..bb86871f03 100644
--- a/lib/ext/ecc.h
+++ b/lib/ext/ecc.h
@@ -24,8 +24,8 @@
 
 #include <extensions.h>
 
-extern extension_entry_st ext_mod_supported_ecc;
-extern extension_entry_st ext_mod_supported_ecc_pf;
+extern const extension_entry_st ext_mod_supported_ecc;
+extern const extension_entry_st ext_mod_supported_ecc_pf;
 
 int
 _gnutls_session_supports_ecc_curve(gnutls_session_t session,
diff --git a/lib/ext/etm.c b/lib/ext/etm.c
index 69474ddd60..b529299b29 100644
--- a/lib/ext/etm.c
+++ b/lib/ext/etm.c
@@ -35,7 +35,7 @@ static int _gnutls_ext_etm_recv_params(gnutls_session_t session,
 static int _gnutls_ext_etm_send_params(gnutls_session_t session,
 					  gnutls_buffer_st * extdata);
 
-extension_entry_st ext_mod_etm = {
+const extension_entry_st ext_mod_etm = {
 	.name = "ENCRYPT THEN MAC",
 	.type = GNUTLS_EXTENSION_ETM,
 	.parse_type = GNUTLS_EXT_MANDATORY,
diff --git a/lib/ext/etm.h b/lib/ext/etm.h
index fcbf94751d..5ceeb618d2 100644
--- a/lib/ext/etm.h
+++ b/lib/ext/etm.h
@@ -25,6 +25,6 @@
 
 #include <extensions.h>
 
-extern extension_entry_st ext_mod_etm;
+extern const extension_entry_st ext_mod_etm;
 
 #endif
diff --git a/lib/ext/ext_master_secret.c b/lib/ext/ext_master_secret.c
index 88eddc7f99..f7e76b04dd 100644
--- a/lib/ext/ext_master_secret.c
+++ b/lib/ext/ext_master_secret.c
@@ -35,7 +35,7 @@ static int _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);
 
-extension_entry_st ext_mod_ext_master_secret = {
+const extension_entry_st ext_mod_ext_master_secret = {
 	.name = "EXT MASTER SECRET",
 	.type = GNUTLS_EXTENSION_EXT_MASTER_SECRET,
 	.parse_type = GNUTLS_EXT_MANDATORY,
diff --git a/lib/ext/ext_master_secret.h b/lib/ext/ext_master_secret.h
index 12f07fb66b..04d20ab3fb 100644
--- a/lib/ext/ext_master_secret.h
+++ b/lib/ext/ext_master_secret.h
@@ -25,6 +25,6 @@
 
 #include <extensions.h>
 
-extern extension_entry_st ext_mod_ext_master_secret;
+extern const extension_entry_st ext_mod_ext_master_secret;
 
 #endif
diff --git a/lib/ext/heartbeat.c b/lib/ext/heartbeat.c
index de83f988f6..c8670256e4 100644
--- a/lib/ext/heartbeat.c
+++ b/lib/ext/heartbeat.c
@@ -519,7 +519,7 @@ _gnutls_heartbeat_unpack(gnutls_buffer_st * ps,
 	return ret;
 }
 
-extension_entry_st ext_mod_heartbeat = {
+const extension_entry_st ext_mod_heartbeat = {
 	.name = "HEARTBEAT",
 	.type = GNUTLS_EXTENSION_HEARTBEAT,
 	.parse_type = GNUTLS_EXT_TLS,
diff --git a/lib/ext/heartbeat.h b/lib/ext/heartbeat.h
index 5851435293..c304e93a36 100644
--- a/lib/ext/heartbeat.h
+++ b/lib/ext/heartbeat.h
@@ -36,7 +36,7 @@
 
 #define HEARTBEAT_DEFAULT_POLICY PEER_NOT_ALLOWED_TO_SEND
 
-extern extension_entry_st ext_mod_heartbeat;
+extern const extension_entry_st ext_mod_heartbeat;
 
 int _gnutls_heartbeat_handle(gnutls_session_t session, mbuffer_st * bufel);
 int _gnutls_heartbeat_enabled(gnutls_session_t session, int local);
diff --git a/lib/ext/max_record.c b/lib/ext/max_record.c
index 607222680c..99b1c1b6a3 100644
--- a/lib/ext/max_record.c
+++ b/lib/ext/max_record.c
@@ -47,7 +47,7 @@ static int _gnutls_mre_num2record(int num);
 static int _gnutls_mre_record2num(uint16_t record_size);
 
 
-extension_entry_st ext_mod_max_record_size = {
+const extension_entry_st ext_mod_max_record_size = {
 	.name = "MAX RECORD SIZE",
 	.type = GNUTLS_EXTENSION_MAX_RECORD_SIZE,
 	.parse_type = GNUTLS_EXT_TLS,
diff --git a/lib/ext/max_record.h b/lib/ext/max_record.h
index 536b9da749..27e621e930 100644
--- a/lib/ext/max_record.h
+++ b/lib/ext/max_record.h
@@ -25,6 +25,6 @@
 
 #include <extensions.h>
 
-extern extension_entry_st ext_mod_max_record_size;
+extern const extension_entry_st ext_mod_max_record_size;
 
 #endif
diff --git a/lib/ext/safe_renegotiation.c b/lib/ext/safe_renegotiation.c
index 3bc0bf363f..886fdaa8e0 100644
--- a/lib/ext/safe_renegotiation.c
+++ b/lib/ext/safe_renegotiation.c
@@ -31,7 +31,7 @@ static int _gnutls_sr_send_params(gnutls_session_t state,
 				  gnutls_buffer_st *);
 static void _gnutls_sr_deinit_data(extension_priv_data_t priv);
 
-extension_entry_st ext_mod_sr = {
+const extension_entry_st ext_mod_sr = {
 	.name = "SAFE RENEGOTIATION",
 	.type = GNUTLS_EXTENSION_SAFE_RENEGOTIATION,
 	.parse_type = GNUTLS_EXT_MANDATORY,
diff --git a/lib/ext/safe_renegotiation.h b/lib/ext/safe_renegotiation.h
index 52e3fcd733..1838d5a08e 100644
--- a/lib/ext/safe_renegotiation.h
+++ b/lib/ext/safe_renegotiation.h
@@ -38,7 +38,7 @@ typedef struct {
 	unsigned int connection_using_safe_renegotiation:1;
 } sr_ext_st;
 
-extern extension_entry_st ext_mod_sr;
+extern const extension_entry_st ext_mod_sr;
 
 int _gnutls_ext_sr_finished(gnutls_session_t session, void *vdata,
 			    size_t vdata_size, int dir);
diff --git a/lib/ext/server_name.c b/lib/ext/server_name.c
index 800f4de8f9..41556b00e8 100644
--- a/lib/ext/server_name.c
+++ b/lib/ext/server_name.c
@@ -43,7 +43,7 @@ static int _gnutls_server_name_pack(extension_priv_data_t _priv,
 static void _gnutls_server_name_deinit_data(extension_priv_data_t priv);
 
 
-extension_entry_st ext_mod_server_name = {
+const extension_entry_st ext_mod_server_name = {
 	.name = "SERVER NAME",
 	.type = GNUTLS_EXTENSION_SERVER_NAME,
 	.parse_type = GNUTLS_EXT_APPLICATION,
diff --git a/lib/ext/server_name.h b/lib/ext/server_name.h
index f25d28051f..62daaf2754 100644
--- a/lib/ext/server_name.h
+++ b/lib/ext/server_name.h
@@ -38,6 +38,6 @@ typedef struct {
 	unsigned server_names_size;
 } server_name_ext_st;
 
-extern extension_entry_st ext_mod_server_name;
+extern const extension_entry_st ext_mod_server_name;
 
 #endif
diff --git a/lib/ext/session_ticket.c b/lib/ext/session_ticket.c
index 799f009ed9..58f1bbacab 100644
--- a/lib/ext/session_ticket.c
+++ b/lib/ext/session_ticket.c
@@ -54,7 +54,7 @@ static int session_ticket_pack(extension_priv_data_t _priv,
 			       gnutls_buffer_st * ps);
 static void session_ticket_deinit_data(extension_priv_data_t priv);
 
-extension_entry_st ext_mod_session_ticket = {
+const extension_entry_st ext_mod_session_ticket = {
 	.name = "SESSION TICKET",
 	.type = GNUTLS_EXTENSION_SESSION_TICKET,
 	.parse_type = GNUTLS_EXT_MANDATORY,
diff --git a/lib/ext/session_ticket.h b/lib/ext/session_ticket.h
index 3bb90f875a..5c862d28d0 100644
--- a/lib/ext/session_ticket.h
+++ b/lib/ext/session_ticket.h
@@ -25,7 +25,7 @@
 
 #include <extensions.h>
 
-extern extension_entry_st ext_mod_session_ticket;
+extern const extension_entry_st ext_mod_session_ticket;
 
 int _gnutls_send_new_session_ticket(gnutls_session_t session, int again);
 int _gnutls_recv_new_session_ticket(gnutls_session_t session);
diff --git a/lib/ext/signature.c b/lib/ext/signature.c
index 03dd4a07da..3135384bcb 100644
--- a/lib/ext/signature.c
+++ b/lib/ext/signature.c
@@ -48,7 +48,7 @@ static int signature_algorithms_pack(extension_priv_data_t epriv,
 static int signature_algorithms_unpack(gnutls_buffer_st * ps,
 				       extension_priv_data_t * _priv);
 
-extension_entry_st ext_mod_sig = {
+const extension_entry_st ext_mod_sig = {
 	.name = "SIGNATURE ALGORITHMS",
 	.type = GNUTLS_EXTENSION_SIGNATURE_ALGORITHMS,
 	.parse_type = GNUTLS_EXT_TLS,
diff --git a/lib/ext/signature.h b/lib/ext/signature.h
index ad2815a51c..2130aa2a6b 100644
--- a/lib/ext/signature.h
+++ b/lib/ext/signature.h
@@ -27,7 +27,7 @@
 
 #include <extensions.h>
 
-extern extension_entry_st ext_mod_sig;
+extern const extension_entry_st ext_mod_sig;
 
 gnutls_sign_algorithm_t
 _gnutls_session_get_sign_algo(gnutls_session_t session,
diff --git a/lib/ext/srp.c b/lib/ext/srp.c
index cd1b54fe93..6a60586bce 100644
--- a/lib/ext/srp.c
+++ b/lib/ext/srp.c
@@ -42,7 +42,7 @@ static int _gnutls_srp_recv_params(gnutls_session_t state,
 static int _gnutls_srp_send_params(gnutls_session_t state,
 				   gnutls_buffer_st * extdata);
 
-extension_entry_st ext_mod_srp = {
+const extension_entry_st ext_mod_srp = {
 	.name = "SRP",
 	.type = GNUTLS_EXTENSION_SRP,
 	.parse_type = GNUTLS_EXT_TLS,
diff --git a/lib/ext/srp.h b/lib/ext/srp.h
index ae9a03c1a4..c3a316a500 100644
--- a/lib/ext/srp.h
+++ b/lib/ext/srp.h
@@ -30,7 +30,7 @@
 #define IS_SRP_KX(kx) ((kx == GNUTLS_KX_SRP || (kx == GNUTLS_KX_SRP_RSA) || \
           kx == GNUTLS_KX_SRP_DSS)?1:0)
 
-extern extension_entry_st ext_mod_srp;
+extern const extension_entry_st ext_mod_srp;
 
 typedef struct {
 	char *username;
diff --git a/lib/ext/srtp.c b/lib/ext/srtp.c
index 0f5d3c0ff8..564566b657 100644
--- a/lib/ext/srtp.c
+++ b/lib/ext/srtp.c
@@ -39,7 +39,7 @@ static int _gnutls_srtp_pack(extension_priv_data_t _priv,
 static void _gnutls_srtp_deinit_data(extension_priv_data_t priv);
 
 
-extension_entry_st ext_mod_srtp = {
+const extension_entry_st ext_mod_srtp = {
 	.name = "SRTP",
 	.type = GNUTLS_EXTENSION_SRTP,
 	.parse_type = GNUTLS_EXT_APPLICATION,
diff --git a/lib/ext/srtp.h b/lib/ext/srtp.h
index bed8fc3963..7846fa2942 100644
--- a/lib/ext/srtp.h
+++ b/lib/ext/srtp.h
@@ -35,6 +35,6 @@ typedef struct {
 	unsigned int mki_received;
 } srtp_ext_st;
 
-extern extension_entry_st ext_mod_srtp;
+extern const extension_entry_st ext_mod_srtp;
 
 #endif
diff --git a/lib/ext/status_request.c b/lib/ext/status_request.c
index e3226b2dd7..c0f0c1ec48 100644
--- a/lib/ext/status_request.c
+++ b/lib/ext/status_request.c
@@ -519,7 +519,7 @@ _gnutls_status_request_unpack(gnutls_buffer_st * ps,
 	return ret;
 }
 
-extension_entry_st ext_mod_status_request = {
+const extension_entry_st ext_mod_status_request = {
 	.name = "STATUS REQUEST",
 	.type = GNUTLS_EXTENSION_STATUS_REQUEST,
 	.parse_type = GNUTLS_EXT_TLS,
diff --git a/lib/ext/status_request.h b/lib/ext/status_request.h
index 604c39248e..81809b1f65 100644
--- a/lib/ext/status_request.h
+++ b/lib/ext/status_request.h
@@ -25,7 +25,7 @@
 
 #include <extensions.h>
 
-extern extension_entry_st ext_mod_status_request;
+extern const extension_entry_st ext_mod_status_request;
 
 int
 _gnutls_send_server_certificate_status(gnutls_session_t session,
diff --git a/lib/extensions.c b/lib/extensions.c
index 1e0aae5998..a8b2dc2892 100644
--- a/lib/extensions.c
+++ b/lib/extensions.c
@@ -315,83 +315,83 @@ int _gnutls_ext_init(void)
 {
 	int ret;
 
-	ret = ext_register(&ext_mod_max_record_size);
+	ret = ext_register((extension_entry_st*)&ext_mod_max_record_size);
 	if (ret != GNUTLS_E_SUCCESS)
 		return ret;
 
-	ret = ext_register(&ext_mod_ext_master_secret);
+	ret = ext_register((extension_entry_st*)&ext_mod_ext_master_secret);
 	if (ret != GNUTLS_E_SUCCESS)
 		return ret;
 
-	ret = ext_register(&ext_mod_etm);
+	ret = ext_register((extension_entry_st*)&ext_mod_etm);
 	if (ret != GNUTLS_E_SUCCESS)
 		return ret;
 
 #ifdef ENABLE_OCSP
-	ret = ext_register(&ext_mod_status_request);
+	ret = ext_register((extension_entry_st*)&ext_mod_status_request);
 	if (ret != GNUTLS_E_SUCCESS)
 		return ret;
 #endif
 
 #ifdef ENABLE_OPENPGP
-	ret = ext_register(&ext_mod_cert_type);
+	ret = ext_register((extension_entry_st*)&ext_mod_cert_type);
 	if (ret != GNUTLS_E_SUCCESS)
 		return ret;
 #endif
 
-	ret = ext_register(&ext_mod_server_name);
+	ret = ext_register((extension_entry_st*)&ext_mod_server_name);
 	if (ret != GNUTLS_E_SUCCESS)
 		return ret;
 
-	ret = ext_register(&ext_mod_sr);
+	ret = ext_register((extension_entry_st*)&ext_mod_sr);
 	if (ret != GNUTLS_E_SUCCESS)
 		return ret;
 
 #ifdef ENABLE_SRP
-	ret = ext_register(&ext_mod_srp);
+	ret = ext_register((extension_entry_st*)&ext_mod_srp);
 	if (ret != GNUTLS_E_SUCCESS)
 		return ret;
 #endif
 
 #ifdef ENABLE_HEARTBEAT
-	ret = ext_register(&ext_mod_heartbeat);
+	ret = ext_register((extension_entry_st*)&ext_mod_heartbeat);
 	if (ret != GNUTLS_E_SUCCESS)
 		return ret;
 #endif
 
 #ifdef ENABLE_SESSION_TICKETS
-	ret = ext_register(&ext_mod_session_ticket);
+	ret = ext_register((extension_entry_st*)&ext_mod_session_ticket);
 	if (ret != GNUTLS_E_SUCCESS)
 		return ret;
 #endif
 
-	ret = ext_register(&ext_mod_supported_ecc);
+	ret = ext_register((extension_entry_st*)&ext_mod_supported_ecc);
 	if (ret != GNUTLS_E_SUCCESS)
 		return ret;
 
-	ret = ext_register(&ext_mod_supported_ecc_pf);
+	ret = ext_register((extension_entry_st*)&ext_mod_supported_ecc_pf);
 	if (ret != GNUTLS_E_SUCCESS)
 		return ret;
 
-	ret = ext_register(&ext_mod_sig);
+	ret = ext_register((extension_entry_st*)&ext_mod_sig);
 	if (ret != GNUTLS_E_SUCCESS)
 		return ret;
 
 #ifdef ENABLE_DTLS_SRTP
-	ret = ext_register(&ext_mod_srtp);
+	ret = ext_register((extension_entry_st*)&ext_mod_srtp);
 	if (ret != GNUTLS_E_SUCCESS)
 		return ret;
 #endif
 
 #ifdef ENABLE_ALPN
-	ret = ext_register(&ext_mod_alpn);
+	ret = ext_register((extension_entry_st*)&ext_mod_alpn);
 	if (ret != GNUTLS_E_SUCCESS)
 		return ret;
 #endif
 
 	/* This must be the last extension registered.
 	 */
-	ret = ext_register(&ext_mod_dumbfw);
+	ret = ext_register((extension_entry_st*)&ext_mod_dumbfw);
 	if (ret != GNUTLS_E_SUCCESS)
 		return ret;