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.

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

Give BIO an ex_data #1328

Merged
merged 2 commits into from
Dec 1, 2023
Merged

Conversation

samuel40791765
Copy link
Contributor

Issue

Fixing postgres compatibility

Description

It has one in upstream OpenSSL. The most recent OpenSSL release is hitting a compatibility issue with postgres, which seems like it'll get fixed by postgres using BIO_get_app_data. Add it on our end too.

https://www.postgresql.org/message-id/CAN55FZ1eDDYsYaL7mv%2BoSLUij2h_u6hvD4Qmv-7PK7jkji0uyQ%40mail.gmail.com Homebrew/homebrew-core#155651

Change-Id: I5bf226cc3506a114cd62f885a8c15006512dfc65 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/64227
Auto-Submit: David Benjamin davidben@google.com
Reviewed-by: Bob Beck bbe@google.com
Commit-Queue: Bob Beck bbe@google.com
(cherry picked from commit 2139aba2e3e28cd1cdefbd9b48e2c31a75441203)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.

@samuel40791765 samuel40791765 requested a review from a team as a code owner November 29, 2023 17:15
@samuel40791765
Copy link
Contributor Author

Reminder to merge commit, no squash

torben-hansen
torben-hansen previously approved these changes Nov 29, 2023
@codecov-commenter
Copy link

codecov-commenter commented Nov 29, 2023

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (bdb1a56) 76.46% compared to head (c5b7335) 76.47%.

Files Patch % Lines
crypto/bio/bio.c 90.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1328      +/-   ##
==========================================
+ Coverage   76.46%   76.47%   +0.01%     
==========================================
  Files         421      421              
  Lines       70986    70996      +10     
==========================================
+ Hits        54280    54297      +17     
+ Misses      16706    16699       -7     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

justsmth
justsmth previously approved these changes Nov 30, 2023
torben-hansen
torben-hansen previously approved these changes Nov 30, 2023
crypto/bio/bio_test.cc Outdated Show resolved Hide resolved
davidben and others added 2 commits November 30, 2023 15:25
It has one in upstream OpenSSL. The most recent OpenSSL release is
hitting a compatibility issue with postgres, which seems like it'll get
fixed by postgres using BIO_get_app_data. Add it on our end too.

https://www.postgresql.org/message-id/CAN55FZ1eDDYsYaL7mv%2BoSLUij2h_u6hvD4Qmv-7PK7jkji0uyQ%40mail.gmail.com
Homebrew/homebrew-core#155651

Change-Id: I5bf226cc3506a114cd62f885a8c15006512dfc65
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/64227
Auto-Submit: David Benjamin <davidben@google.com>
Reviewed-by: Bob Beck <bbe@google.com>
Commit-Queue: Bob Beck <bbe@google.com>
(cherry picked from commit 2139aba2e3e28cd1cdefbd9b48e2c31a75441203)
@skmcgrail skmcgrail self-requested a review November 30, 2023 23:32
@samuel40791765 samuel40791765 merged commit 9a05041 into aws:main Dec 1, 2023
23 of 24 checks passed
@samuel40791765 samuel40791765 deleted the postgres-commit branch December 1, 2023 00:32
@justsmth justsmth mentioned this pull request Dec 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants