Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
beltram committed Nov 27, 2023
1 parent e261edb commit fb36edc
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 13 deletions.
24 changes: 12 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions crypto/src/e2e_identity/identity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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:[email protected]";
#[allow(clippy::redundant_static_lifetimes)]
const ALICE_IOS: &'static str = "t6wRpI8BRSeviBwwiFp5MQ:[email protected]";
#[allow(clippy::redundant_static_lifetimes)]
const BOB_ANDROID: &'static str = "wjoxZL5tTzi2-8iND-HimA:[email protected]";

#[async_std::test]
Expand Down
2 changes: 1 addition & 1 deletion extras/wasm-browser-run/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit fb36edc

Please sign in to comment.