diff --git a/Cargo.lock b/Cargo.lock index a8fa3ad0..9c162865 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -85,33 +85,33 @@ dependencies = [ [[package]] name = "aes" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2bc6d3f370b5666245ff421e231cba4353df936e26986d2918e61a8fd6aef6" +checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" dependencies = [ "aes-soft", "aesni", - "block-cipher", + "cipher", ] [[package]] name = "aes-soft" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63dd91889c49327ad7ef3b500fd1109dbd3c509a03db0d4a9ce413b79f575cb6" +checksum = "8c5ab1fa47ce0ddf44cbd65b1b4e626e3c03b06fd42005603acdc6fa13526296" dependencies = [ - "block-cipher", "byteorder", + "cipher", "opaque-debug 0.3.0", ] [[package]] name = "aesni" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6fe808308bb07d393e2ea47780043ec47683fcf19cf5efc8ca51c50cc8c68a" +checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" dependencies = [ - "block-cipher", + "cipher", "opaque-debug 0.3.0", ] @@ -255,23 +255,14 @@ dependencies = [ "generic-array 0.14.4", ] -[[package]] -name = "block-cipher" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f337a3e6da609650eb74e02bc9fac7b735049f7623ab12f2e4c719316fcc7e80" -dependencies = [ - "generic-array 0.14.4", -] - [[package]] name = "block-modes" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9b14fd8a4739e6548d4b6018696cf991dcf8c6effd9ef9eb33b29b8a650972" +checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0" dependencies = [ - "block-cipher", "block-padding 0.2.1", + "cipher", ] [[package]] @@ -321,12 +312,12 @@ checksum = "8dae9c4b8fedcae85592ba623c4fd08cfdab3e3b72d6df780c6ead964a69bfff" [[package]] name = "ccm" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbba800a6a55058ecb75c7a42e3d16a715a2b1f1afa9acf07365d6ab30d62ce1" +checksum = "5aca1a8fbc20b50ac9673ff014abfb2b5f4085ee1a850d408f14a159c5853ac7" dependencies = [ "aead", - "block-cipher", + "cipher", "subtle", ] @@ -344,24 +335,24 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chacha20" -version = "0.4.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "086c0f07ac275808b7bf9a39f2fd013aae1498be83632814c8c4e0bd53f2dc58" +checksum = "ed8738f14471a99f0e316c327e68fc82a3611cc2895fcb604b89eedaf8f39d95" dependencies = [ - "stream-cipher", + "cipher", "zeroize", ] [[package]] name = "chacha20poly1305" -version = "0.5.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18b0c90556d8e3fec7cf18d84a2f53d27b21288f2fe481b830fadcf809e48205" +checksum = "cc30d6481323d015a91ef515af1ab66bb44686f9634f7ea97410678e7a3bf804" dependencies = [ "aead", "chacha20", + "cipher", "poly1305", - "stream-cipher", "zeroize", ] @@ -385,13 +376,22 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d29eb15132782371f71da8f947dba48b3717bdb6fa771b9b434d645e40a7193" +[[package]] +name = "cipher" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f7954ae5588102b35257639b1c36a2e7425cc6540fcdb4de19dcb91055d659" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "cmac" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5220604fe5c112e2851b00da795c72cbb71bf112f2cbd532bdcfb4106eeb320b" +checksum = "73d4de4f7724e5fe70addfb2bd37c2abd2f95084a429d7773b0b9645499b4272" dependencies = [ - "crypto-mac 0.9.1", + "crypto-mac 0.10.0", "dbl", ] @@ -443,7 +443,17 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca" dependencies = [ - "block-cipher", + "generic-array 0.14.4", + "subtle", +] + +[[package]] +name = "crypto-mac" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" +dependencies = [ + "cipher", "generic-array 0.14.4", "subtle", ] @@ -929,12 +939,12 @@ dependencies = [ [[package]] name = "hkdf" -version = "0.9.0" +version = "0.10.0-alpha.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe1149865383e4526a43aee8495f9a325f0b806c63ce6427d06336a590abbbc9" +checksum = "62bfd183fa80c10d8a5337934bafdd94567a8b843cd0f20fef3284a1ad0defc0" dependencies = [ "digest 0.9.0", - "hmac 0.8.1", + "hmac 0.10.1", ] [[package]] @@ -957,6 +967,16 @@ dependencies = [ "digest 0.9.0", ] +[[package]] +name = "hmac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +dependencies = [ + "crypto-mac 0.10.0", + "digest 0.9.0", +] + [[package]] name = "http" version = "0.2.1" @@ -1363,11 +1383,11 @@ dependencies = [ [[package]] name = "pbkdf2" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170d73bf11f39b4ce1809aabc95bf5c33564cdc16fc3200ddda17a5f6e5e48b" +checksum = "b3b8c0d71734018084da0c0354193a5edfb81b20d2d57a92c5b154aefc554a4a" dependencies = [ - "crypto-mac 0.9.1", + "crypto-mac 0.10.0", ] [[package]] @@ -1874,15 +1894,6 @@ dependencies = [ "toml", ] -[[package]] -name = "stream-cipher" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f8ed9974042b8c3672ff3030a69fcc03b74c47c3d1ecb7755e8a3626011e88" -dependencies = [ - "generic-array 0.14.4", -] - [[package]] name = "strsim" version = "0.9.3" @@ -2464,9 +2475,9 @@ dependencies = [ [[package]] name = "yubihsm" -version = "0.35.0-rc" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5711694d1003e4074362c3be1597a3d0eb84eee78b726e74a01d91b9bc179887" +checksum = "1a705a6b1f039104fa38e1efba2dd273e8873aabe0fcadd8a76df948ffc2e906" dependencies = [ "aes", "anomaly", @@ -2480,7 +2491,7 @@ dependencies = [ "ed25519", "ed25519-dalek", "harp", - "hmac 0.9.0", + "hmac 0.10.1", "k256 0.5.9", "log", "p256", diff --git a/Cargo.toml b/Cargo.toml index 97e1ac9f..fe192a4d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,13 +14,13 @@ edition = "2018" abscissa_core = "0.5" abscissa_tokio = { version = "0.5", optional = true } bytes = "0.5" -chacha20poly1305 = "0.5" +chacha20poly1305 = "0.7" chrono = "0.4" ed25519-dalek = "1" getrandom = "0.1" gumdrop = "0.7" hkd32 = { version = "0.4", default-features = false, features = ["mnemonic"] } -hkdf = "0.9" +hkdf = "0.10.0-alpha.0" hyper = { version = "0.13", optional = true } k256 = { version = "0.5", features = ["ecdsa", "sha256"] } merlin = "2" @@ -43,7 +43,7 @@ tendermint-rpc = { version = "0.16.0", optional = true, features = ["client"] } thiserror = "1" wait-timeout = "0.2" x25519-dalek = "1.1" -yubihsm = { version = "=0.35.0-rc", features = ["secp256k1", "setup", "usb"], optional = true } +yubihsm = { version = "0.35", features = ["secp256k1", "setup", "usb"], optional = true } zeroize = "1" [dev-dependencies]