diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/ssl_sigalgs.c | 8 | ||||
| -rw-r--r-- | 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 @@ | |||
| 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 | ||
| 192 | const struct ssl_sigalg * | 192 | static const struct ssl_sigalg * |
| 193 | ssl_sigalg_lookup(uint16_t value) | 193 | ssl_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 | ||
| 205 | const struct ssl_sigalg * | 205 | static const struct ssl_sigalg * |
| 206 | ssl_sigalg_from_value(uint16_t tls_version, uint16_t value) | 206 | ssl_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 | ||
| 264 | int | 264 | static int |
| 265 | ssl_sigalg_pkey_ok(SSL *s, const struct ssl_sigalg *sigalg, EVP_PKEY *pkey) | 265 | ssl_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 | ||
| 71 | const struct ssl_sigalg *ssl_sigalg_lookup(uint16_t sigalg); | ||
| 72 | const struct ssl_sigalg *ssl_sigalg_from_value(uint16_t tls_version, | ||
| 73 | uint16_t value); | ||
| 74 | int ssl_sigalgs_build(uint16_t tls_version, CBB *cbb); | 71 | int ssl_sigalgs_build(uint16_t tls_version, CBB *cbb); |
| 75 | int ssl_sigalg_pkey_ok(SSL *s, const struct ssl_sigalg *sigalg, | ||
| 76 | EVP_PKEY *pkey); | ||
| 77 | const struct ssl_sigalg *ssl_sigalg_select(SSL *s, EVP_PKEY *pkey); | 72 | const struct ssl_sigalg *ssl_sigalg_select(SSL *s, EVP_PKEY *pkey); |
| 78 | const struct ssl_sigalg *ssl_sigalg_for_peer(SSL *s, EVP_PKEY *pkey, | 73 | const struct ssl_sigalg *ssl_sigalg_for_peer(SSL *s, EVP_PKEY *pkey, |
| 79 | uint16_t sigalg_value); | 74 | uint16_t sigalg_value); |
