Eugeny/thrussh - Change 2SFWWZ2RF742PDI3KLCCQ3CFK7E72I5MJLFNBSS2SVSRL5YOUJKAC

Rearm reading future on empty packet, and respond to server-initiated key re-exchange

Created by pmeunier on November 28, 2020

2SFWWZ2RF742PDI3KLCCQ3CFK7E72I5MJLFNBSS2SVSRL5YOUJKAC

Dependencies

In channels

main

Change contents

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

B:BD[3.219713] → [3.219713:220226]

                if buf.is_empty() {
                    continue
                }
                if buf[0] == crate::msg::DISCONNECT {
                    debug!("break");
                    break;
                } else if buf[0] <= 4 {
                    continue;
                }
                match reply(session, &mut handler, &buf[..]).await {
                    Ok(s) => session = s,
                    Err(e) => {
                        error!("{:?}", e);
                        return Err(e)

[3.219713]

[3.220226]

                if !buf.is_empty() {
                    if buf[0] == crate::msg::DISCONNECT {
                        debug!("break");
                        break;
                    } else if buf[0] > 4 {
                        match reply(session, &mut handler, &buf[..]).await {
                            Ok(s) => session = s,
                            Err(e) => {
                                error!("{:?}", e);
                                return Err(e)
                            }
                        }

Replacement in thrussh/src/client/mod.rs at line 859 [3.334998]

B:BD[3.359700] → [3.359700:359962]

                    if buf.is_empty() {
                        continue
                    }
                    if buf[0] == crate::msg::DISCONNECT {
                        break;
                    } else if buf[0] <= 4 {
                        continue;

[3.359700]

[3.359962]

                    if !buf.is_empty() {
                        if buf[0] == crate::msg::DISCONNECT {
                            break;
                        } else if buf[0] > 4 {
                            self = reply(self, &mut handler, &mut encrypted_signal, &buf[..]).await?;
                        }

Deletion in thrussh/src/client/mod.rs at line 866 [3.334998]

B:BD[3.359984] → [2.290:384]

                    self = reply(self, &mut handler, &mut encrypted_signal, &buf[..]).await?;

Insertion in thrussh/src/client/kex.rs at line 3 [3.381546]
[3.381592]
[3.381592]
```
use crate::negotiation;
```
Deletion in thrussh/src/client/kex.rs at line 5 [3.381546]
B:BD[3.381624] → [3.381624:381657]
```
use crate::{negotiation, Error};
```
Replacement in thrussh/src/client/kex.rs at line 17 [3.381546]
B:BD[3.381947] → [3.381947:381991]
```
        let algo = if self.algo.is_none() {
```
[3.381947]
[3.381991]
```
        let algo = {
```
Deletion in thrussh/src/client/kex.rs at line 22 [3.381546]
B:BD[3.382238] → [3.382238:382298]
```
        } else {
            return Err(Error::Kex.into());
```

Rearm reading future on empty packet, and respond to server-initiated key re-exchange

Dependencies

In channels

Change contents

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

Replacement in thrussh/src/client/mod.rs at line 859 [3.334998]

Deletion in thrussh/src/client/mod.rs at line 866 [3.334998]

Insertion in thrussh/src/client/kex.rs at line 3 [3.381546]

Deletion in thrussh/src/client/kex.rs at line 5 [3.381546]

Replacement in thrussh/src/client/kex.rs at line 17 [3.381546]

Deletion in thrussh/src/client/kex.rs at line 22 [3.381546]