Skip to content

Commit

Permalink
squash! Update tls state machine logic to support dtls1.3 alongside t…
Browse files Browse the repository at this point in the history
…ls1.3

Updated the logic in ssl_cipher_list_to_bytes to take account of the changes
from PR#24161
  • Loading branch information
mattcaswell committed Apr 22, 2024
1 parent fbea037 commit acfd987
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions ssl/statem/statem_clnt.c
Original file line number Diff line number Diff line change
Expand Up @@ -4067,11 +4067,9 @@ int ssl_cipher_list_to_bytes(SSL_CONNECTION *s, STACK_OF(SSL_CIPHER) *sk,
{
int i;
size_t totlen = 0, len, maxlen, maxverok = 0;
int min_proto_version_limit = SSL_CONNECTION_IS_DTLS(s)
? DTLS1_3_VERSION : TLS1_3_VERSION;
int empty_reneg_info_scsv = !s->renegotiate
&& (ssl_version_cmp(s, s->min_proto_version, min_proto_version_limit) < 0
|| s->min_proto_version == 0);
&& (SSL_CONNECTION_IS_DTLS(s)
|| s->min_proto_version < TLS1_3_VERSION);
SSL *ssl = SSL_CONNECTION_GET_SSL(s);

/* Set disabled masks for this session */
Expand Down

0 comments on commit acfd987

Please sign in to comment.