From 0937303160d1e305eb5988363631af6757aa69a1 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Thu, 30 Aug 2012 20:10:20 +0200 Subject: BUFFER_APPEND_PFX is no more. Replaced with BUFFER_APPEND_PFX4 --- lib/ext/server_name.c | 2 +- lib/ext/session_ticket.c | 2 +- lib/ext/srp.c | 4 ++-- lib/gnutls_session_pack.c | 30 +++++++++++++++--------------- lib/gnutls_str.h | 4 ---- 5 files changed, 19 insertions(+), 23 deletions(-) diff --git a/lib/ext/server_name.c b/lib/ext/server_name.c index 91f5e88b16..005d80b948 100644 --- a/lib/ext/server_name.c +++ b/lib/ext/server_name.c @@ -424,7 +424,7 @@ _gnutls_server_name_pack (extension_priv_data_t epriv, gnutls_buffer_st * ps) for (i = 0; i < priv->server_names_size; i++) { BUFFER_APPEND_NUM (ps, priv->server_names[i].type); - BUFFER_APPEND_PFX (ps, priv->server_names[i].name, + BUFFER_APPEND_PFX4 (ps, priv->server_names[i].name, priv->server_names[i].name_length); } return 0; diff --git a/lib/ext/session_ticket.c b/lib/ext/session_ticket.c index 626c976e45..c94242cac2 100644 --- a/lib/ext/session_ticket.c +++ b/lib/ext/session_ticket.c @@ -422,7 +422,7 @@ session_ticket_pack (extension_priv_data_t epriv, gnutls_buffer_st * ps) session_ticket_ext_st *priv = epriv.ptr; int ret; - BUFFER_APPEND_PFX (ps, priv->session_ticket, priv->session_ticket_len); + BUFFER_APPEND_PFX4 (ps, priv->session_ticket, priv->session_ticket_len); BUFFER_APPEND_NUM (ps, priv->session_ticket_enable); return 0; diff --git a/lib/ext/srp.c b/lib/ext/srp.c index 54929ca179..d8a3aae05c 100644 --- a/lib/ext/srp.c +++ b/lib/ext/srp.c @@ -226,8 +226,8 @@ _gnutls_srp_pack (extension_priv_data_t epriv, gnutls_buffer_st * ps) if (priv->password) password_len = strlen (priv->password); - BUFFER_APPEND_PFX (ps, priv->username, username_len); - BUFFER_APPEND_PFX (ps, priv->password, password_len); + BUFFER_APPEND_PFX4 (ps, priv->username, username_len); + BUFFER_APPEND_PFX4 (ps, priv->password, password_len); return 0; } diff --git a/lib/gnutls_session_pack.c b/lib/gnutls_session_pack.c index 2588873453..9982622f83 100644 --- a/lib/gnutls_session_pack.c +++ b/lib/gnutls_session_pack.c @@ -311,20 +311,20 @@ pack_certificate_auth_info (gnutls_session_t session, gnutls_buffer_st * ps) { BUFFER_APPEND_NUM (ps, info->dh.secret_bits); - BUFFER_APPEND_PFX (ps, info->dh.prime.data, info->dh.prime.size); - BUFFER_APPEND_PFX (ps, info->dh.generator.data, + BUFFER_APPEND_PFX4 (ps, info->dh.prime.data, info->dh.prime.size); + BUFFER_APPEND_PFX4 (ps, info->dh.generator.data, info->dh.generator.size); - BUFFER_APPEND_PFX (ps, info->dh.public_key.data, + BUFFER_APPEND_PFX4 (ps, info->dh.public_key.data, info->dh.public_key.size); - BUFFER_APPEND_PFX (ps, info->rsa_export.modulus.data, + BUFFER_APPEND_PFX4 (ps, info->rsa_export.modulus.data, info->rsa_export.modulus.size); - BUFFER_APPEND_PFX (ps, info->rsa_export.exponent.data, + BUFFER_APPEND_PFX4 (ps, info->rsa_export.exponent.data, info->rsa_export.exponent.size); BUFFER_APPEND_NUM (ps, info->ncerts); for (i = 0; i < info->ncerts; i++) - BUFFER_APPEND_PFX (ps, info->raw_certificate_list[i].data, + BUFFER_APPEND_PFX4 (ps, info->raw_certificate_list[i].data, info->raw_certificate_list[i].size); } @@ -443,7 +443,7 @@ pack_srp_auth_info (gnutls_session_t session, gnutls_buffer_st * ps) BUFFER_APPEND_NUM (ps, 0); cur_size = ps->length; - BUFFER_APPEND_PFX (ps, info->username, len); + BUFFER_APPEND_PFX4 (ps, info->username, len); /* write the real size */ _gnutls_write_uint32 (ps->length - cur_size, ps->data + size_offset); @@ -522,10 +522,10 @@ pack_anon_auth_info (gnutls_session_t session, gnutls_buffer_st * ps) if (info) { BUFFER_APPEND_NUM (ps, info->dh.secret_bits); - BUFFER_APPEND_PFX (ps, info->dh.prime.data, info->dh.prime.size); - BUFFER_APPEND_PFX (ps, info->dh.generator.data, + BUFFER_APPEND_PFX4 (ps, info->dh.prime.data, info->dh.prime.size); + BUFFER_APPEND_PFX4 (ps, info->dh.generator.data, info->dh.generator.size); - BUFFER_APPEND_PFX (ps, info->dh.public_key.data, + BUFFER_APPEND_PFX4 (ps, info->dh.public_key.data, info->dh.public_key.size); } @@ -629,13 +629,13 @@ pack_psk_auth_info (gnutls_session_t session, gnutls_buffer_st * ps) BUFFER_APPEND_NUM (ps, 0); cur_size = ps->length; - BUFFER_APPEND_PFX (ps, info->username, username_len); - BUFFER_APPEND_PFX (ps, info->hint, hint_len); + BUFFER_APPEND_PFX4 (ps, info->username, username_len); + BUFFER_APPEND_PFX4 (ps, info->hint, hint_len); BUFFER_APPEND_NUM (ps, info->dh.secret_bits); - BUFFER_APPEND_PFX (ps, info->dh.prime.data, info->dh.prime.size); - BUFFER_APPEND_PFX (ps, info->dh.generator.data, info->dh.generator.size); - BUFFER_APPEND_PFX (ps, info->dh.public_key.data, info->dh.public_key.size); + BUFFER_APPEND_PFX4 (ps, info->dh.prime.data, info->dh.prime.size); + BUFFER_APPEND_PFX4 (ps, info->dh.generator.data, info->dh.generator.size); + BUFFER_APPEND_PFX4 (ps, info->dh.public_key.data, info->dh.public_key.size); /* write the real size */ _gnutls_write_uint32 (ps->length - cur_size, ps->data + size_offset); diff --git a/lib/gnutls_str.h b/lib/gnutls_str.h index e128766008..f8671c26f4 100644 --- a/lib/gnutls_str.h +++ b/lib/gnutls_str.h @@ -123,10 +123,6 @@ int _gnutls_hostname_compare (const char *certname, size_t certnamesize, } \ } -#define BUFFER_APPEND_PFX(b, x, s) { \ - BUFFER_APPEND_PFX4(b, x, s) \ - } - /* append data prefixed with 4-bytes length field*/ #define BUFFER_APPEND_PFX4(b, x, s) { \ ret = _gnutls_buffer_append_data_prefix(b, 32, x, s); \ -- cgit v1.2.1