Removed unused functions

These were identified using callcatcher.
  http://www.skynet.ie/~caolan/Packages/callcatcher.html

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

diff --git a/lib/datum.c b/lib/datum.c
index 27af043a5ee21d6ad1e68677950181cc5681f965..d7b1416168f71b314585cbe1168dad6a1833f17d 100644 (file)
--- a/lib/datum.c
+++ b/lib/datum.c
@@ -72,18 +72,3 @@ _gnutls_set_strdatum(gnutls_datum_t * dat, const void *data, size_t data_size)
        return 0;
 }
 
-int
-_gnutls_datum_append(gnutls_datum_t * dst, const void *data,
-                    size_t data_size)
-{
-
-       dst->data = gnutls_realloc_fast(dst->data, data_size + dst->size);
-       if (dst->data == NULL)
-               return GNUTLS_E_MEMORY_ERROR;
-
-       memcpy(&dst->data[dst->size], data, data_size);
-       dst->size += data_size;
-
-       return 0;
-}
-

diff --git a/lib/datum.h b/lib/datum.h
index 26e31e8d8837ba853ec24217c75e7a86e9ca7a52..ed3589a38252f7cd9bd3fc215f1d2ccb6faa7d8a 100644 (file)
--- a/lib/datum.h
+++ b/lib/datum.h
@@ -36,9 +36,6 @@ int _gnutls_set_datum(gnutls_datum_t * dat, const void *data,
 int _gnutls_set_strdatum(gnutls_datum_t * dat, const void *data,
                         size_t data_size);
 
-int _gnutls_datum_append(gnutls_datum_t * dat, const void *data,
-                        size_t data_size);
-
 
 inline static
 void _gnutls_free_datum(gnutls_datum_t * dat)

diff --git a/lib/extensions.c b/lib/extensions.c
index f19501d8d75ca0565df3f4aba8997d68410d5552..d9119e8f4c9735b0e4cd7c025799527bd50ad33e 100644 (file)
--- a/lib/extensions.c
+++ b/lib/extensions.c
@@ -85,23 +85,6 @@ static extension_entry_st const *extfunc[MAX_EXT_TYPES+1] = {
        NULL
 };
 
-static gnutls_ext_parse_type_t _gnutls_ext_parse_type(gnutls_session_t session, uint16_t type)
-{
-       size_t i;
-
-       for (i=0;i<session->internals.rexts_size;i++) {
-               if (session->internals.rexts[i].type == type)
-                       return session->internals.rexts[i].parse_type;
-       }
-
-       for (i = 0; extfunc[i] != NULL; i++) {
-               if (extfunc[i]->type == type)
-                       return extfunc[i]->parse_type;
-       }
-
-       return GNUTLS_EXT_NONE;
-}
-
 static const extension_entry_st *
 _gnutls_ext_ptr(gnutls_session_t session, uint16_t type, gnutls_ext_parse_type_t parse_type)
 {
@@ -508,35 +491,6 @@ int _gnutls_ext_pack(gnutls_session_t session, gnutls_buffer_st *packed)
        return 0;
 }
 
-void _gnutls_ext_restore_resumed_session(gnutls_session_t session)
-{
-       unsigned i;
-       int parse_type;
-       const struct extension_entry_st *ext;
-
-       /* clear everything except MANDATORY extensions */
-       for (i = 0; i < MAX_EXT_TYPES; i++) {
-               if (!session->internals.ext_data[i].resumed_set && !session->internals.ext_data[i].set)
-                       continue;
-
-               parse_type =_gnutls_ext_parse_type(session, session->internals.ext_data[i].type);
-
-               ext = _gnutls_ext_ptr(session, session->internals.ext_data[i].type, GNUTLS_EXT_ANY);
-
-               if (parse_type != GNUTLS_EXT_MANDATORY) {
-                       if (session->internals.ext_data[i].set != 0)
-                               unset_ext_data(session, ext, i);
-
-                       if (session->internals.ext_data[i].resumed_set != 0) {
-                               session->internals.ext_data[i].priv = session->internals.ext_data[i].resumed_priv;
-                               session->internals.ext_data[i].set = session->internals.ext_data[i].resumed_set;
-                               session->internals.ext_data[i].resumed_set = 0;
-                       }
-               }
-       }
-
-}
-
 static void
 _gnutls_ext_set_resumed_session_data(gnutls_session_t session,
                                     uint16_t type,

diff --git a/lib/extensions.h b/lib/extensions.h
index 678512fafe3458220e65841a98ebea1024949547..bc3154c180d8ecd592aa6fbf07df1ab789abb609 100644 (file)
--- a/lib/extensions.h
+++ b/lib/extensions.h
@@ -51,8 +51,6 @@ int _gnutls_ext_get_resumed_session_data(gnutls_session_t session,
                                         uint16_t type,
                                         gnutls_ext_priv_data_t * data);
 
-void _gnutls_ext_restore_resumed_session(gnutls_session_t session);
-
 /* for session packing */
 int _gnutls_ext_pack(gnutls_session_t session, gnutls_buffer_st * packed);
 int _gnutls_ext_unpack(gnutls_session_t session,

diff --git a/lib/hash_int.c b/lib/hash_int.c
index 024b41a6bbfc8650c02f5823b9d723ccde80157e..ba2a5f01f10c822034f2e5f6cb2d1cffff14aee9 100644 (file)
--- a/lib/hash_int.c
+++ b/lib/hash_int.c
@@ -467,38 +467,6 @@ ssl3_md5(int i, uint8_t * secret, int secret_len,
        return 0;
 }
 
-int
-_gnutls_ssl3_hash_md5(const void *first, int first_len,
-                     const void *second, int second_len,
-                     int ret_len, uint8_t * ret)
-{
-       uint8_t digest[MAX_HASH_SIZE];
-       digest_hd_st td;
-       int block = MD5_DIGEST_OUTPUT;
-       int rc;
-
-       rc = _gnutls_hash_init(&td, mac_to_entry(GNUTLS_MAC_MD5));
-       if (rc < 0) {
-               gnutls_assert();
-               return rc;
-       }
-
-       _gnutls_hash(&td, first, first_len);
-       _gnutls_hash(&td, second, second_len);
-
-       _gnutls_hash_deinit(&td, digest);
-
-       if (ret_len > block) {
-               gnutls_assert();
-               return GNUTLS_E_INTERNAL_ERROR;
-       }
-
-       memcpy(ret, digest, ret_len);
-
-       return 0;
-
-}
-
 int
 _gnutls_ssl3_generate_random(void *secret, int secret_len,
                             void *rnd, int rnd_len,

diff --git a/lib/hash_int.h b/lib/hash_int.h
index 4d0244e91a1ad8b3de326c80d80d32d11ec3cefa..f7f49068f2c12e5a7008aba78678ca2c768bb255 100644 (file)
--- a/lib/hash_int.h
+++ b/lib/hash_int.h
@@ -136,9 +136,6 @@ int _gnutls_mac_output_ssl3(digest_hd_st * handle, void *digest);
 int _gnutls_ssl3_generate_random(void *secret, int secret_len,
                                 void *rnd, int random_len, int bytes,
                                 uint8_t * ret);
-int _gnutls_ssl3_hash_md5(const void *first, int first_len,
-                         const void *second, int second_len,
-                         int ret_len, uint8_t * ret);
 
 int _gnutls_mac_deinit_ssl3_handshake(digest_hd_st * handle, void *digest,
                                      uint8_t * key, uint32_t key_size);

diff --git a/lib/str.c b/lib/str.c
index 673caa9e7d146b625c01fa647736dce56d911af3..373cfce1b9ad0523031d928ec42fd3883d7385d6 100644 (file)
--- a/lib/str.c
+++ b/lib/str.c
@@ -67,20 +67,6 @@ void _gnutls_str_cpy(char *dest, size_t dest_tot_size, const char *src)
        }
 }
 
-void
-_gnutls_mem_cpy(char *dest, size_t dest_tot_size, const char *src,
-               size_t src_size)
-{
-
-       if (dest_tot_size >= src_size) {
-               memcpy(dest, src, src_size);
-       } else {
-               if (dest_tot_size > 0) {
-                       memcpy(dest, src, dest_tot_size);
-               }
-       }
-}
-
 void _gnutls_buffer_init(gnutls_buffer_st * str)
 {
        str->data = str->allocd = NULL;
@@ -884,25 +870,6 @@ int _gnutls_buffer_append_mpi(gnutls_buffer_st * buf, int pfx_size,
        return ret;
 }
 
-int
-_gnutls_buffer_pop_data_prefix(gnutls_buffer_st * buf, void *data,
-                              size_t * data_size)
-{
-       size_t size;
-       int ret;
-
-       ret = _gnutls_buffer_pop_prefix(buf, &size, 1);
-       if (ret < 0) {
-               gnutls_assert();
-               return ret;
-       }
-
-       if (size > 0)
-               _gnutls_buffer_pop_data(buf, data, data_size);
-
-       return 0;
-}
-
 void
 _gnutls_buffer_hexprint(gnutls_buffer_st * str,
                        const void *_data, size_t len)

diff --git a/lib/str.h b/lib/str.h
index e5af223f16f6c6f3aded93446fb3130576854b84..af3f7930e6c1a4141ea0b3e0d20ecebd507eb632 100644 (file)
--- a/lib/str.h
+++ b/lib/str.h
@@ -60,8 +60,6 @@ inline static unsigned _gnutls_str_is_print(const char *str, unsigned size)
 }
 
 void _gnutls_str_cpy(char *dest, size_t dest_tot_size, const char *src);
-void _gnutls_mem_cpy(char *dest, size_t dest_tot_size, const char *src,
-                    size_t src_size);
 void _gnutls_str_cat(char *dest, size_t dest_tot_size, const char *src);
 
 typedef struct gnutls_buffer_st {
@@ -110,9 +108,6 @@ void _gnutls_buffer_pop_datum(gnutls_buffer_st *, gnutls_datum_t *,
 int _gnutls_buffer_pop_prefix(gnutls_buffer_st * buf, size_t * data_size,
                              int check);
 
-int _gnutls_buffer_pop_data_prefix(gnutls_buffer_st * buf, void *data,
-                                  size_t * data_size);
-
 int _gnutls_buffer_pop_datum_prefix(gnutls_buffer_st * buf,
                                    gnutls_datum_t * data);
 int _gnutls_buffer_to_datum(gnutls_buffer_st * str, gnutls_datum_t * data, unsigned is_str);