diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/ssl_sigalgs.c | 15 | ||||
| -rw-r--r-- | src/lib/libssl/ssl_sigalgs.h | 3 |
2 files changed, 2 insertions, 16 deletions
diff --git a/src/lib/libssl/ssl_sigalgs.c b/src/lib/libssl/ssl_sigalgs.c index 5259ea676a..cee3f0bf6d 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.4 2018/11/10 01:19:09 beck Exp $ */ | 1 | /* $OpenBSD: ssl_sigalgs.c,v 1.5 2018/11/10 08:42:39 beck Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2018, Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2018, Bob Beck <beck@openbsd.org> |
| 4 | * | 4 | * |
| @@ -205,19 +205,6 @@ ssl_sigalg(uint16_t sigalg, uint16_t *values, size_t len) | |||
| 205 | return NULL; | 205 | return NULL; |
| 206 | } | 206 | } |
| 207 | 207 | ||
| 208 | uint16_t | ||
| 209 | ssl_sigalg_value(const EVP_PKEY *pk, const EVP_MD *md) | ||
| 210 | { | ||
| 211 | int i; | ||
| 212 | |||
| 213 | for (i = 0; sigalgs[i].value != SIGALG_NONE; i++) { | ||
| 214 | if ((sigalgs[i].key_type == pk->type) && | ||
| 215 | ((sigalgs[i].md() == md))) | ||
| 216 | return sigalgs[i].value; | ||
| 217 | } | ||
| 218 | return SIGALG_NONE; | ||
| 219 | } | ||
| 220 | |||
| 221 | int | 208 | int |
| 222 | ssl_sigalgs_build(CBB *cbb, uint16_t *values, size_t len) | 209 | ssl_sigalgs_build(CBB *cbb, uint16_t *values, size_t len) |
| 223 | { | 210 | { |
diff --git a/src/lib/libssl/ssl_sigalgs.h b/src/lib/libssl/ssl_sigalgs.h index ca1e4feb32..f6fb5e2ad6 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.5 2018/11/10 01:19:09 beck Exp $ */ | 1 | /* $OpenBSD: ssl_sigalgs.h,v 1.6 2018/11/10 08:42:39 beck Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2018, Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2018, Bob Beck <beck@openbsd.org> |
| 4 | * | 4 | * |
| @@ -71,7 +71,6 @@ extern size_t tls12_sigalgs_len; | |||
| 71 | 71 | ||
| 72 | const struct ssl_sigalg *ssl_sigalg_lookup(uint16_t sigalg); | 72 | const struct ssl_sigalg *ssl_sigalg_lookup(uint16_t sigalg); |
| 73 | const struct ssl_sigalg *ssl_sigalg(uint16_t sigalg, uint16_t *values, size_t len); | 73 | const struct ssl_sigalg *ssl_sigalg(uint16_t sigalg, uint16_t *values, size_t len); |
| 74 | uint16_t ssl_sigalg_value(const EVP_PKEY *pk, const EVP_MD *md); | ||
| 75 | int ssl_sigalgs_build(CBB *cbb, uint16_t *values, size_t len); | 74 | int ssl_sigalgs_build(CBB *cbb, uint16_t *values, size_t len); |
| 76 | int ssl_sigalg_pkey_check(uint16_t sigalg, EVP_PKEY *pk); | 75 | int ssl_sigalg_pkey_check(uint16_t sigalg, EVP_PKEY *pk); |
| 77 | 76 | ||
