From 6dde7c5351261f897028a9f683685100898301b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Garillot?= Date: Wed, 26 Aug 2020 09:44:23 -0400 Subject: [PATCH] Update all dependencies to the lates version Not. now using the same upcoming dalek versions (curve25519-dalek v 3) --- Cargo.lock | 94 ++++++++++++++++++++++++++++-------------------------- Cargo.toml | 14 ++++---- 2 files changed, 55 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c2c3c2a..586a43f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -56,7 +56,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.3", + "generic-array", ] [[package]] @@ -205,7 +205,17 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array 0.14.3", + "generic-array", + "subtle", +] + +[[package]] +name = "crypto-mac" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca" +dependencies = [ + "generic-array", "subtle", ] @@ -233,33 +243,24 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "2.1.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d85653f070353a16313d0046f173f70d1aadd5b42600a14de626f0dfb3473a5" +checksum = "c8492de420e9e60bc9a1d66e2dbb91825390b738a388606600663fc529b4b307" dependencies = [ "byteorder", - "digest 0.8.1", + "digest", "rand_core", "subtle", "zeroize", ] -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array 0.12.3", -] - [[package]] name = "digest" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.3", + "generic-array", ] [[package]] @@ -287,18 +288,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "generic-array" -version = "0.12.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" -dependencies = [ - "typenum", -] - -[[package]] -name = "generic-array" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60fb4bb6bba52f78a471264d9a3b7d026cc0af47b22cd2cffbc0b787ca003e63" +checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" dependencies = [ "typenum", "version_check", @@ -342,8 +334,8 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe1149865383e4526a43aee8495f9a325f0b806c63ce6427d06336a590abbbc9" dependencies = [ - "digest 0.9.0", - "hmac", + "digest", + "hmac 0.8.1", ] [[package]] @@ -352,8 +344,18 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" dependencies = [ - "crypto-mac", - "digest 0.9.0", + "crypto-mac 0.8.0", + "digest", +] + +[[package]] +name = "hmac" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deae6d9dbb35ec2c502d62b8f7b1c000a0822c3b0794ba36b3149c0a1c840dff" +dependencies = [ + "crypto-mac 0.9.1", + "digest", ] [[package]] @@ -461,12 +463,12 @@ dependencies = [ "base64", "criterion", "curve25519-dalek", - "digest 0.9.0", + "digest", "displaydoc", - "generic-array 0.14.3", + "generic-array", "hex", "hkdf", - "hmac", + "hmac 0.9.0", "lazy_static", "proptest", "rand", @@ -481,11 +483,11 @@ dependencies = [ [[package]] name = "pbkdf2" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" +checksum = "7170d73bf11f39b4ce1809aabc95bf5c33564cdc16fc3200ddda17a5f6e5e48b" dependencies = [ - "crypto-mac", + "crypto-mac 0.9.1", ] [[package]] @@ -517,9 +519,9 @@ dependencies = [ [[package]] name = "proptest" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2520fe6373cf6a3a61e2d200e987c183778ade8d9248ac3e6614ab0edfe4a0c1" +checksum = "12e6c80c1139113c28ee4670dc50cc42915228b51f56a9e407f0ec60f966646f" dependencies = [ "bit-set", "bitflags", @@ -708,12 +710,12 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scrypt" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10e7e75e27e8cd47e4be027d4b9fdc0b696116f981c22de21ca7bad63a9cb33a" +checksum = "3437654bbbe34054a268b3859fe41f871215069b39f0aef78808d85c37100696" dependencies = [ "base64", - "hmac", + "hmac 0.9.0", "pbkdf2", "rand", "rand_core", @@ -765,9 +767,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" +checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" dependencies = [ "itoa", "ryu", @@ -783,7 +785,7 @@ dependencies = [ "block-buffer", "cfg-if", "cpuid-bool", - "digest 0.9.0", + "digest", "opaque-debug", ] @@ -1016,9 +1018,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "x25519-dalek" -version = "0.6.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "637ff90c9540fa3073bb577e65033069e4bae7c79d49d74aa3ffdf5342a53217" +checksum = "00ffb05621d7d051df0f020edf3e5db20797a4e522bf1f9c5dfa20603f1c85f6" dependencies = [ "curve25519-dalek", "rand_core", diff --git a/Cargo.toml b/Cargo.toml index 9e5571e..66e49b9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,17 +17,17 @@ u64_backend = ["curve25519-dalek/u64_backend", "x25519-dalek/u64_backend"] u32_backend = ["curve25519-dalek/u32_backend", "x25519-dalek/u32_backend"] [dependencies] -curve25519-dalek = { version = "2.1.0", default-features = false, features = ["std"]} +curve25519-dalek = { version = "3.0.0", default-features = false, features = ["std"] } digest = "0.9.0" displaydoc = "0.1.7" -generic-array = "0.14.3" +generic-array = "0.14.4" hkdf = "0.9.0" -hmac = "0.8.1" +hmac = "0.9.0" rand_core = "0.5.1" -scrypt = { version = "0.3.1", optional = true } +scrypt = { version = "0.4.1", optional = true } sha2 = "0.9.1" thiserror = "1.0.20" -x25519-dalek = { version = "0.6.0", default-features = false, features = ["std"]} +x25519-dalek = { version = "1.0.1", default-features = false, features = ["std"] } zeroize = "1.1" [dev-dependencies] @@ -36,8 +36,8 @@ base64 = "0.12.3" criterion = "0.3.3" hex = "0.4.2" lazy_static = "1.4.0" -serde_json = "1.0.56" -proptest = "0.10.0" +serde_json = "1.0.57" +proptest = "0.10.1" rand = "0.7" [[bench]]