Skip to content

Commit

Permalink
Merge pull request #28 from str4d/age-0.6-pre
Browse files Browse the repository at this point in the history
Depend directly on age repo until 0.6 is released
  • Loading branch information
str4d committed Mar 20, 2021
2 parents 63652da + 2a844f6 commit fce4b8b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
8 changes: 6 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ crate-type = ["cdylib", "rlib"]
default = ["console_error_panic_hook"]

[dependencies]
age = { version = "0.5.1", features = ["armor", "async"] }
chrono = { version = "0.4", features = ["wasmbind"] }
futures = "0.3"
getrandom = { version = "0.1", features = ["wasm-bindgen"] }
i18n-embed = { version = "0.10.2", features = ["fluent-system", "web-sys-requester"] }
i18n-embed = { version = "0.12", features = ["fluent-system", "web-sys-requester"] }
js-sys = "0.3"
pin-project = "1"
secrecy = "0.7"
Expand All @@ -39,6 +38,11 @@ wee_alloc = { version = "0.4.2", optional = true }
# Temporary workaround for https://github.com/Amanieu/parking_lot/issues/269
parking_lot_core = "=0.8.0"

[dependencies.age]
git = "https://github.com/str4d/rage.git"
rev = "a9b5e88aa5816b284ebea23fc84d0203a3c4fdbb"
features = ["armor", "async", "web-sys"]

[dependencies.web-sys]
version = "0.3"
features = [
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ impl Decryptor {
};

let reader = decryptor
.decrypt_async(identities.0.into_iter())
.decrypt_async(identities.0.iter().map(|i| &**i))
.map_err(|e| JsValue::from(format!("{}", e)))?;

Ok(ReadableStream::from_stream(shim::ReadStreamer::new(reader, CHUNK_SIZE)).into_raw())
Expand Down

0 comments on commit fce4b8b

Please sign in to comment.