summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_sigalgs.h
diff options
context:
space:
mode:
authorjsing <>2021-06-27 17:59:17 +0000
committerjsing <>2021-06-27 17:59:17 +0000
commit891146bbfc5899a9664de6a0a9cdd3e07e4b71be (patch)
tree9aa7a2ebffa610b50040d3f0f8342808ac133685 /src/lib/libssl/ssl_sigalgs.h
parentd098f30c3e9d8c1b5b893995afa30e490e98bd85 (diff)
downloadopenbsd-891146bbfc5899a9664de6a0a9cdd3e07e4b71be.tar.gz
openbsd-891146bbfc5899a9664de6a0a9cdd3e07e4b71be.tar.bz2
openbsd-891146bbfc5899a9664de6a0a9cdd3e07e4b71be.zip
Change ssl_sigalgs_build() to perform sigalg list selection.
Rather that doing sigalg list selection at every call site, pass in the appropriate TLS version and have ssl_sigalgs_build() perform the sigalg list selection itself. This reduces code duplication, simplifies the calling code and is the first step towards internalising the sigalg lists. ok tb@
Diffstat (limited to 'src/lib/libssl/ssl_sigalgs.h')
-rw-r--r--src/lib/libssl/ssl_sigalgs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_sigalgs.h b/src/lib/libssl/ssl_sigalgs.h
index db21eda1f8..64a2bd435c 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.17 2021/06/27 17:45:16 jsing Exp $ */ 1/* $OpenBSD: ssl_sigalgs.h,v 1.18 2021/06/27 17:59:17 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 *
@@ -75,7 +75,7 @@ extern const size_t tls13_sigalgs_len;
75 75
76const struct ssl_sigalg *ssl_sigalg_lookup(uint16_t sigalg); 76const struct ssl_sigalg *ssl_sigalg_lookup(uint16_t sigalg);
77const struct ssl_sigalg *ssl_sigalg(uint16_t sigalg, const uint16_t *values, size_t len); 77const struct ssl_sigalg *ssl_sigalg(uint16_t sigalg, const uint16_t *values, size_t len);
78int ssl_sigalgs_build(CBB *cbb, const uint16_t *values, size_t len); 78int ssl_sigalgs_build(uint16_t tls_version, CBB *cbb);
79int ssl_sigalg_pkey_check(uint16_t sigalg, EVP_PKEY *pk); 79int ssl_sigalg_pkey_check(uint16_t sigalg, EVP_PKEY *pk);
80int ssl_sigalg_pkey_ok(const struct ssl_sigalg *sigalg, EVP_PKEY *pkey, 80int ssl_sigalg_pkey_ok(const struct ssl_sigalg *sigalg, EVP_PKEY *pkey,
81 int check_curve); 81 int check_curve);