diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libssl/ssl_sess.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c index 969371b1de..504c402105 100644 --- a/src/lib/libssl/ssl_sess.c +++ b/src/lib/libssl/ssl_sess.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_sess.c,v 1.114 2022/06/07 17:32:53 tb Exp $ */ | 1 | /* $OpenBSD: ssl_sess.c,v 1.115 2022/06/07 17:45:13 tb 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 | * |
@@ -526,7 +526,6 @@ int | |||
526 | ssl_get_prev_session(SSL *s, CBS *session_id, CBS *ext_block, int *alert) | 526 | ssl_get_prev_session(SSL *s, CBS *session_id, CBS *ext_block, int *alert) |
527 | { | 527 | { |
528 | SSL_SESSION *sess = NULL; | 528 | SSL_SESSION *sess = NULL; |
529 | size_t session_id_len; | ||
530 | int alert_desc = SSL_AD_INTERNAL_ERROR, fatal = 0; | 529 | int alert_desc = SSL_AD_INTERNAL_ERROR, fatal = 0; |
531 | int ticket_decrypted = 0; | 530 | int ticket_decrypted = 0; |
532 | 531 | ||
@@ -555,11 +554,10 @@ ssl_get_prev_session(SSL *s, CBS *session_id, CBS *ext_block, int *alert) | |||
555 | * ticket has been accepted so we copy it into sess. | 554 | * ticket has been accepted so we copy it into sess. |
556 | */ | 555 | */ |
557 | if (!CBS_write_bytes(session_id, sess->session_id, | 556 | if (!CBS_write_bytes(session_id, sess->session_id, |
558 | sizeof(sess->session_id), &session_id_len)) { | 557 | sizeof(sess->session_id), &sess->session_id_length)) { |
559 | fatal = 1; | 558 | fatal = 1; |
560 | goto err; | 559 | goto err; |
561 | } | 560 | } |
562 | sess->session_id_length = (unsigned int)session_id_len; | ||
563 | break; | 561 | break; |
564 | default: | 562 | default: |
565 | SSLerror(s, ERR_R_INTERNAL_ERROR); | 563 | SSLerror(s, ERR_R_INTERNAL_ERROR); |