summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_clnt.c
diff options
context:
space:
mode:
authorjsing <>2024-07-19 08:56:17 +0000
committerjsing <>2024-07-19 08:56:17 +0000
commitcc7dc6e9b7012526aa3797842d226b3a275a7e70 (patch)
treef7c486e99793aa346ba7c649bc01d3ce39f81718 /src/lib/libssl/ssl_clnt.c
parentf8eff50c9ac6772239e96a6d2031a83bac497a15 (diff)
downloadopenbsd-cc7dc6e9b7012526aa3797842d226b3a275a7e70.tar.gz
openbsd-cc7dc6e9b7012526aa3797842d226b3a275a7e70.tar.bz2
openbsd-cc7dc6e9b7012526aa3797842d226b3a275a7e70.zip
Annotate issues with tls_session_secret_cb() related code.
Diffstat (limited to 'src/lib/libssl/ssl_clnt.c')
-rw-r--r--src/lib/libssl/ssl_clnt.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c
index feb29ee4a5..6cf0ee4a4a 100644
--- a/src/lib/libssl/ssl_clnt.c
+++ b/src/lib/libssl/ssl_clnt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_clnt.c,v 1.165 2024/02/03 18:03:49 tb Exp $ */ 1/* $OpenBSD: ssl_clnt.c,v 1.166 2024/07/19 08:56:17 jsing 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 *
@@ -941,6 +941,11 @@ ssl3_get_server_hello(SSL *s)
941 } 941 }
942 s->session->master_key_length = master_key_length; 942 s->session->master_key_length = master_key_length;
943 943
944 /*
945 * XXX - this appears to be completely broken. The
946 * client cannot change the cipher at this stage,
947 * as the server has already made a selection.
948 */
944 if ((s->session->cipher = pref_cipher) == NULL) 949 if ((s->session->cipher = pref_cipher) == NULL)
945 s->session->cipher = 950 s->session->cipher =
946 ssl3_get_cipher_by_value(cipher_suite); 951 ssl3_get_cipher_by_value(cipher_suite);