Robin_Jadoul/testing - Change NHOSLQGG4CIWBE7VKL5MB7PSY3RZ5IVDFENMGZG6X755GGZ6B3VQC

Thrussh: making OpenSSL optional

Created by pmeunier on June 22, 2021

NHOSLQGG4CIWBE7VKL5MB7PSY3RZ5IVDFENMGZG6X755GGZ6B3VQC

Dependencies

In channels

main

Change contents

Deletion in thrussh/src/session.rs at line 21 [3.171602]
B:BD[3.172404] → [3.172404:172423]
```
use openssl::hash;
```
Replacement in thrussh/src/session.rs at line 35 [3.171602]
B:BD[3.172810] → [3.172810:172849]
```
    pub session_id: hash::DigestBytes,
```
[3.172810]
[3.172849]
```
    pub session_id: crate::Sha256Hash,
```
Replacement in thrussh/src/session.rs at line 405 [3.171602]
B:BD[3.185695] → [3.185695:185742]
```
    pub session_id: Option<hash::DigestBytes>,
```
[3.185695]
[3.185742]
```
    pub session_id: Option<crate::Sha256Hash>,
```
Replacement in thrussh/src/session.rs at line 413 [3.171602]
B:BD[3.185863] → [3.185863:185903]
```
        session_id: &hash::DigestBytes,
```
[3.185863]
[3.185903]
```
        session_id: &crate::Sha256Hash,
```

Replacement in thrussh/src/session.rs at line 428 [3.171602]

B:BD[3.186322] → [3.186322:186404]

    pub fn initiate_rekey(ex: Exchange, session_id: &hash::DigestBytes) -> Self {

[3.186322]

[3.186404]

    pub fn initiate_rekey(ex: Exchange, session_id: &crate::Sha256Hash) -> Self {

Replacement in thrussh/src/session.rs at line 448 [3.171602]
B:BD[3.186921] → [3.186921:186968]
```
    pub session_id: Option<hash::DigestBytes>,
```
[3.186921]
[3.186968]
```
    pub session_id: Option<crate::Sha256Hash>,
```
Replacement in thrussh/src/session.rs at line 456 [3.171602]
B:BD[3.187088] → [3.187088:187135]
```
    pub session_id: Option<hash::DigestBytes>,
```
[3.187088]
[3.187135]
```
    pub session_id: Option<crate::Sha256Hash>,
```
Replacement in thrussh/src/session.rs at line 463 [3.171602]
B:BD[3.187229] → [3.187229:187262]
```
        hash: hash::DigestBytes,
```
[3.187229]
[3.187262]
```
        hash: crate::Sha256Hash,
```
Replacement in thrussh/src/session.rs at line 495 [3.171602]
B:BD[3.188083] → [3.188083:188122]
```
    pub session_id: hash::DigestBytes,
```
[3.188083]
[3.188122]
```
    pub session_id: crate::Sha256Hash,
```
Replacement in thrussh/src/server/mod.rs at line 574 [3.203388]
B:BD[4.5860] → [2.14214:14258]
```
2            .map_err(crate::Error::from)?;
```
[4.5860]
[3.222121]
```
            .map_err(crate::Error::from)?;
```

Replacement in thrussh/src/server/kex.rs at line 93 [3.225726]

B:BD[3.228752] → [4.6145:6236]

            let hash: Result<openssl::hash::DigestBytes, Error> = HASH_BUF.with(|buffer| {

[3.228752]

[3.228851]

            let hash: Result<_, Error> = HASH_BUF.with(|buffer| {

Deletion in thrussh/src/negotiation.rs at line 21 [3.268386]
B:BD[3.269161] → [3.269161:269180]
```
use openssl::rand;
```
Insertion in thrussh/src/negotiation.rs at line 23 [3.268386]
[3.269273]
[3.269273]
```
use rand::RngCore;
```
Insertion in thrussh/src/negotiation.rs at line 87 [3.268386]
[3.270951]
[3.270951]
```
#[cfg(feature = "openssl")]
```
Insertion in thrussh/src/negotiation.rs at line 89 [3.268386]
[3.270994]
[3.270994]
```
#[cfg(not(feature = "openssl"))]
use thrussh_keys::key::{ED25519};
```
Insertion in thrussh/src/negotiation.rs at line 96 [3.268386]
[3.271129]
[3.271129]
```
            #[cfg(feature = "openssl")]
```
Insertion in thrussh/src/negotiation.rs at line 106 [3.268386]
[3.271331]
[3.271331]
```
            #[cfg(feature = "openssl")]
```
Replacement in thrussh/src/negotiation.rs at line 234 [3.268386]
B:BD[3.275820] → [3.275820:275856]
```
    rand::rand_bytes(&mut cookie)?;
```
[3.275820]
[3.275856]
```
    rand::thread_rng().fill_bytes(&mut cookie);
```

Insertion in thrussh/src/lib.rs at line 308 [3.278640]

[3.290483]


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

Insertion in thrussh/src/lib.rs at line 428 [3.278640]
[4.13542]
[4.13542]
```
    #[cfg(feature = "openssl")]
```
Insertion in thrussh/src/key.rs at line 32 [3.304500]
[3.305632]
[3.305632]
```
            #[cfg(feature = "openssl")]
```
Insertion in thrussh/src/key.rs at line 55 [3.304500]
[3.306491]
[3.306491]
```
            #[cfg(feature = "openssl")]
```
Insertion in thrussh/src/kex.rs at line 20 [3.306916]
[3.307643]
[3.307643]
```
#[cfg(feature = "openssl")]
```
Insertion in thrussh/src/kex.rs at line 25 [3.306916]
[3.307730]
[3.307730]
```
use rand::RngCore;
```
Deletion in thrussh/src/kex.rs at line 78 [3.306916]
B:BD[3.309232] → [3.309232:309262]
```
        use openssl::rand::*;
```

Replacement in thrussh/src/kex.rs at line 80 [3.306916]

B:BD[3.309346] → [3.309346:309389]

        rand_bytes(&mut server_secret.0)?;

[3.309346]

[3.309389]

        rand::thread_rng().fill_bytes(&mut server_secret.0);

Deletion in thrussh/src/kex.rs at line 99 [3.306916]
∅:D[4.14749] → [3.309936:309966]
B:BD[3.309936] → [3.309936:309966]
```
        use openssl::rand::*;
```

Replacement in thrussh/src/kex.rs at line 101 [3.306916]

B:BD[3.310050] → [3.310050:310093]

        rand_bytes(&mut client_secret.0)?;

[3.310050]

[3.310093]

        rand::thread_rng().fill_bytes(&mut client_secret.0);

Replacement in thrussh/src/kex.rs at line 133 [3.306916]

B:BD[3.311080] → [4.14848:14908]

    ) -> Result<openssl::hash::DigestBytes, crate::Error> {

[3.311080]

[3.311141]

    ) -> Result<crate::Sha256Hash, crate::Error> {

Replacement in thrussh/src/kex.rs at line 148 [3.306916]

B:BD[3.311729] → [3.311729:311942]

        use openssl::hash::*;
        let hash = {
            let mut hasher = Hasher::new(MessageDigest::sha256())?;
            hasher.update(&buffer)?;
            hasher.finish()?
        };
        Ok(hash)

[3.311729]

[3.311942]


        use sha2::Digest;
        let mut hasher = sha2::Sha256::new();
        hasher.update(&buffer);
        Ok(hasher.finalize())

Replacement in thrussh/src/kex.rs at line 157 [3.306916]

B:BD[3.311989] → [3.311989:312090]

        session_id: &openssl::hash::DigestBytes,
        exchange_hash: &openssl::hash::DigestBytes,

[3.311989]

[3.312090]

        session_id: &crate::Sha256Hash,
        exchange_hash: &crate::Sha256Hash,

Replacement in thrussh/src/kex.rs at line 182 [3.306916]

B:BD[3.313028] → [3.313028:313273]

                    use openssl::hash::*;
                    let hash = {
                        let mut hasher = Hasher::new(MessageDigest::sha256())?;
                        hasher.update(&buffer)?;
                        hasher.finish()?

[3.313028]

[3.313273]

                    let hash =                    {
                        use sha2::Digest;
                        let mut hasher = sha2::Sha256::new();
                        hasher.update(&buffer[..]);
                        hasher.finalize()

Replacement in thrussh/src/kex.rs at line 199 [3.306916]

B:BD[3.313768] → [3.313768:313950]

                            let mut hasher = Hasher::new(MessageDigest::sha256())?;
                            hasher.update(&buffer)?;
                            hasher.finish()?

[3.313768]

[3.313950]

                            use sha2::Digest;
                            let mut hasher = sha2::Sha256::new();
                            hasher.update(&buffer[..]);
                            hasher.finalize()

Replacement in thrussh/Cargo.toml at line 49 [3.426118]
∅:D[5.64] → [3.427105:427122]
∅:D[6.830] → [3.427105:427122]
∅:D[7.1708] → [3.427105:427122]
∅:D[4.24283] → [3.427105:427122]
B:BD[3.427105] → [3.427105:427122]
```
openssl = "0.10"
```
[6.830]
[3.427122]
```
openssl = { version = "0.10", optional = true }
```
Insertion in thrussh/Cargo.toml at line 56 [3.426118]
[3.427375]
[3.427375]
```
rand = "0.8"
sha2 = "0.9"
generic-array = "0.14"
digest = "0.9"
```

Thrussh: making OpenSSL optional

Dependencies

In channels

Change contents

Deletion in thrussh/src/session.rs at line 21 [3.171602]

Replacement in thrussh/src/session.rs at line 35 [3.171602]

Replacement in thrussh/src/session.rs at line 405 [3.171602]

Replacement in thrussh/src/session.rs at line 413 [3.171602]

Replacement in thrussh/src/session.rs at line 428 [3.171602]

Replacement in thrussh/src/session.rs at line 448 [3.171602]

Replacement in thrussh/src/session.rs at line 456 [3.171602]

Replacement in thrussh/src/session.rs at line 463 [3.171602]

Replacement in thrussh/src/session.rs at line 495 [3.171602]

Replacement in thrussh/src/server/mod.rs at line 574 [3.203388]

Replacement in thrussh/src/server/kex.rs at line 93 [3.225726]

Deletion in thrussh/src/negotiation.rs at line 21 [3.268386]

Insertion in thrussh/src/negotiation.rs at line 23 [3.268386]

Insertion in thrussh/src/negotiation.rs at line 87 [3.268386]

Insertion in thrussh/src/negotiation.rs at line 89 [3.268386]

Insertion in thrussh/src/negotiation.rs at line 96 [3.268386]

Insertion in thrussh/src/negotiation.rs at line 106 [3.268386]

Replacement in thrussh/src/negotiation.rs at line 234 [3.268386]

Insertion in thrussh/src/lib.rs at line 308 [3.278640]

Insertion in thrussh/src/lib.rs at line 428 [3.278640]

Insertion in thrussh/src/key.rs at line 32 [3.304500]

Insertion in thrussh/src/key.rs at line 55 [3.304500]

Insertion in thrussh/src/kex.rs at line 20 [3.306916]

Insertion in thrussh/src/kex.rs at line 25 [3.306916]

Deletion in thrussh/src/kex.rs at line 78 [3.306916]