diff options
author | beck <> | 2019-01-23 16:46:04 +0000 |
---|---|---|
committer | beck <> | 2019-01-23 16:46:04 +0000 |
commit | 811354ae1302b7cd68c86866b02f4ab4cf11322b (patch) | |
tree | b41a9c3ad5801c2f161aede880a9a198b66706f7 /src/lib/libssl/ssl_tlsext.h | |
parent | 37392584e512230f90ecbecb535ed1ac0bedd0af (diff) | |
download | openbsd-811354ae1302b7cd68c86866b02f4ab4cf11322b.tar.gz openbsd-811354ae1302b7cd68c86866b02f4ab4cf11322b.tar.bz2 openbsd-811354ae1302b7cd68c86866b02f4ab4cf11322b.zip |
Modify sigalgs extension processing for TLS 1.3.
- Make a separate sigalgs list for TLS 1.3 including only modern
algorithm choices which we use when the handshake will not negotiate
TLS 1.2
- Modify the legacy sigalgs for TLS 1.2 to include the RSA PSS algorithms as
mandated by RFC8446 when the handshake will permit negotiation of TLS 1.2
ok jsing@ tb@
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 940366b7d8..8472a8058b 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.17 2019/01/18 12:18:10 beck Exp $ */ | 1 | /* $OpenBSD: ssl_tlsext.h,v 1.18 2019/01/23 16:46:04 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 |