removed unused epoch change callback

4 files changed, 2 insertions, 34 deletions

diff --git a/lib/gnutls_extensions.c b/lib/gnutls_extensions.c
index 73df5e22cd..473d8c0465 100644
--- a/lib/gnutls_extensions.c
+++ b/lib/gnutls_extensions.c
@@ -419,23 +419,6 @@ int _gnutls_ext_register(extension_entry_st * mod)
 	return GNUTLS_E_SUCCESS;
 }
 
-int _gnutls_ext_before_epoch_change(gnutls_session_t session)
-{
-	unsigned int i;
-	int ret;
-
-	for (i = 0; i < extfunc_size; i++) {
-		if (extfunc[i].epoch_func != NULL) {
-			ret = extfunc[i].epoch_func(session);
-			if (ret < 0)
-				return gnutls_assert_val(ret);
-		}
-	}
-
-	return 0;
-}
-
-
 int _gnutls_ext_pack(gnutls_session_t session, gnutls_buffer_st * packed)
 {
 	unsigned int i;
@@ -752,7 +735,7 @@ int
 gnutls_ext_register(const char *name, int type, gnutls_ext_parse_type_t parse_type,
 		    gnutls_ext_recv_func recv_func, gnutls_ext_send_func send_func, 
 		    gnutls_ext_deinit_data_func deinit_func, gnutls_ext_pack_func pack_func,
-		    gnutls_ext_unpack_func unpack_func, gnutls_ext_epoch_func epoch_func)
+		    gnutls_ext_unpack_func unpack_func)
 {
 	extension_entry_st tmp_mod;
 
@@ -764,7 +747,6 @@ gnutls_ext_register(const char *name, int type, gnutls_ext_parse_type_t parse_ty
 	tmp_mod.deinit_func = deinit_func;
 	tmp_mod.pack_func = pack_func;
 	tmp_mod.unpack_func = unpack_func;
-	tmp_mod.epoch_func = epoch_func;
 
 	return _gnutls_ext_register(&tmp_mod);
 }
diff --git a/lib/gnutls_extensions.h b/lib/gnutls_extensions.h
index 01e865b27e..3df0676e24 100644
--- a/lib/gnutls_extensions.h
+++ b/lib/gnutls_extensions.h
@@ -81,14 +81,8 @@ typedef struct {
 							 */
 	gnutls_ext_pack_func pack_func;	/* packs internal data to machine independent format */
 	gnutls_ext_unpack_func unpack_func;	/* unpacks internal data */
-	gnutls_ext_epoch_func epoch_func;	/* called after the handshake is finished */
 } extension_entry_st;
 
 int _gnutls_ext_register(extension_entry_st *);
 
-int gnutls_ext_register(const char *name, int type, gnutls_ext_parse_type_t parse_type,
-				gnutls_ext_recv_func recv_func, gnutls_ext_send_func send_func, 
-				gnutls_ext_deinit_data_func deinit_func, gnutls_ext_pack_func pack_func,
-				gnutls_ext_unpack_func unpack_func, gnutls_ext_epoch_func epoch_func);
-
 #endif
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index 5bddae5701..b32a6a1901 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -2959,10 +2959,6 @@ static int send_handshake_final(gnutls_session_t session, int init)
 		/* Initialize the connection session (start encryption) - in case of client 
 		 */
 		if (init == TRUE) {
-			ret = _gnutls_ext_before_epoch_change(session);
-			if (ret < 0)
-				return gnutls_assert_val(ret);
-
 			ret = _gnutls_connection_state_init(session);
 			if (ret < 0) {
 				gnutls_assert();
@@ -3049,10 +3045,6 @@ static int recv_handshake_final(gnutls_session_t session, int init)
 
 		/* Initialize the connection session (start encryption) - in case of server */
 		if (init == TRUE) {
-			ret = _gnutls_ext_before_epoch_change(session);
-			if (ret < 0)
-				return gnutls_assert_val(ret);
-
 			ret = _gnutls_connection_state_init(session);
 			if (ret < 0) {
 				gnutls_assert();
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 833b1c6df6..c315389543 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -2271,7 +2271,7 @@ typedef enum {
 int gnutls_ext_register(const char *name, int type, gnutls_ext_parse_type_t parse_type,
 				gnutls_ext_recv_func recv_func, gnutls_ext_send_func send_func, 
 				gnutls_ext_deinit_data_func deinit_func, gnutls_ext_pack_func pack_func,
-				gnutls_ext_unpack_func unpack_func, gnutls_ext_epoch_func epoch_func);
+				gnutls_ext_unpack_func unpack_func);
 
 /* Public supplemental data related functions */