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

Update to rPGP 0.10 #4236

Merged
merged 2 commits into from
Mar 30, 2023
Merged

Update to rPGP 0.10 #4236

merged 2 commits into from
Mar 30, 2023

Conversation

link2xt
Copy link
Collaborator

@link2xt link2xt commented Mar 27, 2023

This increases MSRV to 1.65.0, so blocked by deltachat/deltachat-ios#1771

And we need to merge deltachat/deltachat-android#2494 first, but this can be done right after releasing Delta Chat Android 1.36.

@link2xt link2xt marked this pull request as draft March 27, 2023 10:30
@link2xt
Copy link
Collaborator Author

link2xt commented Mar 27, 2023

This adds more duplicate dependencies, mainly because rPGP updated some crypto dependencies while iroh still depends on old versions.

@link2xt
Copy link
Collaborator Author

link2xt commented Mar 29, 2023

The test pgp::tests::test_decrypt_signed_no_key is broken, I bisected it to rPGP commit rpgp/rpgp@a463cca.

This commit is a squashed PR rpgp/rpgp#215.

EDIT: I made a fix rpgp/rpgp#231

@link2xt link2xt marked this pull request as ready for review March 30, 2023 19:41
{ name = "convert_case", version = "0.4.0" },
{ name = "darling", version = "<0.14" },
{ name = "convert_case", version = "0.4.0" },
{ name = "curve25519-dalek", version = "3.2.0" },
Copy link
Member

Choose a reason for hiding this comment

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

what still pulls this in? this shouldn't be in the dep tree anymore

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

cargo tree -i curve25519-dalek@3.2.0 output:

curve25519-dalek v3.2.0
├── ed25519-dalek v1.0.1
│   ├── iroh v0.4.0
│   │   └── deltachat v1.112.3 (/home/user/src/deltachat/deltachat-core-rust)
│   └── ssh-key v0.5.1
│       └── iroh v0.4.0 (*)
└── x25519-dalek v2.0.0-pre.1
    └── pgp v0.10.1
        └── deltachat v1.112.3 (/home/user/src/deltachat/deltachat-core-rust)

Copy link
Member

Choose a reason for hiding this comment

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

oh lol, okay iroh will upgrade, but we still need some deps to be released first, so I guess we have to accept the duplicate deps for the moment.

Copy link
Member

@dignifiedquire dignifiedquire left a comment

Choose a reason for hiding this comment

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

looks good, just some questions regarding deps

@link2xt link2xt merged commit 3e65b6f into master Mar 30, 2023
@link2xt link2xt deleted the link2xt/update-rpgp branch March 30, 2023 21:09
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