Upstream merge 2024 12 02 #2030
Merged
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2030 +/- ##
==========================================
- Coverage 78.76% 78.76% -0.01%
==========================================
Files 598 598
Lines 103676 103676
Branches 14744 14741 -3
==========================================
- Hits 81665 81662 -3
- Misses 21357 21363 +6
+ Partials 654 651 -3 ☔ View full report in Codecov by Sentry. |
nebeid
force-pushed
the
upstream-merge-2024-12-02
branch
2 times, most recently
from
1f8f5f0 to
00380fe
Compare
nebeid
force-pushed
the
upstream-merge-2024-12-02
branch
from
00380fe to
da9dead
Compare
torben-hansen
approved these changes
Dec 6, 2024
nebeid
force-pushed
the
upstream-merge-2024-12-02
branch
from
da9dead to
1aa2c64
Compare
Change-Id: Id0efd039ba71489f88b9b669a327b29075f3f7de Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/66787 Reviewed-by: Bob Beck <bbe@google.com> Commit-Queue: David Benjamin <davidben@google.com> (cherry picked from commit 5a3faaa2d50b2540c6973531841723f633f388cd)
1) We are calling sha1_block_data_order_avx when avx2 is enabled We should be calling sha1_block_data_order_avx2 2) Looks like clang doesn't define __BMI1__ and calls it simply __BMI__, see https://godbolt.org/z/s8anxn9rc This is less of an issue since we will fallback to dynamic dispatch anyway. AWS-LC: Did not take change 2 since compile time checks for CPU capabilities were removed in 378b394 Change-Id: I9821405444c2e39167f1423c5f08bfcbca1efa51 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/66827 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: David Benjamin <davidben@google.com> (cherry picked from commit cf4f615d706d54fca9323fb1595d88f7ee2d7517)
Make google3 common typos stop complaining in the future. Change-Id: Ib5156335afa691427dbe618c8b29797665cef35f Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/66947 Auto-Submit: Bob Beck <bbe@google.com> Commit-Queue: Bob Beck <bbe@google.com> Reviewed-by: David Benjamin <davidben@google.com> (cherry picked from commit 3ac09394a0c027ca077b8cfda4c0dbc8837ce87a)
After examining consumer test code and discussion with davidben, the stat here serves only to get out of this code without having an error on the error stack when the file does not exist, which is then interpreted as the CA or CRL does not exist. Instead, we simply attempt to open the files, and if it does not work for any reason, clear the error that was set. This changes us to treat any failure in finding a CA or CRL using the by directory lookup as if the file was just not present. This ensures a consistent behaviour with the error returned from the verification code. We don't differentiate between the file not existing or other errors such as garbage in the file. Fixed: 708 Change-Id: I1eee01282cde803fb7c9b52003da3dfbd5ba9e33 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/66967 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> (cherry picked from commit fae0964b3d44e94ca2a2d21f86e61dabe683d130)
nebeid
force-pushed
the
upstream-merge-2024-12-02
branch
from
1aa2c64 to
594581e
Compare
skmcgrail
approved these changes
Dec 10, 2024
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.
Description of changes:
Merging from Upstream considering commits between
google/boringssl@91a3f26 (Mar 7, 2024) and google/boringssl@fae0964 (Mar 13, 2024).
Call-outs:
See internal document as well as "AWS-LC" notes inserted in some of the commit messages for additions/deviations from the upstream commit.
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.