diff options
Diffstat (limited to 'lib/supplemental.c')
| -rw-r--r-- | lib/supplemental.c | 57 |
1 files changed, 32 insertions, 25 deletions
diff --git a/lib/supplemental.c b/lib/supplemental.c index becb01e50c..8573b267df 100644 --- a/lib/supplemental.c +++ b/lib/supplemental.c @@ -71,8 +71,7 @@ static gnutls_supplemental_entry_st *suppfunc = NULL; * supplemental data format type, or %NULL for unknown types. **/ const char - *gnutls_supplemental_get_name(gnutls_supplemental_data_format_type_t - type) +*gnutls_supplemental_get_name(gnutls_supplemental_data_format_type_t type) { size_t i; @@ -98,7 +97,8 @@ void _gnutls_supplemental_deinit(void) } static gnutls_supp_recv_func -get_supp_func_recv(gnutls_session_t session, gnutls_supplemental_data_format_type_t type) +get_supp_func_recv(gnutls_session_t session, + gnutls_supplemental_data_format_type_t type) { size_t i; @@ -115,7 +115,8 @@ get_supp_func_recv(gnutls_session_t session, gnutls_supplemental_data_format_typ return NULL; } -static int gen_supplemental(gnutls_session_t session, const gnutls_supplemental_entry_st *supp, +static int gen_supplemental(gnutls_session_t session, + const gnutls_supplemental_entry_st * supp, gnutls_buffer_st * buf) { int ret; @@ -141,16 +142,14 @@ static int gen_supplemental(gnutls_session_t session, const gnutls_supplemental_ buf->data[sizepos + 1] = supp->type & 0xFF; buf->data[sizepos + 2] = ((buf->length - sizepos - 4) >> 8) & 0xFF; - buf->data[sizepos + 3] = - (buf->length - sizepos - 4) & 0xFF; + buf->data[sizepos + 3] = (buf->length - sizepos - 4) & 0xFF; } else buf->length -= 4; return 0; } -int -_gnutls_gen_supplemental(gnutls_session_t session, gnutls_buffer_st * buf) +int _gnutls_gen_supplemental(gnutls_session_t session, gnutls_buffer_st * buf) { size_t i; int ret; @@ -164,7 +163,8 @@ _gnutls_gen_supplemental(gnutls_session_t session, gnutls_buffer_st * buf) } for (i = 0; i < session->internals.rsup_size; i++) { - ret = gen_supplemental(session, &session->internals.rsup[i], buf); + ret = + gen_supplemental(session, &session->internals.rsup[i], buf); if (ret < 0) return gnutls_assert_val(ret); } @@ -178,12 +178,12 @@ _gnutls_gen_supplemental(gnutls_session_t session, gnutls_buffer_st * buf) i = buf->length - init_pos - 3; buf->data[init_pos] = (i >> 16) & 0xFF; - buf->data[init_pos+1] = (i >> 8) & 0xFF; - buf->data[init_pos+2] = i & 0xFF; + buf->data[init_pos + 1] = (i >> 8) & 0xFF; + buf->data[init_pos + 2] = i & 0xFF; _gnutls_debug_log ("EXT[%p]: Sending %d bytes of supplemental data\n", session, - (int) buf->length); + (int)buf->length); return buf->length - init_pos; } @@ -242,8 +242,7 @@ _gnutls_parse_supplemental(gnutls_session_t session, return 0; } -static int -_gnutls_supplemental_register(gnutls_supplemental_entry_st *entry) +static int _gnutls_supplemental_register(gnutls_supplemental_entry_st * entry) { gnutls_supplemental_entry_st *p; unsigned i; @@ -295,8 +294,10 @@ _gnutls_supplemental_register(gnutls_supplemental_entry_st *entry) * Since: 3.4.0 **/ int -gnutls_supplemental_register(const char *name, gnutls_supplemental_data_format_type_t type, - gnutls_supp_recv_func recv_func, gnutls_supp_send_func send_func) +gnutls_supplemental_register(const char *name, + gnutls_supplemental_data_format_type_t type, + gnutls_supp_recv_func recv_func, + gnutls_supp_send_func send_func) { gnutls_supplemental_entry_st tmp_entry; int ret; @@ -305,7 +306,7 @@ gnutls_supplemental_register(const char *name, gnutls_supplemental_data_format_t tmp_entry.type = type; tmp_entry.supp_recv_func = recv_func; tmp_entry.supp_send_func = send_func; - + ret = _gnutls_supplemental_register(&tmp_entry); if (ret < 0) { gnutls_free(tmp_entry.name); @@ -342,8 +343,8 @@ gnutls_supplemental_register(const char *name, gnutls_supplemental_data_format_t **/ int gnutls_session_supplemental_register(gnutls_session_t session, const char *name, - gnutls_supplemental_data_format_type_t type, - gnutls_supp_recv_func recv_func, + gnutls_supplemental_data_format_type_t + type, gnutls_supp_recv_func recv_func, gnutls_supp_send_func send_func, unsigned flags) { @@ -362,13 +363,15 @@ gnutls_session_supplemental_register(gnutls_session_t session, const char *name, } p = gnutls_realloc(session->internals.rsup, - sizeof(gnutls_supplemental_entry_st)*(session->internals.rsup_size + 1)); + sizeof(gnutls_supplemental_entry_st) * + (session->internals.rsup_size + 1)); if (!p) return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR); session->internals.rsup = p; - memcpy(&session->internals.rsup[session->internals.rsup_size], &tmp_entry, sizeof(tmp_entry)); + memcpy(&session->internals.rsup[session->internals.rsup_size], + &tmp_entry, sizeof(tmp_entry)); session->internals.rsup_size++; session->internals.flags |= INT_FLAG_NO_TLS13; @@ -388,9 +391,11 @@ gnutls_session_supplemental_register(gnutls_session_t session, const char *name, * Since: 3.4.0 **/ void -gnutls_supplemental_recv(gnutls_session_t session, unsigned do_recv_supplemental) +gnutls_supplemental_recv(gnutls_session_t session, + unsigned do_recv_supplemental) { - session->security_parameters.do_recv_supplemental = do_recv_supplemental; + session->security_parameters.do_recv_supplemental = + do_recv_supplemental; } /** @@ -404,7 +409,9 @@ gnutls_supplemental_recv(gnutls_session_t session, unsigned do_recv_supplemental * Since: 3.4.0 **/ void -gnutls_supplemental_send(gnutls_session_t session, unsigned do_send_supplemental) +gnutls_supplemental_send(gnutls_session_t session, + unsigned do_send_supplemental) { - session->security_parameters.do_send_supplemental = do_send_supplemental; + session->security_parameters.do_send_supplemental = + do_send_supplemental; } |