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

Upgrade to libsignal-protocol 0.32 #188

Merged
merged 2 commits into from
Sep 20, 2023
Merged

Conversation

boxdot
Copy link
Collaborator

@boxdot boxdot commented Sep 14, 2023

No description provided.

@boxdot
Copy link
Collaborator Author

boxdot commented Sep 14, 2023

Based on whisperfish/libsignal-service-rs#245. Can be merged when this PR lands.

@Schmiddiii
Copy link
Contributor

Schmiddiii commented Sep 15, 2023

Am I missing something or does this not update the libsignal-commit to the update-libsignal-0.32-branch? And when manually updating locally, it has some version conflicts:

error: failed to select a version for `zeroize`.
    ... required by package `aes v0.8.3`
    ... which satisfies dependency `aes = "^0.8.3"` of package `libsignal-protocol v0.1.0 (https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe)`
    ... which satisfies git dependency `libsignal-protocol` of package `libsignal-service v0.1.0 (https://github.com/whisperfish/libsignal-service-rs?rev=060bba0ffb5792d17563c7228d7d1dd998bff7d8#060bba0f)`
    ... which satisfies git dependency `libsignal-service` of package `libsignal-service-hyper v0.1.0 (https://github.com/whisperfish/libsignal-service-rs?rev=060bba0ffb5792d17563c7228d7d1dd998bff7d8#060bba0f)`
    ... which satisfies git dependency `libsignal-service-hyper` of package `presage v0.6.0-dev (/presage/presage)`
    ... which satisfies path dependency `presage` (locked to 0.6.0-dev) of package `presage-cli v0.6.0-dev (/presage/presage-cli)`
versions that meet the requirements `^1.6.0` are: 1.6.0

all possible versions conflict with previously selected packages.

  previously selected package `zeroize v1.3.0`
    ... which satisfies dependency `zeroize = "^1"` (locked to 1.3.0) of package `chacha20poly1305 v0.9.1`
    ... which satisfies dependency `chacha20poly1305 = "^0.9.0"` (locked to 0.9.1) of package `matrix-sdk-store-encryption v0.2.0`
    ... which satisfies dependency `matrix-sdk-store-encryption = "^0.2.0"` (locked to 0.2.0) of package `presage-store-sled v0.6.0-dev (/presage/presage-store-sled)`
    ... which satisfies path dependency `presage-store-sled` (locked to 0.6.0-dev) of package `presage-cli v0.6.0-dev (/presage/presage-cli)`

failed to select a version for `zeroize` which could resolve this conflict

and (with Flare)


error: failed to select a version for `subtle`.
    ... required by package `poksho v0.7.0 (https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe)`
    ... which satisfies git dependency `poksho` of package `zkgroup v0.9.0 (https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe)`
    ... which satisfies git dependency `zkgroup` of package `libsignal-service v0.1.0 (https://github.com/whisperfish/libsignal-service-rs?rev=060bba0ffb5792d17563c7228d7d1dd998bff7d8#060bba0f)`
    ... which satisfies git dependency `libsignal-service` of package `flare v0.10.1-beta.1 (/flare)`
versions that meet the requirements `^2.5` are: 2.5.0

all possible versions conflict with previously selected packages.

  previously selected package `subtle v2.4.1`
    ... which satisfies dependency `subtle = ">=2, <2.5"` (locked to 2.4.1) of package `aes-gcm v0.9.4`
    ... which satisfies dependency `aes-gcm = "^0.9"` (locked to 0.9.4) of package `libsignal-service v0.1.0 (https://github.com/whisperfish/libsignal-service-rs?rev=060bba0ffb5792d17563c7228d7d1dd998bff7d8#060bba0f)`
    ... which satisfies git dependency `libsignal-service` of package `flare v0.10.1-beta.1 (/flare)`

failed to select a version for `subtle` which could resolve this conflict

@boxdot
Copy link
Collaborator Author

boxdot commented Sep 15, 2023

@Schmiddiii

Most likely you are missing this patch in Cargo.toml:

[patch.crates-io]
curve25519-dalek = { git = 'https://github.com/signalapp/curve25519-dalek', tag = 'signal-curve25519-4.0.0' }

@Schmiddiii
Copy link
Contributor

Schmiddiii commented Sep 15, 2023

I added that patch but it changed nothing.

A simple cargo update fixed it. Probably some dependency version is not strict enough somewhere, but thats not a big problem for me. It now compiles for me and seems to work.

@gferon
Copy link
Collaborator

gferon commented Sep 20, 2023

Thanks for the patches @boxdot, let's 🚀 it and squash bugs at they arise.

@gferon gferon enabled auto-merge (squash) September 20, 2023 16:00
@gferon gferon merged commit 8abd8ca into whisperfish:main Sep 20, 2023
@gferon gferon added this to the 0.6.0 milestone Nov 19, 2023
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.

3 participants