Upstream merge 2024 08 12 #1761
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 #1761 +/- ##
=======================================
Coverage 78.44% 78.45%
=======================================
Files 580 580
Lines 96780 96780
Branches 13863 13862 -1
=======================================
+ Hits 75921 75927 +6
+ Misses 20241 20236 -5
+ Partials 618 617 -1 ☔ View full report in Codecov by Sentry. |
Also some minor fixes from running doc.go over x509.h. Bug: 426 Change-Id: I8d4cf0cc2161aa7ab8ff9461b6d99daa9d9360c6 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/65211 Reviewed-by: Bob Beck <[email protected]> Commit-Queue: David Benjamin <[email protected]> (cherry picked from commit 91b7df2aff7d842fa305dd9e3ebee68f9b357e7c)
Goldmont, the successor to Silvermont in the Atom line, added XSAVE, so these "MOVBE without XSAVE" code paths are strictly for Silvermont. The code paths will still work on Silvermont but with reduced performance. Change-Id: I57f530f487e0f9b6b3f6aac912dbfaaa46628b9f Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/64788 Commit-Queue: Bob Beck <[email protected]> Reviewed-by: David Benjamin <[email protected]> Reviewed-by: Bob Beck <[email protected]> (cherry picked from commit 77ee4e4609cfb3480e1a554790348ebcab61313e)
Per the header, these symbols were private and only exported for decrepit. But decrepit can include internal headers. Change-Id: I1155f4b98252004b80a53efb0a6009400a6c59ac Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/65687 Auto-Submit: David Benjamin <[email protected]> Commit-Queue: Bob Beck <[email protected]> Reviewed-by: Bob Beck <[email protected]> (cherry picked from commit 7f45053d42ae0b5f4d5d96fa471d671c6d1462e9)
These macros are unnamespaced and only used in one file. Keep their definitions more local. Also remove the #undefs at the end of des.c. They date to when des.c was part of bcm.c, but it isn't anymore. Change-Id: I6306929929f2304b93c3fdb2e787965c40729d6a Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/65688 Commit-Queue: David Benjamin <[email protected]> Reviewed-by: Bob Beck <[email protected]> (cherry picked from commit cba7adcd108e9a41a992b4c4fc18b050e4d05a66)
torben-hansen
force-pushed
the
upstream-merge-2024-08-12
branch
from
7159082 to
e349f33
Compare
smittals2
approved these changes
Aug 14, 2024
There was a problem hiding this comment.
Not a blocking comment but should the two later commits to fix the CI and generate files be part of the commit history for the upstream merge? Or should those changes have been done as a part of the relevant upstream commits? Asking for my knowledge as well :)
skmcgrail
approved these changes
Aug 16, 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.
MERGE COMMIT
From
5507ccdto7cb8df5.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.