From 26763c8d2871a8a3ba70ca3b04080b6a1a4939fc Mon Sep 17 00:00:00 2001 From: jsing <> Date: Tue, 29 Jun 2021 19:25:59 +0000 Subject: Make various sigalg functions static now that they're only used internally. --- src/lib/libssl/ssl_sigalgs.c | 8 ++++---- src/lib/libssl/ssl_sigalgs.h | 7 +------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/lib/libssl/ssl_sigalgs.c b/src/lib/libssl/ssl_sigalgs.c index 28d1d36b85..f9788fb263 100644 --- a/src/lib/libssl/ssl_sigalgs.c +++ b/src/lib/libssl/ssl_sigalgs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_sigalgs.c,v 1.33 2021/06/29 19:20:39 jsing Exp $ */ +/* $OpenBSD: ssl_sigalgs.c,v 1.34 2021/06/29 19:25:59 jsing Exp $ */ /* * Copyright (c) 2018-2020 Bob Beck * Copyright (c) 2021 Joel Sing @@ -189,7 +189,7 @@ ssl_sigalgs_for_version(uint16_t tls_version, const uint16_t **out_values, } } -const struct ssl_sigalg * +static const struct ssl_sigalg * ssl_sigalg_lookup(uint16_t value) { int i; @@ -202,7 +202,7 @@ ssl_sigalg_lookup(uint16_t value) return NULL; } -const struct ssl_sigalg * +static const struct ssl_sigalg * ssl_sigalg_from_value(uint16_t tls_version, uint16_t value) { const uint16_t *values; @@ -261,7 +261,7 @@ ssl_sigalg_for_legacy(SSL *s, EVP_PKEY *pkey) return (NULL); } -int +static int ssl_sigalg_pkey_ok(SSL *s, const struct ssl_sigalg *sigalg, EVP_PKEY *pkey) { if (sigalg == NULL || pkey == NULL) diff --git a/src/lib/libssl/ssl_sigalgs.h b/src/lib/libssl/ssl_sigalgs.h index dffa0e0158..beab11afd6 100644 --- a/src/lib/libssl/ssl_sigalgs.h +++ b/src/lib/libssl/ssl_sigalgs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_sigalgs.h,v 1.22 2021/06/29 19:20:39 jsing Exp $ */ +/* $OpenBSD: ssl_sigalgs.h,v 1.23 2021/06/29 19:25:59 jsing Exp $ */ /* * Copyright (c) 2018-2019 Bob Beck * @@ -68,12 +68,7 @@ struct ssl_sigalg { int flags; }; -const struct ssl_sigalg *ssl_sigalg_lookup(uint16_t sigalg); -const struct ssl_sigalg *ssl_sigalg_from_value(uint16_t tls_version, - uint16_t value); int ssl_sigalgs_build(uint16_t tls_version, CBB *cbb); -int ssl_sigalg_pkey_ok(SSL *s, const struct ssl_sigalg *sigalg, - EVP_PKEY *pkey); const struct ssl_sigalg *ssl_sigalg_select(SSL *s, EVP_PKEY *pkey); const struct ssl_sigalg *ssl_sigalg_for_peer(SSL *s, EVP_PKEY *pkey, uint16_t sigalg_value); -- cgit v1.2.3-55-g6feb