diff options
author | tb <> | 2021-01-09 10:41:48 +0000 |
---|---|---|
committer | tb <> | 2021-01-09 10:41:48 +0000 |
commit | 326615a6e0d9c026a95e75db78bdfb2e53aa2972 (patch) | |
tree | 28f969b984b912e52d33a9fb7892a857651662cb | |
parent | da5ab60e604de7c7f22df99fa6f45c0328d48ab6 (diff) | |
download | openbsd-326615a6e0d9c026a95e75db78bdfb2e53aa2972.tar.gz openbsd-326615a6e0d9c026a95e75db78bdfb2e53aa2972.tar.bz2 openbsd-326615a6e0d9c026a95e75db78bdfb2e53aa2972.zip |
Add support for SSL_get_shared_ciphers() in TLSv1.3
As reported by Steffen Ullrich and bluhm, since enabling TLSv1.3 server
some tests fail in t/local/07_sslecho.c of security/p5-Net-SSLeay due
to missing support for SSL_get_shared_ciphers(). This fixes the parts
related to shared ciphers.
ok beck inoguchi jsing
-rw-r--r-- | src/lib/libssl/tls13_server.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/libssl/tls13_server.c b/src/lib/libssl/tls13_server.c index 2062d4956c..0b079c1d83 100644 --- a/src/lib/libssl/tls13_server.c +++ b/src/lib/libssl/tls13_server.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls13_server.c,v 1.68 2021/01/07 16:26:31 tb Exp $ */ | 1 | /* $OpenBSD: tls13_server.c,v 1.69 2021/01/09 10:41:48 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org> |
4 | * Copyright (c) 2020 Bob Beck <beck@openbsd.org> | 4 | * Copyright (c) 2020 Bob Beck <beck@openbsd.org> |
@@ -250,6 +250,10 @@ tls13_client_hello_process(struct tls13_ctx *ctx, CBS *cbs) | |||
250 | } | 250 | } |
251 | S3I(s)->hs.new_cipher = cipher; | 251 | S3I(s)->hs.new_cipher = cipher; |
252 | 252 | ||
253 | sk_SSL_CIPHER_free(s->session->ciphers); | ||
254 | s->session->ciphers = ciphers; | ||
255 | ciphers = NULL; | ||
256 | |||
253 | /* Ensure only the NULL compression method is advertised. */ | 257 | /* Ensure only the NULL compression method is advertised. */ |
254 | if (!CBS_mem_equal(&compression_methods, tls13_compression_null_only, | 258 | if (!CBS_mem_equal(&compression_methods, tls13_compression_null_only, |
255 | sizeof(tls13_compression_null_only))) { | 259 | sizeof(tls13_compression_null_only))) { |