Updating Thrussh version for long or massive connections

pmeunier

Jul 5, 2021, 9:30 AM

HKA66XOQ5LOF3E5DIQGVKPEZGZKCXLLYRVTKDK7SAD7Y5JZB5OUQC

Dependencies

• [2] QJXNUQFJ Solving conflicts
• [3] Y7KH4QOP Updating Cargo.nix
• [4] 6FEU6ES7 Fixing network errors
• [5] 3VJB4ULD Updating Cargo.nix
• [6] TPEH2XNB 1.0.0-alpha.28, with Tokio 1.0
• [7] H62VFFJE Cargo.nix, and solving conflicts
• [8] B5Z4IMEU Generating Cargo.nix for pijul 1.0.0-alpha.6
• [9] 6DOXSHWG Cleanup, and version bump
• [10] FXT5FS5W Updating Cargo.nix
• [11] KUMJITTF Version bump in the lockfiles
• [12] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [13] Q7CAYX5N Fixing Windows compilation
• [14] JRENVH5D Reqwest 0.11
• [15] SAGSYAPX Various version bumps
• [16] HKEOO4QJ Version bump
• [17] ENKQ3QZG Forward the exit status messages from the SSH background loop to the client (solving hangs)
• [18] I6DVZEFU Do not ask for user input if the SSH channel is already closed
• [19] 7ZFRYVVQ Cargo.nix and formatting
• [20] HDGRZISM Version updates
• [21] I24UEJQL Various post-fire fixes
• [22] G734WNM6 flake.nix: use crate2nix
• [23] LPOLG44W fixing nix build
• [24] YMWMWFA5 Version bumps
• [*] I52XSRUH Massive cleanup, and simplification
• [*] UJI4SB5T Updating Cargo.nix
• [*] 3WIQYEIS Fixing conflicts in Cargo.lock

Change contents

• replacement in pijul/src/remote/ssh.rs at line 273
  [4.32070]→[4.32070:32167](∅→∅)
  − if let Ok(k) = thrussh_keys::load_secret_key(&key_path, Some(pass.as_bytes())) {
  [4.32070]

  [4.32167]
  + if let Ok(k) = thrussh_keys::load_secret_key(&key_path, Some(&pass)) {
• replacement in pijul/Cargo.toml at line 63
  [4.1615]→[4.132:151](∅→∅),[4.151]→[4.24505:24529](∅→∅)
  − thrussh = "0.32.7"

  − thrussh-keys = "0.20.3"
  [4.1615]

  [4.1656]
  + thrussh = "0.33.2"

  + thrussh-keys = "0.21"
• edit in Cargo.nix at line 362
  [26.74787]

  [26.74787]
  + ];

  + features = {

  + "default" = [ "std" ];

  + };

  + resolvedDefaultFeatures = [ "default" "std" ];

  + };

  + "base64ct" = rec {

  + crateName = "base64ct";

  + version = "1.0.0";

  + edition = "2018";

  + sha256 = "1dbk04hir0vr17hxb80sg2x1751j96fz92hlmx3k3r7insv7zlnh";

  + authors = [

  + "RustCrypto Developers"

  + ];

  + features = {

  + "std" = [ "alloc" ];

  + };

  + };

  + "bcrypt-pbkdf" = rec {

  + crateName = "bcrypt-pbkdf";

  + version = "0.6.1";

  + edition = "2018";

  + sha256 = "1fa1xw5c06rdmvh7wycq8ff25ci6j3j1bcyvwnk87cgyhy71nqhj";

  + authors = [

  + "RustCrypto Developers"

  + ];

  + dependencies = [

  + {

  + name = "blowfish";

  + packageId = "blowfish";

  + features = [ "bcrypt" ];

  + }

  + {

  + name = "crypto-mac";

  + packageId = "crypto-mac 0.11.0";

  + }

  + {

  + name = "pbkdf2";

  + packageId = "pbkdf2";

  + usesDefaultFeatures = false;

  + }

  + {

  + name = "sha2";

  + packageId = "sha2";

  + usesDefaultFeatures = false;

  + }

  + {

  + name = "zeroize";

  + packageId = "zeroize";

  + usesDefaultFeatures = false;

  + }
• edit in Cargo.nix at line 527
  [3.3228]

  [3.3228]
  + ];

  +

  + };

  + "block-modes" = rec {

  + crateName = "block-modes";

  + version = "0.8.1";

  + edition = "2018";

  + sha256 = "13id7rw1lhi83i701za8w5is3a8qkf4vfigqw3f8jp8mxldkvc1c";

  + authors = [

  + "RustCrypto Developers"

  + ];

  + dependencies = [

  + {

  + name = "block-padding";

  + packageId = "block-padding";

  + }

  + {

  + name = "cipher";

  + packageId = "cipher";

  + }

  + ];

  + features = {

  + "default" = [ "std" ];

  + "std" = [ "alloc" ];

  + };

  + resolvedDefaultFeatures = [ "alloc" "default" "std" ];

  + };

  + "block-padding" = rec {

  + crateName = "block-padding";

  + version = "0.2.1";

  + edition = "2018";

  + sha256 = "1bickjlmfw9iv63dp781n589rfybw879mik1va59833m1hvnqscd";

  + authors = [

  + "RustCrypto Developers"
• edit in Cargo.nix at line 563
  [3.3240]

  [4.16436]
  + };

  + "blowfish" = rec {

  + crateName = "blowfish";

  + version = "0.8.0";

  + edition = "2018";

  + sha256 = "1ax736islxcbghc2lqq4vy7zn6qdigrls71lwg11m3743pyg6gzy";

  + authors = [

  + "RustCrypto Developers"

  + ];

  + dependencies = [

  + {

  + name = "byteorder";

  + packageId = "byteorder";

  + usesDefaultFeatures = false;

  + }

  + {

  + name = "cipher";

  + packageId = "cipher";

  + }

  + {

  + name = "opaque-debug";

  + packageId = "opaque-debug";

  + }

  + ];

  + devDependencies = [

  + {

  + name = "cipher";

  + packageId = "cipher";

  + features = [ "dev" ];

  + }

  + ];

  + features = {

  + };

  + resolvedDefaultFeatures = [ "bcrypt" ];
• edit in Cargo.nix at line 3600
  [4.93884]

  [4.93884]
  + "md5" = rec {

  + crateName = "md5";

  + version = "0.7.0";

  + edition = "2015";

  + sha256 = "0wcps37hrhz59fkhf8di1ppdnqld6l1w5sdy7jp7p51z0i4c8329";

  + authors = [

  + "Ivan Ukhov <ivan.ukhov@gmail.com>"

  + "Kamal Ahmad <shibe@openmailbox.org>"

  + "Konstantin Stepanov <milezv@gmail.com>"

  + "Lukas Kalbertodt <lukas.kalbertodt@gmail.com>"

  + "Nathan Musoke <nathan.musoke@gmail.com>"

  + "Scott Mabin <scott@mabez.dev>"

  + "Tony Arcieri <bascule@gmail.com>"

  + "Wim de With <register@dewith.io>"

  + "Yosef Dinerstein <yosefdi@gmail.com>"

  + ];

  + features = {

  + "default" = [ "std" ];

  + };

  + resolvedDefaultFeatures = [ "default" "std" ];

  + };
• edit in Cargo.nix at line 4269
  [4.114338]

  [27.506]
  + "password-hash" = rec {

  + crateName = "password-hash";

  + version = "0.2.1";

  + edition = "2018";

  + sha256 = "10i2jp5d3cng482baqrfwz01i0p981ianjmqffpc3lh5qblx99f1";

  + authors = [

  + "RustCrypto Developers"

  + ];

  + dependencies = [

  + {

  + name = "base64ct";

  + packageId = "base64ct";

  + }

  + {

  + name = "rand_core";

  + packageId = "rand_core 0.6.3";

  + optional = true;

  + usesDefaultFeatures = false;

  + }

  + {

  + name = "subtle";

  + packageId = "subtle";

  + usesDefaultFeatures = false;

  + }

  + ];

  + features = {

  + "alloc" = [ "base64ct/alloc" ];

  + "default" = [ "rand_core" ];

  + "std" = [ "alloc" "base64ct/std" ];

  + };

  + resolvedDefaultFeatures = [ "rand_core" ];

  + };
• edit in Cargo.nix at line 4321
  [3.21211]

  [3.21211]
  + name = "base64ct";

  + packageId = "base64ct";

  + optional = true;

  + usesDefaultFeatures = false;

  + }

  + {
• edit in Cargo.nix at line 4329
  [3.21289]

  [3.21289]
  + }

  + {

  + name = "hmac";

  + packageId = "hmac";

  + optional = true;

  + usesDefaultFeatures = false;

  + }

  + {

  + name = "password-hash";

  + packageId = "password-hash";

  + optional = true;

  + usesDefaultFeatures = false;

  + features = [ "rand_core" ];

  + }

  + {

  + name = "sha2";

  + packageId = "sha2";

  + optional = true;

  + usesDefaultFeatures = false;

  + }

  + ];

  + devDependencies = [

  + {

  + name = "hmac";

  + packageId = "hmac";

  + }

  + {

  + name = "sha2";

  + packageId = "sha2";
• edit in Cargo.nix at line 4366
  [3.21532]

  [27.769]
  + resolvedDefaultFeatures = [ "base64ct" "default" "hmac" "password-hash" "sha2" "simple" ];
• replacement in Cargo.nix at line 6306
  [4.161611]→[3.33777:33806](∅→∅)
  − version = "0.32.10";
  [4.161611]

  [4.161639]
  + version = "0.33.2";
• replacement in Cargo.nix at line 6308
  [4.161665]→[3.33807:33880](∅→∅)
  − sha256 = "0drcjk59y2h24c6ikvlp2z4w4mpg6alrgk4yk4pv36nd0vinc6yb";
  [4.161665]

  [4.161738]
  + sha256 = "0vmr3shp30mcnp5xmldnx59347wnal0zajqslvgbrbxxkc545g6b";
• edit in Cargo.nix at line 6326
  [4.162221]

  [4.162221]
  + name = "digest";

  + packageId = "digest";

  + }

  + {
• edit in Cargo.nix at line 6337
  [4.162402]

  [4.162402]
  + }

  + {

  + name = "generic-array";

  + packageId = "generic-array";
• replacement in Cargo.nix at line 6347
  [4.162507]→[4.162507:162572](∅→∅)
  − name = "openssl";

  − packageId = "openssl";
  [4.162507]

  [4.162572]
  + name = "rand";

  + packageId = "rand 0.8.4";

  + }

  + {

  + name = "sha2";

  + packageId = "sha2";
• replacement in Cargo.nix at line 6423
  [4.163485]→[3.33881:33909](∅→∅)
  − version = "0.20.6";
  [4.163485]

  [4.163513]
  + version = "0.21.0";
• replacement in Cargo.nix at line 6425
  [4.163539]→[3.33910:33983](∅→∅)
  − sha256 = "1xvmgvq2xrs1jlr4spc101fr7vhz7nsqqj2pc445amqc3lwd1gjn";
  [4.163539]

  [4.163612]
  + sha256 = "1azmv32m5jpxsflj4dq62i84mv2cavc354r8yy98vc9j54dcab57";
• edit in Cargo.nix at line 6431
  [4.163731]

  [4.163818]
  + name = "aes";

  + packageId = "aes";

  + features = [ "ctr" ];

  + }

  + {

  + name = "bcrypt-pbkdf";

  + packageId = "bcrypt-pbkdf";

  + }

  + {
• edit in Cargo.nix at line 6442
  [4.163883]

  [4.163883]
  + }

  + {

  + name = "block-modes";

  + packageId = "block-modes";
• edit in Cargo.nix at line 6466
  [4.164342]

  [4.164342]
  + }

  + {

  + name = "hmac";

  + packageId = "hmac";
• edit in Cargo.nix at line 6476
  [4.164447]

  [4.164447]
  + name = "md5";

  + packageId = "md5";

  + }

  + {
• replacement in Cargo.nix at line 6488
  [4.164639]→[4.164639:164704](∅→∅)
  − name = "openssl";

  − packageId = "openssl";
  [4.164639]

  [4.164704]
  + name = "pbkdf2";

  + packageId = "pbkdf2";

  + }

  + {

  + name = "rand";

  + packageId = "rand 0.8.4";
• edit in Cargo.nix at line 6504
  [4.164912]

  [4.164912]
  + name = "sha2";

  + packageId = "sha2";

  + }

  + {
• edit in Cargo.nix at line 6521
  [4.165273]

  [4.165273]
  + name = "tokio-stream";

  + packageId = "tokio-stream";

  + features = [ "net" ];

  + }

  + {
• edit in Cargo.nix at line 6766
  [4.172773]

  [4.172773]
  + "tokio-stream" = rec {

  + crateName = "tokio-stream";

  + version = "0.1.6";

  + edition = "2018";

  + sha256 = "0rj0k7s2qnchf6viif7flscaq3bjjb47lr297a2c0g6vdxq4v1pq";

  + authors = [

  + "Tokio Contributors <team@tokio.rs>"

  + ];

  + dependencies = [

  + {

  + name = "futures-core";

  + packageId = "futures-core";

  + }

  + {

  + name = "pin-project-lite";

  + packageId = "pin-project-lite";

  + }

  + {

  + name = "tokio";

  + packageId = "tokio";

  + features = [ "sync" ];

  + }

  + ];

  + devDependencies = [

  + {

  + name = "tokio";

  + packageId = "tokio";

  + features = [ "full" "test-util" ];

  + }

  + ];

  + features = {

  + "default" = [ "time" ];

  + "fs" = [ "tokio/fs" ];

  + "io-util" = [ "tokio/io-util" ];

  + "net" = [ "tokio/net" ];

  + "signal" = [ "tokio/signal" ];

  + "sync" = [ "tokio/sync" "tokio-util" ];

  + "time" = [ "tokio/time" ];

  + };

  + resolvedDefaultFeatures = [ "default" "net" "time" ];

  + };
• edit in Cargo.lock at line 103
  [28.290]

  [4.1032850]
  +

  + [[package]]

  + name = "base64ct"

  + version = "1.0.0"

  + source = "registry+https://github.com/rust-lang/crates.io-index"

  + checksum = "d0d27fb6b6f1e43147af148af49d49329413ba781aa0d5e10979831c210173b5"

  +

  + [[package]]

  + name = "bcrypt-pbkdf"

  + version = "0.6.1"

  + source = "registry+https://github.com/rust-lang/crates.io-index"

  + checksum = "12621b8e87feb183a6e5dbb315e49026b2229c4398797ee0ae2d1bc00aef41b9"

  + dependencies = [

  + "blowfish",

  + "crypto-mac 0.11.0",

  + "pbkdf2",

  + "sha2",

  + "zeroize",

  + ]
• edit in Cargo.lock at line 169
  [2.546]

  [2.546]
  + name = "block-modes"

  + version = "0.8.1"

  + source = "registry+https://github.com/rust-lang/crates.io-index"

  + checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e"

  + dependencies = [

  + "block-padding",

  + "cipher",

  + ]

  +

  + [[package]]

  + name = "block-padding"

  + version = "0.2.1"

  + source = "registry+https://github.com/rust-lang/crates.io-index"

  + checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"

  +

  + [[package]]

  + name = "blowfish"

  + version = "0.8.0"

  + source = "registry+https://github.com/rust-lang/crates.io-index"

  + checksum = "fe3ff3fc1de48c1ac2e3341c4df38b0d1bfb8fdf04632a187c8b75aaa319a7ab"

  + dependencies = [

  + "byteorder",

  + "cipher",

  + "opaque-debug",

  + ]

  +

  + [[package]]
• edit in Cargo.lock at line 1244
  [2.25684]

  [2.25684]
  + name = "md5"

  + version = "0.7.0"

  + source = "registry+https://github.com/rust-lang/crates.io-index"

  + checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"

  +

  + [[package]]
• edit in Cargo.lock at line 1496
  [2.32636]

  [2.32636]
  + name = "password-hash"

  + version = "0.2.1"

  + source = "registry+https://github.com/rust-lang/crates.io-index"

  + checksum = "c1a5d4e9c205d2c1ae73b84aab6240e98218c0e72e63b50422cfb2d1ca952282"

  + dependencies = [

  + "base64ct",

  + "rand_core 0.6.3",

  + "subtle",

  + ]

  +

  + [[package]]
• edit in Cargo.lock at line 1518
  [2.33024]

  [2.33024]
  + "base64ct",
• edit in Cargo.lock at line 1520
  [2.33046]

  [2.33046]
  + "hmac",

  + "password-hash",

  + "sha2",
• replacement in Cargo.lock at line 2210
  [2.49301]→[2.49301:49321](∅→∅)
  − version = "0.32.10"
  [2.49301]

  [2.49321]
  + version = "0.33.2"
• replacement in Cargo.lock at line 2212
  [2.49386]→[2.49386:49464](∅→∅)
  − checksum = "cb1b66e306cd9ab12f999ecc97a932ef56c2c91797ee190d23020a9fca942c37"
  [2.49386]

  [2.49464]
  + checksum = "cbbc420a9bbdafbcdea61a4bf50155961f3252e9b6d1dacbb5ac8271a11eb96e"
• edit in Cargo.lock at line 2217
  [2.49522]

  [2.49522]
  + "digest",
• edit in Cargo.lock at line 2220
  [2.49545]

  [2.49545]
  + "generic-array",
• replacement in Cargo.lock at line 2222
  [2.49553]→[2.49553:49565](∅→∅)
  − "openssl",
  [2.49553]

  [2.49565]
  + "rand 0.8.4",

  + "sha2",
• replacement in Cargo.lock at line 2246
  [2.49957]→[2.49957:49976](∅→∅)
  − version = "0.20.6"
  [2.49957]

  [2.49976]
  + version = "0.21.0"
• replacement in Cargo.lock at line 2248
  [2.50041]→[2.50041:50119](∅→∅)
  − checksum = "56bed0381d0c5755086157488cb53d1fee935d00815d4d329541e72ef07e75f7"
  [2.50041]

  [2.50119]
  + checksum = "a72cc51a2932b18d92f7289332d8564cec4a5014063722a9d3fdca52c5d8f5ab"
• edit in Cargo.lock at line 2250
  [2.50136]

  [2.50136]
  + "aes",

  + "bcrypt-pbkdf",
• edit in Cargo.lock at line 2253
  [2.50148]

  [2.50148]
  + "block-modes",
• edit in Cargo.lock at line 2259
  [2.50215]

  [2.50215]
  + "hmac",
• edit in Cargo.lock at line 2261
  [2.50223]

  [2.50223]
  + "md5",
• replacement in Cargo.lock at line 2264
  [2.50254]→[2.50254:50266](∅→∅)
  − "openssl",
  [2.50254]

  [2.50266]
  + "pbkdf2",

  + "rand 0.8.4",
• edit in Cargo.lock at line 2268
  [2.50293]

  [2.50293]
  + "sha2",
• edit in Cargo.lock at line 2272
  [2.50339]

  [2.50339]
  + "tokio-stream",
• edit in Cargo.lock at line 2351
  [2.52140]

  [2.52140]
  + "tokio",

  + ]

  +

  + [[package]]

  + name = "tokio-stream"

  + version = "0.1.6"

  + source = "registry+https://github.com/rust-lang/crates.io-index"

  + checksum = "f8864d706fdb3cc0843a49647ac892720dac98a6eeb818b77190592cf4994066"

  + dependencies = [

  + "futures-core",

  + "pin-project-lite",