Skip to content

Avoid using undefined value in generate_stateless_cookie_callback#16381

Closed
bernd-edlinger wants to merge 2 commits intoopenssl:OpenSSL_1_1_1-stablefrom
bernd-edlinger:fix_undef_value_in_cookie_callback
Closed

Avoid using undefined value in generate_stateless_cookie_callback#16381
bernd-edlinger wants to merge 2 commits intoopenssl:OpenSSL_1_1_1-stablefrom
bernd-edlinger:fix_undef_value_in_cookie_callback

Conversation

@bernd-edlinger
Copy link
Member

@bernd-edlinger bernd-edlinger commented Aug 23, 2021

Checklist
  • documentation is added or updated
  • tests are added or updated

@bernd-edlinger bernd-edlinger added the branch: 1.1.1 Applies to OpenSSL_1_1_1-stable branch (EOL) label Aug 23, 2021
paulidale
paulidale approved these changes Aug 23, 2021
View reviewed changes
@paulidale paulidale added approval: done This pull request has the required number of approvals triaged: bug The issue/pr is/fixes a bug labels Aug 23, 2021
@mattcaswell mattcaswell added the branch: master Applies to master branch label Aug 23, 2021
@mattcaswell
Copy link
Member

mattcaswell commented Aug 23, 2021

Looks like the same problem applies to master, so this fix should be applied there too.

@paulidale
Copy link
Contributor

paulidale commented Aug 23, 2021

Yes for master.

@bernd-edlinger
Copy link
Member Author

bernd-edlinger commented Aug 23, 2021

master solved this differently, and initialized temp = 0, so it's not undefined.

@bernd-edlinger
Copy link
Member Author

bernd-edlinger commented Aug 23, 2021

do you still want me to add the if (res != 0) in master?

@mattcaswell
Copy link
Member

mattcaswell commented Aug 23, 2021

Ah, sorry. That's me misreading the code. Ignore me. The code actually looks a little different here in master anyway. 1.1.1 only is fine by me.

@mattcaswell mattcaswell removed the branch: master Applies to master branch label Aug 23, 2021
@paulidale
Copy link
Contributor

paulidale commented Aug 23, 2021

I'd still be tempted to make this change in master too, just from the point of view of don't change things on failure.
I'm not all that fussed either way, though.

@openssl-machine
Copy link
Collaborator

openssl-machine commented Aug 24, 2021

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.

@t8m t8m added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: done This pull request has the required number of approvals labels Aug 24, 2021
openssl-machine pushed a commit that referenced this pull request Aug 25, 2021
@bernd-edlinger @t8m
Avoid using undefined value in generate_stateless_cookie_callback
cf2b1d6 
Reviewed-by: Paul Yang <[email protected]>
Reviewed-by: Paul Dale <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from #16381)
@t8m
Copy link
Member

t8m commented Aug 25, 2021

Merged to 1.1.1 branch. Thank you.

@t8m t8m closed this Aug 25, 2021
baentsch added a commit to open-quantum-safe/openssl that referenced this pull request Dec 15, 2021
@baentsch @beldmit
@DDvO @levitte @t8m @mattcaswell @tim-hitchins-ekkosense @mspncp @arminfuerst @bernd-edlinger @jay @kaduk @bsdjhb @zjd87 @jwalch @mszabo @romen @mamapanda @paulidale @dongbeiouba @NanXiao @yursha @mohd-akram @dcoombs @tmshort @niclasr @slontis @tomato42 @iguessthislldo @devnexen @bonniegong @botovq @tiran @jpboivin @p-steuer @goodpaperman @larsimmisch-adobe @luyahan @davidben @ueno @ischwarze @bbbrumley @ifranzki @uudiin @zhaozg @Dani-Hub @ellert @lprimak @PeiweiHu @x2018 @allanjude
Merging OpenSSL 1.1.1m (#346