summaryrefslogtreecommitdiff
path: root/lib/libssl
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2021-06-29 19:26:00 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2021-06-29 19:26:00 +0000
commitc1c7355f6df1fa0f50948593cda07fbcf5469f78 (patch)
tree852d8e496745d1fc1ba11d60ba397c85b7c7f464 /lib/libssl
parent4b540599088230449b9e1e5ce89348d12a14012a (diff)
Make various sigalg functions static now that they're only used internally.
Diffstat (limited to 'lib/libssl')
-rw-r--r--lib/libssl/ssl_sigalgs.c8
-rw-r--r--lib/libssl/ssl_sigalgs.h7
2 files changed, 5 insertions, 10 deletions
diff --git a/lib/libssl/ssl_sigalgs.c b/lib/libssl/ssl_sigalgs.c
index 28d1d36b85c..f9788fb2636 100644
--- a/lib/libssl/ssl_sigalgs.c
+++ b/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 <beck@openbsd.org>
* 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,
}
}
-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/lib/libssl/ssl_sigalgs.h b/lib/libssl/ssl_sigalgs.h
index dffa0e0158c..beab11afd67 100644
--- a/lib/libssl/ssl_sigalgs.h
+++ b/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 <beck@openbsd.org>
*
@@ -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);