cargo fmt

Robin_Jadoul

Apr 11, 2023, 12:32 AM

TAOFQAIISOBF3NJ5BG72NRG5JSTIJN4X2QZXFPB75US6WTFSK7DQC

Dependencies

• [2] NLPZS76W Make AgentSigner::sign_request_signature return self on error
• [3] LZA3GTZA is_closed() in thrussh::client
• [4] G3FNNIIU Limiting the amount of messages that can be buffered while rekeying to two channel windows
• [5] 4XWMB23A
• [6] BITIYBKM Removing Cargo.lock (tokio 0.3)
• [7] ATOFE4ZX more detailed error message when SSH_AUTH_SOCK points to a bad location
• [8] MCS77Y4V Making OpenSSL optional
• [9] NHOSLQGG Thrussh: making OpenSSL optional
• [10] 7S7FHFDV Solving name conflicts
• [11] OQZGSEWM Buffering non-kex packets received after issuing a KEXINIT
• [12] 2WEO7OZL Version updates: getting rid of anyhow + moving to Tokio 1.0
• [13] F4WG4OHQ Solving conflicts introduced by an old format change
• [14] MFMCIUMJ Fixing authentication with RSA
• [15] HDEDMPBT Client example
• [16] FT67GGO4 Version bump (Pijul and Thrussh)
• [17] 2NUPA5PY include missing env var in error message
• [18] 7FRJYUI6 Reboot because of a bad change

Change contents

• file move: thrussh-libsodium (d--r------) → thrussh-libsodium (d--r------)
  [5.1]

  [6.20]
• file move: thrussh-keys (d--r------) → thrussh-keys (d--r------)
  [5.1]

  [6.5798]
• replacement in thrussh-keys/src/lib.rs at line 130
  [6.433]→[6.0:154](∅→∅)
  − #[error("Unable to connect to ssh-agent. The environment variable `SSH_AUTH_SOCK` \

  − was set, but it points to a nonexistent file or directory.")]
  [6.433]

  [6.154]
  + #[error(

  + "Unable to connect to ssh-agent. The environment variable `SSH_AUTH_SOCK` \

  + was set, but it points to a nonexistent file or directory."

  + )]
• replacement in thrussh-keys/src/key.rs at line 157
  [6.3613]→[6.3613:3723](∅→∅)
  − if key_algo != b"ssh-rsa" && key_algo != b"rsa-sha2-256" && key_algo != b"rsa-sha2-512" {
  [6.3613]

  [6.3723]
  + if key_algo != b"ssh-rsa"

  + && key_algo != b"rsa-sha2-256"

  + && key_algo != b"rsa-sha2-512"

  + {
• replacement in thrussh-keys/src/key.rs at line 225
  [6.64152]→[6.4933:4969](∅→∅)
  − use sha2::{Sha256, Digest};
  [6.64152]

  [6.4969]
  + use sha2::{Digest, Sha256};
• edit in thrussh-keys/src/key.rs at line 231
  [6.5107]→[6.0:1](∅→∅),[6.64234]→[6.0:1](∅→∅)
  −
• replacement in thrussh-keys/src/key.rs at line 245
  [6.5185]→[6.5185:5233](∅→∅),[6.5233]→[6.428:434](∅→∅),[6.428]→[6.428:434](∅→∅)
  − pub fn set_algorithm(&mut self, _: &[u8]) {

  − }
  [6.5185]

  [6.64234]
  + pub fn set_algorithm(&mut self, _: &[u8]) {}
• replacement in thrussh-keys/src/key.rs at line 304
  [6.65879]→[6.5349:5380](∅→∅)
  − .unwrap();
  [6.65879]

  [6.65906]
  + .unwrap();
• replacement in thrussh-keys/src/format/pkcs8.rs at line 102
  [6.75090]→[6.6323:6374](∅→∅),[6.6374]→[6.75145:75183](∅→∅),[6.75145]→[6.75145:75183](∅→∅),[6.75203]→[6.75203:75215](∅→∅)
  − Ok(digest.map(|()| KeyDerivation::Pbkdf2 {

  − salt,

  − rounds,

  − }))
  [6.75090]

  [6.75215]
  + Ok(digest.map(|()| KeyDerivation::Pbkdf2 { salt, rounds }))
• edit in thrussh-keys/src/format/pkcs8.rs at line 261
  [6.80875]→[6.80875:80912](∅→∅)
  − use yasna::models::ObjectIdentifier;
• edit in thrussh-keys/src/format/pkcs8.rs at line 264
  [6.6699]

  [6.6699]
  + use yasna::models::ObjectIdentifier;
• replacement in thrussh-keys/src/format/pkcs8.rs at line 376
  [6.84334]→[6.84334:84420](∅→∅),[6.84420]→[6.7244:7263](∅→∅)
  − KeyDerivation::Pbkdf2 {

  − ref salt,

  − rounds,

  − } => {
  [6.84334]

  [6.7263]
  + KeyDerivation::Pbkdf2 { ref salt, rounds } => {
• replacement in thrussh-keys/src/format/pkcs8.rs at line 379
  [6.7436]→[6.7436:7451](∅→∅)
  − },
  [6.7436]

  [6.84521]
  + }
• replacement in thrussh-keys/src/format/pkcs8.rs at line 426
  [6.7760]→[6.7760:7775](∅→∅)
  − },
  [6.7760]

  [6.7775]
  + }
• replacement in thrussh-keys/src/format/pkcs8.rs at line 433
  [6.8043]→[6.8043:8058](∅→∅)
  − },
  [6.8043]

  [6.8058]
  + }
• replacement in thrussh-keys/src/format/pkcs8.rs at line 439
  [6.85644]→[6.85644:85701](∅→∅),[6.85732]→[6.85732:85739](∅→∅)
  − Pbkdf2 {

  − salt: Vec<u8>,

  − rounds: u64,

  − },
  [6.85644]

  [6.85739]
  + Pbkdf2 { salt: Vec<u8>, rounds: u64 },
• replacement in thrussh-keys/src/agent/client.rs at line 51
  [6.217]→[6.217:356](∅→∅)
  − Err(Error::IO(io_err)) if io_err.kind() == std::io::ErrorKind::NotFound => Err(Error::BadAuthSock),

  − owise => owise
  [6.217]

  [6.356]
  + Err(Error::IO(io_err)) if io_err.kind() == std::io::ErrorKind::NotFound => {

  + Err(Error::BadAuthSock)

  + }

  + owise => owise,
• file move: thrussh-config (d--r------) → thrussh-config (d--r------)
  [5.1]

  [6.158258]
• file move: thrussh (d--r------) → thrussh (d--r------)
  [5.1]

  [6.165397]
• replacement in thrussh/src/server/encrypted.rs at line 30
  [6.231049]→[6.231049:231111](∅→∅)
  − pub(in crate) async fn server_read_encrypted<H: Handler>(
  [6.231049]

  [6.231111]
  + pub(crate) async fn server_read_encrypted<H: Handler>(
• replacement in thrussh/src/server/encrypted.rs at line 103
  [4.220]→[4.220:274](∅→∅)
  − return Err(Error::Pending.into())
  [4.220]

  [4.274]
  + return Err(Error::Pending.into());
• replacement in thrussh/src/server/encrypted.rs at line 111
  [6.652]→[6.652:667](∅→∅)
  − },
  [6.652]

  [6.233300]
  + }
• edit in thrussh/src/negotiation.rs at line 21
  [6.269161]

  [6.269180]
  + use rand::RngCore;
• edit in thrussh/src/negotiation.rs at line 24
  [6.269273]→[6.493:512](∅→∅)
  − use rand::RngCore;
• edit in thrussh/src/negotiation.rs at line 97
  [6.270951]

  [6.513]
  + #[cfg(not(feature = "openssl"))]

  + use thrussh_keys::key::ED25519;
• edit in thrussh/src/negotiation.rs at line 101
  [6.270994]→[6.542:609](∅→∅)
  − #[cfg(not(feature = "openssl"))]

  − use thrussh_keys::key::{ED25519};
• replacement in thrussh/src/lib.rs at line 309
  [6.742]→[6.742:849](∅→∅)
  − type Sha256Hash = generic_array::GenericArray<u8, <sha2::Sha256 as digest::FixedOutputDirty>::OutputSize>;
  [6.742]

  [6.849]
  + type Sha256Hash =

  + generic_array::GenericArray<u8, <sha2::Sha256 as digest::FixedOutputDirty>::OutputSize>;
• edit in thrussh/src/kex.rs at line 20
  [6.307643]

  [6.307656]
  + use rand::RngCore;
• edit in thrussh/src/kex.rs at line 24
  [6.307730]→[6.995:1014](∅→∅)
  − use rand::RngCore;
• replacement in thrussh/src/kex.rs at line 180
  [6.313028]→[6.1411:1463](∅→∅)
  − let hash = {
  [6.313028]

  [6.1463]
  + let hash = {
• edit in thrussh/src/client/mod.rs at line 213
  [6.15617]→[3.0:1](∅→∅)
  −
• replacement in thrussh/src/client/encrypted.rs at line 117
  [4.574]→[4.574:632](∅→∅)
  − return Err(Error::Pending.into())
  [4.574]

  [4.632]
  + return Err(Error::Pending.into());
• file move: shell.nix (----------) → shell.nix (----------)
  [5.1]

  [6.427539]
• file move: cryptovec (d--r------) → cryptovec (d--r------)
  [5.1]

  [6.427973]
• file move: README.md (----------) → README.md (----------)
  [5.1]

  [6.441125]
• file move: LICENSE-2.0.txt (---r------) → LICENSE-2.0.txt (---r------)
  [5.1]

  [6.442368]
• file move: Cargo.toml (----------) → Cargo.toml (----------)
  [5.1]

  [6.453741]