Skip to content

Commit 57d1a1f

Browse files
committed
update to chacha20poly1305 prerelease
1 parent 3e2d73b commit 57d1a1f

File tree

3 files changed

+38
-40
lines changed

3 files changed

+38
-40
lines changed

Cargo.lock

Lines changed: 33 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ crate-type = ["cdylib"]
1111

1212
[dependencies]
1313
base64 = "0.22.1"
14-
chacha20poly1305 = "0.10.1"
14+
chacha20poly1305 = "0.11.0-pre.2"
1515
console_error_panic_hook = "0.1.7"
1616
flate2 = "1.0.35"
1717
formdata = "0.13.0"
18-
generic-array = { version = "^0.14", features = [ "serde" ] }
18+
hybrid-array = { version = "0.2.3", features = [ "serde" ] }
1919
getrandom = { version = "0.2.15", features = [ "js" ] }
2020
lz4_flex = "0.11.3"
2121
mime_guess = "2.0.5"

src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![feature(path_file_prefix)]
22
use base64::{engine::general_purpose, Engine as _};
33
use chacha20poly1305::{
4-
aead::{Aead, AeadCore, KeyInit, OsRng},
4+
aead::{Aead, AeadCore, KeyInit},
55
ChaCha20Poly1305,
66
};
77
use lz4_flex::block::{compress_prepend_size, decompress_size_prepended};
@@ -58,10 +58,10 @@ async fn post_put(_req: Request, ctx: RouteContext<()>) -> Result<Response> {
5858
}
5959

6060
async fn post_encrypted(_req: Request, ctx: RouteContext<()>) -> Result<Response> {
61-
let key = ChaCha20Poly1305::generate_key(&mut OsRng);
61+
let key = ChaCha20Poly1305::generate_key().unwrap();
6262
let keytext = general_purpose::STANDARD.encode(serde_json::to_string(&key).unwrap());
6363
let cipher = ChaCha20Poly1305::new(&key);
64-
let nonce = ChaCha20Poly1305::generate_nonce(&mut OsRng); // 96-bits; unique per message
64+
let nonce = ChaCha20Poly1305::generate_nonce().unwrap(); // 96-bits; unique per message
6565
let noncetext = general_purpose::STANDARD.encode(serde_json::to_string(&nonce).unwrap());
6666
let mut req_mut = _req.clone_mut().map_err(|e| console_log!("{}", e)).unwrap();
6767
let form_data = req_mut.form_data().await.unwrap();

0 commit comments

Comments
 (0)