diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2015-03-19 20:35:22 +0100 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2015-03-19 20:35:22 +0100 |
commit | e12cb04f181f69bbbcc2dc8ef15a74e77ee6f029 (patch) | |
tree | 259a11c162be32b4f6338ac0f8155f186abda951 | |
parent | 433e72f3dabae870cc0a0efa3a5ea34f2ff764a6 (diff) | |
download | gnutls-e12cb04f181f69bbbcc2dc8ef15a74e77ee6f029.tar.gz |
renamed gnutls_buffer_st -> gnutls_buffer_t
-rw-r--r-- | lib/gnutls_str.h | 2 | ||||
-rw-r--r-- | lib/includes/gnutls/gnutls.h.in | 10 | ||||
-rw-r--r-- | tests/Makefile.am | 2 | ||||
-rw-r--r-- | tests/mini-extension.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/lib/gnutls_str.h b/lib/gnutls_str.h index c264ad491e..d569f8833a 100644 --- a/lib/gnutls_str.h +++ b/lib/gnutls_str.h @@ -33,7 +33,7 @@ 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{ +typedef struct gnutls_buffer_st { uint8_t *allocd; /* pointer to allocated data */ uint8_t *data; /* API: pointer to data to copy from */ size_t max_length; diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in index 048d5d2e36..14eccc72b8 100644 --- a/lib/includes/gnutls/gnutls.h.in +++ b/lib/includes/gnutls/gnutls.h.in @@ -2218,9 +2218,9 @@ void gnutls_certificate_set_pin_function(gnutls_certificate_credentials_t, void *userdata); /* Public string related functions */ -typedef struct gnutls_buffer gnutls_buffer_st; +typedef struct gnutls_buffer_st *gnutls_buffer_t; -int gnutls_buffer_append_data(gnutls_buffer_st *, const void *data, size_t data_size); +int gnutls_buffer_append_data(gnutls_buffer_t, const void *data, size_t data_size); /* Public extensions related functions */ @@ -2234,14 +2234,14 @@ typedef int (*gnutls_ext_recv_func) (gnutls_session_t session, size_t len); typedef int (*gnutls_ext_send_func) (gnutls_session_t session, - gnutls_buffer_st * extdata); + gnutls_buffer_t extdata); typedef void (*gnutls_ext_deinit_data_func) (extension_priv_data_t data); typedef int (*gnutls_ext_pack_func) (extension_priv_data_t data, - gnutls_buffer_st * packed_data); + gnutls_buffer_t packed_data); -typedef int (*gnutls_ext_unpack_func) (gnutls_buffer_st * packed_data, +typedef int (*gnutls_ext_unpack_func) (gnutls_buffer_t packed_data, extension_priv_data_t * data); typedef int (*gnutls_ext_epoch_func) (gnutls_session_t session); diff --git a/tests/Makefile.am b/tests/Makefile.am index 5be3618d0b..69e944d62e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -89,7 +89,7 @@ ctests = mini-record-2 simple gc set_pkcs12_cred certder certuniqueid \ mini-chain-unsorted x509-verify-with-crl mini-dtls-mtu \ mini-dtls-record-asym openpgp-callback key-import-export \ mini-dtls-fork mini-dtls-pthread mini-key-material x509cert-invalid \ - strict-der + strict-der mini-extension mini_dtls_pthread_LDADD = $(LDADD) -lpthread diff --git a/tests/mini-extension.c b/tests/mini-extension.c index 7ec85d6e8f..3814983d74 100644 --- a/tests/mini-extension.c +++ b/tests/mini-extension.c @@ -86,7 +86,7 @@ static int ext_recv_client_params(gnutls_session_t session, const unsigned char return 0; //Success } -static int ext_send_client_params(gnutls_session_t session, gnutls_buffer_st * extdata) +static int ext_send_client_params(gnutls_session_t session, gnutls_buffer_t extdata) { TLSEXT_TYPE_client_sent = 1; gnutls_buffer_append_data(extdata, ext_data, sizeof(ext_data)); @@ -106,7 +106,7 @@ static int ext_recv_server_params(gnutls_session_t session, const unsigned char return 0; //Success } -static int ext_send_server_params(gnutls_session_t session, gnutls_buffer_st * extdata) +static int ext_send_server_params(gnutls_session_t session, gnutls_buffer_t extdata) { TLSEXT_TYPE_server_sent = 1; gnutls_buffer_append_data(extdata, ext_data, sizeof(ext_data)); |