diff --git a/Cargo.lock b/Cargo.lock index b75ba012db..bf856052d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -926,16 +926,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" -[[package]] -name = "crypto-mac" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" -dependencies = [ - "generic-array 0.12.3", - "subtle 1.0.0", -] - [[package]] name = "crypto-mac" version = "0.8.0" @@ -943,7 +933,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ "generic-array 0.14.4", - "subtle 2.2.2", + "subtle", ] [[package]] @@ -953,7 +943,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca" dependencies = [ "generic-array 0.14.4", - "subtle 2.2.2", + "subtle", ] [[package]] @@ -963,7 +953,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" dependencies = [ "generic-array 0.14.4", - "subtle 2.2.2", + "subtle", ] [[package]] @@ -1007,7 +997,7 @@ dependencies = [ "byteorder", "digest 0.8.1", "rand_core 0.5.1", - "subtle 2.2.2", + "subtle", "zeroize", ] @@ -1020,7 +1010,7 @@ dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", - "subtle 2.2.2", + "subtle", "zeroize", ] @@ -1194,7 +1184,7 @@ dependencies = [ "rand 0.7.3", "serde", "serde_bytes", - "sha2 0.9.8", + "sha2", "zeroize", ] @@ -1208,7 +1198,7 @@ dependencies = [ "ed25519-dalek", "failure", "hmac 0.9.0", - "sha2 0.9.8", + "sha2", ] [[package]] @@ -1790,16 +1780,6 @@ version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12cb882ccb290b8646e554b157ab0b71e64e8d5bef775cd66b6531e52d302669" -[[package]] -name = "hmac" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" -dependencies = [ - "crypto-mac 0.7.0", - "digest 0.8.1", -] - [[package]] name = "hmac" version = "0.8.1" @@ -2022,6 +2002,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" dependencies = [ "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", ] [[package]] @@ -2310,7 +2293,7 @@ dependencies = [ "libsecp256k1-gen-genmult", "rand 0.7.3", "serde", - "sha2 0.9.8", + "sha2", "typenum", ] @@ -2329,7 +2312,7 @@ dependencies = [ "libsecp256k1-gen-genmult", "rand 0.7.3", "serde", - "sha2 0.9.8", + "sha2", "typenum", ] @@ -2341,7 +2324,7 @@ checksum = "d0f6ab710cec28cef759c5f18671a27dae2a5f952cdaaee1d8e2908cb2478a80" dependencies = [ "crunchy", "digest 0.9.0", - "subtle 2.2.2", + "subtle", ] [[package]] @@ -2704,9 +2687,9 @@ checksum = "9cbca9424c482ee628fa549d9c812e2cd22f1180b9222c9200fdfa6eb31aecb2" [[package]] name = "once_cell" -version = "1.5.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" dependencies = [ "parking_lot 0.11.2", ] @@ -2885,16 +2868,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "pbkdf2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" -dependencies = [ - "byteorder", - "crypto-mac 0.7.0", -] - [[package]] name = "pbkdf2" version = "0.4.0" @@ -3975,18 +3948,6 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" -[[package]] -name = "sha2" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" -dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", -] - [[package]] name = "sha2" version = "0.9.8" @@ -4349,7 +4310,7 @@ dependencies = [ "solana-sdk", "tempfile", "thiserror", - "tiny-bip39 0.8.0", + "tiny-bip39", "uriparse", "url 2.2.2", ] @@ -4393,7 +4354,7 @@ dependencies = [ "spl-memo", "tempfile", "thiserror", - "tiny-bip39 0.7.3", + "tiny-bip39", ] [[package]] @@ -4675,7 +4636,7 @@ dependencies = [ "rustc_version 0.2.3", "serde", "serde_derive", - "sha2 0.9.8", + "sha2", "solana-frozen-abi-macro 1.7.6", "solana-logger 1.7.6", "thiserror", @@ -4693,7 +4654,7 @@ dependencies = [ "rustc_version 0.4.0", "serde", "serde_derive", - "sha2 0.9.8", + "sha2", "solana-frozen-abi-macro 1.8.0", "solana-logger 1.8.0", "thiserror", @@ -4840,7 +4801,7 @@ dependencies = [ "solana-remote-wallet", "solana-sdk", "solana-version", - "tiny-bip39 0.7.3", + "tiny-bip39", ] [[package]] @@ -4870,7 +4831,7 @@ dependencies = [ "rustc_version 0.4.0", "serde", "serde_bytes", - "sha2 0.9.8", + "sha2", "solana-account-decoder", "solana-bpf-loader-program", "solana-entry", @@ -5178,7 +5139,7 @@ dependencies = [ "serde", "serde_bytes", "serde_derive", - "sha2 0.9.8", + "sha2", "sha3", "solana-frozen-abi 1.7.6", "solana-frozen-abi-macro 1.7.6", @@ -5215,7 +5176,7 @@ dependencies = [ "serde_bytes", "serde_derive", "serde_json", - "sha2 0.9.8", + "sha2", "sha3", "solana-frozen-abi 1.8.0", "solana-frozen-abi-macro 1.8.0", @@ -5484,7 +5445,7 @@ dependencies = [ "serde_bytes", "serde_derive", "serde_json", - "sha2 0.9.8", + "sha2", "sha3", "solana-crate-features", "solana-frozen-abi 1.8.0", @@ -5493,7 +5454,7 @@ dependencies = [ "solana-program 1.8.0", "solana-sdk-macro 1.8.0", "thiserror", - "tiny-bip39 0.7.3", + "tiny-bip39", "uriparse", ] @@ -5965,12 +5926,6 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -[[package]] -name = "subtle" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" - [[package]] name = "subtle" version = "2.2.2" @@ -6242,33 +6197,18 @@ dependencies = [ [[package]] name = "tiny-bip39" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0165e045cc2ae1660270ca65e1676dbaab60feb0f91b10f7d0665e9b47e31f2" -dependencies = [ - "failure", - "hmac 0.7.1", - "once_cell", - "pbkdf2 0.3.0", - "rand 0.7.3", - "rustc-hash", - "sha2 0.8.2", - "unicode-normalization", -] - -[[package]] -name = "tiny-bip39" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9e44c4759bae7f1032e286a7ef990bd9ed23fe831b7eeba0beb97484c2e59b8" +checksum = "524daa5624d9d4ffb5a0625971d35205b882111daa6b6338a7a6c578a3c36928" dependencies = [ "anyhow", "hmac 0.8.1", "once_cell", + "parking_lot 0.11.2", "pbkdf2 0.4.0", "rand 0.7.3", "rustc-hash", - "sha2 0.9.8", + "sha2", "thiserror", "unicode-normalization", "zeroize", diff --git a/clap-utils/Cargo.toml b/clap-utils/Cargo.toml index dbc72bad73..beb101d7cc 100644 --- a/clap-utils/Cargo.toml +++ b/clap-utils/Cargo.toml @@ -15,7 +15,7 @@ rpassword = "5.0" solana-remote-wallet = { path = "../remote-wallet", version = "=1.8.0" } solana-sdk = { path = "../sdk", version = "=1.8.0" } thiserror = "1.0.29" -tiny-bip39 = "0.8.0" +tiny-bip39 = "0.8.1" uriparse = "0.6.3" url = "2.2.2" chrono = "0.4" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index e054eca7a4..f3358b8516 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -42,7 +42,7 @@ solana-version = { path = "../version", version = "=1.8.0" } solana-vote-program = { path = "../programs/vote", version = "=1.8.0" } spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] } thiserror = "1.0.29" -tiny-bip39 = "0.7.0" +tiny-bip39 = "0.8.1" [dev-dependencies] solana-core = { path = "../core", version = "=1.8.0" } diff --git a/keygen/Cargo.toml b/keygen/Cargo.toml index d3d7f4dd7b..fb9bfd5f5d 100644 --- a/keygen/Cargo.toml +++ b/keygen/Cargo.toml @@ -19,7 +19,7 @@ solana-cli-config = { path = "../cli-config", version = "=1.8.0" } solana-remote-wallet = { path = "../remote-wallet", version = "=1.8.0" } solana-sdk = { path = "../sdk", version = "=1.8.0" } solana-version = { path = "../version", version = "=1.8.0" } -tiny-bip39 = "0.7.0" +tiny-bip39 = "0.8.1" [[bin]] name = "solana-keygen" diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 64c6170fbd..0bcb3defd1 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -1270,6 +1270,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" dependencies = [ "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", ] [[package]] @@ -1662,9 +1665,9 @@ checksum = "9cbca9424c482ee628fa549d9c812e2cd22f1180b9222c9200fdfa6eb31aecb2" [[package]] name = "once_cell" -version = "1.5.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" dependencies = [ "parking_lot", ] @@ -3680,13 +3683,14 @@ dependencies = [ [[package]] name = "tiny-bip39" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9e44c4759bae7f1032e286a7ef990bd9ed23fe831b7eeba0beb97484c2e59b8" +checksum = "524daa5624d9d4ffb5a0625971d35205b882111daa6b6338a7a6c578a3c36928" dependencies = [ "anyhow", "hmac 0.8.1", "once_cell", + "parking_lot", "pbkdf2 0.4.0", "rand 0.7.3", "rustc-hash", diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index 1e561ec637..4545c265b3 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -83,7 +83,7 @@ uriparse = "0.6.3" [dev-dependencies] curve25519-dalek = "3.2.0" -tiny-bip39 = "0.7.0" +tiny-bip39 = "0.8.1" [build-dependencies] rustc_version = "0.4"