summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2021-06-29 19:25:59 +0000
committerjsing <>2021-06-29 19:25:59 +0000
commit26763c8d2871a8a3ba70ca3b04080b6a1a4939fc (patch)
treed216a571e3ef59d7d4c9b1b227dd902a0904937a
parenta9fca25b84daaf2725140dc9ed1fae79bc52327b (diff)
downloadopenbsd-26763c8d2871a8a3ba70ca3b04080b6a1a4939fc.tar.gz
openbsd-26763c8d2871a8a3ba70ca3b04080b6a1a4939fc.tar.bz2
openbsd-26763c8d2871a8a3ba70ca3b04080b6a1a4939fc.zip
Make various sigalg functions static now that they're only used internally.
-rw-r--r--src/lib/libssl/ssl_sigalgs.c8
-rw-r--r--src/lib/libssl/ssl_sigalgs.h7
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 @@
1/* $OpenBSD: ssl_sigalgs.c,v 1.33 2021/06/29 19:20:39 jsing Exp $ */ 1/* $OpenBSD: ssl_sigalgs.c,v 1.34 2021/06/29 19:25:59 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2018-2020 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2018-2020 Bob Beck <beck@openbsd.org>
4 * Copyright (c) 2021 Joel Sing <jsing@openbsd.org> 4 * Copyright (c) 2021 Joel Sing <jsing@openbsd.org>
@@ -189,7 +189,7 @@ ssl_sigalgs_for_version(uint16_t tls_version, const uint16_t **out_values,
189 } 189 }
190} 190}
191 191
192const struct ssl_sigalg * 192static const struct ssl_sigalg *
193ssl_sigalg_lookup(uint16_t value) 193ssl_sigalg_lookup(uint16_t value)
194{ 194{
195 int i; 195 int i;
@@ -202,7 +202,7 @@ ssl_sigalg_lookup(uint16_t value)
202 return NULL; 202 return NULL;
203} 203}
204 204
205const struct ssl_sigalg * 205static const struct ssl_sigalg *
206ssl_sigalg_from_value(uint16_t tls_version, uint16_t value) 206ssl_sigalg_from_value(uint16_t tls_version, uint16_t value)
207{ 207{
208 const uint16_t *values; 208 const uint16_t *values;
@@ -261,7 +261,7 @@ ssl_sigalg_for_legacy(SSL *s, EVP_PKEY *pkey)
261 return (NULL); 261 return (NULL);
262} 262}
263 263
264int 264static int
265ssl_sigalg_pkey_ok(SSL *s, const struct ssl_sigalg *sigalg, EVP_PKEY *pkey) 265ssl_sigalg_pkey_ok(SSL *s, const struct ssl_sigalg *sigalg, EVP_PKEY *pkey)
266{ 266{
267 if (sigalg == NULL || pkey == NULL) 267 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 @@
1/* $OpenBSD: ssl_sigalgs.h,v 1.22 2021/06/29 19:20:39 jsing Exp $ */ 1/* $OpenBSD: ssl_sigalgs.h,v 1.23 2021/06/29 19:25:59 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2018-2019 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2018-2019 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -68,12 +68,7 @@ struct ssl_sigalg {
68 int flags; 68 int flags;
69}; 69};
70 70
71const struct ssl_sigalg *ssl_sigalg_lookup(uint16_t sigalg);
72const struct ssl_sigalg *ssl_sigalg_from_value(uint16_t tls_version,
73 uint16_t value);
74int ssl_sigalgs_build(uint16_t tls_version, CBB *cbb); 71int ssl_sigalgs_build(uint16_t tls_version, CBB *cbb);
75int ssl_sigalg_pkey_ok(SSL *s, const struct ssl_sigalg *sigalg,
76 EVP_PKEY *pkey);
77const struct ssl_sigalg *ssl_sigalg_select(SSL *s, EVP_PKEY *pkey); 72const struct ssl_sigalg *ssl_sigalg_select(SSL *s, EVP_PKEY *pkey);
78const struct ssl_sigalg *ssl_sigalg_for_peer(SSL *s, EVP_PKEY *pkey, 73const struct ssl_sigalg *ssl_sigalg_for_peer(SSL *s, EVP_PKEY *pkey,
79 uint16_t sigalg_value); 74 uint16_t sigalg_value);