Skip to content

X.509 Preparation#6715

Merged
kaylendog merged 4 commits into
mainfrom
kaylendog/x509/preparation
Jul 7, 2026
Merged

X.509 Preparation#6715
kaylendog merged 4 commits into
mainfrom
kaylendog/x509/preparation

Conversation

@kaylendog

@kaylendog kaylendog commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

This PR extracts three of the more general changes made in andyrich/x509 (the X.509 development branch) and applies them independently. In summary:

  • Adjusts Sugnatures::add_signature to accept any type implementing Into<Signature> - done in advance of adding X.509-specific signature structs;
  • Makes bootstrap_cross_signing falliable, since X.509 signature setup can fail;
  • Inlines Account::sign_master_key, as this is only used in one place, and will be touched by X.509 anyway.

PR checklist:

  • I've documented the public API changes in the appropriate changelog files (see Writing changelog entries).
  • This PR was made with the help of AI.

Signed-off-by: Skye Elliot actuallyori@gmail.com

@kaylendog kaylendog force-pushed the kaylendog/x509/preparation branch 2 times, most recently from 966e755 to 6b4122c Compare July 3, 2026 13:10
@codecov

codecov Bot commented Jul 3, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 75.00000% with 11 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.91%. Comparing base (c9c4b26) to head (63b4987).
✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
crates/matrix-sdk/src/error.rs 0.00% 5 Missing ⚠️
crates/matrix-sdk-crypto/src/identities/user.rs 85.71% 0 Missing and 2 partials ⚠️
crates/matrix-sdk-crypto/src/olm/account.rs 71.42% 0 Missing and 2 partials ⚠️
crates/matrix-sdk-crypto/src/machine/mod.rs 50.00% 0 Missing and 1 partial ⚠️
crates/matrix-sdk-crypto/src/olm/signing/mod.rs 88.88% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6715      +/-   ##
==========================================
- Coverage   89.92%   89.91%   -0.02%     
==========================================
  Files         398      398              
  Lines      111154   111157       +3     
  Branches   111154   111157       +3     
==========================================
- Hits        99959    99947      -12     
- Misses       7401     7412      +11     
- Partials     3794     3798       +4     

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

@codspeed-hq

codspeed-hq Bot commented Jul 3, 2026

Copy link
Copy Markdown

Merging this PR will not alter performance

✅ 50 untouched benchmarks


Comparing kaylendog/x509/preparation (63b4987) with main (c9c4b26)

Open in CodSpeed

@kaylendog kaylendog force-pushed the kaylendog/x509/preparation branch from f5f9e54 to 87d9c03 Compare July 3, 2026 13:50
Comment thread bindings/matrix-sdk-crypto-ffi/src/error.rs Outdated
@kaylendog kaylendog marked this pull request as ready for review July 3, 2026 13:56
@kaylendog kaylendog requested review from a team as code owners July 3, 2026 13:56
@kaylendog kaylendog requested review from poljar and removed request for a team July 3, 2026 13:56

@andybalaam andybalaam left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. A couple of minor comments.

Comment thread bindings/matrix-sdk-crypto-ffi/src/error.rs Outdated
Comment thread bindings/matrix-sdk-crypto-ffi/src/machine.rs
Comment thread bindings/matrix-sdk-ffi/changelog.d/6715.changed.md Outdated
Comment thread crates/matrix-sdk-crypto/changelog.d/6715.changed Outdated
Comment thread crates/matrix-sdk-crypto/changelog.d/6715.changed Outdated
@andybalaam andybalaam removed the request for review from poljar July 7, 2026 09:59
@kaylendog kaylendog force-pushed the kaylendog/x509/preparation branch 2 times, most recently from a99e5ea to 9c30a94 Compare July 7, 2026 11:51
kaylendog and others added 4 commits July 7, 2026 12:52
…ature

Co-Authored-By: Richard van der Hoff <richard@matrix.org>
Signed-off-by: Skye Elliot <actuallyori@gmail.com>
Co-Authored-By: Hubert Chathi <hubertc@matrix.org>
Co-Authored-By: Richard van der Hoff <richard@matrix.org>
Signed-off-by: Skye Elliot <actuallyori@gmail.com>
Co-Authored-By: Richard van der Hoff <richard@matrix.org>
Co-Authored-By: Andy Balaam <andy.balaam@matrix.org>
Signed-off-by: Skye Elliot <actuallyori@gmail.com>
Signed-off-by: Skye Elliot <actuallyori@gmail.com>
@kaylendog kaylendog force-pushed the kaylendog/x509/preparation branch from 9c30a94 to 63b4987 Compare July 7, 2026 11:57
@kaylendog kaylendog merged commit 7bf142a into main Jul 7, 2026
54 checks passed
@kaylendog kaylendog deleted the kaylendog/x509/preparation branch July 7, 2026 13:34
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.

2 participants