diff options
| author | beck <> | 2019-01-23 18:39:28 +0000 |
|---|---|---|
| committer | beck <> | 2019-01-23 18:39:28 +0000 |
| commit | 5b044ab96482aee07d5182930013d4e606d4740d (patch) | |
| tree | e5f32c31b20068e7d8674ff7ddb1ea2fe2ca16fa /src/lib/libssl/ssl_locl.h | |
| parent | 9a6a5e403c8b66eb5bbc3532a5f1b5e325b172c1 (diff) | |
| download | openbsd-5b044ab96482aee07d5182930013d4e606d4740d.tar.gz openbsd-5b044ab96482aee07d5182930013d4e606d4740d.tar.bz2 openbsd-5b044ab96482aee07d5182930013d4e606d4740d.zip | |
Modify sigalgs extension processing to accomodate 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
from a 1.3 handshake.
ok jsing@ tb@
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl_locl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 7fd155648c..8447484ec7 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_locl.h,v 1.230 2019/01/23 18:24:40 beck Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.231 2019/01/23 18:39:28 beck Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -1313,7 +1313,7 @@ int tls1_process_ticket(SSL *s, const unsigned char *session_id, | |||
| 1313 | int session_id_len, CBS *ext_block, SSL_SESSION **ret); | 1313 | int session_id_len, CBS *ext_block, SSL_SESSION **ret); |
| 1314 | 1314 | ||
| 1315 | long ssl_get_algorithm2(SSL *s); | 1315 | long ssl_get_algorithm2(SSL *s); |
| 1316 | int tls1_process_sigalgs(SSL *s, CBS *cbs); | 1316 | int tls1_process_sigalgs(SSL *s, CBS *cbs, uint16_t *, size_t); |
| 1317 | 1317 | ||
| 1318 | int tls1_check_ec_server_key(SSL *s); | 1318 | int tls1_check_ec_server_key(SSL *s); |
| 1319 | 1319 | ||
