minissl.c - Use Random.bytes if available #2642
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 tasks
onlined
approved these changes
Jun 12, 2021
Member
Author
|
I looked at this one more time, and thought maybe the below was a little clearer. Note that this code is only called on Puma start/restart, once for each ssl binder/listener. // Random.bytes available in Ruby 2.5 and later, Random::DEFAULT deprecated in 3.0
#ifdef HAVE_RANDOM_BYTES
bytes_func = rb_cRandom;
#else
bytes_func = rb_const_get(rb_cRandom, rb_intern_const("DEFAULT"));
#endif
session_id_bytes = rb_funcall(bytes_func, rb_intern_const("bytes"),
1, ULL2NUM(SSL_MAX_SSL_SESSION_ID_LENGTH));If anyone has objections, please let me know, otherwise I'll change. I also added the comment to |
Contributor
|
I like the approach, but I don't like the name // Random.bytes available in Ruby 2.5 and later, Random::DEFAULT deprecated in 3.0
session_id_bytes = rb_funcall(
#ifdef HAVE_RANDOM_BYTES
rb_cRandom,
#else
rb_const_get(rb_cRandom, rb_intern_const("DEFAULT")),
#endif
bytes_func,
rb_intern_const("bytes"),
1, ULL2NUM(SSL_MAX_SSL_SESSION_ID_LENGTH)
); |
onlined
suggested changes
Jun 16, 2021
Co-authored-by: Ekin Dursun <[email protected]>
onlined
approved these changes
Jun 16, 2021
nateberkopec
pushed a commit
that referenced
this pull request
Feb 16, 2022
* Actions - add Ruby 3.0 and 3.1 * .gitignore - add entry for local use * test_puma_server_ssl.rb - backport fix 888b0213f11 * minissl.c and extconf.rb - backport fixes Fixes from PR's: #2535 #2633 #2642
JuanitoFatas
pushed a commit
to JuanitoFatas/puma
that referenced
this pull request
Sep 9, 2022
Co-authored-by: Ekin Dursun <[email protected]> Co-authored-by: Ekin Dursun <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
PR #2633 throws deprecation warnings in Ruby 3. Fix by using
Random.byteswhen available.Your checklist for this pull request
[ci skip]to the title of the PR.#issue" to the PR description or my commit messages.