pijul/thrussh - Change A65U4PLN44AD63EMBHB3KMPM2W7SXL246VTS2BCTH6KPWD2OM72QC

Update dependencies. Update edition to 2021. Improve tests.

Created by sunjith on March 10, 2022

A65U4PLN44AD63EMBHB3KMPM2W7SXL246VTS2BCTH6KPWD2OM72QC

Dependencies

In discussions

#73 PR: Update dependencies. Update edition to 2021. Improve tests.

Change contents

File move: thrussh-libsodium → thrussh-libsodium
BF:BFD[1.0] → [2.0:19]
BF:BF[2.19] → [5.20:20]
[4.1]
[5.20]
Replacement in thrussh-libsodium/Cargo.toml at line 10 [5.5310]
B:BD[5.5640] → [5.5640:5657]
```
edition = "2018"
```
[5.5640]
[5.5657]
```
edition = "2021"
```
File move: thrussh-keys → thrussh-keys
BF:BFD[1.0] → [2.48:62]
BF:BF[2.62] → [5.5798:5798]
[4.1]
[5.5798]

Replacement in thrussh-keys/src/lib.rs at line 121 [5.21590]

B:BD[6.952] → [6.952:1030]

    #[error(transparent)]
    BlockMode(#[from] block_modes::BlockModeError),

[6.952]

[6.1030]

    #[error("Block mode error")]
    BlockMode,

Replacement in thrussh-keys/src/lib.rs at line 130 [5.21590]

B:BD[7.433] → [8.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.")]

[7.433]

[8.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."
    )]

Insertion in thrussh-keys/src/lib.rs at line 135 [5.21590]

[8.171]

[9.29]

    #[error("Cipher: Invalid nonce length")]
    InvalidKeyIvLength,
    #[error("Cipher: Unpadding failed")]
    UnpadError,
    #[error("Cipher: Padding failed")]
    PadError,

Insertion in thrussh-keys/src/lib.rs at line 146 [5.21590]

[9.139]

    }
}
impl From<aes::cipher::InvalidLength> for Error {
    fn from(_err: aes::cipher::InvalidLength) -> Self {
        Error::InvalidKeyIvLength
    }
}
impl From<aes::cipher::block_padding::UnpadError> for Error {
    fn from(_err: aes::cipher::block_padding::UnpadError) -> Self {
        Error::UnpadError

Insertion in thrussh-keys/src/lib.rs at line 158 [5.21590]

[5.27376]

impl From<aes::cipher::inout::PadError> for Error {
    fn from(_err: aes::cipher::inout::PadError) -> Self {
        Error::PadError
    }
}

Replacement in thrussh-keys/src/lib.rs at line 170 [5.21590]

B:BD[5.27563] → [5.27563:27639]

/// thrussh_keys::load_public_key("/home/pe/.ssh/id_ed25519.pub").unwrap();

[5.27563]

[5.27639]

/// use std::env;
/// let home_dir = env::var("HOME").unwrap_or_else(|_| "/home/pe".to_string());
/// let key_file = format!("{}/.ssh/id_ed25519.pub", home_dir);
/// thrussh_keys::load_public_key(key_file).unwrap();

Replacement in thrussh-keys/src/lib.rs at line 318 [5.21590]
B:BD[5.32131] → [5.32131:32159]
```
        file.write(b"\n")?;
```
[5.32131]
[5.32159]
```
        file.write_all(b"\n")?;
```
Replacement in thrussh-keys/src/lib.rs at line 326 [5.21590]
B:BD[5.32334] → [5.32334:32358]
```
    file.write(b"\n")?;
```
[5.32334]
[5.32358]
```
    file.write_all(b"\n")?;
```

Replacement in thrussh-keys/src/lib.rs at line 513 [5.21590]

B:BD[5.39296] → [5.39296:39644]

            f.write(b"[localhost]:13265 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJdD7y3aLq454yWBdwLWbieU1ebz9/cu7/QEXn9OIeZJ\n#pijul.org,37.120.161.53 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA6rWI3G2sz07DnfFlrouTcysQlj2P+jpNSOEWD9OJ3X\npijul.org,37.120.161.53 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA6rWI3G1sz07DnfFlrouTcysQlj2P+jpNSOEWD9OJ3X\n").unwrap();

[5.39296]

[5.39644]

            f.write_all(b"[localhost]:13265 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJdD7y3aLq454yWBdwLWbieU1ebz9/cu7/QEXn9OIeZJ\n#pijul.org,37.120.161.53 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA6rWI3G2sz07DnfFlrouTcysQlj2P+jpNSOEWD9OJ3X\npijul.org,37.120.161.53 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA6rWI3G1sz07DnfFlrouTcysQlj2P+jpNSOEWD9OJ3X\n").unwrap();

Replacement in thrussh-keys/src/format/pkcs8.rs at line 102 [5.71340]
B:BD[5.75090] → [6.6323:6374]
∅:D[6.6374] → [5.75145:75183]
B:BD[5.75145] → [5.75145:75183]
B:BD[5.75203] → [5.75203:75215]
```
        Ok(digest.map(|()| KeyDerivation::Pbkdf2 {
            salt,
            rounds,
        }))
```
[5.75090]
[5.75215]
```
        Ok(digest.map(|()| KeyDerivation::Pbkdf2 { salt, rounds }))
```
Insertion in thrussh-keys/src/format/pkcs8.rs at line 261 [5.71340]
[5.80842]
[5.80875]
```
use aes::{Aes128, Aes256};
```

Deletion in thrussh-keys/src/format/pkcs8.rs at line 263 [5.71340]

B:BD[5.80912] → [6.6616:6807]

use aes::*;
use block_modes::block_padding::NoPadding;
use block_modes::BlockMode;
type Aes128Cbc = block_modes::Cbc<Aes128, NoPadding>;
type Aes256Cbc = block_modes::Cbc<Aes256, NoPadding>;

Deletion in thrussh-keys/src/format/pkcs8.rs at line 283 [5.71340]
B:BD[5.81555] → [6.7014:7075]
```
    let c = Aes256Cbc::new_from_slices(&dkey, &iv).unwrap();
```

Replacement in thrussh-keys/src/format/pkcs8.rs at line 284 [5.71340]

B:BD[6.7104] → [6.7104:7147]

    c.encrypt(&mut plaintext, n).unwrap();

[6.7104]

[5.81639]

    super::cbc_encrypt::<Aes256>(&mut plaintext, n, &dkey, &iv).unwrap();

Replacement in thrussh-keys/src/format/pkcs8.rs at line 371 [5.71340]

B:BD[5.84334] → [5.84334:84420]

B:BD[5.84420] → [6.7244:7263]

            KeyDerivation::Pbkdf2 {
                ref salt,
                rounds,
            } => {

[5.84334]

[6.7263]

            KeyDerivation::Pbkdf2 { ref salt, rounds } => {

Replacement in thrussh-keys/src/format/pkcs8.rs at line 374 [5.71340]
B:BD[6.7436] → [6.7436:7451]
```
            },
```
[6.7436]
[5.84521]
```
            }
```
Deletion in thrussh-keys/src/format/pkcs8.rs at line 416 [5.71340]
B:BD[6.7539] → [6.7539:7609]
```
                let c = Aes128Cbc::new_from_slices(key, iv).unwrap();
```

Replacement in thrussh-keys/src/format/pkcs8.rs at line 417 [5.71340]

B:BD[6.7660] → [6.7660:7698]

                c.decrypt(&mut dec)?;

[6.7660]

[6.7698]

                super::cbc_decrypt::<Aes128>(&mut dec, key, iv).unwrap();

Replacement in thrussh-keys/src/format/pkcs8.rs at line 420 [5.71340]
B:BD[6.7760] → [6.7760:7775]
```
            },
```
[6.7760]
[6.7775]
```
            }
```
Deletion in thrussh-keys/src/format/pkcs8.rs at line 422 [5.71340]
B:BD[6.7822] → [6.7822:7892]
```
                let c = Aes256Cbc::new_from_slices(key, iv).unwrap();
```

Replacement in thrussh-keys/src/format/pkcs8.rs at line 423 [5.71340]

B:BD[6.7943] → [6.7943:7981]

                c.decrypt(&mut dec)?;

[6.7943]

[6.7981]

                super::cbc_decrypt::<Aes256>(&mut dec, key, iv).unwrap();

Replacement in thrussh-keys/src/format/pkcs8.rs at line 426 [5.71340]
B:BD[6.8043] → [6.8043:8058]
```
            },
```
[6.8043]
[6.8058]
```
            }
```
Replacement in thrussh-keys/src/format/pkcs8.rs at line 432 [5.71340]
B:BD[5.85644] → [5.85644:85701]
B:BD[5.85732] → [5.85732:85739]
```
    Pbkdf2 {
        salt: Vec<u8>,
        rounds: u64,
    },
```
[5.85644]
[5.85739]
```
    Pbkdf2 { salt: Vec<u8>, rounds: u64 },
```

Replacement in thrussh-keys/src/format/pkcs5.rs at line 5 [5.85753]

B:BD[5.85838] → [6.8107:8244]

use aes::*;
use block_modes::block_padding::NoPadding;
use block_modes::BlockMode;
type Aes128Cbc = block_modes::Cbc<Aes128, NoPadding>;

[5.85838]

[5.85920]

use aes::Aes128;

Deletion in thrussh-keys/src/format/pkcs5.rs at line 23 [5.85753]

B:BD[6.8473] → [6.8473:8551]

                let c = Aes128Cbc::new_from_slices(&md5.0, &iv[..]).unwrap();

Replacement in thrussh-keys/src/format/pkcs5.rs at line 24 [5.85753]

B:BD[6.8598] → [6.8598:8644]

                c.decrypt(&mut dec).unwrap();

[6.8598]

[5.86566]

                super::cbc_decrypt::<Aes128>(&mut dec, &md5.0, &iv[..]).unwrap();

Replacement in thrussh-keys/src/format/openssh.rs at line 83 [5.86809]

B:BD[5.90173] → [6.10473:10636]

use aes::*;
use block_modes::block_padding::NoPadding;
type Aes128Cbc = block_modes::Cbc<Aes128, NoPadding>;
type Aes256Cbc = block_modes::Cbc<Aes256, NoPadding>;

[5.90173]

[6.10636]

use aes::{
    cipher::{KeyIvInit, StreamCipher},
    Aes128, Aes256,
};
use ctr::Ctr128BE;
type Aes128Ctr = Ctr128BE<Aes128>;
type Aes256Ctr = Ctr128BE<Aes256>;

Deletion in thrussh-keys/src/format/openssh.rs at line 127 [5.86809]

B:BD[6.11056] → [6.11056:11144]

        use aes::cipher::{NewCipher, StreamCipher};
        use block_modes::BlockMode;

Replacement in thrussh-keys/src/format/openssh.rs at line 129 [5.86809]

B:BD[6.11202] → [6.11202:11334]

                let cipher = Aes128Cbc::new_from_slices(key, iv).unwrap();
                let n = cipher.decrypt(&mut dec)?.len();

[6.11202]

[6.11334]

                let n = super::cbc_decrypt::<Aes128>(&mut dec, key, iv)?;

Replacement in thrussh-keys/src/format/openssh.rs at line 133 [5.86809]

B:BD[6.11411] → [6.11411:11543]

                let cipher = Aes256Cbc::new_from_slices(key, iv).unwrap();
                let n = cipher.decrypt(&mut dec)?.len();

[6.11411]

[6.11543]

                let n = super::cbc_decrypt::<Aes256>(&mut dec, key, iv)?;

Insertion in thrussh-keys/src/format/mod.rs at line 12 [5.92032]

[5.92192]


use aes::cipher::{
    block_padding::NoPadding, BlockCipher, BlockDecryptMut, BlockEncryptMut, KeyInit, KeyIvInit,
};
use cbc::{Decryptor as CbcDecryptor, Encryptor as CbcEncryptor};

Insertion in thrussh-keys/src/format/mod.rs at line 153 [5.92032]

[5.96052]


fn cbc_encrypt<C>(dest: &mut [u8], len: usize, key: &[u8], iv: &[u8]) -> Result<usize, Error>
where
    C: BlockCipher + BlockEncryptMut + KeyInit,
{
    Ok(CbcEncryptor::<C>::new_from_slices(key, iv)?
        .encrypt_padded_mut::<NoPadding>(dest, len)?
        .len())
}
fn cbc_decrypt<C>(dest: &mut [u8], key: &[u8], iv: &[u8]) -> Result<usize, Error>
where
    C: BlockCipher + BlockDecryptMut + KeyInit,
{
    Ok(CbcDecryptor::<C>::new_from_slices(key, iv)?
        .decrypt_padded_mut::<NoPadding>(dest)?
        .len())
}

Replacement in thrussh-keys/Cargo.toml at line 4 [5.157024]
∅:D[3.19] → [5.157076:157093]
∅:D[10.19] → [5.157076:157093]
∅:D[11.19] → [5.157076:157093]
∅:D[12.19] → [5.157076:157093]
∅:D[13.19] → [5.157076:157093]
∅:D[14.119] → [5.157076:157093]
∅:D[9.165] → [5.157076:157093]
∅:D[15.184] → [5.157076:157093]
∅:D[16.292] → [5.157076:157093]
∅:D[17.454] → [5.157076:157093]
∅:D[7.4463] → [5.157076:157093]
B:BD[5.157076] → [5.157076:157093]
```
edition = "2018"
```
[3.19]
[5.157093]
```
edition = "2021"
```

Replacement in thrussh-keys/Cargo.toml at line 38 [5.157024]

B:BD[5.157924] → [9.255:325]

yasna = { version = "0.4.0", features = [ "bit-vec", "num-bigint" ] }

[5.157924]

[9.325]

yasna = { version = "0.5.0", features = [ "bit-vec", "num-bigint" ] }

Replacement in thrussh-keys/Cargo.toml at line 45 [5.157024]
B:BD[5.158129] → [7.4647:4660]
```
dirs = "3.0"
```
[5.158129]
[5.158142]
```
dirs = "4.0"
```
Replacement in thrussh-keys/Cargo.toml at line 49 [5.157024]
B:BD[6.14059] → [6.14059:14101]
```
sha2 = "0.9"
pbkdf2 = "0.8"
hmac = "0.11"
```
[6.14059]
[6.14101]
```
sha2 = "0.10"
pbkdf2 = "0.10"
hmac = "0.12"
```

Replacement in thrussh-keys/Cargo.toml at line 53 [5.157024]

B:BD[6.14114] → [6.14114:14203]

block-modes = "0.8"
aes = { version = "0.7", features = [ "ctr" ] }
bcrypt-pbkdf = "0.6"

[6.14114]

[3.20]

aes =  "0.8"
cbc = { version = "0.1", features = ["zeroize"] }
ctr = { version = "0.9", features = ["zeroize"] }
bcrypt-pbkdf = "0.8"

Replacement in thrussh-keys/Cargo.toml at line 60 [5.157024]
B:BD[5.158207] → [9.345:364]
```
env_logger = "0.8"
```
[5.158207]
[5.158226]
```
env_logger = "0.9"
```
File move: thrussh-config → thrussh-config
BF:BFD[1.0] → [16.293:309]
BF:BF[16.309] → [5.158258:158258]
[4.1]
[5.158258]
Replacement in thrussh-config/Cargo.toml at line 10 [5.164787]
B:BD[5.165184] → [5.165184:165201]
```
edition = "2018"
```
[5.165184]
[5.165201]
```
edition = "2021"
```
File move: thrussh → thrussh
BF:BFD[1.0] → [16.368:377]
BF:BF[16.377] → [5.165397:165397]
[4.1]
[5.165397]

Replacement in thrussh/src/lib.rs at line 309 [5.278640]

B:BD[18.742] → [18.742:849]

type Sha256Hash = generic_array::GenericArray<u8, <sha2::Sha256 as digest::FixedOutputDirty>::OutputSize>;

[18.742]

[18.849]

type Sha256Hash =
    generic_array::GenericArray<u8, <sha2::Sha256 as digest::OutputSizeUser>::OutputSize>;

Replacement in thrussh/examples/remote_shell_call.rs at line 4 [19.23]
B:BD[19.84] → [19.84:121]
```
use thrussh::*;
use thrussh_keys::*;
```
[19.84]
[19.121]
```
use thrussh::{client, Disconnect};
use thrussh_keys::{agent, key};
```

Deletion in thrussh/examples/client.rs at line 1 [20.24]

B:BD[20.24] → [20.25:141]

extern crate env_logger;
extern crate futures;
extern crate thrussh;
extern crate thrussh_keys;
extern crate tokio;

Replacement in thrussh/examples/client.rs at line 3 [20.24]
B:BD[20.182] → [20.182:219]
```
use thrussh::*;
use thrussh_keys::*;
```
[20.182]
[20.219]
```
use thrussh::{client, Disconnect};
use thrussh_keys::key;
```
Replacement in thrussh/Cargo.toml at line 39 [5.426118]
B:BD[5.426966] → [5.426966:426983]
```
edition = "2018"
```
[5.426966]
[5.426983]
```
edition = "2021"
```
Replacement in thrussh/Cargo.toml at line 57 [5.426118]
B:BD[18.1939] → [18.1939:1952]
```
sha2 = "0.9"
```
[18.1939]
[18.1952]
```
sha2 = "0.10"
```
Replacement in thrussh/Cargo.toml at line 59 [5.426118]
B:BD[18.1975] → [18.1975:1990]
```
digest = "0.9"
```
[18.1975]
[5.427375]
```
digest = "0.10"
```
Replacement in thrussh/Cargo.toml at line 62 [5.426118]
B:BD[5.427395] → [5.427395:427414]
```
env_logger = "0.7"
```
[5.427395]
[7.24391]
```
env_logger = "0.9"
```
File move: shell.nix → shell.nix
BF:BFD[1.0] → [16.831:842]
BF:BF[16.842] → [5.427539:427539]
[4.1]
[5.427539]
File move: cryptovec → cryptovec
BF:BFD[1.0] → [16.843:854]
BF:BF[16.854] → [5.427973:427973]
[4.1]
[5.427973]
Replacement in cryptovec/src/lib.rs at line 403 [5.427990]
B:BD[5.439904] → [5.439904:439944]
```
    /// CryptoVec::from_slice(b"test");
```
[5.439904]
[5.439944]
```
    /// cryptovec::CryptoVec::from_slice(b"test");
```
File move: README.md → README.md
BF:BFD[1.0] → [16.883:894]
BF:BF[16.894] → [5.441125:441125]
[4.1]
[5.441125]
File move: LICENSE-2.0.txt → LICENSE-2.0.txt
BF:BFD[1.0] → [16.895:912]
BF:BF[16.912] → [5.442368:442368]
[4.1]
[5.442368]
File move: Cargo.toml → Cargo.toml
BF:BFD[1.0] → [16.913:925]
BF:BF[16.925] → [5.453741:453741]
[4.1]
[5.453741]

Update dependencies. Update edition to 2021. Improve tests.

Dependencies

In discussions

Change contents

File move: thrussh-libsodium → thrussh-libsodium

Replacement in thrussh-libsodium/Cargo.toml at line 10 [5.5310]

File move: thrussh-keys → thrussh-keys

Replacement in thrussh-keys/src/lib.rs at line 121 [5.21590]

Replacement in thrussh-keys/src/lib.rs at line 130 [5.21590]

Insertion in thrussh-keys/src/lib.rs at line 135 [5.21590]

Insertion in thrussh-keys/src/lib.rs at line 146 [5.21590]

Insertion in thrussh-keys/src/lib.rs at line 158 [5.21590]

Replacement in thrussh-keys/src/lib.rs at line 170 [5.21590]

Replacement in thrussh-keys/src/lib.rs at line 318 [5.21590]

Replacement in thrussh-keys/src/lib.rs at line 326 [5.21590]

Replacement in thrussh-keys/src/lib.rs at line 513 [5.21590]

Replacement in thrussh-keys/src/format/pkcs8.rs at line 102 [5.71340]

Insertion in thrussh-keys/src/format/pkcs8.rs at line 261 [5.71340]

Deletion in thrussh-keys/src/format/pkcs8.rs at line 263 [5.71340]

Deletion in thrussh-keys/src/format/pkcs8.rs at line 283 [5.71340]

Replacement in thrussh-keys/src/format/pkcs8.rs at line 284 [5.71340]

Replacement in thrussh-keys/src/format/pkcs8.rs at line 371 [5.71340]

Replacement in thrussh-keys/src/format/pkcs8.rs at line 374 [5.71340]

Deletion in thrussh-keys/src/format/pkcs8.rs at line 416 [5.71340]

Replacement in thrussh-keys/src/format/pkcs8.rs at line 417 [5.71340]

Replacement in thrussh-keys/src/format/pkcs8.rs at line 420 [5.71340]

Deletion in thrussh-keys/src/format/pkcs8.rs at line 422 [5.71340]

Replacement in thrussh-keys/src/format/pkcs8.rs at line 423 [5.71340]

Replacement in thrussh-keys/src/format/pkcs8.rs at line 426 [5.71340]

Replacement in thrussh-keys/src/format/pkcs8.rs at line 432 [5.71340]

Replacement in thrussh-keys/src/format/pkcs5.rs at line 5 [5.85753]

Deletion in thrussh-keys/src/format/pkcs5.rs at line 23 [5.85753]

Replacement in thrussh-keys/src/format/pkcs5.rs at line 24 [5.85753]

Replacement in thrussh-keys/src/format/openssh.rs at line 83 [5.86809]

Deletion in thrussh-keys/src/format/openssh.rs at line 127 [5.86809]

Replacement in thrussh-keys/src/format/openssh.rs at line 129 [5.86809]

Replacement in thrussh-keys/src/format/openssh.rs at line 133 [5.86809]

Insertion in thrussh-keys/src/format/mod.rs at line 12 [5.92032]

Insertion in thrussh-keys/src/format/mod.rs at line 153 [5.92032]

Replacement in thrussh-keys/Cargo.toml at line 4 [5.157024]

Replacement in thrussh-keys/Cargo.toml at line 38 [5.157024]

Replacement in thrussh-keys/Cargo.toml at line 45 [5.157024]

Replacement in thrussh-keys/Cargo.toml at line 49 [5.157024]

Replacement in thrussh-keys/Cargo.toml at line 53 [5.157024]

Replacement in thrussh-keys/Cargo.toml at line 60 [5.157024]

File move: thrussh-config → thrussh-config

Replacement in thrussh-config/Cargo.toml at line 10 [5.164787]

File move: thrussh → thrussh

Replacement in thrussh/src/lib.rs at line 309 [5.278640]

Replacement in thrussh/examples/remote_shell_call.rs at line 4 [19.23]

Deletion in thrussh/examples/client.rs at line 1 [20.24]

Replacement in thrussh/examples/client.rs at line 3 [20.24]

Replacement in thrussh/Cargo.toml at line 39 [5.426118]

Replacement in thrussh/Cargo.toml at line 57 [5.426118]

Replacement in thrussh/Cargo.toml at line 59 [5.426118]

Replacement in thrussh/Cargo.toml at line 62 [5.426118]

File move: shell.nix → shell.nix

File move: cryptovec → cryptovec

Replacement in cryptovec/src/lib.rs at line 403 [5.427990]

File move: README.md → README.md

File move: LICENSE-2.0.txt → LICENSE-2.0.txt

File move: Cargo.toml → Cargo.toml