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.

Sign up for GitHub

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

Jump to bottom

Merge async support branch to 0.7 rust-mbedtls #224

Merged
merged 9 commits into from
Mar 15, 2023
Merged

Merge async support branch to 0.7 rust-mbedtls #224

merged 9 commits into from
Mar 15, 2023

Conversation

Taowyoo
Copy link
Collaborator

@Taowyoo Taowyoo commented Mar 9, 2023 •
edited
Loading

This is the successor PR for #127 but with some more latest changes needed

@Taowyoo Taowyoo marked this pull request as draft March 9, 2023 20:19
@Taowyoo Taowyoo marked this pull request as ready for review March 9, 2023 20:42
@Taowyoo

This comment was marked as outdated.

Sign in to view
bors bot added a commit that referenced this pull request Mar 9, 2023
@bors
Try #224:
1edd806
@bors

This comment was marked as outdated.

Sign in to view
@Taowyoo
Copy link
Collaborator Author

Taowyoo commented Mar 10, 2023

Hi @zugzwang , I noticed on those branches based on @mzohreva 's async support branch, such as yours: francisco/tokio-1.15-mbedtls-sys-2.28.0-aria-hkdf
It just cherry pick PR from master, but do not run the CI on current branch.

So for this PR which based on your branchfrancisco/tokio-1.15-mbedtls-sys-2.28.0-aria-hkdf, do I need to make sure all tests/CI passed on this branch?

I ask this because I found the some tests actually is not working on this branch now, and the fix may need to back-port changes after v0.7.

Also, I want to get some feedback about if we actually need to first merge the async support into 0.7. It seems redundant work, in case we finally need to use 0.8+ rust-mbedtls (with async support) internally, we could skip this and continue working on: #163

CC: @raoulstrackx @jethrogb

@zugzwang
Copy link
Contributor

zugzwang commented Mar 10, 2023 •
edited
Loading

Seems that all things 0.7 will be unblocked with an approval of #127 (the only unreviewed part of this PR). Then we can squash branches, fix everything for CI to pass, and tag 0.7.2.

You are right in that we could simply skip this and we could work in 0.8 instead, but I do not know how much work is needed to complete #163.

@Taowyoo Taowyoo changed the base branch from v0.7 to francisco/async-support-2.28 March 13, 2023 23:51
@Taowyoo Taowyoo force-pushed the yx/tokio-1.15-mbedtls-sys-2.28.0-aria-hkdf-merging branch from 8676d8a to 6cd5c2b Compare March 14, 2023 01:02
@Taowyoo

This comment was marked as duplicate.

Sign in to view
@Taowyoo

This comment was marked as duplicate.

Sign in to view
@Taowyoo Taowyoo force-pushed the yx/tokio-1.15-mbedtls-sys-2.28.0-aria-hkdf-merging branch from b5950c5 to 184f260 Compare March 14, 2023 05:31
@Taowyoo Taowyoo force-pushed the francisco/async-support-2.28 branch from 0237eba to 2fc953f Compare March 14, 2023 05:39
@Taowyoo Taowyoo force-pushed the yx/tokio-1.15-mbedtls-sys-2.28.0-aria-hkdf-merging branch from 184f260 to 74990fa Compare March 14, 2023 06:21
@Taowyoo Taowyoo changed the base branch from francisco/async-support-2.28 to mz/async-support March 14, 2023 06:25
@Taowyoo
Copy link
Collaborator Author

Taowyoo commented Mar 14, 2023

bors try

@bors
Copy link
Contributor

bors bot commented Mar 14, 2023

try

Already running a review

bors bot added a commit that referenced this pull request Mar 14, 2023
@bors
Try #224:
5bc8bbb
@bors
Copy link
Contributor

bors bot commented Mar 14, 2023

try

Build succeeded:

  • continuous-integration/travis-ci/push

This was referenced Mar 14, 2023
Merged
Merged
@Taowyoo Taowyoo changed the base branch from mz/async-support to v0.7 March 15, 2023 15:38
raoulstrackx and others added 4 commits March 15, 2023 08:40
@raoulstrackx @Taowyoo
Update to tokio 1.14.0
ccc8c4d
@raoulstrackx @Taowyoo
Update to tokio 1.15.0
df54c10
@bors @zugzwang @Taowyoo
Merge #187
925398f 
187: Enable ARIA cipher r=jethrogb a=zugzwang

Co-authored-by: Francisco Vial-Prado <francisco.vialprado@fortanix.com>
@bors @zugzwang @Taowyoo
Merge #191
de2561b 
191: Add serde support for the ARIA cipher r=AdrianCX a=zugzwang

This PR adds serde support for the Aria cipher. This is needed to use the `update` API. This is a follow-up of #187.

Co-authored-by: Francisco Vial-Prado <francisco.vialprado@fortanix.com>
bors bot and others added 5 commits March 15, 2023 08:40
@bors @kedars @Taowyoo
Merge #176
66b9324 
176: Add support for HKDF r=jethrogb a=kedars

Co-authored-by: Kedar Sovani <kedars@gmail.com>
@bors @zugzwang @Taowyoo
Merge #194
7d6ebc8 
194: Fix checks on curve parameters r=jethrogb a=zugzwang

On instantiating a curve by parameters, the code checks that all
field elements are non-zero in 𝔽ₚ. This is not necessary, and forbids
useful curves such as e.g. the Barreto-Naehrig pairing-friendly curves,
of the form y² = x³ + 257 (e.g. `a = 0`), and secp256k1 (used in Bitcoin, but can be instantiated by name).

Co-authored-by: Francisco Vial-Prado <francisco.vialprado@fortanix.com>
@Taowyoo
pump mbedtls version
1196658
@Taowyoo
pump tokio version
a7aa915
@Taowyoo
fix: fix error after rebase
02305b7
@Taowyoo Taowyoo force-pushed the yx/tokio-1.15-mbedtls-sys-2.28.0-aria-hkdf-merging branch from 74990fa to 02305b7 Compare March 15, 2023 16:08
@Taowyoo
Copy link
Collaborator Author

Taowyoo commented Mar 15, 2023

bors try

bors bot added a commit that referenced this pull request Mar 15, 2023
@bors
Try #224:
464a877
@Taowyoo Taowyoo requested a review from zugzwang March 15, 2023 18:30
@bors
Copy link
Contributor

bors bot commented Mar 15, 2023

try

Build succeeded:

  • continuous-integration/travis-ci/push

zugzwang
zugzwang approved these changes Mar 15, 2023
View reviewed changes
Copy link
Contributor

@zugzwang zugzwang left a comment

Choose a reason for hiding this comment

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

Before 1196658, all commits have been reviewed when merged to master.
I reviewed to 119665 to 02305b.

@Taowyoo
Copy link
Collaborator Author

Taowyoo commented Mar 15, 2023

bors r+

bors bot added a commit that referenced this pull request Mar 15, 2023
@bors @raoulstrackx @Taowyoo
Merge #224
8d93c73 
224: Merge async support branch to 0.7 rust-mbedtls r=Taowyoo a=Taowyoo

This is the successor PR for #127 but with some more latest changes needed

Co-authored-by: Raoul Strackx <raoul.strackx@fortanix.com>
Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Co-authored-by: Yuxiang Cao <yuxiang.cao@fortanix.com>
@bors
Copy link
Contributor

bors bot commented Mar 15, 2023

Timed out.

@Taowyoo
Copy link
Collaborator Author

Taowyoo commented Mar 15, 2023

bors r+

@bors
Copy link
Contributor

bors bot commented Mar 15, 2023

Build succeeded:

@bors bors bot merged commit 19fe2ab into v0.7 Mar 15, 2023
@Taowyoo Taowyoo deleted the yx/tokio-1.15-mbedtls-sys-2.28.0-aria-hkdf-merging branch April 3, 2023 19:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zugzwang zugzwang zugzwang approved these changes

@mzohreva mzohreva Awaiting requested review from mzohreva

@raoulstrackx raoulstrackx Awaiting requested review from raoulstrackx

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Taowyoo @zugzwang @raoulstrackx