diff --git a/Cargo.lock b/Cargo.lock index 3cde1a2d..7c5bef2d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,9 +11,9 @@ checksum = "847495c209977a90e8aad588b959d0ca9f5dc228096d29a6bd3defd53f35eaec" [[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", ] @@ -36,9 +36,9 @@ dependencies = [ [[package]] name = "cipher" -version = "0.5.0-pre.1" +version = "0.5.0-pre.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e338a2ceb7493b9b89d12728c6feb2d4b61708cb63b577c556c92f43aef0cd" +checksum = "40619e61d2e7c018604193e71763730a96b0e606e19aba895956635986c7fe98" dependencies = [ "blobby", "crypto-common", @@ -57,9 +57,9 @@ dependencies = [ [[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", @@ -93,18 +93,18 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[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", ] [[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", "hybrid-array", diff --git a/chacha20/Cargo.toml b/chacha20/Cargo.toml index d33b7473..ffef6fb6 100644 --- a/chacha20/Cargo.toml +++ b/chacha20/Cargo.toml @@ -20,13 +20,13 @@ categories = ["cryptography", "no-std"] [dependencies] cfg-if = "1" -cipher = "=0.5.0-pre.1" +cipher = "=0.5.0-pre.2" [target.'cfg(any(target_arch = "x86_64", target_arch = "x86"))'.dependencies] cpufeatures = "0.2" [dev-dependencies] -cipher = { version = "=0.5.0-pre.1", features = ["dev"] } +cipher = { version = "=0.5.0-pre.2", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/chacha20/src/xchacha.rs b/chacha20/src/xchacha.rs index 46b9c653..74e556c6 100644 --- a/chacha20/src/xchacha.rs +++ b/chacha20/src/xchacha.rs @@ -185,7 +185,7 @@ mod hchacha20_tests { "a0f9e4d58a74a853c12ec41326d3ecdc" ); - let actual = hchacha::(Array::ref_from_slice(&KEY), Array::ref_from_slice(&INPUT)); + let actual = hchacha::(Array::from_slice(&KEY), Array::from_slice(&INPUT)); assert_eq!(actual.as_slice(), &OUTPUT); } } diff --git a/hc-256/Cargo.toml b/hc-256/Cargo.toml index 00dea615..8060c564 100644 --- a/hc-256/Cargo.toml +++ b/hc-256/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "stream-cipher", "trait"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.1" +cipher = "=0.5.0-pre.2" [dev-dependencies] -cipher = { version = "=0.5.0-pre.1", features = ["dev"] } +cipher = { version = "=0.5.0-pre.2", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/rabbit/Cargo.toml b/rabbit/Cargo.toml index 537659e8..669b2987 100644 --- a/rabbit/Cargo.toml +++ b/rabbit/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "rabbit", "stream-cipher", "trait"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.1" +cipher = "=0.5.0-pre.2" [dev-dependencies] -cipher = { version = "=0.5.0-pre.1", features = ["dev"] } +cipher = { version = "=0.5.0-pre.2", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/rc4/Cargo.toml b/rc4/Cargo.toml index 62497e62..b35170ac 100644 --- a/rc4/Cargo.toml +++ b/rc4/Cargo.toml @@ -13,7 +13,7 @@ keywords = ["arc4", "arcfour", "crypto", "stream-cipher", "trait"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.1" +cipher = "=0.5.0-pre.2" [dev-dependencies] hex-literal = "0.4" diff --git a/rc4/src/lib.rs b/rc4/src/lib.rs index 6e4005b9..b3874e9f 100644 --- a/rc4/src/lib.rs +++ b/rc4/src/lib.rs @@ -25,7 +25,7 @@ //! rc4.apply_keystream(&mut data); //! assert_eq!(data, [0x10, 0x21, 0xBF, 0x04, 0x20]); //! -//! let key = Key::::ref_from_slice(b"Secret"); +//! let key = Key::::from_slice(b"Secret"); //! let mut rc4 = Rc4::<_>::new(key); //! let mut data = b"Attack at dawn".to_vec(); //! rc4.apply_keystream(&mut data); diff --git a/rc4/tests/lib.rs b/rc4/tests/lib.rs index 894b9121..92b44fee 100644 --- a/rc4/tests/lib.rs +++ b/rc4/tests/lib.rs @@ -32,7 +32,7 @@ fn test_rfc6229_length_40_bits_key1() { " ); - let key = Key::::ref_from_slice(&KEY); + let key = Key::::from_slice(&KEY); let mut cipher = Rc4::<_>::new(key); let mut data = [0u8; 0x1010]; @@ -74,7 +74,7 @@ fn test_rfc6229_length_56_bits_key1() { " ); - let key = Key::::ref_from_slice(&KEY); + let key = Key::::from_slice(&KEY); let mut cipher = Rc4::<_>::new(key); let mut data = [0u8; 0x1010]; @@ -116,7 +116,7 @@ fn test_rfc6229_length_64_bits_key1() { " ); - let key = Key::::ref_from_slice(&KEY); + let key = Key::::from_slice(&KEY); let mut cipher = Rc4::<_>::new(key); let mut data = [0u8; 0x1010]; @@ -158,7 +158,7 @@ fn test_rfc6229_length_80_bits_key1() { " ); - let key = Key::::ref_from_slice(&KEY); + let key = Key::::from_slice(&KEY); let mut cipher = Rc4::<_>::new(key); let mut data = [0u8; 0x1010]; @@ -201,7 +201,7 @@ fn test_rfc6229_length_128_bits_key1() { " ); - let key = Key::::ref_from_slice(&KEY); + let key = Key::::from_slice(&KEY); let mut cipher = Rc4::<_>::new(key); let mut data = [0u8; 0x1010]; @@ -243,7 +243,7 @@ fn test_rfc6229_length_192_bits_key1() { " ); - let key = Key::::ref_from_slice(&KEY); + let key = Key::::from_slice(&KEY); let mut cipher = Rc4::<_>::new(key); let mut data = [0u8; 0x1010]; @@ -286,7 +286,7 @@ fn test_rfc6229_length_256_bits_key1() { " ); - let key = Key::::ref_from_slice(&KEY); + let key = Key::::from_slice(&KEY); let mut cipher = Rc4::<_>::new(key); let mut data = [0u8; 0x1010]; @@ -328,7 +328,7 @@ fn test_rfc6229_length_40_bits_key2() { " ); - let key = Key::::ref_from_slice(&KEY); + let key = Key::::from_slice(&KEY); let mut cipher = Rc4::<_>::new(key); let mut data = [0u8; 0x1010]; @@ -370,7 +370,7 @@ fn test_rfc6229_length_56_bits_key2() { " ); - let key = Key::::ref_from_slice(&KEY); + let key = Key::::from_slice(&KEY); let mut cipher = Rc4::<_>::new(key); let mut data = [0u8; 0x1010]; @@ -412,7 +412,7 @@ fn test_rfc6229_length_64_bits_key2() { " ); - let key = Key::::ref_from_slice(&KEY); + let key = Key::::from_slice(&KEY); let mut cipher = Rc4::<_>::new(key); let mut data = [0u8; 0x1010]; @@ -454,7 +454,7 @@ fn test_rfc6229_length_80_bits_key2() { " ); - let key = Key::::ref_from_slice(&KEY); + let key = Key::::from_slice(&KEY); let mut cipher = Rc4::<_>::new(key); let mut data = [0u8; 0x1010]; @@ -497,7 +497,7 @@ fn test_rfc6229_length_128_bits_key2() { " ); - let key = Key::::ref_from_slice(&KEY); + let key = Key::::from_slice(&KEY); let mut cipher = Rc4::<_>::new(key); let mut data = [0u8; 0x1010]; @@ -539,7 +539,7 @@ fn test_rfc6229_length_192_bits_key2() { " ); - let key = Key::::ref_from_slice(&KEY); + let key = Key::::from_slice(&KEY); let mut cipher = Rc4::<_>::new(key); let mut data = [0u8; 0x1010]; @@ -582,7 +582,7 @@ fn test_rfc6229_length_256_bits_key2() { " ); - let key = Key::::ref_from_slice(&KEY); + let key = Key::::from_slice(&KEY); let mut cipher = Rc4::<_>::new(key); let mut data = [0u8; 0x1010]; diff --git a/salsa20/Cargo.toml b/salsa20/Cargo.toml index 965e34b1..8f5da3b2 100644 --- a/salsa20/Cargo.toml +++ b/salsa20/Cargo.toml @@ -14,10 +14,10 @@ categories = ["cryptography", "no-std"] [dependencies] cfg-if = "1" -cipher = "=0.5.0-pre.1" +cipher = "=0.5.0-pre.2" [dev-dependencies] -cipher = { version = "=0.5.0-pre.1", features = ["dev"] } +cipher = { version = "=0.5.0-pre.2", features = ["dev"] } hex-literal = "0.4" [features]