diff options
author | beck <> | 2019-01-24 02:56:41 +0000 |
---|---|---|
committer | beck <> | 2019-01-24 02:56:41 +0000 |
commit | 10e3b663a1750bc234861ed33ad78e8088b5cb47 (patch) | |
tree | eaf3f613ad96dff5f56e2d992bfb0ad1b7457dac /src/lib/libssl/ssl_tlsext.h | |
parent | 354172b127820c0f48cb417d4d46746e2122f87b (diff) | |
download | openbsd-10e3b663a1750bc234861ed33ad78e8088b5cb47.tar.gz openbsd-10e3b663a1750bc234861ed33ad78e8088b5cb47.tar.bz2 openbsd-10e3b663a1750bc234861ed33ad78e8088b5cb47.zip |
Add server side of versions, keyshare, and client and server of cookie
extensions for tls1.3.
versions is currently defanged to ignore its result until tls13 server
side wired in full, so that server side code still works today when
we only support tls 1.2
ok bcook@ tb@ jsing@
Diffstat (limited to 'src/lib/libssl/ssl_tlsext.h')
-rw-r--r-- | src/lib/libssl/ssl_tlsext.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_tlsext.h b/src/lib/libssl/ssl_tlsext.h index e82be579d0..2f90a03ee9 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.19 2019/01/23 18:24:40 beck Exp $ */ | 1 | /* $OpenBSD: ssl_tlsext.h,v 1.20 2019/01/24 02:56:41 beck 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> |
@@ -101,6 +101,13 @@ int tlsext_keyshare_server_needs(SSL *s); | |||
101 | int tlsext_keyshare_server_build(SSL *s, CBB *cbb); | 101 | int tlsext_keyshare_server_build(SSL *s, CBB *cbb); |
102 | int tlsext_keyshare_server_parse(SSL *s, CBS *cbs, int *alert); | 102 | int tlsext_keyshare_server_parse(SSL *s, CBS *cbs, int *alert); |
103 | 103 | ||
104 | int tlsext_cookie_client_needs(SSL *s); | ||
105 | int tlsext_cookie_client_build(SSL *s, CBB *cbb); | ||
106 | int tlsext_cookie_client_parse(SSL *s, CBS *cbs, int *alert); | ||
107 | int tlsext_cookie_server_needs(SSL *s); | ||
108 | int tlsext_cookie_server_build(SSL *s, CBB *cbb); | ||
109 | int tlsext_cookie_server_parse(SSL *s, CBS *cbs, int *alert); | ||
110 | |||
104 | #ifndef OPENSSL_NO_SRTP | 111 | #ifndef OPENSSL_NO_SRTP |
105 | int tlsext_srtp_client_needs(SSL *s); | 112 | int tlsext_srtp_client_needs(SSL *s); |
106 | int tlsext_srtp_client_build(SSL *s, CBB *cbb); | 113 | int tlsext_srtp_client_build(SSL *s, CBB *cbb); |
@@ -116,6 +123,7 @@ int tlsext_client_parse(SSL *s, CBS *cbs, int *alert, uint16_t msg_type); | |||
116 | int tlsext_server_build(SSL *s, CBB *cbb, uint16_t msg_type); | 123 | int tlsext_server_build(SSL *s, CBB *cbb, uint16_t msg_type); |
117 | int tlsext_server_parse(SSL *s, CBS *cbs, int *alert, uint16_t msg_type); | 124 | int tlsext_server_parse(SSL *s, CBS *cbs, int *alert, uint16_t msg_type); |
118 | 125 | ||
126 | struct tls_extension *tls_extension_find(uint16_t, size_t *); | ||
119 | __END_HIDDEN_DECLS | 127 | __END_HIDDEN_DECLS |
120 | 128 | ||
121 | #endif | 129 | #endif |