Partially update boringssl, add warnings for invalid parameters #2745
Conversation
This file contains 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
fhanau
commented
Sep 19, 2024
|
|
This is only a partial update for now due to incompatible changes to DH introduced in https://boringssl-review.googlesource.com/c/boringssl/+/62226. Includes some code changes based on the RSA struct now being opaque as well as slight code simplifications for DH.
fhanau
force-pushed
the
felix/roll-boringssl
branch
from
26afed9
to
f1abaf2
Compare
fhanau
changed the title
fhanau
force-pushed
the
felix/roll-boringssl
branch
from
f1abaf2
to
6db46c2
Compare
jasnell
reviewed
Sep 23, 2024
jasnell
reviewed
Sep 23, 2024
| @@ -100,6 +103,10 @@ kj::Own<DH> initDh(kj::OneOf<kj::Array<kj::byte>, int>& sizeOrKey, | |||
| } | |||
| return 1; | |||
| }; | |||
| // Operations on an "egregiously large" prime will throw with recent boringssl. | |||
| if (size > OPENSSL_DH_MAX_MODULUS_BITS) { | |||
| KJ_LOG(WARNING, "DiffieHellman init: requested prime size too large"); | |||
There was a problem hiding this comment.
Should these be NOSENTRY or do we want them appearing there?
There was a problem hiding this comment.
I do prefer having warnings appear on Sentry as it makes them easier to find. These should be temporary so hopefully this is fine
jasnell
approved these changes
Sep 23, 2024
https://boringssl-review.googlesource.com/c/boringssl/+/62226 added some additional DH checks for "egregiously large or invalid" parameters. Add a warning when creating a DH handle that would cause boringssl to throw. Some of the additional checks are already covered by our implementation, so we only need this for some checks on the p parameter.
fhanau
force-pushed
the
felix/roll-boringssl
branch
from
6db46c2
to
55db359
Compare
fhanau
added a commit
that referenced
this pull request
Oct 19, 2024
Follow-up to #2745. After confirming that the few DH inputs that are now rejected by boringssl are not being actively used, we can return a proper error for them and update the boringssl version for workerd. Even if the version used internally is out-of-sync for now, the added checks here ensure that the behavior is the same. Test cases are updated based on the new behavior.
Merged
fhanau
added a commit
that referenced
this pull request
Oct 21, 2024
Follow-up to #2745. After confirming that the few DH inputs that are now rejected by boringssl are not being actively used, we can return a proper error for them and update the boringssl version for workerd. Even if the version used internally is out-of-sync for now, the added checks here ensure that the behavior is the same. Test cases are updated based on the new behavior.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Boringssl now has built-in bazel support, so we no longer have to use a commit from main-with-bazel instead of the primary branch. A few code changes are needed based on the RSA struct now being opaque, which is why we deferred updating this so far.Roll boringssl, fix RSA struct usage and refactor DH code
Warn when creating DH handle with invalid parameters
============
This will allows us to see if we can safely update boringssl or if there is code depending on using DH with impractical parameters.