From 5701ea5c02448836714a314278807fc7bb41d164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Tue, 1 Mar 2022 11:55:12 +0000 Subject: [PATCH] First level of trait updates --- Cargo.lock | 125 +- common/crypto/Cargo.toml | 13 +- common/crypto/src/crypto_hash.rs | 9 +- common/crypto/src/hkdf.rs | 8 +- common/crypto/src/hmac.rs | 65 +- common/crypto/src/lib.rs | 1 + common/crypto/src/shared_key.rs | 25 +- common/crypto/src/symmetric/stream_cipher.rs | 34 +- common/nymsphinx/params/src/lib.rs | 5 +- contracts/Cargo.lock | 121 +- nym-wallet/Cargo.lock | 1115 +++++++++++------- 11 files changed, 950 insertions(+), 571 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 72f9da601a..fefa6acd23 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -25,12 +25,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if 1.0.0", - "cipher", + "cipher 0.3.0", "cpufeatures", - "ctr", + "ctr 0.8.0", "opaque-debug 0.3.0", ] +[[package]] +name = "aes" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfe0133578c0986e1fe3dfcd4af1cc5b2dd6c3dbf534d69916ce16a2701d40ba" +dependencies = [ + "cfg-if 1.0.0", + "cipher 0.4.3", + "cpufeatures", +] + [[package]] name = "ahash" version = "0.7.4" @@ -242,7 +253,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "873faa4363bfc54c36a48321da034c92a0645a363eed34d948683ffc1706e37f" dependencies = [ "bs58", - "hmac", + "hmac 0.11.0", "k256 0.10.1", "once_cell", "pbkdf2", @@ -304,17 +315,16 @@ dependencies = [ [[package]] name = "blake3" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "526c210b4520e416420759af363083471656e819a75e831b8d2c9d5a584f2413" +checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" dependencies = [ "arrayref", "arrayvec 0.7.1", "cc", "cfg-if 1.0.0", "constant_time_eq", - "crypto-mac 0.11.1", - "digest 0.9.0", + "digest 0.10.3", ] [[package]] @@ -339,6 +349,15 @@ dependencies = [ "generic-array 0.14.4", ] +[[package]] +name = "block-buffer" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "block-padding" version = "0.1.5" @@ -488,6 +507,16 @@ dependencies = [ "generic-array 0.14.4", ] +[[package]] +name = "cipher" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" +dependencies = [ + "crypto-common", + "inout", +] + [[package]] name = "clap" version = "2.33.3" @@ -915,16 +944,17 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" name = "crypto" version = "0.1.0" dependencies = [ - "aes", + "aes 0.8.1", "blake3", "bs58", - "cipher", + "cipher 0.4.3", "config", - "digest 0.9.0", + "ctr 0.9.1", + "digest 0.10.3", "ed25519-dalek", "generic-array 0.14.4", - "hkdf", - "hmac", + "hkdf 0.12.3", + "hmac 0.12.1", "log", "nymsphinx-types", "pemstore", @@ -957,6 +987,16 @@ dependencies = [ "zeroize", ] +[[package]] +name = "crypto-common" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +dependencies = [ + "generic-array 0.14.4", + "typenum", +] + [[package]] name = "crypto-mac" version = "0.7.0" @@ -1014,7 +1054,16 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher", + "cipher 0.3.0", +] + +[[package]] +name = "ctr" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d14f329cfbaf5d0e06b5e87fff7e265d2673c5ea7d2c27691a2c107db1442a0" +dependencies = [ + "cipher 0.4.3", ] [[package]] @@ -1203,6 +1252,17 @@ dependencies = [ "generic-array 0.14.4", ] +[[package]] +name = "digest" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +dependencies = [ + "block-buffer 0.10.2", + "crypto-common", + "subtle 2.4.1", +] + [[package]] name = "dirs" version = "3.0.2" @@ -1294,7 +1354,7 @@ checksum = "43ee23aa5b4f68c7a092b5c3beb25f50c406adc75e2363634f242f28ab255372" dependencies = [ "der 0.4.3", "elliptic-curve 0.10.6", - "hmac", + "hmac 0.11.0", "signature", ] @@ -2135,7 +2195,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b" dependencies = [ "digest 0.9.0", - "hmac", + "hmac 0.11.0", +] + +[[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac 0.12.1", ] [[package]] @@ -2148,6 +2217,15 @@ dependencies = [ "digest 0.9.0", ] +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.3", +] + [[package]] name = "http" version = "0.2.6" @@ -2370,6 +2448,15 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3094308123a0e9fd59659ce45e22de9f53fc1d2ac6e1feb9fef988e4f76cad77" +[[package]] +name = "inout" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1f03d4ab4d5dc9ec2d219f86c15d2a15fc08239d1cd3b2d6a19717c0a2f443" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "input_buffer" version = "0.4.0" @@ -4275,7 +4362,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525" dependencies = [ "crypto-bigint 0.3.2", - "hmac", + "hmac 0.11.0", "zeroize", ] @@ -5010,7 +5097,7 @@ name = "sphinx" version = "0.1.0" source = "git+https://github.com/nymtech/sphinx?rev=c494250f2a78bed33a618d470792418eee932859#c494250f2a78bed33a618d470792418eee932859" dependencies = [ - "aes", + "aes 0.7.5", "arrayref", "blake2", "bs58", @@ -5018,8 +5105,8 @@ dependencies = [ "chacha", "curve25519-dalek", "digest 0.9.0", - "hkdf", - "hmac", + "hkdf 0.11.0", + "hmac 0.11.0", "lioness", "log", "rand 0.7.3", diff --git a/common/crypto/Cargo.toml b/common/crypto/Cargo.toml index a638b089dc..8ad37ba420 100644 --- a/common/crypto/Cargo.toml +++ b/common/crypto/Cargo.toml @@ -7,14 +7,15 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -aes = { version = "0.7.4", features = ["ctr"] } +aes = "0.8.1" bs58 = "0.4.0" -blake3 = { version = "~1.2.0", features = ["traits-preview"] } -digest = "0.9.0" +blake3 = { version = "1.3.1", features = ["traits-preview"] } +ctr = "0.9.1" +digest = "0.10.3" generic-array = "0.14" -hkdf = "0.11.0" -hmac = "0.11.0" -cipher = "0.3.0" +hkdf = "0.12.3" +hmac = "0.12.1" +cipher = "0.4.3" x25519-dalek = "1.1" ed25519-dalek = "1.0" log = "0.4" diff --git a/common/crypto/src/crypto_hash.rs b/common/crypto/src/crypto_hash.rs index 4585789715..9698ca21dc 100644 --- a/common/crypto/src/crypto_hash.rs +++ b/common/crypto/src/crypto_hash.rs @@ -1,14 +1,11 @@ // Copyright 2021 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use digest::{BlockInput, Digest, FixedOutput, Reset, Update}; -use generic_array::{ArrayLength, GenericArray}; +use digest::{Digest, Output}; -pub fn compute_digest(data: &[u8]) -> GenericArray::OutputSize> +pub fn compute_digest(data: &[u8]) -> Output where - D: Update + BlockInput + FixedOutput + Reset + Default + Clone, - D::BlockSize: ArrayLength, - D::OutputSize: ArrayLength, + D: Digest, { D::digest(data) } diff --git a/common/crypto/src/hkdf.rs b/common/crypto/src/hkdf.rs index 141b5c607c..5fe7f56137 100644 --- a/common/crypto/src/hkdf.rs +++ b/common/crypto/src/hkdf.rs @@ -1,9 +1,7 @@ // Copyright 2021 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use digest::{BlockInput, FixedOutput, Reset, Update}; -use generic_array::ArrayLength; -use hkdf::Hkdf; +use hkdf::{hmac::digest::Digest, Hkdf}; /// Perform HKDF `extract` then `expand` as a single step. pub fn extract_then_expand( @@ -13,9 +11,7 @@ pub fn extract_then_expand( okm_length: usize, ) -> Result, hkdf::InvalidLength> where - D: Update + BlockInput + FixedOutput + Reset + Default + Clone, - D::BlockSize: ArrayLength, - D::OutputSize: ArrayLength, + D: Digest, { // TODO: this would need to change if we ever needed the generated pseudorandom key, but // realistically I don't see any reasons why we might need it diff --git a/common/crypto/src/hmac.rs b/common/crypto/src/hmac.rs index 659bfe036b..b8dbad43e2 100644 --- a/common/crypto/src/hmac.rs +++ b/common/crypto/src/hmac.rs @@ -1,24 +1,23 @@ // Copyright 2021 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use digest::{BlockInput, FixedOutput, Reset, Update}; -use generic_array::{typenum::Unsigned, ArrayLength, GenericArray}; -use hmac::{crypto_mac, Hmac, Mac, NewMac}; +use hmac::{ + digest::{crypto_common::BlockSizeUser, Digest, Output}, + Mac, SimpleHmac, +}; pub use hmac; -// Type alias for ease of use so that it would not require explicit import of crypto_mac or Hmac -pub type HmacOutput = crypto_mac::Output>; +// TODO: We should probably change it to use some sealed trait to allow for both `Hmac` and `SimpleHmac` +pub type HmacOutput = Output>; /// Compute keyed hmac pub fn compute_keyed_hmac(key: &[u8], data: &[u8]) -> HmacOutput where - D: Update + BlockInput + FixedOutput + Reset + Default + Clone, - D::BlockSize: ArrayLength, - D::OutputSize: ArrayLength, + D: Digest + BlockSizeUser, { - let mut hmac = - Hmac::::new_from_slice(key).expect("HMAC should be able to take key of any size!"); + let mut hmac = SimpleHmac::::new_from_slice(key) + .expect("HMAC was instantiated with a key of an invalid size!"); hmac.update(data); hmac.finalize() } @@ -26,33 +25,29 @@ where /// Compute keyed hmac and performs constant time equality check with the provided tag value. pub fn recompute_keyed_hmac_and_verify_tag(key: &[u8], data: &[u8], tag: &[u8]) -> bool where - D: Update + BlockInput + FixedOutput + Reset + Default + Clone, - D::BlockSize: ArrayLength, - D::OutputSize: ArrayLength, + D: Digest, { - let mut hmac = - Hmac::::new_from_slice(key).expect("HMAC should be able to take key of any size!"); + let mut hmac = SimpleHmac::::new_from_slice(key) + .expect("HMAC was instantiated with a key of an invalid size!"); hmac.update(data); // note, under the hood ct_eq is called hmac.verify(tag).is_ok() } -/// Verifies tag of an hmac output. -pub fn verify_tag(tag: &[u8], out: HmacOutput) -> bool -where - D: Update + BlockInput + FixedOutput + Reset + Default + Clone, - D::BlockSize: ArrayLength, - D::OutputSize: ArrayLength, -{ - if tag.len() != D::OutputSize::to_usize() { - return false; - } - - let tag_bytes = GenericArray::clone_from_slice(tag); - let tag_out = HmacOutput::new(tag_bytes); - // note, under the hood ct_eq is called - out == tag_out -} +// /// Verifies tag of an hmac output. +// pub fn verify_tag(tag: &[u8], out: HmacOutput) -> bool +// where +// D: Digest, +// { +// if tag.len() != D::output_size() { +// return false; +// } +// +// let tag_bytes = GenericArray::clone_from_slice(tag); +// +// // note, under the hood ct_eq is called +// out == tag_out +// } #[cfg(test)] mod tests { @@ -76,9 +71,9 @@ mod tests { &output_tag )); - assert!(verify_tag::( - &output_tag, - compute_keyed_hmac::(&key, msg) - )); + // assert!(verify_tag::( + // &output_tag, + // compute_keyed_hmac::(&key, msg) + // )); } } diff --git a/common/crypto/src/lib.rs b/common/crypto/src/lib.rs index b28a630dfd..60c63bb31f 100644 --- a/common/crypto/src/lib.rs +++ b/common/crypto/src/lib.rs @@ -16,6 +16,7 @@ pub use generic_array; // etc. algorithms and import them elsewhere as needed via common/crypto pub use aes; pub use blake3; +pub use ctr; // TODO: this function uses all three modules: asymmetric crypto, symmetric crypto and derives key..., // so I don't know where to put it... diff --git a/common/crypto/src/shared_key.rs b/common/crypto/src/shared_key.rs index 21042d9b21..ac4001b957 100644 --- a/common/crypto/src/shared_key.rs +++ b/common/crypto/src/shared_key.rs @@ -3,9 +3,8 @@ use crate::asymmetric::encryption; use crate::hkdf; -use cipher::{CipherKey, NewCipher, StreamCipher}; -use digest::{BlockInput, FixedOutput, Reset, Update}; -use generic_array::{typenum::Unsigned, ArrayLength}; +use cipher::{Key, KeyIvInit, StreamCipher}; +use digest::Digest; use rand::{CryptoRng, RngCore}; /// Generate an ephemeral encryption keypair and perform diffie-hellman to establish @@ -13,12 +12,10 @@ use rand::{CryptoRng, RngCore}; pub fn new_ephemeral_shared_key( rng: &mut R, remote_key: &encryption::PublicKey, -) -> (encryption::KeyPair, CipherKey) +) -> (encryption::KeyPair, Key) where - C: StreamCipher + NewCipher, - D: Update + BlockInput + FixedOutput + Reset + Default + Clone, - D::BlockSize: ArrayLength, - D::OutputSize: ArrayLength, + C: StreamCipher + KeyIvInit, + D: Digest, R: RngCore + CryptoRng, { let ephemeral_keypair = encryption::KeyPair::new(rng); @@ -31,7 +28,7 @@ where .expect("somehow too long okm was provided"); let derived_shared_key = - CipherKey::::from_exact_iter(okm).expect("okm was expanded to incorrect length!"); + Key::::from_exact_iter(okm).expect("okm was expanded to incorrect length!"); (ephemeral_keypair, derived_shared_key) } @@ -40,12 +37,10 @@ where pub fn recompute_shared_key( remote_key: &encryption::PublicKey, local_key: &encryption::PrivateKey, -) -> CipherKey +) -> Key where - C: StreamCipher + NewCipher, - D: Update + BlockInput + FixedOutput + Reset + Default + Clone, - D::BlockSize: ArrayLength, - D::OutputSize: ArrayLength, + C: StreamCipher + KeyIvInit, + D: Digest, { let dh_result = local_key.diffie_hellman(remote_key); @@ -53,5 +48,5 @@ where let okm = hkdf::extract_then_expand::(None, &dh_result, None, C::KeySize::to_usize()) .expect("somehow too long okm was provided"); - CipherKey::::from_exact_iter(okm).expect("okm was expanded to incorrect length!") + Key::::from_exact_iter(okm).expect("okm was expanded to incorrect length!") } diff --git a/common/crypto/src/symmetric/stream_cipher.rs b/common/crypto/src/symmetric/stream_cipher.rs index 6f98c3205f..fa6cd1852f 100644 --- a/common/crypto/src/symmetric/stream_cipher.rs +++ b/common/crypto/src/symmetric/stream_cipher.rs @@ -1,12 +1,12 @@ // Copyright 2020 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use cipher::{Nonce, StreamCipher}; +use cipher::{Iv, KeyIvInit, StreamCipher}; use generic_array::{typenum::Unsigned, GenericArray}; use rand::{CryptoRng, RngCore}; // re-export this for ease of use -pub use cipher::{CipherKey, NewCipher}; +pub use cipher::Key; // SECURITY: // TODO: note that this is not the most secure approach here @@ -19,11 +19,11 @@ pub use cipher::{CipherKey, NewCipher}; // I think 'IV' looks better than 'Iv', feel free to change that. #[allow(clippy::upper_case_acronyms)] -pub type IV = Nonce; +pub type IV = Iv; -pub fn generate_key(rng: &mut R) -> CipherKey +pub fn generate_key(rng: &mut R) -> Key where - C: NewCipher, + C: KeyIvInit, R: RngCore + CryptoRng, { let mut key = GenericArray::default(); @@ -33,7 +33,7 @@ where pub fn random_iv(rng: &mut R) -> IV where - C: NewCipher, + C: KeyIvInit, R: RngCore + CryptoRng, { let mut iv = GenericArray::default(); @@ -43,14 +43,14 @@ where pub fn zero_iv() -> IV where - C: NewCipher, + C: KeyIvInit, { GenericArray::default() } pub fn iv_from_slice(b: &[u8]) -> &IV where - C: NewCipher, + C: KeyIvInit, { if b.len() != C::NonceSize::to_usize() { // `from_slice` would have caused a panic about this issue anyway. @@ -68,9 +68,9 @@ where // However, do we really expect to ever need it? #[inline] -pub fn encrypt(key: &CipherKey, iv: &IV, data: &[u8]) -> Vec +pub fn encrypt(key: &Key, iv: &IV, data: &[u8]) -> Vec where - C: StreamCipher + NewCipher, + C: StreamCipher + KeyIvInit, { let mut ciphertext = data.to_vec(); encrypt_in_place::(key, iv, &mut ciphertext); @@ -78,18 +78,18 @@ where } #[inline] -pub fn encrypt_in_place(key: &CipherKey, iv: &IV, data: &mut [u8]) +pub fn encrypt_in_place(key: &Key, iv: &IV, data: &mut [u8]) where - C: StreamCipher + NewCipher, + C: StreamCipher + KeyIvInit, { let mut cipher = C::new(key, iv); cipher.apply_keystream(data) } #[inline] -pub fn decrypt(key: &CipherKey, iv: &IV, ciphertext: &[u8]) -> Vec +pub fn decrypt(key: &Key, iv: &IV, ciphertext: &[u8]) -> Vec where - C: StreamCipher + NewCipher, + C: StreamCipher + KeyIvInit, { let mut data = ciphertext.to_vec(); decrypt_in_place::(key, iv, &mut data); @@ -97,9 +97,9 @@ where } #[inline] -pub fn decrypt_in_place(key: &CipherKey, iv: &IV, data: &mut [u8]) +pub fn decrypt_in_place(key: &Key, iv: &IV, data: &mut [u8]) where - C: StreamCipher + NewCipher, + C: StreamCipher + KeyIvInit, { let mut cipher = C::new(key, iv); cipher.apply_keystream(data) @@ -113,7 +113,7 @@ mod tests { #[cfg(test)] mod aes_ctr128 { use super::*; - use aes::Aes128Ctr; + type Aes128Ctr = ctr::Ctr64LE; #[test] fn zero_iv_is_actually_zero() { diff --git a/common/nymsphinx/params/src/lib.rs b/common/nymsphinx/params/src/lib.rs index b8954fc975..41e6c2581a 100644 --- a/common/nymsphinx/params/src/lib.rs +++ b/common/nymsphinx/params/src/lib.rs @@ -1,8 +1,11 @@ // Copyright 2021 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use crypto::aes::Aes128Ctr; +use crypto::aes::Aes128; use crypto::blake3; +use crypto::ctr; + +type Aes128Ctr = ctr::Ctr64LE; // Re-export for ease of use pub use packet_modes::PacketMode; diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock index 864a01cdab..e956bef20d 100644 --- a/contracts/Cargo.lock +++ b/contracts/Cargo.lock @@ -9,12 +9,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", - "cipher", + "cipher 0.3.0", "cpufeatures", - "ctr", + "ctr 0.8.0", "opaque-debug 0.3.0", ] +[[package]] +name = "aes" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfe0133578c0986e1fe3dfcd4af1cc5b2dd6c3dbf534d69916ce16a2701d40ba" +dependencies = [ + "cfg-if", + "cipher 0.4.3", + "cpufeatures", +] + [[package]] name = "anyhow" version = "1.0.52" @@ -92,17 +103,16 @@ dependencies = [ [[package]] name = "blake3" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "526c210b4520e416420759af363083471656e819a75e831b8d2c9d5a584f2413" +checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "crypto-mac 0.11.1", - "digest 0.9.0", + "digest 0.10.3", ] [[package]] @@ -126,6 +136,15 @@ dependencies = [ "generic-array 0.14.5", ] +[[package]] +name = "block-buffer" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +dependencies = [ + "generic-array 0.14.5", +] + [[package]] name = "block-padding" version = "0.1.5" @@ -212,6 +231,16 @@ dependencies = [ "generic-array 0.14.5", ] +[[package]] +name = "cipher" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" +dependencies = [ + "crypto-common", + "inout", +] + [[package]] name = "config" version = "0.1.0" @@ -320,16 +349,17 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" name = "crypto" version = "0.1.0" dependencies = [ - "aes", + "aes 0.8.1", "blake3", "bs58", - "cipher", + "cipher 0.4.3", "config", - "digest 0.9.0", + "ctr 0.9.1", + "digest 0.10.3", "ed25519-dalek", "generic-array 0.14.5", - "hkdf", - "hmac", + "hkdf 0.12.3", + "hmac 0.12.1", "log", "nymsphinx-types", "pemstore", @@ -350,6 +380,16 @@ dependencies = [ "zeroize", ] +[[package]] +name = "crypto-common" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +dependencies = [ + "generic-array 0.14.5", + "typenum", +] + [[package]] name = "crypto-mac" version = "0.7.0" @@ -376,7 +416,16 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher", + "cipher 0.3.0", +] + +[[package]] +name = "ctr" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d14f329cfbaf5d0e06b5e87fff7e265d2673c5ea7d2c27691a2c107db1442a0" +dependencies = [ + "cipher 0.4.3", ] [[package]] @@ -430,6 +479,17 @@ dependencies = [ "generic-array 0.14.5", ] +[[package]] +name = "digest" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +dependencies = [ + "block-buffer 0.10.2", + "crypto-common", + "subtle 2.4.1", +] + [[package]] name = "dyn-clone" version = "1.0.4" @@ -444,7 +504,7 @@ checksum = "43ee23aa5b4f68c7a092b5c3beb25f50c406adc75e2363634f242f28ab255372" dependencies = [ "der", "elliptic-curve", - "hmac", + "hmac 0.11.0", "signature", ] @@ -678,7 +738,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b" dependencies = [ "digest 0.9.0", - "hmac", + "hmac 0.11.0", +] + +[[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac 0.12.1", ] [[package]] @@ -691,6 +760,15 @@ dependencies = [ "digest 0.9.0", ] +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.3", +] + [[package]] name = "humantime" version = "2.1.0" @@ -718,6 +796,15 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "inout" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1f03d4ab4d5dc9ec2d219f86c15d2a15fc08239d1cd3b2d6a19717c0a2f443" +dependencies = [ + "generic-array 0.14.5", +] + [[package]] name = "itoa" version = "1.0.1" @@ -1304,7 +1391,7 @@ name = "sphinx" version = "0.1.0" source = "git+https://github.com/nymtech/sphinx?rev=c494250f2a78bed33a618d470792418eee932859#c494250f2a78bed33a618d470792418eee932859" dependencies = [ - "aes", + "aes 0.7.5", "arrayref", "blake2", "bs58", @@ -1312,8 +1399,8 @@ dependencies = [ "chacha", "curve25519-dalek", "digest 0.9.0", - "hkdf", - "hmac", + "hkdf 0.11.0", + "hmac 0.11.0", "lioness", "log", "rand", diff --git a/nym-wallet/Cargo.lock b/nym-wallet/Cargo.lock index 2107c8e5b3..f4cab5331f 100644 --- a/nym-wallet/Cargo.lock +++ b/nym-wallet/Cargo.lock @@ -40,12 +40,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if 1.0.0", - "cipher", + "cipher 0.3.0", "cpufeatures", - "ctr", + "ctr 0.8.0", "opaque-debug 0.3.0", ] +[[package]] +name = "aes" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfe0133578c0986e1fe3dfcd4af1cc5b2dd6c3dbf534d69916ce16a2701d40ba" +dependencies = [ + "cfg-if 1.0.0", + "cipher 0.4.3", + "cpufeatures", +] + [[package]] name = "aes-gcm" version = "0.9.4" @@ -53,9 +64,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" dependencies = [ "aead", - "aes", - "cipher", - "ctr", + "aes 0.7.5", + "cipher 0.3.0", + "ctr 0.8.0", "ghash", "subtle 2.4.1", ] @@ -113,7 +124,7 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e96d5444b02f3080edac8a144f6baf29b2fb6ff589ad4311559731a7c7529381" dependencies = [ - "darling", + "darling 0.10.2", "pmutil", "proc-macro2", "quote", @@ -134,9 +145,9 @@ dependencies = [ [[package]] name = "atk" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a83b21d2aa75e464db56225e1bda2dd5993311ba1095acaa8fa03d1ae67026ba" +checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" dependencies = [ "atk-sys", "bitflags", @@ -146,32 +157,14 @@ dependencies = [ [[package]] name = "atk-sys" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "badcf670157c84bb8b1cf6b5f70b650fed78da2033c9eed84c4e49b11cbe83ea" +checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" dependencies = [ - "glib-sys 0.14.0", - "gobject-sys 0.14.0", + "glib-sys 0.15.6", + "gobject-sys 0.15.5", "libc", - "system-deps 3.2.0", -] - -[[package]] -name = "attohttpc" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8bda305457262b339322106c776e3fd21df860018e566eb6a5b1aa4b6ae02d" -dependencies = [ - "flate2", - "http", - "log", - "native-tls", - "openssl", - "serde", - "serde_json", - "serde_urlencoded 0.6.1", - "url", - "wildmatch", + "system-deps 6.0.2", ] [[package]] @@ -220,13 +213,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "873faa4363bfc54c36a48321da034c92a0645a363eed34d948683ffc1706e37f" dependencies = [ "bs58", - "hmac", + "hmac 0.11.0", "k256 0.10.1", "once_cell", "pbkdf2", "rand_core 0.6.3", "ripemd160", - "sha2", + "sha2 0.9.8", "subtle 2.4.1", "zeroize", ] @@ -274,22 +267,21 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b94ba84325db59637ffc528bbe8c7f86c02c57cff5c0e2b9b00f9a851f42f309" dependencies = [ - "digest 0.10.1", + "digest 0.10.3", ] [[package]] name = "blake3" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "526c210b4520e416420759af363083471656e819a75e831b8d2c9d5a584f2413" +checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if 1.0.0", "constant_time_eq", - "crypto-mac 0.11.1", - "digest 0.9.0", + "digest 0.10.3", "rayon", ] @@ -365,7 +357,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" dependencies = [ - "sha2", + "sha2 0.9.8", ] [[package]] @@ -430,9 +422,9 @@ dependencies = [ [[package]] name = "cairo-rs" -version = "0.14.9" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b5725979db0c586d98abad2193cdb612dd40ef95cd26bd99851bf93b3cb482" +checksum = "e8b14c80d8d1a02fa6d914b9d1afeeca9bc34257f8300d9696e1e331ae114223" dependencies = [ "bitflags", "cairo-sys-rs", @@ -443,13 +435,24 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.14.9" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b448b876970834fda82ba3aeaccadbd760206b75388fc5c1b02f1e343b697570" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ - "glib-sys 0.14.0", + "glib-sys 0.15.6", "libc", - "system-deps 3.2.0", + "system-deps 6.0.2", +] + +[[package]] +name = "cargo_toml" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e270ef0cd868745878982f7ce470aa898d0d4bb248af67f0cf66f54617913ef" +dependencies = [ + "serde", + "serde_derive", + "toml", ] [[package]] @@ -477,7 +480,25 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e" dependencies = [ - "smallvec 1.7.0", + "smallvec 1.8.0", +] + +[[package]] +name = "cfg-expr" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" +dependencies = [ + "smallvec 1.8.0", +] + +[[package]] +name = "cfg-expr" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e068cb2806bbc15b439846dc16c5f89f8599f2c3e4d73d4449d38f9b2f0b6c5" +dependencies = [ + "smallvec 1.8.0", ] [[package]] @@ -517,6 +538,16 @@ dependencies = [ "generic-array 0.14.4", ] +[[package]] +name = "cipher" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" +dependencies = [ + "crypto-common", + "inout", +] + [[package]] name = "cloudabi" version = "0.0.3" @@ -535,8 +566,8 @@ dependencies = [ "bitflags", "block", "cocoa-foundation", - "core-foundation 0.9.2", - "core-graphics 0.22.3", + "core-foundation", + "core-graphics", "foreign-types", "libc", "objc", @@ -550,7 +581,7 @@ checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" dependencies = [ "bitflags", "block", - "core-foundation 0.9.2", + "core-foundation", "core-graphics-types", "foreign-types", "libc", @@ -566,37 +597,6 @@ dependencies = [ "serde", ] -[[package]] -name = "com" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a30a2b2a013da986dc5cc3eda3d19c0d59d53f835be1b2356eb8d00f000c793" -dependencies = [ - "com_macros", -] - -[[package]] -name = "com_macros" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7606b05842fea68ddcc89e8053b8860ebcb2a0ba8d6abfe3a148e5d5a8d3f0c1" -dependencies = [ - "com_macros_support", - "proc-macro2", - "syn", -] - -[[package]] -name = "com_macros_support" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97e9a6d20f4ac8830e309a455d7e9416e65c6af5a97c88c55fbb4c2012e107da" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "config" version = "0.1.0" @@ -640,50 +640,22 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" -[[package]] -name = "core-foundation" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -dependencies = [ - "core-foundation-sys 0.7.0", - "libc", -] - [[package]] name = "core-foundation" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" dependencies = [ - "core-foundation-sys 0.8.3", + "core-foundation-sys", "libc", ] -[[package]] -name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - [[package]] name = "core-foundation-sys" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" -[[package]] -name = "core-graphics" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" -dependencies = [ - "bitflags", - "core-foundation 0.7.0", - "foreign-types", - "libc", -] - [[package]] name = "core-graphics" version = "0.22.3" @@ -691,7 +663,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ "bitflags", - "core-foundation 0.9.2", + "core-foundation", "core-graphics-types", "foreign-types", "libc", @@ -704,24 +676,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" dependencies = [ "bitflags", - "core-foundation 0.9.2", + "core-foundation", "foreign-types", "libc", ] -[[package]] -name = "core-video-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828" -dependencies = [ - "cfg-if 0.1.10", - "core-foundation-sys 0.7.0", - "core-graphics 0.19.2", - "libc", - "objc", -] - [[package]] name = "cosmos-sdk-proto" version = "0.9.0" @@ -878,16 +837,17 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" name = "crypto" version = "0.1.0" dependencies = [ - "aes", + "aes 0.8.1", "blake3", "bs58", - "cipher", + "cipher 0.4.3", "config", - "digest 0.9.0", + "ctr 0.9.1", + "digest 0.10.3", "ed25519-dalek", "generic-array 0.14.4", - "hkdf", - "hmac", + "hkdf 0.12.3", + "hmac 0.12.1", "log", "nymsphinx-types", "pemstore", @@ -922,11 +882,12 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0" +checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" dependencies = [ "generic-array 0.14.4", + "typenum", ] [[package]] @@ -962,7 +923,7 @@ dependencies = [ "phf 0.8.0", "proc-macro2", "quote", - "smallvec 1.7.0", + "smallvec 1.8.0", "syn", ] @@ -985,13 +946,32 @@ dependencies = [ "sct", ] +[[package]] +name = "ctor" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" +dependencies = [ + "quote", + "syn", +] + [[package]] name = "ctr" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher", + "cipher 0.3.0", +] + +[[package]] +name = "ctr" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d14f329cfbaf5d0e06b5e87fff7e265d2673c5ea7d2c27691a2c107db1442a0" +dependencies = [ + "cipher 0.4.3", ] [[package]] @@ -1030,8 +1010,18 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.10.2", + "darling_macro 0.10.2", +] + +[[package]] +name = "darling" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4" +dependencies = [ + "darling_core 0.13.1", + "darling_macro 0.13.1", ] [[package]] @@ -1044,7 +1034,21 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.9.3", + "syn", +] + +[[package]] +name = "darling_core" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a340f241d2ceed1deb47ae36c4144b2707ec7dd0b649f894cb39bb595986324" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", "syn", ] @@ -1054,7 +1058,18 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ - "darling_core", + "darling_core 0.10.2", + "quote", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b" +dependencies = [ + "darling_core 0.13.1", "quote", "syn", ] @@ -1141,13 +1156,12 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b" +checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" dependencies = [ "block-buffer 0.10.0", "crypto-common", - "generic-array 0.14.4", "subtle 2.4.1", ] @@ -1266,7 +1280,7 @@ checksum = "43ee23aa5b4f68c7a092b5c3beb25f50c406adc75e2363634f242f28ab255372" dependencies = [ "der 0.4.5", "elliptic-curve 0.10.6", - "hmac", + "hmac 0.11.0", "signature", ] @@ -1301,7 +1315,7 @@ dependencies = [ "ed25519", "rand 0.7.3", "serde", - "sha2", + "sha2 0.9.8", "zeroize", ] @@ -1315,7 +1329,7 @@ dependencies = [ "hex", "rand_core 0.5.1", "serde", - "sha2", + "sha2 0.9.8", "thiserror", ] @@ -1666,9 +1680,9 @@ dependencies = [ [[package]] name = "gdk" -version = "0.14.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d749dcfc00d8de0d7c3a289e04a04293eb5ba3d8a4e64d64911d481fa9933b" +checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" dependencies = [ "bitflags", "cairo-rs", @@ -1682,10 +1696,11 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534192cb8f01daeb8fab2c8d4baa8f9aae5b7a39130525779f5c2608e235b10f" +checksum = "d8750501d75f318c2ec0314701bc8403901303210def80bafd13f6b6059a3f45" dependencies = [ + "bitflags", "gdk-pixbuf-sys", "gio", "glib", @@ -1694,32 +1709,45 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f097c0704201fbc8f69c1762dc58c6947c8bb188b8ed0bc7e65259f1894fe590" +checksum = "413424d9818621fa3cfc8a3a915cdb89a7c3c507d56761b4ec83a9a98e587171" dependencies = [ - "gio-sys 0.14.0", - "glib-sys 0.14.0", - "gobject-sys 0.14.0", + "gio-sys 0.15.6", + "glib-sys 0.15.6", + "gobject-sys 0.15.5", "libc", - "system-deps 3.2.0", + "system-deps 6.0.2", ] [[package]] name = "gdk-sys" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e091b3d3d6696949ac3b3fb3c62090e5bfd7bd6850bef5c3c5ea701de1b1f1e" +checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", - "gio-sys 0.14.0", - "glib-sys 0.14.0", - "gobject-sys 0.14.0", + "gio-sys 0.15.6", + "glib-sys 0.15.6", + "gobject-sys 0.15.5", "libc", "pango-sys", "pkg-config", - "system-deps 3.2.0", + "system-deps 6.0.2", +] + +[[package]] +name = "gdkx11-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" +dependencies = [ + "gdk-sys", + "glib-sys 0.15.6", + "libc", + "system-deps 6.0.2", + "x11", ] [[package]] @@ -1804,34 +1832,21 @@ dependencies = [ [[package]] name = "gio" -version = "0.14.8" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711c3632b3ebd095578a9c091418d10fed492da9443f58ebc8f45efbeb215cb0" +checksum = "96efd8a1c00d890f6b45671916e165b5e43ccec61957d443aff6d7e44f62d348" dependencies = [ "bitflags", "futures-channel", "futures-core", "futures-io", - "gio-sys 0.14.0", + "gio-sys 0.15.6", "glib", "libc", "once_cell", "thiserror", ] -[[package]] -name = "gio-sys" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e24fb752f8f5d2cf6bbc2c606fd2bc989c81c5e2fe321ab974d54f8b6344eac" -dependencies = [ - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "libc", - "system-deps 1.3.2", - "winapi", -] - [[package]] name = "gio-sys" version = "0.14.0" @@ -1846,10 +1861,23 @@ dependencies = [ ] [[package]] -name = "glib" -version = "0.14.8" +name = "gio-sys" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c515f1e62bf151ef6635f528d05b02c11506de986e43b34a5c920ef0b3796a4" +checksum = "1d0fa5052773f5a56b8ae47dab09d040f5d9ce1311f4f99006e16e9a08269296" +dependencies = [ + "glib-sys 0.15.6", + "gobject-sys 0.15.5", + "libc", + "system-deps 6.0.2", + "winapi", +] + +[[package]] +name = "glib" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa570813c504bdf7539a9400180c2dd4b789a819556fb86da7226d7d1b037b49" dependencies = [ "bitflags", "futures-channel", @@ -1857,21 +1885,22 @@ dependencies = [ "futures-executor", "futures-task", "glib-macros", - "glib-sys 0.14.0", - "gobject-sys 0.14.0", + "glib-sys 0.15.6", + "gobject-sys 0.15.5", "libc", "once_cell", - "smallvec 1.7.0", + "smallvec 1.8.0", + "thiserror", ] [[package]] name = "glib-macros" -version = "0.14.1" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518" +checksum = "41bfd8d227dead0829ac142454e97531b93f576d0805d779c42bfd799c65c572" dependencies = [ "anyhow", - "heck", + "heck 0.4.0", "proc-macro-crate 1.1.0", "proc-macro-error", "proc-macro2", @@ -1879,16 +1908,6 @@ dependencies = [ "syn", ] -[[package]] -name = "glib-sys" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e9b997a66e9a23d073f2b1abb4dbfc3925e0b8952f67efd8d9b6e168e4cdc1" -dependencies = [ - "libc", - "system-deps 1.3.2", -] - [[package]] name = "glib-sys" version = "0.14.0" @@ -1899,6 +1918,22 @@ dependencies = [ "system-deps 3.2.0", ] +[[package]] +name = "glib-sys" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4366377bd56697de8aaee24e673c575d2694d72e7756324ded2b0428829a7b8" +dependencies = [ + "libc", + "system-deps 6.0.2", +] + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + [[package]] name = "globset" version = "0.4.8" @@ -1912,17 +1947,6 @@ dependencies = [ "regex", ] -[[package]] -name = "gobject-sys" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "952133b60c318a62bf82ee75b93acc7e84028a093e06b9e27981c2b6fe68218c" -dependencies = [ - "glib-sys 0.10.1", - "libc", - "system-deps 1.3.2", -] - [[package]] name = "gobject-sys" version = "0.14.0" @@ -1934,6 +1958,17 @@ dependencies = [ "system-deps 3.2.0", ] +[[package]] +name = "gobject-sys" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df6859463843c20cf3837e3a9069b6ab2051aeeadf4c899d33344f4aea83189a" +dependencies = [ + "glib-sys 0.15.6", + "libc", + "system-deps 6.0.2", +] + [[package]] name = "group" version = "0.10.0" @@ -1959,9 +1994,9 @@ dependencies = [ [[package]] name = "gtk" -version = "0.14.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb51122dd3317e9327ec1e4faa151d1fa0d95664cd8fb8dcfacf4d4d29ac70c" +checksum = "5f2d1326b36af927fe46ae2f89a8fec38c6f0d279ebc5ef07ffeeabb70300bfc" dependencies = [ "atk", "bitflags", @@ -1982,30 +2017,29 @@ dependencies = [ [[package]] name = "gtk-sys" -version = "0.14.0" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c14c8d3da0545785a7c5a120345b3abb534010fb8ae0f2ef3f47c027fba303e" +checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" dependencies = [ "atk-sys", "cairo-sys-rs", "gdk-pixbuf-sys", "gdk-sys", - "gio-sys 0.14.0", - "glib-sys 0.14.0", - "gobject-sys 0.14.0", + "gio-sys 0.15.6", + "glib-sys 0.15.6", + "gobject-sys 0.15.5", "libc", "pango-sys", - "system-deps 3.2.0", + "system-deps 6.0.2", ] [[package]] name = "gtk3-macros" -version = "0.14.0" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21de1da96dc117443fb03c2e270b2d34b7de98d0a79a19bbb689476173745b79" +checksum = "24f518afe90c23fba585b2d7697856f9e6a7bbc62f65588035e66f6afb01a2e9" dependencies = [ "anyhow", - "heck", "proc-macro-crate 1.1.0", "proc-macro-error", "proc-macro2", @@ -2092,6 +2126,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -2120,7 +2160,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b" dependencies = [ "digest 0.9.0", - "hmac", + "hmac 0.11.0", +] + +[[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac 0.12.1", ] [[package]] @@ -2133,6 +2182,15 @@ dependencies = [ "digest 0.9.0", ] +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.3", +] + [[package]] name = "html5ever" version = "0.25.1" @@ -2149,13 +2207,13 @@ dependencies = [ [[package]] name = "http" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" +checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" dependencies = [ "bytes", "fnv", - "itoa 0.4.8", + "itoa 1.0.1", ] [[package]] @@ -2355,6 +2413,15 @@ dependencies = [ "adler32", ] +[[package]] +name = "inout" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1f03d4ab4d5dc9ec2d219f86c15d2a15fc08239d1cd3b2d6a19717c0a2f443" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "instant" version = "0.1.12" @@ -2406,21 +2473,25 @@ checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" [[package]] name = "javascriptcore-rs" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca9c7d1445bba2889672fbadc16c3d5007bfdcf0a15a18a3a50fe9fab2c7427" +checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" dependencies = [ + "bitflags", "glib", "javascriptcore-rs-sys", ] [[package]] name = "javascriptcore-rs-sys" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f46ada8a08dcd75a10afae872fbfb51275df4a8ae0d46b8cc7c708f08dd2998" +checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" dependencies = [ + "glib-sys 0.15.6", + "gobject-sys 0.15.5", "libc", + "system-deps 5.0.0", ] [[package]] @@ -2447,6 +2518,17 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "json-patch" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f995a3c8f2bc3dd52a18a583e90f9ec109c047fa1603a853e46bcda14d2e279d" +dependencies = [ + "serde", + "serde_json", + "treediff", +] + [[package]] name = "k256" version = "0.9.6" @@ -2456,7 +2538,7 @@ dependencies = [ "cfg-if 1.0.0", "ecdsa 0.12.4", "elliptic-curve 0.10.6", - "sha2", + "sha2 0.9.8", ] [[package]] @@ -2469,7 +2551,7 @@ dependencies = [ "ecdsa 0.13.4", "elliptic-curve 0.11.6", "sec1", - "sha2", + "sha2 0.9.8", "sha3", ] @@ -2505,9 +2587,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.112" +version = "0.2.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" +checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4" [[package]] name = "libm" @@ -2658,9 +2740,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.14" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2" dependencies = [ "libc", "log", @@ -2747,7 +2829,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d" dependencies = [ - "darling", + "darling 0.10.2", "proc-macro-crate 0.1.5", "proc-macro2", "quote", @@ -2934,7 +3016,7 @@ dependencies = [ "rand 0.8.4", "serde", "serde_derive", - "sha2", + "sha2 0.9.8", "thiserror", ] @@ -2954,17 +3036,6 @@ dependencies = [ "malloc_buf", ] -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - [[package]] name = "objc_id" version = "0.1.1" @@ -3055,9 +3126,9 @@ dependencies = [ [[package]] name = "pango" -version = "0.14.8" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "546fd59801e5ca735af82839007edd226fe7d3bb06433ec48072be4439c28581" +checksum = "78c7420fc01a390ec200da7395b64d705f5d82fe03e5d0708aee422c46538be7" dependencies = [ "bitflags", "glib", @@ -3068,14 +3139,14 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2367099ca5e761546ba1d501955079f097caa186bb53ce0f718dca99ac1942fe" +checksum = "7022c2fb88cd2d9d55e1a708a8c53a3ae8678234c4a54bf623400aeb7f31fac2" dependencies = [ - "glib-sys 0.14.0", - "gobject-sys 0.14.0", + "glib-sys 0.15.6", + "gobject-sys 0.15.5", "libc", - "system-deps 3.2.0", + "system-deps 6.0.2", ] [[package]] @@ -3105,7 +3176,7 @@ dependencies = [ "instant", "libc", "redox_syscall", - "smallvec 1.7.0", + "smallvec 1.8.0", "winapi", ] @@ -3770,16 +3841,6 @@ dependencies = [ "rand_core 0.3.1", ] -[[package]] -name = "raw-window-handle" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28f55143d0548dad60bb4fbdc835a3d7ac6acc3324506450c5fdd6e42903a76" -dependencies = [ - "libc", - "raw-window-handle 0.4.2", -] - [[package]] name = "raw-window-handle" version = "0.4.2" @@ -3902,7 +3963,7 @@ dependencies = [ "pin-project-lite", "serde", "serde_json", - "serde_urlencoded 0.7.0", + "serde_urlencoded", "tokio", "tokio-native-tls", "url", @@ -3919,33 +3980,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525" dependencies = [ "crypto-bigint 0.3.2", - "hmac", + "hmac 0.11.0", "zeroize", ] -[[package]] -name = "rfd" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "609ed912e110af7d7084b6b17d2a68b25e766208e015a37beba1be3c2d7cbb3b" -dependencies = [ - "block", - "dispatch", - "glib-sys 0.14.0", - "gobject-sys 0.14.0", - "gtk-sys", - "js-sys", - "lazy_static", - "objc", - "objc-foundation", - "objc_id", - "raw-window-handle 0.3.4", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winapi", -] - [[package]] name = "ring" version = "0.16.20" @@ -4112,8 +4150,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" dependencies = [ "bitflags", - "core-foundation 0.9.2", - "core-foundation-sys 0.8.3", + "core-foundation", + "core-foundation-sys", "libc", "security-framework-sys", ] @@ -4124,7 +4162,7 @@ version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" dependencies = [ - "core-foundation-sys 0.8.3", + "core-foundation-sys", "libc", ] @@ -4144,7 +4182,7 @@ dependencies = [ "phf_codegen", "precomputed-hash", "servo_arc", - "smallvec 1.7.0", + "smallvec 1.8.0", "thin-slice", ] @@ -4174,9 +4212,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.131" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ad69dfbd3e45369132cc64e6748c2d65cdfb001a2b1c232d128b4ad60561c1" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" dependencies = [ "serde_derive", ] @@ -4201,9 +4239,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.131" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b710a83c4e0dff6a3d511946b95274ad9ca9e5d3ae497b63fda866ac955358d2" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ "proc-macro2", "quote", @@ -4243,18 +4281,6 @@ dependencies = [ "syn", ] -[[package]] -name = "serde_urlencoded" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" -dependencies = [ - "dtoa", - "itoa 0.4.8", - "serde", - "url", -] - [[package]] name = "serde_urlencoded" version = "0.7.0" @@ -4267,6 +4293,51 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_with" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec1e6ec4d8950e5b1e894eac0d360742f3b1407a6078a604a731c4b3f49cefbc" +dependencies = [ + "rustversion", + "serde", + "serde_with_macros", +] + +[[package]] +name = "serde_with_macros" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12e47be9471c72889ebafb5e14d5ff930d89ae7a67bbdb5f8abb564f845a927e" +dependencies = [ + "darling 0.13.1", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serialize-to-javascript" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" +dependencies = [ + "serde", + "serde_json", + "serialize-to-javascript-impl", +] + +[[package]] +name = "serialize-to-javascript-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "servo_arc" version = "0.1.1" @@ -4315,6 +4386,17 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "sha2" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.3", +] + [[package]] name = "sha3" version = "0.9.1" @@ -4369,33 +4451,32 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" +checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "socket2" -version = "0.4.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" +checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" dependencies = [ "libc", "winapi", ] [[package]] -name = "soup-sys" -version = "0.10.0" +name = "soup2-sys" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7adf08565630bbb71f955f11f8a68464817ded2703a3549747c235b58a13e" +checksum = "9f056675eda9a7417163e5f742bb119e8e1d385edd2ada8f7031a7230a3ec10a" dependencies = [ "bitflags", - "gio-sys 0.10.1", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "gio-sys 0.14.0", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", "libc", - "pkg-config", - "system-deps 1.3.2", + "system-deps 5.0.0", ] [[package]] @@ -4403,7 +4484,7 @@ name = "sphinx" version = "0.1.0" source = "git+https://github.com/nymtech/sphinx?rev=c494250f2a78bed33a618d470792418eee932859#c494250f2a78bed33a618d470792418eee932859" dependencies = [ - "aes", + "aes 0.7.5", "arrayref", "blake2 0.8.1", "bs58", @@ -4411,13 +4492,13 @@ dependencies = [ "chacha", "curve25519-dalek", "digest 0.9.0", - "hkdf", - "hmac", + "hkdf 0.11.0", + "hmac 0.11.0", "lioness", "log", "rand 0.7.3", "rand_distr", - "sha2", + "sha2 0.9.8", "subtle 2.4.1", ] @@ -4513,10 +4594,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" [[package]] -name = "strum" -version = "0.18.0" +name = "strsim" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" @@ -4533,25 +4614,13 @@ dependencies = [ "strum_macros 0.23.1", ] -[[package]] -name = "strum_macros" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "strum_macros" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" dependencies = [ - "heck", + "heck 0.3.3", "proc-macro2", "quote", "syn", @@ -4563,7 +4632,7 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38" dependencies = [ - "heck", + "heck 0.3.3", "proc-macro2", "quote", "rustversion", @@ -4650,7 +4719,7 @@ dependencies = [ "log", "num-bigint", "serde", - "smallvec 1.7.0", + "smallvec 1.8.0", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -4695,9 +4764,9 @@ dependencies = [ [[package]] name = "swc_macros_common" -version = "0.3.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08ed2e930f5a1a4071fe62c90fd3a296f6030e5d94bfe13993244423caf59a78" +checksum = "bf7c68e78ffbcba3d38abe6d0b76a0e1a37888b5c9301db3426537207090ada3" dependencies = [ "pmutil", "proc-macro2", @@ -4731,9 +4800,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.65" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1d708c221c5a612956ef9f75b37e454e88d1f7b899fbd3a18d4252012d663" +checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" dependencies = [ "proc-macro2", "quote", @@ -4752,21 +4821,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "system-deps" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b" -dependencies = [ - "heck", - "pkg-config", - "strum 0.18.0", - "strum_macros 0.18.0", - "thiserror", - "toml", - "version-compare 0.0.10", -] - [[package]] name = "system-deps" version = "3.2.0" @@ -4774,8 +4828,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6" dependencies = [ "anyhow", - "cfg-expr", - "heck", + "cfg-expr 0.8.1", + "heck 0.3.3", "itertools", "pkg-config", "strum 0.21.0", @@ -4786,26 +4840,52 @@ dependencies = [ ] [[package]] -name = "tao" -version = "0.5.2" +name = "system-deps" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aa57de7c282b68f8906278543a724ed8f5a2568f069dd0cc05fc10d1f07036b" +checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" +dependencies = [ + "cfg-expr 0.9.1", + "heck 0.3.3", + "pkg-config", + "toml", + "version-compare 0.0.11", +] + +[[package]] +name = "system-deps" +version = "6.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a45a1c4c9015217e12347f2a411b57ce2c4fc543913b14b6fe40483328e709" +dependencies = [ + "cfg-expr 0.10.2", + "heck 0.4.0", + "pkg-config", + "toml", + "version-compare 0.1.0", +] + +[[package]] +name = "tao" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c4c62fc16d698750c5c918088c8134c63e8661e65efc608fe614236c59462f4" dependencies = [ "bitflags", "cairo-rs", "cc", "cocoa", - "core-foundation 0.9.2", - "core-graphics 0.22.3", - "core-video-sys", + "core-foundation", + "core-graphics", "crossbeam-channel", "dispatch", "gdk", "gdk-pixbuf", "gdk-sys", + "gdkx11-sys", "gio", "glib", - "glib-sys 0.14.0", + "glib-sys 0.15.6", "gtk", "instant", "lazy_static", @@ -4816,14 +4896,28 @@ dependencies = [ "ndk-sys", "objc", "parking_lot", - "raw-window-handle 0.3.4", + "raw-window-handle", "scopeguard", "serde", + "tao-core-video-sys", "unicode-segmentation", - "winapi", + "windows", + "windows_macros", "x11-dl", ] +[[package]] +name = "tao-core-video-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271450eb289cb4d8d0720c6ce70c72c8c858c93dd61fc625881616752e6b98f6" +dependencies = [ + "cfg-if 1.0.0", + "core-foundation-sys", + "libc", + "objc", +] + [[package]] name = "tar" version = "0.4.38" @@ -4837,11 +4931,11 @@ dependencies = [ [[package]] name = "tauri" -version = "1.0.0-beta.8" +version = "1.0.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a0579dcc6fb883fe90dd3c66d76b8b8f4a1786e1e915e314b2017a500ede09" +checksum = "bb0c4a4ffd1f9b02cc3e974ce902f8132fb3d08ec6cce4ca193f97d921f5bce4" dependencies = [ - "attohttpc", + "anyhow", "bincode", "cfg_aliases", "dirs-next", @@ -4851,6 +4945,7 @@ dependencies = [ "futures", "futures-lite", "glib", + "glob", "gtk", "http", "ignore", @@ -4858,12 +4953,13 @@ dependencies = [ "open", "percent-encoding", "rand 0.8.4", - "raw-window-handle 0.3.4", - "rfd", + "raw-window-handle", + "regex", "semver 1.0.4", "serde", "serde_json", "serde_repr", + "serialize-to-javascript", "state", "tar", "tauri-macros", @@ -4880,13 +4976,12 @@ dependencies = [ [[package]] name = "tauri-build" -version = "1.0.0-beta.4" +version = "1.0.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c9c9a9bea25b9d6f5845b8662e18447e17218f99860cab37e39e2b57a9fcd49" +checksum = "855e47d8cfb2219fc14d2eed2c09bfb35f9ecd71a40ca2084aeeee2d23e0b60d" dependencies = [ "anyhow", - "proc-macro2", - "quote", + "cargo_toml", "serde_json", "tauri-utils", "winres", @@ -4894,40 +4989,44 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.0.0-beta.4" +version = "1.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1663739ab53e281919676f216fb56a031104d0d2cd1a2dd5b012d279bcdb0ea4" +checksum = "eef4656d174ba982198266da0c016573fe6c7c760e4290f05c8c384fe180007e" dependencies = [ + "base64", "blake3", - "kuchiki", "proc-macro2", "quote", "regex", "serde", "serde_json", + "sha2 0.10.2", "tauri-utils", "thiserror", + "uuid", "walkdir", "zstd", ] [[package]] name = "tauri-macros" -version = "1.0.0-beta.5" +version = "1.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddf9f5868402323f35ef94fa6ab1d5d10b29aea9de598d829723aa1db5693b4" +checksum = "a0993f5a867e321d26200b2d6394cdf482bd6cc5a0e4691bcabf811544f51cd4" dependencies = [ + "heck 0.4.0", "proc-macro2", "quote", "syn", "tauri-codegen", + "tauri-utils", ] [[package]] name = "tauri-runtime" -version = "0.2.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9c52eccfb7f2ce5a09262bdc3671f0f07f637e27f8aa25e5f38145cddcd4e01" +checksum = "851cd65e2c9df4dd70a4f9e115fb2441ac89f1c80df79de0c15a448b4acd7768" dependencies = [ "gtk", "http", @@ -4938,14 +5037,15 @@ dependencies = [ "tauri-utils", "thiserror", "uuid", - "winapi", + "webview2-com", + "windows", ] [[package]] name = "tauri-runtime-wry" -version = "0.2.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fed8dd0a448c303fa764859d6dfa1c746c4f2c6c30a83c162f8bebb12e4af4e" +checksum = "0184f95e065fb80afadf53f0a5f87a75af2da774d0524fe8cb2976fbec4a0bf2" dependencies = [ "gtk", "ico", @@ -4954,25 +5054,33 @@ dependencies = [ "tauri-runtime", "tauri-utils", "uuid", - "winapi", + "webview2-com", + "windows", "wry", ] [[package]] name = "tauri-utils" -version = "1.0.0-beta.3" +version = "1.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb9b79594f22b6ed0cc8362e0dfde5b7969962de3cd8ca683de702e59e8221b" +checksum = "0ad38ad698838886bf22ecb91c4b3d1ce178fdff7901ac7bff370103a4f51e59" dependencies = [ + "ctor", + "glob", + "heck 0.4.0", "html5ever", + "json-patch", "kuchiki", "phf 0.10.1", "proc-macro2", "quote", "serde", "serde_json", + "serde_with", + "serialize-to-javascript", "thiserror", "url", + "walkdir", "zstd", ] @@ -5012,7 +5120,7 @@ dependencies = [ "serde_bytes", "serde_json", "serde_repr", - "sha2", + "sha2 0.9.8", "signature", "subtle 2.4.1", "subtle-encoding", @@ -5162,9 +5270,9 @@ checksum = "25eb0ca3468fc0acc11828786797f6ef9aa1555e4a211a60d64cc8e4d1be47d6" [[package]] name = "tokio" -version = "1.15.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838" +checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" dependencies = [ "bytes", "libc", @@ -5172,6 +5280,7 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", + "socket2", "tokio-macros", "winapi", ] @@ -5291,13 +5400,22 @@ dependencies = [ "matchers", "regex", "sharded-slab", - "smallvec 1.7.0", + "smallvec 1.8.0", "thread_local", "tracing", "tracing-core", "tracing-log", ] +[[package]] +name = "treediff" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "761e8d5ad7ce14bb82b7e61ccc0ca961005a275a060b9644a2431aa11553c2ff" +dependencies = [ + "serde_json", +] + [[package]] name = "try-lock" version = "0.2.3" @@ -5455,7 +5573,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "sha2", + "sha2 0.9.8", "thiserror", "ts-rs", "url", @@ -5470,18 +5588,18 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "version-compare" -version = "0.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" - [[package]] name = "version-compare" version = "0.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" +[[package]] +name = "version-compare" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73" + [[package]] name = "version_check" version = "0.9.3" @@ -5632,19 +5750,19 @@ dependencies = [ [[package]] name = "webkit2gtk" -version = "0.14.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3e47b7f870883fc21612d2a51b74262f7f2cc5371f1621370817292a35300a9" +checksum = "2cbd39499e917de9dad36eb11c09f665eb984d432638ae7971feed98eb96df88" dependencies = [ "bitflags", "cairo-rs", "gdk", "gdk-sys", "gio", - "gio-sys 0.14.0", + "gio-sys 0.15.6", "glib", - "glib-sys 0.14.0", - "gobject-sys 0.14.0", + "glib-sys 0.15.6", + "gobject-sys 0.15.5", "gtk", "gtk-sys", "javascriptcore-rs", @@ -5655,25 +5773,25 @@ dependencies = [ [[package]] name = "webkit2gtk-sys" -version = "0.14.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b66ccc9f0cb4de7c3b92376a5bf64e7ddffb33852f092721731a039ec38dda98" +checksum = "ddcce6f1e0fc7715d651dba29875741509f5fc12f4e2976907272a74405f2b01" dependencies = [ "atk-sys", "bitflags", "cairo-sys-rs", "gdk-pixbuf-sys", "gdk-sys", - "gio-sys 0.14.0", - "glib-sys 0.14.0", - "gobject-sys 0.14.0", + "gio-sys 0.15.6", + "glib-sys 0.15.6", + "gobject-sys 0.15.5", "gtk-sys", "javascriptcore-rs-sys", "libc", "pango-sys", "pkg-config", - "soup-sys", - "system-deps 3.2.0", + "soup2-sys", + "system-deps 5.0.0", ] [[package]] @@ -5696,39 +5814,41 @@ dependencies = [ ] [[package]] -name = "webview2" -version = "0.1.4" +name = "webview2-com" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "283bf6b0ed9c83faea8c7bfe40bb261592147a109effaa4077eed294863d5031" +checksum = "bb8e90ac2d9ce39cdb70017aaec641be09fbdd702b7b332b9896d053eb469524" dependencies = [ - "com", - "once_cell", - "webview2-sys", - "widestring", - "winapi", + "webview2-com-macros", + "webview2-com-sys", + "windows", + "windows_macros", ] [[package]] -name = "webview2-sys" -version = "0.1.1" +name = "webview2-com-macros" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b7889e893ac4c50d7346356be3ce13a85e56512c38b8fde0526559b8012a4c" +checksum = "1515c6c82fcee93f6edaacc72c8e233dbe4ff3ca569dce1901dfc36c404a3e99" dependencies = [ - "com", - "winapi", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "widestring" -version = "0.5.1" +name = "webview2-com-sys" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" - -[[package]] -name = "wildmatch" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f44b95f62d34113cf558c93511ac93027e03e9c29a60dd0fd70e6e025c7270a" +checksum = "92160310b3322397e4ff8a8285a7429d73a07a68fda44ee80879605b93e53f76" +dependencies = [ + "regex", + "serde", + "serde_json", + "thiserror", + "windows", + "windows-bindgen", +] [[package]] name = "winapi" @@ -5761,6 +5881,93 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b749ebd2304aa012c5992d11a25d07b406bdbe5f79d371cb7a918ce501a19eb0" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows-bindgen" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "944c545fcae9dd66488308f8b69aa3ba34f53714416ecfcdcbbfa4b6821e27c6" +dependencies = [ + "windows_quote", + "windows_reader", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29277a4435d642f775f63c7d1faeb927adba532886ce0287bd985bffb16b6bca" + +[[package]] +name = "windows_gen" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30dff4d91d22520628bb94b66f2bb313cb16a09a515a32320a84a1b449bc94c0" +dependencies = [ + "windows_quote", + "windows_reader", +] + +[[package]] +name = "windows_i686_gnu" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1145e1989da93956c68d1864f32fb97c8f561a8f89a5125f6a2b7ea75524e4b8" + +[[package]] +name = "windows_i686_msvc" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a09e3a0d4753b73019db171c1339cd4362c8c44baf1bcea336235e955954a6" + +[[package]] +name = "windows_macros" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ae44ab917e9005fe710d99d52d227ca0164b10a09be90649142cc3fab825d3" +dependencies = [ + "syn", + "windows_gen", + "windows_quote", + "windows_reader", +] + +[[package]] +name = "windows_quote" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71f02c51a77e6248c1206aaa920802c32d50a05205e229b118d7f3afd3036667" + +[[package]] +name = "windows_reader" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e44e6df0da993cda589c5ac852272fbb2a0ead67a031a017dd3eac11528a2d72" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca64fcb0220d58db4c119e050e7af03c69e6f4f415ef69ec1773d9aab422d5a" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08cabc9f0066848fef4bc6a1c1668e6efce38b661d2aeec75d18d8617eebb5f1" + [[package]] name = "winreg" version = "0.7.0" @@ -5781,12 +5988,12 @@ dependencies = [ [[package]] name = "wry" -version = "0.12.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9549393a3917b5303277abb0267f8eecf9fd629b25f1c04e5284aa58b61915" +checksum = "9514586e5c964d30cc7123c9aea9880ff7b3cb1c43f6a1dc8703941eb72ac89f" dependencies = [ "cocoa", - "core-graphics 0.22.3", + "core-graphics", "gdk", "gio", "glib", @@ -5804,9 +6011,19 @@ dependencies = [ "url", "webkit2gtk", "webkit2gtk-sys", - "webview2", - "webview2-sys", - "winapi", + "webview2-com", + "windows", + "windows_macros", +] + +[[package]] +name = "x11" +version = "2.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd0565fa8bfba8c5efe02725b14dff114c866724eff2cfd44d76cea74bcd87a" +dependencies = [ + "libc", + "pkg-config", ] [[package]] @@ -5877,18 +6094,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.9.0+zstd.1.5.0" +version = "0.10.0+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07749a5dc2cb6b36661290245e350f15ec3bbb304e493db54a1d354480522ccd" +checksum = "3b1365becbe415f3f0fcd024e2f7b45bacfb5bdd055f0dc113571394114e7bdd" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "4.1.1+zstd.1.5.0" +version = "4.1.4+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c91c90f2c593b003603e5e0493c837088df4469da25aafff8bce42ba48caf079" +checksum = "2f7cd17c9af1a4d6c24beb1cc54b17e2ef7b593dc92f19e9d9acad8b182bbaee" dependencies = [ "libc", "zstd-sys", @@ -5896,9 +6113,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.6.1+zstd.1.5.0" +version = "1.6.3+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615120c7a2431d16cf1cf979e7fc31ba7a5b5e5707b29c8a99e5dbf8a8392a33" +checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" dependencies = [ "cc", "libc",