Skip to content

Comments

Fix some minor record layer issues [1.1.1]#16105

Closed
kaduk wants to merge 1 commit intoopenssl:OpenSSL_1_1_1-stablefrom
kaduk:pr16086
Closed

Fix some minor record layer issues [1.1.1]#16105
kaduk wants to merge 1 commit intoopenssl:OpenSSL_1_1_1-stablefrom
kaduk:pr16086

Conversation

@kaduk
Copy link
Contributor

@kaduk kaduk commented Jul 17, 2021

Backport #16086 to 1.1.1.
Two chunks didn't apply cleanly: one due to ssl3_state_st being a separate allocation in 1.1.1 (but the fields being described are no longer in that structure anyway), and one due to SSL_new_session_ticket() not existing on 1.1.1.

Various comments referred to s->packet and s->packet_length instead of
s->rlayer.packet and s->rlayer.packet_length. Also fixed is a spot where
RECORD_LAYER_write_pending() should have been used. Based on the review
comments in openssl#16077.

Reviewed-by: Tomas Mraz <[email protected]>
Reviewed-by: Ben Kaduk <[email protected]>
(Merged from openssl#16086)

(cherry picked from commit ca00152)
@paulidale paulidale added approval: done This pull request has the required number of approvals branch: 1.1.1 Applies to OpenSSL_1_1_1-stable branch (EOL) labels Jul 19, 2021
@t8m
Copy link
Member

t8m commented Jul 19, 2021

So this is just fixing the comments, but OK anyway.

@openssl-machine
Copy link
Collaborator

24 hours has passed since 'approval: done' was set, but as this PR has been updated in that time the label 'approval: ready to merge' is not being automatically set. Please review the updates and set the label manually.

@paulidale
Copy link
Contributor

Merged to 1.1.1, thanks.

@paulidale paulidale closed this Jul 20, 2021
openssl-machine pushed a commit that referenced this pull request Jul 20, 2021
Various comments referred to s->packet and s->packet_length instead of
s->rlayer.packet and s->rlayer.packet_length. Also fixed is a spot where
RECORD_LAYER_write_pending() should have been used. Based on the review
comments in #16077.

Reviewed-by: Tomas Mraz <[email protected]>
Reviewed-by: Ben Kaduk <[email protected]>

(cherry picked from commit ca00152)

Reviewed-by: Paul Dale <[email protected]>
(Merged from #16105)