From: Nikos Mavrogiannopoulos Date: Fri, 11 Jun 2010 13:01:00 +0000 (+0200) Subject: The gnutls_string code was simplified and integrated with the buffer to avoid X-Git-Tag: gnutls_2_11_3~185 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6affb75709b91ea172d6119ecb687a767a9423ae;p=thirdparty%2Fgnutls.git The gnutls_string code was simplified and integrated with the buffer to avoid having two named for the same thing. --- diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c index 58d2f6aab8..0b6b88bbcd 100644 --- a/lib/gnutls_buffers.c +++ b/lib/gnutls_buffers.c @@ -127,7 +127,7 @@ _gnutls_record_buffer_put (content_type_t type, gnutls_session_t session, opaque * data, size_t length) { - gnutls_buffer *buf; + gnutls_buffer_st *buf; if (length == 0) return 0; @@ -157,7 +157,7 @@ _gnutls_record_buffer_put (content_type_t type, return GNUTLS_E_INVALID_REQUEST; } - if (_gnutls_buffer_append (buf, data, length) < 0) + if (_gnutls_buffer_append_data (buf, data, length) < 0) { gnutls_assert (); return GNUTLS_E_MEMORY_ERROR; @@ -839,14 +839,14 @@ _gnutls_handshake_io_recv_int (gnutls_session_t session, gnutls_assert (); tmp = sizeOfPtr; - _gnutls_string_get_data (&session->internals.handshake_recv_buffer, + _gnutls_buffer_get_data (&session->internals.handshake_recv_buffer, iptr, &tmp); return tmp; } gnutls_assert (); tmp = sizeOfPtr; - _gnutls_string_get_data (&session->internals.handshake_recv_buffer, + _gnutls_buffer_get_data (&session->internals.handshake_recv_buffer, iptr, &tmp); left -= tmp; @@ -865,7 +865,7 @@ _gnutls_handshake_io_recv_int (gnutls_session_t session, { gnutls_assert (); - _gnutls_buffer_append (&session->internals. + _gnutls_buffer_append_data (&session->internals. handshake_recv_buffer, iptr, dsize); session->internals.handshake_recv_buffer_htype = htype; @@ -910,7 +910,7 @@ _gnutls_handshake_buffer_put (gnutls_session_t session, opaque * data, } _gnutls_buffers_log ("BUF[HSK]: Inserted %d bytes of Data\n", (int) length); - if (_gnutls_buffer_append (&session->internals.handshake_hash_buffer, + if (_gnutls_buffer_append_data (&session->internals.handshake_hash_buffer, data, length) < 0) { gnutls_assert (); diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c index ecdee2f0bb..95bbb3ddcd 100644 --- a/lib/gnutls_handshake.c +++ b/lib/gnutls_handshake.c @@ -2590,7 +2590,7 @@ _gnutls_send_supplemental (gnutls_session_t session, int again) ret = _gnutls_send_handshake (session, NULL, GNUTLS_HANDSHAKE_SUPPLEMENTAL); else { - gnutls_buffer buf; + gnutls_buffer_st buf; _gnutls_buffer_init (&buf); ret = _gnutls_gen_supplemental (session, &buf); diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h index d317486c7c..aa727c16bf 100644 --- a/lib/gnutls_int.h +++ b/lib/gnutls_int.h @@ -532,8 +532,8 @@ typedef struct typedef struct { - gnutls_buffer application_data_buffer; /* holds data to be delivered to application layer */ - gnutls_buffer handshake_hash_buffer; /* used to keep the last received handshake + gnutls_buffer_st application_data_buffer; /* holds data to be delivered to application layer */ + gnutls_buffer_st handshake_hash_buffer; /* used to keep the last received handshake * message */ union { @@ -550,8 +550,8 @@ typedef struct } handshake_mac_handle; int handshake_mac_handle_init; /* 1 when the previous union and type were initialized */ - gnutls_buffer handshake_data_buffer; /* this is a buffer that holds the current handshake message */ - gnutls_buffer ia_data_buffer; /* holds inner application data (TLS/IA) */ + gnutls_buffer_st handshake_data_buffer; /* this is a buffer that holds the current handshake message */ + gnutls_buffer_st ia_data_buffer; /* holds inner application data (TLS/IA) */ resumable_session_t resumable; /* TRUE or FALSE - if we can resume that session */ handshake_state_t handshake_state; /* holds * a number which indicates where @@ -594,12 +594,12 @@ typedef struct gnutls_handshake_description_t handshake_send_buffer_htype; content_type_t handshake_recv_buffer_type; gnutls_handshake_description_t handshake_recv_buffer_htype; - gnutls_buffer handshake_recv_buffer; + gnutls_buffer_st handshake_recv_buffer; /* this buffer holds a record packet -mostly used for * non blocking IO. */ - gnutls_buffer record_recv_buffer; + gnutls_buffer_st record_recv_buffer; mbuffer_head_st record_send_buffer; /* holds cached data * for the gnutls_io_write_buffered() * function. diff --git a/lib/gnutls_str.c b/lib/gnutls_str.c index c5c8493934..0667886449 100644 --- a/lib/gnutls_str.c +++ b/lib/gnutls_str.c @@ -93,26 +93,19 @@ _gnutls_mem_cpy (char *dest, size_t dest_tot_size, const char *src, } void -_gnutls_string_init (gnutls_string * str, - gnutls_alloc_function alloc_func, - gnutls_realloc_function realloc_func, - gnutls_free_function free_func) +_gnutls_buffer_init (gnutls_buffer_st * str) { str->data = str->allocd = NULL; str->max_length = 0; str->length = 0; - - str->alloc_func = alloc_func; - str->free_func = free_func; - str->realloc_func = realloc_func; } void -_gnutls_string_clear (gnutls_string * str) +_gnutls_buffer_clear (gnutls_buffer_st * str) { if (str == NULL || str->allocd == NULL) return; - str->free_func (str->allocd); + gnutls_free (str->allocd); str->data = str->allocd = NULL; str->max_length = 0; @@ -122,7 +115,7 @@ _gnutls_string_clear (gnutls_string * str) #define MIN_CHUNK 256 int -_gnutls_string_append_data (gnutls_string * dest, const void *data, +_gnutls_buffer_append_data (gnutls_buffer_st * dest, const void *data, size_t data_size) { size_t tot_len = data_size + dest->length; @@ -149,7 +142,7 @@ _gnutls_string_append_data (gnutls_string * dest, const void *data, size_t new_len = MAX (data_size, MIN_CHUNK) + MAX (dest->max_length, MIN_CHUNK); - dest->allocd = dest->realloc_func (dest->allocd, new_len); + dest->allocd = gnutls_realloc (dest->allocd, new_len); if (dest->allocd == NULL) { gnutls_assert (); @@ -170,7 +163,7 @@ _gnutls_string_append_data (gnutls_string * dest, const void *data, } int -_gnutls_string_resize (gnutls_string * dest, size_t new_size) +_gnutls_buffer_resize (gnutls_buffer_st * dest, size_t new_size) { if (dest->max_length >= new_size) { @@ -190,7 +183,7 @@ _gnutls_string_resize (gnutls_string * dest, size_t new_size) size_t alloc_len = MAX (new_size, MIN_CHUNK) + MAX (dest->max_length, MIN_CHUNK); - dest->allocd = dest->realloc_func (dest->allocd, alloc_len); + dest->allocd = gnutls_realloc (dest->allocd, alloc_len); if (dest->allocd == NULL) { gnutls_assert (); @@ -208,9 +201,9 @@ _gnutls_string_resize (gnutls_string * dest, size_t new_size) } int -_gnutls_string_append_str (gnutls_string * dest, const char *src) +_gnutls_buffer_append_str (gnutls_buffer_st * dest, const char *src) { - return _gnutls_string_append_data (dest, src, strlen (src)); + return _gnutls_buffer_append_data (dest, src, strlen (src)); } /* returns data from a string in a constant buffer. @@ -218,7 +211,7 @@ _gnutls_string_append_str (gnutls_string * dest, const char *src) * data are appended in the buffer. */ void -_gnutls_string_get_datum (gnutls_string * str, gnutls_datum_t * data, +_gnutls_buffer_get_datum (gnutls_buffer_st * str, gnutls_datum_t * data, size_t req_size) { @@ -250,11 +243,11 @@ _gnutls_string_get_datum (gnutls_string * str, gnutls_datum_t * data, /* returns data from a string in a constant buffer. */ void -_gnutls_string_get_data (gnutls_string * str, void *data, size_t * req_size) +_gnutls_buffer_get_data (gnutls_buffer_st * str, void *data, size_t * req_size) { gnutls_datum_t tdata; - _gnutls_string_get_datum (str, &tdata, *req_size); + _gnutls_buffer_get_datum (str, &tdata, *req_size); *req_size = tdata.size; memcpy (data, tdata.data, tdata.size); @@ -263,7 +256,7 @@ _gnutls_string_get_data (gnutls_string * str, void *data, size_t * req_size) } int -_gnutls_string_append_printf (gnutls_string * dest, const char *fmt, ...) +_gnutls_buffer_append_printf (gnutls_buffer_st * dest, const char *fmt, ...) { va_list args; int len; @@ -276,19 +269,19 @@ _gnutls_string_append_printf (gnutls_string * dest, const char *fmt, ...) if (len < 0 || !str) return -1; - len = _gnutls_string_append_str (dest, str); + len = _gnutls_buffer_append_str (dest, str); free (str); return len; } -static int _gnutls_string_insert_data(gnutls_string * dest, int pos, const void* str, size_t str_size) +static int _gnutls_buffer_insert_data(gnutls_buffer_st * dest, int pos, const void* str, size_t str_size) { size_t orig_length = dest->length; int ret; - ret = _gnutls_string_resize(dest, dest->length+str_size); /* resize to make space */ + ret = _gnutls_buffer_resize(dest, dest->length+str_size); /* resize to make space */ if (ret < 0) return ret; @@ -300,7 +293,7 @@ static int _gnutls_string_insert_data(gnutls_string * dest, int pos, const void* return 0; } -static void _gnutls_string_delete_data(gnutls_string * dest, int pos, size_t str_size) +static void _gnutls_buffer_delete_data(gnutls_buffer_st * dest, int pos, size_t str_size) { memmove(&dest->data[pos], &dest->data[pos+str_size], dest->length-pos-str_size); @@ -310,7 +303,7 @@ static void _gnutls_string_delete_data(gnutls_string * dest, int pos, size_t str } -int _gnutls_string_escape(gnutls_string * dest, const char *const invalid_chars) +int _gnutls_buffer_escape(gnutls_buffer_st * dest, const char *const invalid_chars) { static const char *x = "0123456789ABCDEF"; int rv = -1; @@ -328,9 +321,9 @@ int _gnutls_string_escape(gnutls_string * dest, const char *const invalid_chars) t[1] = x[(dest->data[pos] & 0xf0) >> 4]; t[2] = x[(dest->data[pos] & 0x0f) >> 0]; - _gnutls_string_delete_data(dest, pos, 1); + _gnutls_buffer_delete_data(dest, pos, 1); - if (_gnutls_string_insert_data(dest, pos, t, 3) < 0) { + if (_gnutls_buffer_insert_data(dest, pos, t, 3) < 0) { rv = -1; goto cleanup; } @@ -346,7 +339,7 @@ int _gnutls_string_escape(gnutls_string * dest, const char *const invalid_chars) return rv; } -int _gnutls_string_unescape(gnutls_string * dest) +int _gnutls_buffer_unescape(gnutls_buffer_st * dest) { int rv = -1; int pos = 0; @@ -364,8 +357,8 @@ int _gnutls_string_unescape(gnutls_string * dest) sscanf(b, "%08x", &u); x = u & 0xff; - _gnutls_string_delete_data(dest, pos, 3); - _gnutls_string_insert_data(dest, pos, &x, 1); + _gnutls_buffer_delete_data(dest, pos, 3); + _gnutls_buffer_insert_data(dest, pos, &x, 1); } pos++; } diff --git a/lib/gnutls_str.h b/lib/gnutls_str.h index a011f4a9eb..63b8761a87 100644 --- a/lib/gnutls_str.h +++ b/lib/gnutls_str.h @@ -39,26 +39,22 @@ typedef struct opaque *data; /* API: pointer to data to copy from */ size_t max_length; size_t length; /* API: current length */ - gnutls_realloc_function realloc_func; - gnutls_alloc_function alloc_func; - gnutls_free_function free_func; -} gnutls_string; +} gnutls_buffer_st; -void _gnutls_string_init (gnutls_string *, gnutls_alloc_function, - gnutls_realloc_function, gnutls_free_function); -void _gnutls_string_clear (gnutls_string *); -int _gnutls_string_resize (gnutls_string *, size_t new_size); +void _gnutls_buffer_init (gnutls_buffer_st *); +void _gnutls_buffer_clear (gnutls_buffer_st *); +int _gnutls_buffer_resize (gnutls_buffer_st *, size_t new_size); -int _gnutls_string_append_str (gnutls_string *, const char *str); -int _gnutls_string_append_data (gnutls_string *, const void *data, +int _gnutls_buffer_append_str (gnutls_buffer_st *, const char *str); +int _gnutls_buffer_append_data (gnutls_buffer_st *, const void *data, size_t data_size); -void _gnutls_string_get_data (gnutls_string *, void *, size_t * size); -void _gnutls_string_get_datum (gnutls_string *, gnutls_datum_t *, +void _gnutls_buffer_get_data (gnutls_buffer_st *, void *, size_t * size); +void _gnutls_buffer_get_datum (gnutls_buffer_st *, gnutls_datum_t *, size_t max_size); -int _gnutls_string_escape(gnutls_string * dest, const char *const invalid_chars); -int _gnutls_string_unescape(gnutls_string * dest); +int _gnutls_buffer_escape(gnutls_buffer_st * dest, const char *const invalid_chars); +int _gnutls_buffer_unescape(gnutls_buffer_st * dest); #ifndef __attribute__ /* This feature is available in gcc versions 2.5 and later. */ @@ -67,18 +63,9 @@ int _gnutls_string_unescape(gnutls_string * dest); # endif #endif -int _gnutls_string_append_printf (gnutls_string * dest, const char *fmt, ...) +int _gnutls_buffer_append_printf (gnutls_buffer_st * dest, const char *fmt, ...) __attribute__ ((format (printf, 2, 3))); -typedef gnutls_string gnutls_buffer; - -#define _gnutls_buffer_init(buf) _gnutls_string_init(buf, gnutls_malloc, gnutls_realloc, gnutls_free); -#define _gnutls_buffer_clear _gnutls_string_clear -#define _gnutls_buffer_append _gnutls_string_append_data -#define _gnutls_buffer_get_datum _gnutls_string_get_datum -#define _gnutls_buffer_get_data _gnutls_string_get_data -#define _gnutls_buffer_resize _gnutls_string_resize - char *_gnutls_bin2hex (const void *old, size_t oldlen, char *buffer, size_t buffer_size, const char* separator); int _gnutls_hex2bin (const opaque * hex_data, int hex_size, opaque * bin_data, diff --git a/lib/gnutls_supplemental.c b/lib/gnutls_supplemental.c index 46debd3eaf..b2a1dca645 100644 --- a/lib/gnutls_supplemental.c +++ b/lib/gnutls_supplemental.c @@ -52,7 +52,7 @@ typedef int (*supp_recv_func) (gnutls_session_t session, const opaque * data, size_t data_size); -typedef int (*supp_send_func) (gnutls_session_t session, gnutls_buffer * buf); +typedef int (*supp_send_func) (gnutls_session_t session, gnutls_buffer_st * buf); typedef struct { @@ -101,13 +101,13 @@ get_supp_func_recv (gnutls_supplemental_data_format_type_t type) } int -_gnutls_gen_supplemental (gnutls_session_t session, gnutls_buffer * buf) +_gnutls_gen_supplemental (gnutls_session_t session, gnutls_buffer_st * buf) { gnutls_supplemental_entry *p; int ret; /* Make room for 3 byte length field. */ - ret = _gnutls_buffer_append (buf, "\0\0\0", 3); + ret = _gnutls_buffer_append_data (buf, "\0\0\0", 3); if (ret < 0) { gnutls_assert (); @@ -120,7 +120,7 @@ _gnutls_gen_supplemental (gnutls_session_t session, gnutls_buffer * buf) size_t sizepos = buf->length; /* Make room for supplement type and length byte length field. */ - ret = _gnutls_buffer_append (buf, "\0\0\0\0", 4); + ret = _gnutls_buffer_append_data (buf, "\0\0\0\0", 4); if (ret < 0) { gnutls_assert (); diff --git a/lib/gnutls_supplemental.h b/lib/gnutls_supplemental.h index 20ad617ddc..bf21c25a1f 100644 --- a/lib/gnutls_supplemental.h +++ b/lib/gnutls_supplemental.h @@ -26,4 +26,4 @@ int _gnutls_parse_supplemental (gnutls_session_t session, const uint8_t * data, int data_size); -int _gnutls_gen_supplemental (gnutls_session_t session, gnutls_buffer * buf); +int _gnutls_gen_supplemental (gnutls_session_t session, gnutls_buffer_st * buf); diff --git a/lib/openpgp/output.c b/lib/openpgp/output.c index 20d2855aa2..0413668c8a 100644 --- a/lib/openpgp/output.c +++ b/lib/openpgp/output.c @@ -33,11 +33,11 @@ #include "gettext.h" #define _(String) dgettext (PACKAGE, String) -#define addf _gnutls_string_append_printf -#define adds _gnutls_string_append_str +#define addf _gnutls_buffer_append_printf +#define adds _gnutls_buffer_append_str static void -hexdump (gnutls_string * str, const char *data, size_t len, const char *spc) +hexdump (gnutls_buffer_st * str, const char *data, size_t len, const char *spc) { size_t j; @@ -61,7 +61,7 @@ hexdump (gnutls_string * str, const char *data, size_t len, const char *spc) } static void -hexprint (gnutls_string * str, const char *data, size_t len) +hexprint (gnutls_buffer_st * str, const char *data, size_t len) { size_t j; @@ -75,7 +75,7 @@ hexprint (gnutls_string * str, const char *data, size_t len) } static void -print_key_usage (gnutls_string * str, gnutls_openpgp_crt_t cert, +print_key_usage (gnutls_buffer_st * str, gnutls_openpgp_crt_t cert, unsigned int idx) { unsigned int key_usage; @@ -110,7 +110,7 @@ print_key_usage (gnutls_string * str, gnutls_openpgp_crt_t cert, * otherwise the subkey. */ static void -print_key_id (gnutls_string * str, gnutls_openpgp_crt_t cert, int idx) +print_key_id (gnutls_buffer_st * str, gnutls_openpgp_crt_t cert, int idx) { gnutls_openpgp_keyid_t id; int err; @@ -134,7 +134,7 @@ print_key_id (gnutls_string * str, gnutls_openpgp_crt_t cert, int idx) * otherwise the subkey. */ static void -print_key_fingerprint (gnutls_string * str, gnutls_openpgp_crt_t cert) +print_key_fingerprint (gnutls_buffer_st * str, gnutls_openpgp_crt_t cert) { char fpr[128]; size_t fpr_size = sizeof (fpr); @@ -152,7 +152,7 @@ print_key_fingerprint (gnutls_string * str, gnutls_openpgp_crt_t cert) } static void -print_key_revoked (gnutls_string * str, gnutls_openpgp_crt_t cert, int idx) +print_key_revoked (gnutls_buffer_st * str, gnutls_openpgp_crt_t cert, int idx) { int err; @@ -168,7 +168,7 @@ print_key_revoked (gnutls_string * str, gnutls_openpgp_crt_t cert, int idx) } static void -print_key_times (gnutls_string * str, gnutls_openpgp_crt_t cert, int idx) +print_key_times (gnutls_buffer_st * str, gnutls_openpgp_crt_t cert, int idx) { time_t tim; @@ -218,7 +218,7 @@ print_key_times (gnutls_string * str, gnutls_openpgp_crt_t cert, int idx) } static void -print_key_info (gnutls_string * str, gnutls_openpgp_crt_t cert, int idx) +print_key_info (gnutls_buffer_st * str, gnutls_openpgp_crt_t cert, int idx) { int err; unsigned int bits; @@ -307,7 +307,7 @@ print_key_info (gnutls_string * str, gnutls_openpgp_crt_t cert, int idx) } static void -print_cert (gnutls_string * str, gnutls_openpgp_crt_t cert) +print_cert (gnutls_buffer_st * str, gnutls_openpgp_crt_t cert) { int i, subkeys; int err; @@ -388,7 +388,7 @@ print_cert (gnutls_string * str, gnutls_openpgp_crt_t cert) } static void -print_oneline (gnutls_string * str, gnutls_openpgp_crt_t cert) +print_oneline (gnutls_buffer_st * str, gnutls_openpgp_crt_t cert) { int err, i; @@ -514,20 +514,20 @@ gnutls_openpgp_crt_print (gnutls_openpgp_crt_t cert, gnutls_certificate_print_formats_t format, gnutls_datum_t * out) { - gnutls_string str; + gnutls_buffer_st str; - _gnutls_string_init (&str, gnutls_malloc, gnutls_realloc, gnutls_free); + _gnutls_buffer_init (&str); if (format == GNUTLS_CRT_PRINT_ONELINE) print_oneline (&str, cert); else { - _gnutls_string_append_str (&str, + _gnutls_buffer_append_str (&str, _("OpenPGP Certificate Information:\n")); print_cert (&str, cert); } - _gnutls_string_append_data (&str, "\0", 1); + _gnutls_buffer_append_data (&str, "\0", 1); out->data = str.data; out->size = strlen (str.data); diff --git a/lib/pkcs11.c b/lib/pkcs11.c index f8bf51ac2b..ecd2033081 100644 --- a/lib/pkcs11.c +++ b/lib/pkcs11.c @@ -343,12 +343,12 @@ void gnutls_pkcs11_set_token_function(gnutls_pkcs11_token_callback_t fn, static int unescape_string (char* output, const char* input, size_t* size, char terminator) { - gnutls_string str; + gnutls_buffer_st str; int ret = 0; char* p; int len; - _gnutls_string_init(&str, gnutls_malloc, gnutls_realloc, gnutls_free); + _gnutls_buffer_init(&str); /* find terminator */ p = strchr(input, terminator); @@ -357,27 +357,27 @@ static int unescape_string (char* output, const char* input, size_t* size, char else len = strlen(input); - ret = _gnutls_string_append_data(&str, input, len); + ret = _gnutls_buffer_append_data(&str, input, len); if (ret < 0) { gnutls_assert(); return ret; } - ret = _gnutls_string_unescape(&str); + ret = _gnutls_buffer_unescape(&str); if (ret < 0) { gnutls_assert(); return ret; } - ret = _gnutls_string_append_data(&str, "", 1); + ret = _gnutls_buffer_append_data(&str, "", 1); if (ret < 0) { gnutls_assert(); return ret; } - _gnutls_string_get_data(&str, output, size); + _gnutls_buffer_get_data(&str, output, size); - _gnutls_string_clear(&str); + _gnutls_buffer_clear(&str); return ret; } @@ -493,29 +493,29 @@ cleanup: #define INVALID_CHARS "\\/\"'%&#@!?$* <>{}[]()`|:;,.+-" -static int append(gnutls_string* dest, const char* tname, const char* p11name, int init) +static int append(gnutls_buffer_st* dest, const char* tname, const char* p11name, int init) { - gnutls_string tmpstr; + gnutls_buffer_st tmpstr; int ret; - _gnutls_string_init(&tmpstr, gnutls_malloc, gnutls_realloc, gnutls_free); - if ((ret=_gnutls_string_append_str(&tmpstr, tname))<0) { + _gnutls_buffer_init(&tmpstr); + if ((ret=_gnutls_buffer_append_str(&tmpstr, tname))<0) { gnutls_assert(); goto cleanup; } - ret = _gnutls_string_escape(&tmpstr, INVALID_CHARS); + ret = _gnutls_buffer_escape(&tmpstr, INVALID_CHARS); if (ret < 0) { gnutls_assert(); goto cleanup; } - if ((ret=_gnutls_string_append_data(&tmpstr, "", 1)) < 0) { + if ((ret=_gnutls_buffer_append_data(&tmpstr, "", 1)) < 0) { gnutls_assert(); goto cleanup; } - if ((ret=_gnutls_string_append_printf(dest, "%s%s=%s", (init!=0)?";":"", p11name, tmpstr.data)) < 0) { + if ((ret=_gnutls_buffer_append_printf(dest, "%s%s=%s", (init!=0)?";":"", p11name, tmpstr.data)) < 0) { gnutls_assert(); goto cleanup; } @@ -523,7 +523,7 @@ static int append(gnutls_string* dest, const char* tname, const char* p11name, i ret = 0; cleanup: - _gnutls_string_clear(&tmpstr); + _gnutls_buffer_clear(&tmpstr); return ret; @@ -532,13 +532,13 @@ cleanup: int pkcs11_info_to_url(const struct pkcs11_url_info* info, char** url) { - gnutls_string str; + gnutls_buffer_st str; int init = 0; int ret; - _gnutls_string_init (&str, gnutls_malloc, gnutls_realloc, gnutls_free); + _gnutls_buffer_init (&str); - _gnutls_string_append_str(&str, "pkcs11:"); + _gnutls_buffer_append_str(&str, "pkcs11:"); if (info->token[0]) { ret = append(&str, info->token, "token", init); @@ -596,21 +596,21 @@ int pkcs11_info_to_url(const struct pkcs11_url_info* info, char** url) } if (info->id[0] != 0) { - ret = _gnutls_string_append_printf(&str, ";id=%s", info->id); + ret = _gnutls_buffer_append_printf(&str, ";id=%s", info->id); if (ret < 0) { gnutls_assert(); return ret; } } - _gnutls_string_append_data(&str, "", 1); + _gnutls_buffer_append_data(&str, "", 1); *url = str.data; return 0; cleanup: - _gnutls_string_clear(&str); + _gnutls_buffer_clear(&str); return ret; } @@ -1474,7 +1474,7 @@ gnutls_pkcs11_obj_type_t gnutls_pkcs11_obj_get_type (gnutls_pkcs11_obj_t obj) } struct pkey_list { - gnutls_string *key_ids; + gnutls_buffer_st *key_ids; size_t key_ids_size; }; @@ -1599,7 +1599,7 @@ static int find_privkeys(pakchois_session_t *pks, struct token_info* info, struc return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE; } - list->key_ids = gnutls_malloc(sizeof(gnutls_string)*list->key_ids_size); + list->key_ids = gnutls_malloc(sizeof(gnutls_buffer_st)*list->key_ids_size); if (list->key_ids == NULL) { gnutls_assert(); return GNUTLS_E_MEMORY_ERROR; @@ -1624,10 +1624,10 @@ static int find_privkeys(pakchois_session_t *pks, struct token_info* info, struc a[0].value = certid_tmp; a[0].value_len = sizeof(certid_tmp); - _gnutls_string_init(&list->key_ids[current], gnutls_malloc, gnutls_realloc, gnutls_free); + _gnutls_buffer_init(&list->key_ids[current]); if (pakchois_get_attribute_value(pks, obj, a, 1) == CKR_OK) { - _gnutls_string_append_data(&list->key_ids[current], a[0].value, a[0].value_len); + _gnutls_buffer_append_data(&list->key_ids[current], a[0].value, a[0].value_len); current++; } @@ -1889,7 +1889,7 @@ fail: pakchois_find_objects_final(pks); if (plist.key_ids != NULL) { for (i=0;idata = str.data; out->size = strlen (str.data); } else if (format == GNUTLS_CRT_PRINT_ONELINE) { - _gnutls_string_init (&str, gnutls_malloc, gnutls_realloc, gnutls_free); + _gnutls_buffer_init (&str); print_oneline (&str, cert); - _gnutls_string_append_data (&str, "\0", 1); + _gnutls_buffer_append_data (&str, "\0", 1); out->data = str.data; out->size = strlen (str.data); } @@ -1503,7 +1503,7 @@ gnutls_x509_crt_print (gnutls_x509_crt_t cert, #ifdef ENABLE_PKI static void -print_crl (gnutls_string * str, gnutls_x509_crl_t crl, int notsigned) +print_crl (gnutls_buffer_st * str, gnutls_x509_crl_t crl, int notsigned) { /* Version. */ { @@ -1818,16 +1818,16 @@ gnutls_x509_crl_print (gnutls_x509_crl_t crl, gnutls_certificate_print_formats_t format, gnutls_datum_t * out) { - gnutls_string str; + gnutls_buffer_st str; - _gnutls_string_init (&str, gnutls_malloc, gnutls_realloc, gnutls_free); + _gnutls_buffer_init (&str); - _gnutls_string_append_str + _gnutls_buffer_append_str (&str, _("X.509 Certificate Revocation List Information:\n")); print_crl (&str, crl, format == GNUTLS_CRT_PRINT_UNSIGNED_FULL); - _gnutls_string_append_data (&str, "\0", 1); + _gnutls_buffer_append_data (&str, "\0", 1); out->data = str.data; out->size = strlen (str.data); @@ -1835,7 +1835,7 @@ gnutls_x509_crl_print (gnutls_x509_crl_t crl, } static void -print_crq (gnutls_string * str, gnutls_x509_crq_t cert) +print_crq (gnutls_buffer_st * str, gnutls_x509_crq_t cert) { /* Version. */ { @@ -2075,7 +2075,7 @@ print_crq (gnutls_string * str, gnutls_x509_crq_t cert) } static void -print_crq_other (gnutls_string * str, gnutls_x509_crq_t crq) +print_crq_other (gnutls_buffer_st * str, gnutls_x509_crq_t crq) { int err; size_t size = 0; @@ -2132,20 +2132,20 @@ gnutls_x509_crq_print (gnutls_x509_crq_t crq, gnutls_certificate_print_formats_t format, gnutls_datum_t * out) { - gnutls_string str; + gnutls_buffer_st str; - _gnutls_string_init (&str, gnutls_malloc, gnutls_realloc, gnutls_free); + _gnutls_buffer_init (&str); - _gnutls_string_append_str + _gnutls_buffer_append_str (&str, _("PKCS #10 Certificate Request Information:\n")); print_crq (&str, crq); - _gnutls_string_append_str (&str, _("Other Information:\n")); + _gnutls_buffer_append_str (&str, _("Other Information:\n")); print_crq_other (&str, crq); - _gnutls_string_append_data (&str, "\0", 1); + _gnutls_buffer_append_data (&str, "\0", 1); out->data = str.data; out->size = strlen (str.data);