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

Revert "Replace CONF's internal representation with something more typesafe" #1986

Merged
merged 1 commit into from
Nov 14, 2024

Conversation

samuel40791765
Copy link
Contributor

This reverts commit cc932cf.

Issues:

Addresses CryptoAlg-2449

Description of changes:

OpenSSL's historically made the CONF struct non-opaque. This hasn't changed in OpenSSL 3 either although there is documentation that indicates they wish to do so in the long run. It's likely going to be some time before this is actually done, but in the meantime Ruby has a dependency on CONF's internals.
This commit is reverting some of the original upstream work done that changes the internal variables of CONF. There will be a follow up PR to make the structure non-opaque.

Call-outs:

N/A

Testing:

Original tests

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.

@codecov-commenter
Copy link

codecov-commenter commented Nov 12, 2024

Codecov Report

Attention: Patch coverage is 89.70588% with 7 lines in your changes missing coverage. Please review.

Project coverage is 78.86%. Comparing base (796202b) to head (6fadb50).
Report is 5 commits behind head on main.

Files with missing lines Patch % Lines
crypto/conf/conf.c 89.70% 7 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1986      +/-   ##
==========================================
- Coverage   78.86%   78.86%   -0.01%     
==========================================
  Files         593      593              
  Lines      101933   101936       +3     
  Branches    14450    14453       +3     
==========================================
+ Hits        80386    80388       +2     
  Misses      20903    20903              
- Partials      644      645       +1     

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

@samuel40791765 samuel40791765 merged commit f0c9b3a into aws:main Nov 14, 2024
114 of 116 checks passed
@samuel40791765 samuel40791765 deleted the revert-conf-change branch November 14, 2024 18:44
samuel40791765 added a commit that referenced this pull request Nov 16, 2024
This extends upon #1986.

We do have all the necessary support for "LHASH", it's just been renamed
and made internal by upstream: b8441ac. Ruby's CONF module happens
to have a dependency on a couple of LHASH macros OpenSSL created
and the non-opaqueness of CONF.
Although we aren't likely to be supporting CONF files for the time
being, this change seems to reasonable for enough us to maintain so we
can get a better build/patch for Ruby. We still fail most CONF related
tests in Ruby, so we'll have to work around those. But this commit lets
us gracefully build with the underlying C code for Ruby CONF without any
AWS-LC specific logic.

### Testing:
Verified that this passes the build for Ruby

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.
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.

4 participants