pijul/thrussh - Change XJ7D5MCK5RMZNJWOEOP5C3K57NQRMRRELFFTURV47RUKCA7BSRCQC

Rustfmt formatting (with 2021 edition)

Created by sunjith on April 19, 2022

XJ7D5MCK5RMZNJWOEOP5C3K57NQRMRRELFFTURV47RUKCA7BSRCQC

Dependencies

In discussions

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

Change contents

Deletion in thrussh-keys/src/pem.rs at line 1 [4.10525]

B:BD[4.10525] → [4.10526:10663]

use {Error, ErrorKind, KEYTYPE_ED25519, KEYTYPE_RSA, rsa_key_from_components};
use std;
use thrussh::encoding::Reader;
use thrussh::key;

Insertion in thrussh-keys/src/pem.rs at line 2 [4.10525]
[4.10690]
[4.10690]
```
use base64::{decode_config, MIME};
```
Replacement in thrussh-keys/src/pem.rs at line 4 [4.10525]
B:BD[4.10708] → [4.10708:10743]
```
use base64::{decode_config, MIME};
```
[4.10708]
[4.10743]
```
use ring;
```
Insertion in thrussh-keys/src/pem.rs at line 6 [4.10525]
[4.10764]
[4.10764]
```
use std;
use thrussh::encoding::Reader;
use thrussh::key;
```
Replacement in thrussh-keys/src/pem.rs at line 11 [4.10525]
B:BD[4.10790] → [4.10790:10800]
```
use ring;
```
[4.10790]
[4.10800]
```
use {rsa_key_from_components, Error, ErrorKind, KEYTYPE_ED25519, KEYTYPE_RSA};
```

Deletion in thrussh-keys/src/pem.rs at line 13 [4.10525]

B:BD[4.10801] → [4.10801:10907]

use openssl::symm::{encrypt, decrypt, Cipher, Mode, Crypter};
use openssl::hash::{MessageDigest, Hasher};

Replacement in thrussh-keys/src/pem.rs at line 14 [4.10525]
B:BD[4.10925] → [4.10925:10926]
[4.10925]
[4.10926]
```
use openssl::hash::{Hasher, MessageDigest};
use openssl::symm::{decrypt, encrypt, Cipher, Crypter, Mode};
```

Replacement in thrussh-keys/src/pem.rs at line 55 [4.10525]

B:BD[4.12611] → [4.12611:12786]

                reader.next().read_sequence(|reader| {
                    oid = Some(reader.next().read_oid()?);
                    Ok(())
                }).unwrap_or(());

[4.12611]

[4.12786]

                reader
                    .next()
                    .read_sequence(|reader| {
                        oid = Some(reader.next().read_oid()?);
                        Ok(())
                    })
                    .unwrap_or(());

Replacement in thrussh-keys/src/pem.rs at line 64 [4.10525]
B:BD[4.12824] → [4.12824:12850]
```
        }).unwrap_or(());
```
[4.12824]
[4.12850]
```
        })
        .unwrap_or(());
```

Replacement in thrussh-keys/src/pem.rs at line 71 [4.10525]

B:BD[4.12966] → [4.12966:13024]

            return Err(ErrorKind::CouldNotReadKey.into())

[4.12966]

[4.13024]

            return Err(ErrorKind::CouldNotReadKey.into());

Replacement in thrussh-keys/src/pem.rs at line 80 [4.10525]

B:BD[4.13407] → [4.13407:13522]

            Ok((key::Algorithm::Ed25519(keypair),
                super::KeyPairComponents::Ed25519(components)))

[4.13407]

[4.13522]

            Ok((
                key::Algorithm::Ed25519(keypair),
                super::KeyPairComponents::Ed25519(components),
            ))

Replacement in thrussh-keys/src/pem.rs at line 99 [4.10525]

B:BD[4.14211] → [4.14211:14356]

                super::KeyPairComponents::RSA(
                    super::RSAKeyPairComponents::from_components(&components),
                ),

[4.14211]

[4.14356]

                super::KeyPairComponents::RSA(super::RSAKeyPairComponents::from_components(
                    &components,
                )),

Deletion in thrussh-keys/src/pem.rs at line 129 [4.10525]
B:BD[4.15092] → [4.15092:15093]
Replacement in thrussh-keys/src/pem.rs at line 130 [4.10525]
B:BD[4.15130] → [4.15130:15179]
```
pub fn encode_pkcs8<R:ring::rand::SecureRandom>(
```
[4.15130]
[4.15179]
```
pub fn encode_pkcs8<R: ring::rand::SecureRandom>(
```
Replacement in thrussh-keys/src/pem.rs at line 134 [4.10525]
B:BD[4.15244] → [4.15244:15260]
```
    rounds: u32
```
[4.15244]
[4.15260]
```
    rounds: u32,
```
Deletion in thrussh-keys/src/pem.rs at line 137 [4.10525]
B:BD[4.15325] → [4.15325:15326]

Replacement in thrussh-keys/src/pem.rs at line 156 [4.10525]

B:BD[4.16126] → [4.16126:16209]

                    writer.next().write_oid(&ObjectIdentifier::from_slice(PBES2));

[4.16126]

[4.16209]

                    writer
                        .next()
                        .write_oid(&ObjectIdentifier::from_slice(PBES2));

Replacement in thrussh-keys/src/pem.rs at line 175 [4.10525]

B:BD[4.16715] → [4.16715:16791]

            writer.next().write_oid(&ObjectIdentifier::from_slice(PBKDF2));

[4.16715]

[4.16791]

            writer
                .next()
                .write_oid(&ObjectIdentifier::from_slice(PBKDF2));

Replacement in thrussh-keys/src/pem.rs at line 182 [4.10525]

B:BD[4.16946] → [4.16946:17025]

            writer.next().write_oid(&ObjectIdentifier::from_slice(AES256CBC));

[4.16946]

[4.17025]

            writer
                .next()
                .write_oid(&ObjectIdentifier::from_slice(AES256CBC));

Replacement in thrussh-keys/src/pem.rs at line 195 [4.10525]

B:BD[4.17331] → [4.17331:17412]

            writer.next().write_oid(&ObjectIdentifier::from_slice(HMAC_SHA256));

[4.17331]

[4.17412]

            writer
                .next()
                .write_oid(&ObjectIdentifier::from_slice(HMAC_SHA256));

Replacement in thrussh-keys/src/pem.rs at line 269 [4.10525]

B:BD[4.19149] → [4.19149:19280]

        let mut dec = decrypt(
            cipher,
            &key,
            Some(&iv[..]),
            ciphertext
        )?;

[4.19149]

[4.19280]

        let mut dec = decrypt(cipher, &key, Some(&iv[..]), ciphertext)?;

Replacement in thrussh-keys/src/pem.rs at line 306 [4.10525]

B:BD[4.20390] → [4.20390:20506]

        Ok(keygen.and_then(|keygen| {
            algorithm.map(|algo| Algorithms::Pbes2(keygen, algo))
        }))

[4.20390]

[4.20506]

        Ok(keygen.and_then(|keygen| algorithm.map(|algo| Algorithms::Pbes2(keygen, algo))))

Replacement in thrussh-keys/src/pem.rs at line 325 [4.10525]

B:BD[4.21148] → [4.21148:21301]

        Ok(digest.map(|digest| {
            KeyDerivation::Pbkdf2 {
                salt,
                rounds,
                digest,
            }

[4.21148]

[4.21301]

        Ok(digest.map(|digest| KeyDerivation::Pbkdf2 {
            salt,
            rounds,
            digest,

Deletion in thrussh-keys/src/pem.rs at line 340 [4.10525]
B:BD[4.21577] → [4.21577:21578]

Replacement in thrussh-keys/src/key.rs at line 205 [4.57451]

B:BD[3.3505] → [3.3505:3623]

∅:D[3.3623] → [4.63562:63576]

B:BD[4.63562] → [4.63562:63576]

            PublicKey::Ed25519(ref public) => {
                sodium::ed25519::verify_detached(sig, buffer, public)
            }

[3.3505]

[5.4892]

            PublicKey::Ed25519(ref public) => sodium::ed25519::verify_detached(sig, buffer, public),

Replacement in thrussh-keys/src/bcrypt_pbkdf.rs at line 11 [4.122723]
B:BD[4.123136] → [5.13391:13419]
```
use sha2::{Sha512, Digest};
```
[4.123136]
[4.123162]
```
use sha2::{Digest, Sha512};
```

Replacement in thrussh-keys/src/agent/client.rs at line 51 [4.139093]

B:BD[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,

Replacement in thrussh/src/server/session.rs at line 160 [4.188192]

B:BD[4.192816] → [3.9909:9948]

            ) && enc.rekey.is_none() {

[4.192816]

[3.9948]

            ) && enc.rekey.is_none()
            {

Deletion in thrussh/src/client/mod.rs at line 213 [4.334998]
B:BD[7.15617] → [2.0:1]

Replacement in cryptovec/src/lib.rs at line 237 [4.427990]

B:BD[4.434647] → [4.434647:434677]

B:BD[4.434677] → [3.14700:14753]

∅:D[3.14753] → [4.434742:434822]

B:BD[4.434742] → [4.434742:434822]

                libc::memset(
                    self.p.add(size) as *mut c_void,
                    0,
                    self.size - size,
                );

[4.434647]

[4.434822]

                libc::memset(self.p.add(size) as *mut c_void, 0, self.size - size);

Replacement in cryptovec/src/lib.rs at line 333 [4.427990]

B:BD[4.437909] → [4.437909:437925]

B:BD[4.437925] → [3.14959:15045]

        let s =
            unsafe { std::slice::from_raw_parts_mut(self.p.add(cur_size), n_bytes) };

[4.437909]

[4.438023]

        let s = unsafe { std::slice::from_raw_parts_mut(self.p.add(cur_size), n_bytes) };

Rustfmt formatting (with 2021 edition)

Dependencies

In discussions

Change contents

Deletion in thrussh-keys/src/pem.rs at line 1 [4.10525]

Insertion in thrussh-keys/src/pem.rs at line 2 [4.10525]

Replacement in thrussh-keys/src/pem.rs at line 4 [4.10525]

Insertion in thrussh-keys/src/pem.rs at line 6 [4.10525]

Replacement in thrussh-keys/src/pem.rs at line 11 [4.10525]

Deletion in thrussh-keys/src/pem.rs at line 13 [4.10525]

Replacement in thrussh-keys/src/pem.rs at line 14 [4.10525]

Replacement in thrussh-keys/src/pem.rs at line 55 [4.10525]

Replacement in thrussh-keys/src/pem.rs at line 64 [4.10525]

Replacement in thrussh-keys/src/pem.rs at line 71 [4.10525]

Replacement in thrussh-keys/src/pem.rs at line 80 [4.10525]

Replacement in thrussh-keys/src/pem.rs at line 99 [4.10525]

Deletion in thrussh-keys/src/pem.rs at line 129 [4.10525]

Replacement in thrussh-keys/src/pem.rs at line 130 [4.10525]

Replacement in thrussh-keys/src/pem.rs at line 134 [4.10525]

Deletion in thrussh-keys/src/pem.rs at line 137 [4.10525]