diff --git a/Cargo.lock b/Cargo.lock index ae66c6a19..075f27568 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,7 +19,7 @@ dependencies = [ "arrayvec", "blobby", "bytes", - "crypto-common 0.2.0-pre.3", + "crypto-common 0.2.0-pre.4 (registry+https://github.com/rust-lang/crates.io-index)", "heapless", ] @@ -61,12 +61,6 @@ dependencies = [ "signature 2.2.0", ] -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - [[package]] name = "base16ct" version = "0.1.1" @@ -94,18 +88,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - [[package]] name = "blobby" version = "0.3.1" @@ -132,11 +114,11 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.11.0-pre.3" +version = "0.11.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72bc448e41b30773616b4f51a23f1a51634d41ce0d06a9bf6c3065ee85e227a1" +checksum = "0edadbde8e0243b49d434f9a23ec0590af201f400a34d7d51049284e4a77c568" dependencies = [ - "crypto-common 0.2.0-pre.3", + "crypto-common 0.2.0-pre.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -150,9 +132,9 @@ dependencies = [ [[package]] name = "block-padding" -version = "0.4.0-pre.3" +version = "0.4.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a359e2b51a0e9b9d6a6d4582b7b62723e4a25f4e5ca6be70a6a00050202ab" +checksum = "e8ab21a8964437caf2e83a92a1221ce65e356a2a9b8b52d58bece04005fe114e" dependencies = [ "hybrid-array", ] @@ -222,11 +204,11 @@ dependencies = [ [[package]] name = "cipher" -version = "0.5.0-pre.1" +version = "0.5.0-pre.2" dependencies = [ "blobby", - "crypto-common 0.2.0-pre.3", - "inout 0.2.0-pre.3", + "crypto-common 0.2.0-pre.4 (registry+https://github.com/rust-lang/crates.io-index)", + "inout 0.2.0-pre.4", "zeroize", ] @@ -308,34 +290,30 @@ dependencies = [ ] [[package]] -name = "crypto-bigint" -version = "0.6.0-pre.8" +name = "crypto-common" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f83f24a157ad881f072a0ba6b4950dc0d1fbbea38df4dcc271d9a4a1501b96e" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "hybrid-array", - "num-traits", + "generic-array", "rand_core 0.6.4", - "subtle", - "zeroize", + "typenum", ] [[package]] name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +version = "0.2.0-pre.4" dependencies = [ - "generic-array", + "getrandom", + "hybrid-array", "rand_core 0.6.4", - "typenum", ] [[package]] name = "crypto-common" -version = "0.2.0-pre.3" +version = "0.2.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc17eb697364b18256ec92675ebe6b7b153d2f1041e568d74533c5d0fc1ca162" +checksum = "806e4e3731d44f1340b069551225b44c2056c105cad9e67f0c46266db8a3a6b9" dependencies = [ "getrandom", "hybrid-array", @@ -402,17 +380,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "der" -version = "0.8.0-pre.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b489fd2221710c1dd46637d66b984161fb66134f81437a8489800306bcc2ecea" -dependencies = [ - "const-oid 0.10.0-pre.2", - "pem-rfc7468 1.0.0-pre.0", - "zeroize", -] - [[package]] name = "digest" version = "0.9.0" @@ -435,24 +402,12 @@ dependencies = [ [[package]] name = "digest" -version = "0.11.0-pre.3" +version = "0.11.0-pre.4" dependencies = [ "blobby", - "block-buffer 0.11.0-pre.3", + "block-buffer 0.11.0-pre.4", "const-oid 0.10.0-pre.2", - "crypto-common 0.2.0-pre.3", - "subtle", -] - -[[package]] -name = "digest" -version = "0.11.0-pre.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3be3c52e023de5662dc05a32f747d09a1d6024fdd1f64b0850e373269efb43" -dependencies = [ - "block-buffer 0.11.0-pre.3", - "const-oid 0.10.0-pre.2", - "crypto-common 0.2.0-pre.3", + "crypto-common 0.2.0-pre.4 (registry+https://github.com/rust-lang/crates.io-index)", "subtle", ] @@ -528,32 +483,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "elliptic-curve" -version = "0.14.0-pre.0" -dependencies = [ - "base16ct 0.2.0", - "base64ct", - "crypto-bigint 0.6.0-pre.8", - "digest 0.11.0-pre.3 (registry+https://github.com/rust-lang/crates.io-index)", - "ff 0.13.0", - "group 0.13.0", - "hex-literal", - "hkdf 0.13.0-pre.0", - "hybrid-array", - "pem-rfc7468 1.0.0-pre.0", - "pkcs8 0.11.0-pre.0", - "rand_core 0.6.4", - "sec1 0.8.0-pre.0", - "serde_json", - "serdect", - "sha2 0.11.0-pre.0", - "sha3", - "subtle", - "tap", - "zeroize", -] - [[package]] name = "ff" version = "0.10.1" @@ -580,17 +509,10 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "bitvec", "rand_core 0.6.4", "subtle", ] -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - [[package]] name = "generic-array" version = "0.14.7" @@ -681,12 +603,6 @@ dependencies = [ "stable_deref_trait", ] -[[package]] -name = "hex-literal" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" - [[package]] name = "hkdf" version = "0.11.0" @@ -706,15 +622,6 @@ dependencies = [ "hmac 0.12.1", ] -[[package]] -name = "hkdf" -version = "0.13.0-pre.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3bed625061d9ed27cd87356cb46c3c8269a585be23d56c6f179c722bbea471" -dependencies = [ - "hmac 0.13.0-pre.0", -] - [[package]] name = "hmac" version = "0.11.0" @@ -734,15 +641,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "hmac" -version = "0.13.0-pre.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22cb0183a745c3444af57c24aa1293e1f3e538717acce39a9d3b271c999b24f" -dependencies = [ - "digest 0.11.0-pre.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "hpke" version = "0.10.0" @@ -767,12 +665,11 @@ dependencies = [ [[package]] name = "hybrid-array" -version = "0.2.0-pre.8" +version = "0.2.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27fbaf242418fe980caf09ed348d5a6aeabe71fc1bd8bebad641f4591ae0a46d" +checksum = "b8c5517ac29f08e88170b9647d85cc5f21c2596de177b4867232e20b214b8da1" dependencies = [ "typenum", - "zeroize", ] [[package]] @@ -787,20 +684,14 @@ dependencies = [ [[package]] name = "inout" -version = "0.2.0-pre.3" +version = "0.2.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ea9986e1fde8d177cd039f00f9f316d3bfce9ebc2787c1267d4414adf3acb3" +checksum = "0a2cc35b920cc3b344af824e64e508ffc2c819fc2368ed4d253244446194d2fe" dependencies = [ - "block-padding 0.4.0-pre.3", + "block-padding 0.4.0-pre.4", "hybrid-array", ] -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - [[package]] name = "jobserver" version = "0.1.27" @@ -810,15 +701,6 @@ dependencies = [ "libc", ] -[[package]] -name = "keccak" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" -dependencies = [ - "cpufeatures", -] - [[package]] name = "kem" version = "0.3.0-pre" @@ -840,15 +722,6 @@ version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", -] - [[package]] name = "opaque-debug" version = "0.3.0" @@ -904,15 +777,6 @@ dependencies = [ "base64ct", ] -[[package]] -name = "pem-rfc7468" -version = "1.0.0-pre.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a65e1c27d1680f8805b3f8c9949f08d6aa5d6cbd088c9896e64a53821dc27d" -dependencies = [ - "base64ct", -] - [[package]] name = "pkcs8" version = "0.7.6" @@ -920,7 +784,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee3ef9b64d26bad0536099c816c6734379e45bbd5f14798def6809e5cc350447" dependencies = [ "der 0.4.5", - "pem-rfc7468 0.2.3", + "pem-rfc7468", "spki 0.4.1", "zeroize", ] @@ -935,16 +799,6 @@ dependencies = [ "spki 0.7.3", ] -[[package]] -name = "pkcs8" -version = "0.11.0-pre.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "935c09e0aecb0cb8f8907b57438b19a068cb74a25189b06724f061170b2465ff" -dependencies = [ - "der 0.8.0-pre.0", - "spki 0.8.0-pre.0", -] - [[package]] name = "poly1305" version = "0.8.0" @@ -1033,12 +887,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - [[package]] name = "rand" version = "0.8.5" @@ -1075,12 +923,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "ryu" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - [[package]] name = "sec1" version = "0.3.0" @@ -1108,21 +950,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "sec1" -version = "0.8.0-pre.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ccf9d914303f6606a4fa47933f65b92ce13991573a3c61118a458ec5b5ca6cb" -dependencies = [ - "base16ct 0.2.0", - "der 0.8.0-pre.0", - "hybrid-array", - "pkcs8 0.11.0-pre.0", - "serdect", - "subtle", - "zeroize", -] - [[package]] name = "serde" version = "1.0.195" @@ -1152,27 +979,6 @@ dependencies = [ "syn", ] -[[package]] -name = "serde_json" -version = "1.0.111" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serdect" -version = "0.3.0-pre.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791ef964bfaba6be28a5c3f0c56836e17cb711ac009ca1074b9c735a3ebf240a" -dependencies = [ - "base16ct 0.2.0", - "serde", -] - [[package]] name = "sha2" version = "0.9.9" @@ -1197,27 +1003,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "sha2" -version = "0.11.0-pre.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0628cd6fd8219612c2d71ad52ab8c2014a18cbdbedbde17de04d400df65997" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.11.0-pre.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "sha3" -version = "0.11.0-pre.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab80aa0f8ab215182f50d06bf13ed44929975b0f57ec4f2ddf97f01a4f6a41ab" -dependencies = [ - "digest 0.11.0-pre.3 (registry+https://github.com/rust-lang/crates.io-index)", - "keccak", -] - [[package]] name = "signature" version = "1.3.2" @@ -1238,17 +1023,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "signature" -version = "2.3.0-pre.0" -dependencies = [ - "digest 0.11.0-pre.3 (registry+https://github.com/rust-lang/crates.io-index)", - "hex-literal", - "rand_core 0.6.4", - "sha2 0.11.0-pre.0", - "signature_derive", -] - [[package]] name = "signature_derive" version = "2.1.0" @@ -1277,16 +1051,6 @@ dependencies = [ "der 0.7.8", ] -[[package]] -name = "spki" -version = "0.8.0-pre.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb2b56670f5ef52934c97efad30bf42585de0c33ec3e2a886e38b80d2db67243" -dependencies = [ - "base64ct", - "der 0.8.0-pre.0", -] - [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -1310,12 +1074,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "typenum" version = "1.17.0" @@ -1342,7 +1100,7 @@ dependencies = [ name = "universal-hash" version = "0.6.0-pre" dependencies = [ - "crypto-common 0.2.0-pre.3", + "crypto-common 0.2.0-pre.4 (registry+https://github.com/rust-lang/crates.io-index)", "subtle", ] @@ -1358,15 +1116,6 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - [[package]] name = "x25519-dalek" version = "2.0.0-pre.1" diff --git a/Cargo.toml b/Cargo.toml index 43e1e3c82..c61ac8267 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,13 +5,13 @@ members = [ "async-signature", "cipher", "crypto", -# "crypto-common", + "crypto-common", "digest", - "elliptic-curve", +# "elliptic-curve", "kem", "password-hash", - "signature", +# "signature", "signature_derive", "universal-hash", ] -exclude = ["crypto-common"] +exclude = ["elliptic-curve", "signature"] diff --git a/aead/Cargo.toml b/aead/Cargo.toml index e69d1df0e..f92036811 100644 --- a/aead/Cargo.toml +++ b/aead/Cargo.toml @@ -16,7 +16,7 @@ categories = ["cryptography", "no-std"] rust-version = "1.65" [dependencies] -crypto-common = "=0.2.0-pre.3" +crypto-common = "=0.2.0-pre.4" # optional dependencies arrayvec = { version = "0.7", optional = true, default-features = false } diff --git a/aead/src/lib.rs b/aead/src/lib.rs index 8448e40f7..157401f14 100644 --- a/aead/src/lib.rs +++ b/aead/src/lib.rs @@ -255,7 +255,7 @@ macro_rules! impl_decrypt_in_place { let tag_pos = $buffer.len() - Self::TagSize::to_usize(); let (msg, tag) = $buffer.as_mut().split_at_mut(tag_pos); - $aead.decrypt_in_place_detached($nonce, $aad, msg, Tag::::ref_from_slice(tag))?; + $aead.decrypt_in_place_detached($nonce, $aad, msg, Tag::::from_slice(tag))?; $buffer.truncate(tag_pos); Ok(()) }}; diff --git a/cipher/Cargo.toml b/cipher/Cargo.toml index 1968148f4..b998b22a5 100644 --- a/cipher/Cargo.toml +++ b/cipher/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cipher" description = "Traits for describing block ciphers and stream ciphers" -version = "0.5.0-pre.1" +version = "0.5.0-pre.2" authors = ["RustCrypto Developers"] license = "MIT OR Apache-2.0" readme = "README.md" @@ -13,8 +13,8 @@ keywords = ["crypto", "block-cipher", "stream-cipher", "trait"] categories = ["cryptography", "no-std"] [dependencies] -crypto-common = "=0.2.0-pre.3" -inout = "=0.2.0-pre.3" +crypto-common = "=0.2.0-pre.4" +inout = "=0.2.0-pre.4" # optional dependencies blobby = { version = "0.3", optional = true } diff --git a/digest/Cargo.toml b/digest/Cargo.toml index 36c62e2ee..fe639df5a 100644 --- a/digest/Cargo.toml +++ b/digest/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "digest" description = "Traits for cryptographic hash functions and message authentication codes" -version = "0.11.0-pre.3" +version = "0.11.0-pre.4" authors = ["RustCrypto Developers"] license = "MIT OR Apache-2.0" readme = "README.md" @@ -13,10 +13,10 @@ keywords = ["digest", "crypto", "hash"] categories = ["cryptography", "no-std"] [dependencies] -crypto-common = "=0.2.0-pre.3" +crypto-common = "=0.2.0-pre.4" # optional dependencies -block-buffer = { version = "=0.11.0-pre.3", optional = true } +block-buffer = { version = "=0.11.0-pre.4", optional = true } subtle = { version = "2.4", default-features = false, optional = true } blobby = { version = "0.3", optional = true } const-oid = { version = "=0.10.0-pre.2", optional = true } diff --git a/universal-hash/Cargo.toml b/universal-hash/Cargo.toml index 9ddc4c06b..dafe0fd36 100644 --- a/universal-hash/Cargo.toml +++ b/universal-hash/Cargo.toml @@ -13,7 +13,7 @@ keywords = ["crypto", "mac"] categories = ["cryptography", "no-std"] [dependencies] -crypto-common = "=0.2.0-pre.3" +crypto-common = "=0.2.0-pre.4" subtle = { version = "2.4", default-features = false } [features]