diff --git a/Cargo.lock b/Cargo.lock index 4bad827..aed2be6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 4 [[package]] name = "aead" -version = "0.6.0-rc.8" +version = "0.6.0-rc.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2b86f658b0f536411ee61c10cec8376f83375b0c98bdc6a640e249f01549d0" +checksum = "6b657e772794c6b04730ea897b66a058ccd866c16d1967da05eeeecec39043fe" dependencies = [ "crypto-common", "inout", @@ -14,21 +14,21 @@ dependencies = [ [[package]] name = "aes" -version = "0.9.0-rc.2" +version = "0.9.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9e1c818b25efb32214df89b0ec22f01aa397aaeb718d1022bf0635a3bfd1a8" +checksum = "04097e08a47d9ad181c2e1f4a5fabc9ae06ce8839a333ba9a949bcb0d31fd2a3" dependencies = [ - "cfg-if", "cipher", + "cpubits", "cpufeatures", "zeroize", ] [[package]] name = "aes-gcm" -version = "0.11.0-rc.2" +version = "0.11.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f5c07f414d7dc0755870f84c7900425360288d24e0eae4836f9dee19a30fa5f" +checksum = "e22c0c90bbe8d4f77c3ca9ddabe41a1f8382d6fc1f7cea89459d0f320371f972" dependencies = [ "aead", "aes", @@ -41,9 +41,9 @@ dependencies = [ [[package]] name = "argon2" -version = "0.6.0-rc.6" +version = "0.6.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39b5afeb474438603309cd6e638f6baff5b8f4eb4605d63c761516712e044e5c" +checksum = "5cc32af0fde8095068147d01a5dfbc0e0b06307924138d992df7c8f18d34c585" dependencies = [ "base64ct", "blake2", @@ -71,9 +71,9 @@ checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" [[package]] name = "bcrypt-pbkdf" -version = "0.11.0-rc.3" +version = "0.11.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f77aa83b547cf80cbf9591df43bec6f18f8303cfab26883b1b2d9ad039f9bfe4" +checksum = "1dd80936d4a1ae6919e782d45e4ccb5928bf6d742d588ab8350b1417addcd325" dependencies = [ "blowfish", "pbkdf2", @@ -82,9 +82,9 @@ dependencies = [ [[package]] name = "blake2" -version = "0.11.0-rc.3" +version = "0.11.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "679065eb2b85a078ace42411e657bef3a6afe93a40d1b9cb04e39ca303cc3f36" +checksum = "d52965399b470437fc7f4d4b51134668dbc96573fea6f1b83318a420e4605745" dependencies = [ "digest", ] @@ -110,9 +110,9 @@ dependencies = [ [[package]] name = "blowfish" -version = "0.10.0-rc.2" +version = "0.10.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecfb049d43f70154a8a232d709710dc7350bda1fa7d0e539a252f0938adad8e" +checksum = "e68258100c60364f089766a8de37b8382136bab19abe6086627dfb324cf095c7" dependencies = [ "byteorder", "cipher", @@ -132,9 +132,9 @@ checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" [[package]] name = "cbc" -version = "0.2.0-rc.2" +version = "0.2.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c34a745c272d1f6124df3006881364190a8f033ff3857ce196a17aa4a753096" +checksum = "85742c5f1d0dda799d2e582c76b82b817d3e4d6434dd285e48e90ed0c963b667" dependencies = [ "cipher", ] @@ -147,9 +147,9 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "chacha20" -version = "0.10.0-rc.9" +version = "0.10.0-rc.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c81d916c6ae06736ec667b51f95ee5ff660a75f4ea6ce1bd932c942365c0ea43" +checksum = "c536927023d1c432e6e23a25ef45f6756094eac2ab460db5fb17a772acdfd312" dependencies = [ "cfg-if", "cipher", @@ -160,9 +160,9 @@ dependencies = [ [[package]] name = "cipher" -version = "0.5.0-rc.6" +version = "0.5.0-rc.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba4d87abf4032a6d927f84b71af5086128a3349b929b4501c51a0fe0981a937" +checksum = "9002c8edb9b1e21938663da3489c9c4403bba2393997fb2ecbd401386c0e71dc" dependencies = [ "block-buffer", "crypto-common", @@ -182,6 +182,12 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" +[[package]] +name = "cpubits" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef0c543070d296ea414df2dd7625d1b24866ce206709d8a4a424f28377f5861" + [[package]] name = "cpufeatures" version = "0.2.17" @@ -193,10 +199,11 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.7.0-rc.22" +version = "0.7.0-rc.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c3561863ce55e3226ecc48b08679f4b66cb1b92b9afb42c2c402dfe8b9b51" +checksum = "cba9eeeb213f7fd29353032f71f7c173e5f6d95d85151cb3a47197b0ea7e8be7" dependencies = [ + "cpubits", "ctutils", "hybrid-array", "num-traits", @@ -208,9 +215,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.2.0-rc.13" +version = "0.2.0-rc.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7722afd27468475c9b6063dc03a57ef2ca833816981619f8ebe64d38d207eef" +checksum = "6f8441110cea75afde0b89a8d796e2bc67b23432f5a9566cb15d9d365d91a2b0" dependencies = [ "hybrid-array", "rand_core", @@ -229,9 +236,9 @@ dependencies = [ [[package]] name = "ctr" -version = "0.10.0-rc.2" +version = "0.10.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d0ec605a95e78815a4c4b8040217d56d5a1ab37043851ee9e7e65b89afa00e3" +checksum = "65ea71550d18331d179854662ab330bb54306b9b56020d0466aae2a58f4e17c1" dependencies = [ "cipher", ] @@ -249,8 +256,7 @@ dependencies = [ [[package]] name = "curve25519-dalek" version = "5.0.0-pre.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a434aec7908df6ca86cda069864d7686aea8afad979aadc9e30e50ac3e40b45a" +source = "git+https://github.com/dalek-cryptography/curve25519-dalek#ea475248aec83dc319765974350d4731f2660731" dependencies = [ "cfg-if", "cpufeatures", @@ -284,18 +290,18 @@ dependencies = [ [[package]] name = "des" -version = "0.9.0-rc.2" +version = "0.9.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512ca722eff02fa73c43e5136f440c46f861d41f9dd7761c1f2817a5ca5d9ad7" +checksum = "3214053e68a813b9c06ef61075c844f3a1cdeb307d8998ea8555c063caa52fa9" dependencies = [ "cipher", ] [[package]] name = "digest" -version = "0.11.0-rc.9" +version = "0.11.0-rc.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff8de092798697546237a3a701e4174fe021579faec9b854379af9bf1e31962" +checksum = "02b42f1d9edf5207c137646b568a0168ca0ec25b7f9eaf7f9961da51a3d91cea" dependencies = [ "block-buffer", "const-oid", @@ -305,9 +311,9 @@ dependencies = [ [[package]] name = "dsa" -version = "0.7.0-rc.11" +version = "0.7.0-rc.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3eba9e80ed870bde8fbd018338932a3b59cf67d3b0d6a1e3c538e0047e879f" +checksum = "5995fdb6fe48cf93a88c2520eb18b4a871567fb5c2561cf2f2494e216e32805d" dependencies = [ "crypto-bigint", "crypto-primes", @@ -321,9 +327,9 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.17.0-rc.14" +version = "0.17.0-rc.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e5676a9322ce14a73b65930ef95139fb8c41df02dfa610a3a5928a52f9ae4ee" +checksum = "91bbdd377139884fafcad8dc43a760a3e1e681aa26db910257fa6535b70e1829" dependencies = [ "der", "digest", @@ -356,9 +362,9 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.14.0-rc.24" +version = "0.14.0-rc.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0f6cc67cc39a00bce2c6f8f8aced0e8c0a06eb1a30f9dd2a9c9f4618bdf3b4" +checksum = "bde7860544606d222fd6bd6d9f9a0773321bf78072a637e1d560a058c0031978" dependencies = [ "base16ct", "crypto-bigint", @@ -381,9 +387,9 @@ checksum = "64cd1e32ddd350061ae6edb1b082d7c54915b5c672c389143b9a63403a109f24" [[package]] name = "ghash" -version = "0.6.0-rc.3" +version = "0.6.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "333de57ed9494a40df4bbb866752b100819dde0d18f2264c48f5a08a85fe673d" +checksum = "f484be0236661c5ba22d445ed75d3624ba5544541c647549f867fb576e55b2a2" dependencies = [ "polyval", ] @@ -402,9 +408,9 @@ checksum = "e712f64ec3850b98572bffac52e2c6f282b29fe6c5fa6d42334b30be438d95c1" [[package]] name = "hmac" -version = "0.13.0-rc.4" +version = "0.13.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9956e202a691c5c86c60303a421f66f93f44b29433407b7c43cf2bebadc750e" +checksum = "ef451d73f36d8a3f93ad32c332ea01146c9650e1ec821a9b0e46c01277d544f8" dependencies = [ "digest", ] @@ -453,9 +459,9 @@ dependencies = [ [[package]] name = "p256" -version = "0.14.0-rc.6" +version = "0.14.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de1286c2d38465adf5a7d970766796c1fb343172c58fd70f69e8d96e7d9dcbe4" +checksum = "018bfbb86e05fd70a83e985921241035ee09fcd369c4a2c3680b389a01d2ad28" dependencies = [ "ecdsa", "elliptic-curve", @@ -466,9 +472,9 @@ dependencies = [ [[package]] name = "p384" -version = "0.14.0-rc.6" +version = "0.14.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7574cab645ebcc13db3a531ae853d369e786270efd8b7fdb61de5c9328438d" +checksum = "8c91df688211f5957dbe2ab599dcbcaade8d6d3cdc15c5b350d350d7d07ce423" dependencies = [ "ecdsa", "elliptic-curve", @@ -480,9 +486,9 @@ dependencies = [ [[package]] name = "p521" -version = "0.14.0-rc.6" +version = "0.14.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa943740d30f154f6370223a510d5111d08528bf857cb61359048e61983b3eb0" +checksum = "de6cd9451de522549d36cc78a1b45a699a3d55a872e8ea0c8f0318e502d99e2c" dependencies = [ "base16ct", "ecdsa", @@ -494,18 +500,18 @@ dependencies = [ [[package]] name = "password-hash" -version = "0.6.0-rc.11" +version = "0.6.0-rc.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856b64c3c87d737f723456e6e399adcb471e5446f42ba3d1e4f50a81d894b274" +checksum = "5fa9e3d1c7b6f3e230b60fa44adc855cb8e24eede37236621f2cc1940d95564f" dependencies = [ "phc", ] [[package]] name = "pbkdf2" -version = "0.13.0-rc.8" +version = "0.13.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626220f48328b90cad8393e99e9ef80503970e6e86e77f32f7e42227972e7c2c" +checksum = "c8dfa4e14084d963d35bfb4cdb38712cde78dcf83054c0e8b9b8e899150f374e" dependencies = [ "digest", ] @@ -531,9 +537,9 @@ dependencies = [ [[package]] name = "poly1305" -version = "0.9.0-rc.3" +version = "0.9.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c0749ae91cfe6e68c77c4d48802d9720ee06aed3f7100a38975fb0962d50bc" +checksum = "518693a4015fbfd281debf35bcac145ba2e180ae325ec855fdb405be0b2971fb" dependencies = [ "cpufeatures", "universal-hash", @@ -542,20 +548,20 @@ dependencies = [ [[package]] name = "polyval" -version = "0.7.0-rc.3" +version = "0.7.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad60831c19edda4b20878a676595c357e93a9b4e6dca2ba98d75b01066b317b" +checksum = "63641a86fddf4b5274f31c43734458ec7acd3133016dbaa37e4e247e1e9acd46" dependencies = [ - "cfg-if", + "cpubits", "cpufeatures", "universal-hash", ] [[package]] name = "primefield" -version = "0.14.0-rc.6" +version = "0.14.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40d00b69a9bd66d09004e2db633068d5af00435f6e673838e50f2944b8033ec8" +checksum = "93401c13cc7ff24684571cfca9d3cf9ebabfaf3d4b7b9963ade41ec54da196b5" dependencies = [ "crypto-bigint", "crypto-common", @@ -567,9 +573,9 @@ dependencies = [ [[package]] name = "primeorder" -version = "0.14.0-rc.6" +version = "0.14.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "156aeda78c4a7e86701563514573bc28f127eec880bfa6a22efc4b8139b1c049" +checksum = "a0c5c8a39bcd764bfedf456e8d55e115fe86dda3e0f555371849f2a41cbc9706" dependencies = [ "elliptic-curve", ] @@ -594,15 +600,15 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.10.0-rc-6" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70765ff7112b0fb2d272d24d9a2f907fc206211304328fe58b2db15a5649ef28" +checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" [[package]] name = "rfc6979" -version = "0.5.0-rc.3" +version = "0.5.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b8e2323084c987a72875b2fd682b7307d5cf14d47e3875bb5e89948e8809d4" +checksum = "23a3127ee32baec36af75b4107082d9bd823501ec14a4e016be4b6b37faa74ae" dependencies = [ "hmac", "subtle", @@ -610,9 +616,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.10.0-rc.14" +version = "0.10.0-rc.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef381dd6f207f81aff2ee3a8264eddd68ba475bbfcdb44ca445e5906bce381b" +checksum = "1b342b99544549f37509ed7fd42b0cea04bfd9ce07c16ca56094cf0fbeefbbcd" dependencies = [ "const-oid", "crypto-bigint", @@ -635,9 +641,9 @@ dependencies = [ [[package]] name = "rustcrypto-ff" -version = "0.14.0-pre.1" +version = "0.14.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36fdf8f956089df8343b9479045c026932f9eb004d0f32d8497b4d133b316a66" +checksum = "c5db129183b2c139d7d87d08be57cba626c715789db17aec65c8866bfd767d1f" dependencies = [ "rand_core", "subtle", @@ -645,9 +651,9 @@ dependencies = [ [[package]] name = "rustcrypto-group" -version = "0.14.0-pre.1" +version = "0.14.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df76d08c12814c794ffe95ac788b48081cccb607fade4ed746825d29791ce538" +checksum = "57c4b1463f274a3ff6fb2f44da43e576cb9424367bd96f185ead87b52fe00523" dependencies = [ "rand_core", "rustcrypto-ff", @@ -715,9 +721,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.11.0-rc.4" +version = "0.11.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c777f0a122a53fddb0beb6e706771197000b8eb5c9f42b5b850f450ef48c788" +checksum = "3b167252f3c126be0d8926639c4c4706950f01445900c4b3db0fd7e89fcb750a" dependencies = [ "cfg-if", "cpufeatures", @@ -726,9 +732,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.11.0-rc.4" +version = "0.11.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7535f94fa3339fe9e5e9be6260a909e62af97f6e14b32345ccf79b92b8b81233" +checksum = "7c5f3b1e2dc8aad28310d8410bd4d7e180eca65fca176c52ab00d364475d0024" dependencies = [ "cfg-if", "cpufeatures", @@ -737,9 +743,9 @@ dependencies = [ [[package]] name = "signature" -version = "3.0.0-rc.9" +version = "3.0.0-rc.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad0ce3b3f8efd7406f22e2ca5d02be21cdf3b3d1d53ab141f784de8965c7c7e" +checksum = "7f1880df446116126965eeec169136b2e0251dba37c6223bcc819569550edea3" dependencies = [ "digest", "rand_core", @@ -856,9 +862,9 @@ checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "universal-hash" -version = "0.6.0-rc.4" +version = "0.6.0-rc.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0386f227888b17b65d3e38219a7d41185035471300855c285667811907bb1677" +checksum = "058482a494bb3c9c39447d8b40a3a0f38ebb3dccaf02c5a2d681e69035f8da11" dependencies = [ "crypto-common", "subtle", diff --git a/Cargo.toml b/Cargo.toml index e08f27c..3110642 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,3 +16,5 @@ ssh-cipher = { path = "./ssh-cipher" } ssh-derive = { path = "./ssh-derive" } ssh-encoding = { path = "./ssh-encoding" } ssh-key = { path = "./ssh-key" } + +curve25519-dalek = { git = "https://github.com/dalek-cryptography/curve25519-dalek" } diff --git a/ssh-cipher/Cargo.toml b/ssh-cipher/Cargo.toml index 1e979df..736d1ee 100644 --- a/ssh-cipher/Cargo.toml +++ b/ssh-cipher/Cargo.toml @@ -23,14 +23,14 @@ cipher = "0.5.0-rc.6" encoding = { package = "ssh-encoding", version = "0.3.0-rc.6" } # optional dependencies -aead = { version = "0.6.0-rc.8", optional = true, default-features = false } -aes = { version = "0.9.0-rc.2", optional = true, default-features = false } -aes-gcm = { version = "0.11.0-rc.2", optional = true, default-features = false, features = ["aes"] } -cbc = { version = "0.2.0-rc.2", optional = true } -ctr = { version = "0.10.0-rc.2", optional = true, default-features = false } -chacha20 = { version = "0.10.0-rc.9", optional = true, default-features = false, features = ["cipher", "legacy"] } -des = { version = "0.9.0-rc.2", optional = true, default-features = false } -poly1305 = { version = "0.9.0-rc.3", optional = true, default-features = false } +aead = { version = "0.6.0-rc.10", optional = true, default-features = false } +aes = { version = "0.9.0-rc.4", optional = true, default-features = false } +aes-gcm = { version = "0.11.0-rc.3", optional = true, default-features = false, features = ["aes"] } +cbc = { version = "0.2.0-rc.3", optional = true } +ctr = { version = "0.10.0-rc.3", optional = true, default-features = false } +chacha20 = { version = "0.10.0-rc.10", optional = true, default-features = false, features = ["cipher", "legacy"] } +des = { version = "0.9.0-rc.3", optional = true, default-features = false } +poly1305 = { version = "0.9.0-rc.5", optional = true, default-features = false } subtle = { version = "2", optional = true, default-features = false } zeroize = { version = "1", optional = true, default-features = false } diff --git a/ssh-encoding/Cargo.toml b/ssh-encoding/Cargo.toml index 7654eeb..6dc3098 100644 --- a/ssh-encoding/Cargo.toml +++ b/ssh-encoding/Cargo.toml @@ -17,9 +17,9 @@ rust-version = "1.85" [dependencies] base64ct = { version = "1.8", optional = true } -bigint = { package = "crypto-bigint", version = "0.7.0-rc.22", optional = true, default-features = false, features = ["alloc"] } +bigint = { package = "crypto-bigint", version = "0.7.0-rc.25", optional = true, default-features = false, features = ["alloc"] } bytes = { version = "1", optional = true, default-features = false } -digest = { version = "0.11.0-rc.9", optional = true, default-features = false } +digest = { version = "0.11.0-rc.11", optional = true, default-features = false } pem-rfc7468 = { version = "1", optional = true } ssh-derive = { version = "0.3.0-rc.0", optional = true } subtle = { version = "2", optional = true, default-features = false } diff --git a/ssh-key/Cargo.toml b/ssh-key/Cargo.toml index 23feee8..a302134 100644 --- a/ssh-key/Cargo.toml +++ b/ssh-key/Cargo.toml @@ -30,30 +30,30 @@ package = "ssh-encoding" features = ["base64", "digest", "pem", "subtle", "zeroize"] [dependencies] -sha2 = { version = "0.11.0-rc.4", default-features = false } -signature = { version = "3.0.0-rc.9", default-features = false } +sha2 = { version = "0.11.0-rc.5", default-features = false } +signature = { version = "3.0.0-rc.10", default-features = false } subtle = { version = "2", default-features = false } zeroize = { version = "1", default-features = false } # optional dependencies -argon2 = { version = "0.6.0-rc.6", optional = true, default-features = false, features = ["alloc"] } -bcrypt-pbkdf = { version = "0.11.0-rc.3", optional = true, default-features = false, features = ["alloc"] } -dsa = { version = "0.7.0-rc.11", optional = true, default-features = false, features = ["hazmat"] } +argon2 = { version = "0.6.0-rc.7", optional = true, default-features = false, features = ["alloc"] } +bcrypt-pbkdf = { version = "0.11.0-rc.6", optional = true, default-features = false, features = ["alloc"] } +dsa = { version = "0.7.0-rc.12", optional = true, default-features = false, features = ["hazmat"] } ed25519-dalek = { version = "=3.0.0-pre.5", optional = true, default-features = false } hex = { version = "0.4", optional = true, default-features = false, features = ["alloc"] } -hmac = { version = "0.13.0-rc.4", optional = true } -p256 = { version = "0.14.0-rc.6", optional = true, default-features = false, features = ["ecdsa"] } -p384 = { version = "0.14.0-rc.6", optional = true, default-features = false, features = ["ecdsa"] } -p521 = { version = "0.14.0-rc.6", optional = true, default-features = false, features = ["ecdsa"] } -rand_core = { version = "0.10.0-rc-6", optional = true, default-features = false } -rsa = { version = "0.10.0-rc.14", optional = true, default-features = false, features = ["sha2"] } +hmac = { version = "0.13.0-rc.5", optional = true } +p256 = { version = "0.14.0-rc.7", optional = true, default-features = false, features = ["ecdsa"] } +p384 = { version = "0.14.0-rc.7", optional = true, default-features = false, features = ["ecdsa"] } +p521 = { version = "0.14.0-rc.7", optional = true, default-features = false, features = ["ecdsa"] } +rand_core = { version = "0.10", optional = true, default-features = false } +rsa = { version = "0.10.0-rc.15", optional = true, default-features = false, features = ["sha2"] } sec1 = { version = "0.8.0-rc.13", optional = true, default-features = false, features = ["point"] } serde = { version = "1.0.16", optional = true } -sha1 = { version = "0.11.0-rc.4", optional = true, default-features = false, features = ["oid"] } +sha1 = { version = "0.11.0-rc.5", optional = true, default-features = false, features = ["oid"] } [dev-dependencies] hex-literal = "1" -chacha20 = { version = "0.10.0-rc.9", features = ["rng"] } +chacha20 = { version = "0.10.0-rc.10", features = ["rng"] } [features] default = ["ecdsa", "rand_core", "std"] diff --git a/ssh-key/src/private/ecdsa.rs b/ssh-key/src/private/ecdsa.rs index b5567ae..8fb51fe 100644 --- a/ssh-key/src/private/ecdsa.rs +++ b/ssh-key/src/private/ecdsa.rs @@ -14,7 +14,7 @@ use rand_core::CryptoRng; feature = "rand_core", any(feature = "p256", feature = "p384", feature = "p521") ))] -use cipher::cipher::crypto_common::Generate; +use cipher::cipher::common::Generate; /// Elliptic Curve Digital Signature Algorithm (ECDSA) private key. #[derive(Clone)] diff --git a/ssh-key/src/public/ecdsa.rs b/ssh-key/src/public/ecdsa.rs index cf6c42c..054403b 100644 --- a/ssh-key/src/public/ecdsa.rs +++ b/ssh-key/src/public/ecdsa.rs @@ -173,8 +173,7 @@ macro_rules! impl_ecdsa_for_curve { fn try_from(public_key: &EcdsaPublicKey) -> Result<$krate::ecdsa::VerifyingKey> { match public_key { EcdsaPublicKey::$curve(key) => { - $krate::ecdsa::VerifyingKey::from_encoded_point(key) - .map_err(|_| Error::Crypto) + $krate::ecdsa::VerifyingKey::from_sec1_point(key).map_err(|_| Error::Crypto) } _ => Err(Error::AlgorithmUnknown), } @@ -191,7 +190,7 @@ macro_rules! impl_ecdsa_for_curve { #[cfg(feature = $feature)] impl From<&$krate::ecdsa::VerifyingKey> for EcdsaPublicKey { fn from(key: &$krate::ecdsa::VerifyingKey) -> EcdsaPublicKey { - EcdsaPublicKey::$curve(key.to_encoded_point(false)) + EcdsaPublicKey::$curve(key.to_sec1_point(false)) } } }; diff --git a/ssh-key/src/signature.rs b/ssh-key/src/signature.rs index 6b19bda..aab3f02 100644 --- a/ssh-key/src/signature.rs +++ b/ssh-key/src/signature.rs @@ -459,7 +459,7 @@ impl Verifier for public::SkEcdsaSha2NistP256 { fn verify(&self, message: &[u8], signature: &Signature) -> signature::Result<()> { let (signature_bytes, flags_and_counter) = split_sk_signature(signature)?; let signature = p256_signature_from_openssh_bytes(signature_bytes)?; - p256::ecdsa::VerifyingKey::from_encoded_point(self.ec_point())?.verify( + p256::ecdsa::VerifyingKey::from_sec1_point(self.ec_point())?.verify( &make_sk_signed_data(self.application(), flags_and_counter, message), &signature, )