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

Upstream merge 2024 08 02 #1738

Merged
merged 4 commits into from
Aug 6, 2024
Merged

Conversation

smittals2
Copy link
Contributor

Merging from Upstream considering commits between
google/boringssl@4972efd
(Jan 22, 2024) and
google/boringssl@100e212
(Jan 23, 2024).

See "AWS-LC" notes inserted in some of the commit messages
for additions/deviations from the upstream commit.

@smittals2 smittals2 requested a review from a team as a code owner August 2, 2024 21:09
@codecov-commenter
Copy link

codecov-commenter commented Aug 2, 2024

Codecov Report

Attention: Patch coverage is 90.54054% with 14 lines in your changes missing coverage. Please review.

Project coverage is 78.43%. Comparing base (98eeccf) to head (4faeee7).

Files Patch % Lines
crypto/x509/x509_test.cc 92.56% 5 Missing and 4 partials ⚠️
crypto/x509/v3_purp.c 60.00% 2 Missing ⚠️
crypto/x509/x509_vfy.c 89.47% 2 Missing ⚠️
crypto/x509/x509_trs.c 66.66% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1738      +/-   ##
==========================================
+ Coverage   78.31%   78.43%   +0.12%     
==========================================
  Files         580      580              
  Lines       96644    96756     +112     
  Branches    13859    13877      +18     
==========================================
+ Hits        75690    75895     +205     
+ Misses      20341    20243      -98     
- Partials      613      618       +5     

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

@smittals2 smittals2 force-pushed the upstream-merge-2024-08-01V2 branch from 0396a2e to 7d43595 Compare August 2, 2024 23:23
torben-hansen
torben-hansen previously approved these changes Aug 5, 2024
util/fipstools/delocate/testdata/aarch64-Basic/in.s Outdated Show resolved Hide resolved
@smittals2 smittals2 force-pushed the upstream-merge-2024-08-01V2 branch from 7ccf503 to 3d9f2cf Compare August 5, 2024 20:25
@smittals2 smittals2 force-pushed the upstream-merge-2024-08-01V2 branch 2 times, most recently from d9fc7cf to 789d703 Compare August 5, 2024 20:33
agl and others added 4 commits August 5, 2024 13:56
Aarch64's SVE2 extension adds more syntax forms for registers, and a new
"tweak" pattern that means "multiply offset by the hardware's vector
length". This change tweaks delocate so that it can pass these forms.

See https://developer.arm.com/documentation/102340/0100/SVE2-architecture-fundamentals

Change-Id: I9a736dcf0b57d36d5e08a53e073da7fe3c62dea2
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/65349
Commit-Queue: David Benjamin <[email protected]>
Reviewed-by: David Benjamin <[email protected]>
Auto-Submit: Adam Langley <[email protected]>
(cherry picked from commit 672efb1f8ee029762e29ff16811b68a071a0528e)

AWS-LC:
Merged in delocator instructions for SVE2
Generated new delecote.peg.go file
Fixed indentation in in.s and out.s
The CROS_EC and CROS_ZEPHYR platforms currently have threads disabled,
so we should not attempt to search for (or link) a threads library.

BUG=b/273639386

Change-Id: I094a989680160f9ecefbdb4cb3e94c4825a651e3
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/65568
Reviewed-by: David Benjamin <[email protected]>
Reviewed-by: Bob Beck <[email protected]>
Commit-Queue: Bob Beck <[email protected]>
(cherry picked from commit becb3ffccdecff83047285ebea20e5b85b2d65b1)
The trust and purpose is all a bit tied up together, as is the meaning
of the certificates in an X509_STORE at all. (It's hard to discuss
whether a "trusted certificate" is actually a trust anchor without a
description of trust settings to reference.)

Cut the Gordian Knot by documenting all that first. Later CLs will move
other symbols into the sections established here. Also as the behavior
is a little complex, add some tests to cover some of this machinery.

Bug: 426
Change-Id: Idde8bc4e588de92ebabf6ecf640b62a2a6803688
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/65207
Commit-Queue: David Benjamin <[email protected]>
Reviewed-by: Bob Beck <[email protected]>
(cherry picked from commit 352740cef428f0f1eccdfff8dca9aaf1f85e31e4)

AWS-LC:
Moved functions around in x509.h
Added two new tests to x509_test.cc
Added explicit initialization for Cert struct fields in X509 Test
X509_STORE_CTX_purpose_inherit's behavior is even more bizarre than
X509_STORE_CTX_set_purpose and X509_STORE_CTX_set_trust. Remove it and
reimplement X509_STORE_CTX_set_purpose and X509_STORE_CTX_set_trust's
behaviors directly.

Change-Id: Icc6a4a84ee8fa38e2fe70a4cfa06e74dee186d29
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/65208
Reviewed-by: Bob Beck <[email protected]>
Commit-Queue: David Benjamin <[email protected]>
(cherry picked from commit 3d9e5a355b1ce8518aefce2df00dfab3fe63c379)
@smittals2 smittals2 force-pushed the upstream-merge-2024-08-01V2 branch from 789d703 to 4faeee7 Compare August 5, 2024 20:58
@smittals2 smittals2 requested a review from torben-hansen August 5, 2024 22:33
@smittals2 smittals2 merged commit 5fd0f08 into aws:main Aug 6, 2024
105 of 106 checks passed
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.

7 participants