diff options
-rw-r--r-- | src/lib/libssl/ssl_sigalgs.h | 10 | ||||
-rw-r--r-- | src/lib/libssl/ssl_tlsext.h | 11 |
2 files changed, 19 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_sigalgs.h b/src/lib/libssl/ssl_sigalgs.h index b0ed70b7fc..a73c398e58 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.1 2018/11/09 00:34:55 beck Exp $ */ | 1 | /* $OpenBSD: ssl_sigalgs.h,v 1.2 2018/11/09 03:17:04 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018, Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2018, Bob Beck <beck@openbsd.org> |
4 | * | 4 | * |
@@ -15,6 +15,10 @@ | |||
15 | * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #ifndef HEADER_SSL_SIGALGS_H | ||
19 | #define HEADER_SSL_SIGALGS_H | ||
20 | |||
21 | __BEGIN_HIDDEN_DECLS | ||
18 | 22 | ||
19 | #define SIGALG_NONE 0x0000 | 23 | #define SIGALG_NONE 0x0000 |
20 | 24 | ||
@@ -67,3 +71,7 @@ const EVP_MD * ssl_sigalg_md(uint16_t sigalg); | |||
67 | uint16_t ssl_sigalg_value(const EVP_PKEY *pk, const EVP_MD *md); | 71 | uint16_t ssl_sigalg_value(const EVP_PKEY *pk, const EVP_MD *md); |
68 | int ssl_sigalgs_build(CBB *cbb); | 72 | int ssl_sigalgs_build(CBB *cbb); |
69 | int ssl_sigalg_pkey_check(uint16_t sigalg, EVP_PKEY *pk); | 73 | int ssl_sigalg_pkey_check(uint16_t sigalg, EVP_PKEY *pk); |
74 | |||
75 | __END_HIDDEN_DECLS | ||
76 | |||
77 | #endif | ||
diff --git a/src/lib/libssl/ssl_tlsext.h b/src/lib/libssl/ssl_tlsext.h index 974ab929ec..b6108ea45a 100644 --- a/src/lib/libssl/ssl_tlsext.h +++ b/src/lib/libssl/ssl_tlsext.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_tlsext.h,v 1.13 2018/11/05 20:41:30 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_tlsext.h,v 1.14 2018/11/09 03:17:24 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org> |
4 | * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> | 4 | * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> |
@@ -16,6 +16,11 @@ | |||
16 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 16 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #ifndef HEADER_SSL_TLSEXT_H | ||
20 | #define HEADER_SSL_TLSEXT_H | ||
21 | |||
22 | __BEGIN_HIDDEN_DECLS | ||
23 | |||
19 | int tlsext_alpn_clienthello_needs(SSL *s); | 24 | int tlsext_alpn_clienthello_needs(SSL *s); |
20 | int tlsext_alpn_clienthello_build(SSL *s, CBB *cbb); | 25 | int tlsext_alpn_clienthello_build(SSL *s, CBB *cbb); |
21 | int tlsext_alpn_clienthello_parse(SSL *s, CBS *cbs, int *alert); | 26 | int tlsext_alpn_clienthello_parse(SSL *s, CBS *cbs, int *alert); |
@@ -86,3 +91,7 @@ int tlsext_clienthello_parse(SSL *s, CBS *cbs, int *alert); | |||
86 | 91 | ||
87 | int tlsext_serverhello_build(SSL *s, CBB *cbb); | 92 | int tlsext_serverhello_build(SSL *s, CBB *cbb); |
88 | int tlsext_serverhello_parse(SSL *s, CBS *cbs, int *alert); | 93 | int tlsext_serverhello_parse(SSL *s, CBS *cbs, int *alert); |
94 | |||
95 | __END_HIDDEN_DECLS | ||
96 | |||
97 | #endif | ||