From fb36edc9fb8700f63da4bc3a3268697e2581fe03 Mon Sep 17 00:00:00 2001 From: beltram Date: Mon, 27 Nov 2023 17:02:32 +0100 Subject: [PATCH] wip --- Cargo.toml | 24 ++++++++++++------------ crypto/src/e2e_identity/identity.rs | 3 +++ extras/wasm-browser-run/Cargo.toml | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 87077bf410..5f219c9794 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,32 +46,32 @@ git = "https://github.com/wireapp/proteus" branch = "2.x" [patch.crates-io.openmls] -#package = "openmls" -#git = "https://github.com/wireapp/openmls" +package = "openmls" +git = "https://github.com/wireapp/openmls" #tag = "v1.0.0-pre.core-crypto-1.0.0" #branch = "feat/rfc9420" -path = "../openmls/openmls" +branch = "build/tls-codec-040" [patch.crates-io.openmls_traits] -#package = "openmls_traits" -#git = "https://github.com/wireapp/openmls" +package = "openmls_traits" +git = "https://github.com/wireapp/openmls" #tag = "v1.0.0-pre.core-crypto-1.0.0" #branch = "feat/rfc9420" -path = "../openmls/traits" +branch = "build/tls-codec-040" [patch.crates-io.openmls_basic_credential] -#package = "openmls_basic_credential" -#git = "https://github.com/wireapp/openmls" +package = "openmls_basic_credential" +git = "https://github.com/wireapp/openmls" #tag = "v1.0.0-pre.core-crypto-1.0.0" #branch = "feat/rfc9420" -path = "../openmls/basic_credential" +branch = "build/tls-codec-040" [patch.crates-io.openmls_x509_credential] -#package = "openmls_x509_credential" -#git = "https://github.com/wireapp/openmls" +package = "openmls_x509_credential" +git = "https://github.com/wireapp/openmls" #tag = "v1.0.0-pre.core-crypto-1.0.0" #branch = "feat/rfc9420" -path = "../openmls/x509_credential" +branch = "build/tls-codec-040" [patch.crates-io.hpke] git = "https://github.com/wireapp/rust-hpke.git" diff --git a/crypto/src/e2e_identity/identity.rs b/crypto/src/e2e_identity/identity.rs index eeb5273b3d..dd9505eff6 100644 --- a/crypto/src/e2e_identity/identity.rs +++ b/crypto/src/e2e_identity/identity.rs @@ -123,8 +123,11 @@ pub mod tests { wasm_bindgen_test_configure!(run_in_browser); + #[allow(clippy::redundant_static_lifetimes)] const ALICE_ANDROID: &'static str = "t6wRpI8BRSeviBwwiFp5MQ:a661e79735dc890f@wire.com"; + #[allow(clippy::redundant_static_lifetimes)] const ALICE_IOS: &'static str = "t6wRpI8BRSeviBwwiFp5MQ:ce3c1921aacdbcfe@wire.com"; + #[allow(clippy::redundant_static_lifetimes)] const BOB_ANDROID: &'static str = "wjoxZL5tTzi2-8iND-HimA:2af3cbe39aed8cc5@wire.com"; #[async_std::test] diff --git a/extras/wasm-browser-run/Cargo.toml b/extras/wasm-browser-run/Cargo.toml index 9f0d1e6f9c..3f97151fd4 100644 --- a/extras/wasm-browser-run/Cargo.toml +++ b/extras/wasm-browser-run/Cargo.toml @@ -24,7 +24,7 @@ semver = { version = "1.0", features = ["serde"] } tempfile = "3.3" futures-util = "0.3" wasm-bindgen = "0.2" -walrus = "0.19" +walrus = "0.20" hex = "0.4" wasm-bindgen-cli-support = "0.2" tokio-tungstenite = "0.20"