Skip to content

chore: update core-crypto repo to rust 2024 edition [WPB-16113] #925

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

Merged
merged 11 commits into from
Feb 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ jobs:
needs: build-android
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- name: set up jdk 17
uses: actions/setup-java@v4
with:
Expand Down
123 changes: 89 additions & 34 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions crypto-ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "core-crypto-ffi"
description = "Platform-specific bindings (Android, iOS, WASM) for CoreCrypto"
repository = "https://github.com/wireapp/core-crypto"
version = "4.1.0"
edition = "2021"
edition = "2024"
license = "GPL-3.0-only"
publish = false

Expand Down Expand Up @@ -52,7 +52,8 @@ uniffi.workspace = true
core-crypto = { workspace = true, features = ["uniffi"] }

[target.wasm32-unknown-unknown.dependencies]
wasm-bindgen = "0.2"
# caution! wasm-bindgen v0.2.100 causes our CI to fail
wasm-bindgen = "=0.2.99"
wasm-bindgen-futures = "0.4"
serde-wasm-bindgen = "0.6"
serde_json.workspace = true
Expand Down
8 changes: 4 additions & 4 deletions crypto-ffi/src/generic/context/e2ei.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
use std::{collections::HashMap, ops::DerefMut};

use crate::{
CoreCryptoError, NewCrlDistributionPoints,
generic::{
context::CoreCryptoContext, Ciphersuite, ClientId, CoreCryptoResult, CrlRegistration, E2eiConversationState,
E2eiDumpedPkiEnv, E2eiEnrollment, MlsCredentialType, WireIdentity,
Ciphersuite, ClientId, CoreCryptoResult, CrlRegistration, E2eiConversationState, E2eiDumpedPkiEnv,
E2eiEnrollment, MlsCredentialType, WireIdentity, context::CoreCryptoContext,
},
CoreCryptoError, NewCrlDistributionPoints,
};
use core_crypto::{prelude::VerifiableGroupInfo, RecursiveError};
use core_crypto::{RecursiveError, prelude::VerifiableGroupInfo};
use tls_codec::Deserialize;

#[uniffi::export]
Expand Down
2 changes: 1 addition & 1 deletion crypto-ffi/src/generic/context/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ use super::{
use crate::NewCrlDistributionPoints;
use async_lock::{Mutex, OnceCell};
use core_crypto::{
RecursiveError,
context::CentralContext,
prelude::{
ClientIdentifier, ConversationId, KeyPackageIn, KeyPackageRef, MlsConversationConfiguration,
VerifiableGroupInfo,
},
RecursiveError,
};
use std::{future::Future, ops::Deref, sync::Arc};
use tls_codec::{Deserialize, Serialize};
Expand Down
2 changes: 1 addition & 1 deletion crypto-ffi/src/generic/context/proteus.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::ProteusAutoPrekeyBundle;
use crate::context::CoreCryptoContext;
use crate::generic::CoreCryptoResult;
use crate::proteus_impl;
use crate::ProteusAutoPrekeyBundle;

#[uniffi::export]
impl CoreCryptoContext {
Expand Down
Loading
Loading