From c18c986abbe66711d3b3ed873f7dde63d0573969 Mon Sep 17 00:00:00 2001 From: inoguchi <> Date: Wed, 29 Apr 2020 01:16:49 +0000 Subject: tls13_handshake internal functions to static in libssl ok jsing@ tb@ --- src/lib/libssl/tls13_handshake.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/lib/libssl/tls13_handshake.c b/src/lib/libssl/tls13_handshake.c index 86046144de..0d3e64dee8 100644 --- a/src/lib/libssl/tls13_handshake.c +++ b/src/lib/libssl/tls13_handshake.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls13_handshake.c,v 1.53 2020/04/22 17:05:07 jsing Exp $ */ +/* $OpenBSD: tls13_handshake.c,v 1.54 2020/04/29 01:16:49 inoguchi Exp $ */ /* * Copyright (c) 2018-2019 Theo Buehler * Copyright (c) 2019 Joel Sing @@ -36,15 +36,16 @@ struct tls13_handshake_action { int (*recv)(struct tls13_ctx *ctx, CBS *cbs); }; -enum tls13_message_type tls13_handshake_active_state(struct tls13_ctx *ctx); +static enum tls13_message_type + tls13_handshake_active_state(struct tls13_ctx *ctx); -struct tls13_handshake_action * +static struct tls13_handshake_action * tls13_handshake_active_action(struct tls13_ctx *ctx); -int tls13_handshake_advance_state_machine(struct tls13_ctx *ctx); +static int tls13_handshake_advance_state_machine(struct tls13_ctx *ctx); -int tls13_handshake_send_action(struct tls13_ctx *ctx, +static int tls13_handshake_send_action(struct tls13_ctx *ctx, struct tls13_handshake_action *action); -int tls13_handshake_recv_action(struct tls13_ctx *ctx, +static int tls13_handshake_recv_action(struct tls13_ctx *ctx, struct tls13_handshake_action *action); struct tls13_handshake_action state_machine[] = { @@ -247,7 +248,7 @@ enum tls13_message_type handshakes[][TLS13_NUM_MESSAGE_TYPES] = { const size_t handshake_count = sizeof(handshakes) / sizeof(handshakes[0]); -enum tls13_message_type +static enum tls13_message_type tls13_handshake_active_state(struct tls13_ctx *ctx) { struct tls13_handshake_stage hs = ctx->handshake_stage; @@ -260,7 +261,7 @@ tls13_handshake_active_state(struct tls13_ctx *ctx) return handshakes[hs.hs_type][hs.message_number]; } -struct tls13_handshake_action * +static struct tls13_handshake_action * tls13_handshake_active_action(struct tls13_ctx *ctx) { enum tls13_message_type mt = tls13_handshake_active_state(ctx); @@ -271,7 +272,7 @@ tls13_handshake_active_action(struct tls13_ctx *ctx) return &state_machine[mt]; } -int +static int tls13_handshake_advance_state_machine(struct tls13_ctx *ctx) { if (++ctx->handshake_stage.message_number >= TLS13_NUM_MESSAGE_TYPES) @@ -321,7 +322,7 @@ tls13_handshake_perform(struct tls13_ctx *ctx) } } -int +static int tls13_handshake_send_action(struct tls13_ctx *ctx, struct tls13_handshake_action *action) { @@ -369,7 +370,7 @@ tls13_handshake_send_action(struct tls13_ctx *ctx, return TLS13_IO_SUCCESS; } -int +static int tls13_handshake_recv_action(struct tls13_ctx *ctx, struct tls13_handshake_action *action) { -- cgit v1.2.3-55-g6feb