Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

minissl.c - change dh1024 to dh2048 for SSL_CTX_set_tmp_dh #2535

Merged
merged 1 commit into from
Jan 27, 2021
Merged

minissl.c - change dh1024 to dh2048 for SSL_CTX_set_tmp_dh #2535

merged 1 commit into from
Jan 27, 2021

Conversation

MSP-Greg
Copy link
Member

@MSP-Greg MSP-Greg commented Jan 26, 2021 •
edited
Loading

Description

update minissl.c

change dh1024 to dh2048 for SSL_CTX_set_tmp_dh

Closes #1921

Your checklist for this pull request

  • I have reviewed the guidelines for contributing to this repository.
  • I have added an entry to History.md if this PR fixes a bug or adds a feature. If it doesn't need an entry to HISTORY.md, I have added [changelog skip] or [ci skip] to the pull request title.
  • I have added appropriate tests if this PR fixes a bug or adds a feature.
  • My pull request is 100 lines added/removed or less so that it can be easily reviewed.
  • If this PR doesn't need tests (docs change), I added [ci skip] to the title of the PR.
  • If this closes any issues, I have added "Closes #issue" to the PR description or my commit messages.
  • I have updated the documentation accordingly.
  • All new and existing tests passed, including Rubocop.

@nateberkopec
Copy link
Member

#1921

@nateberkopec
Copy link
Member

Definitely needs a changelog entry (rebase now too)

@nateberkopec nateberkopec added feature ssl waiting-for-changes Waiting on changes from the requestor labels Jan 26, 2021
@MSP-Greg MSP-Greg changed the title minissl.c - change dh1024 to dh2048 for SSL_CTX_set_tmp_dh [changelog skip] minissl.c - change dh1024 to dh2048 for SSL_CTX_set_tmp_dh Jan 26, 2021
@MSP-Greg
Copy link
Member Author

I screwed up that rebase (accidentally ran it from WSL2/Ubuntu, not Windows). GIve me a second...

@nateberkopec nateberkopec merged commit 9a10064 into puma:master Jan 27, 2021
@MSP-Greg MSP-Greg deleted the dh2048 branch January 27, 2021 20:37
This was referenced Mar 8, 2021
Merged
Merged
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Merged
Closed
This was referenced Mar 15, 2021
Closed
Open
Closed
Closed
Closed
Closed
This was referenced Mar 15, 2021
Closed
Closed
Merged
Closed
MSP-Greg added a commit to MSP-Greg/puma that referenced this pull request Feb 13, 2022
@MSP-Greg
minissl.c and extconf.rb - backport fixes
db61529 
Fixes from PR's:
puma#2535
puma#2633
puma#2642
MSP-Greg added a commit to MSP-Greg/puma that referenced this pull request Feb 13, 2022
@MSP-Greg
minissl.c and extconf.rb - backport fixes
22b4b61 
Fixes from PR's:
puma#2535
puma#2633
puma#2642
nateberkopec pushed a commit that referenced this pull request Feb 16, 2022
@MSP-Greg
Updates and backports to 4-3-stable (#2829)
706534a 
* 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
@MSP-Greg @JuanitoFatas
minissl.c - change dh1024 to dh2048 for SSL_CTX_set_tmp_dh (puma#2535)
4ccf1d7
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
feature ssl waiting-for-changes Waiting on changes from the requestor
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Use a 2048-bit Diffie-Hellman group
2 participants
@MSP-Greg @nateberkopec