pijul/thrussh - Change VJIXIN4TVZX2ZELE3H5PVZIO6JIG7JZ3UKEJC7TAUYLOPW6GOGOQC

Fixing CVE-2023-48795

Created by pmeunier on November 23, 2023

VJIXIN4TVZX2ZELE3H5PVZIO6JIG7JZ3UKEJC7TAUYLOPW6GOGOQC

Dependencies

In channels

main

Change contents

Insertion in thrussh/src/sshbuffer.rs at line 27 [5.165420]
[5.166325]
[5.166325]
```
    pub strict: bool,
```
Insertion in thrussh/src/sshbuffer.rs at line 37 [5.165420]
[5.166503]
[5.166503]
```
            strict: false,
```

Insertion in thrussh/src/session.rs at line 70 [5.171602]

[5.174049]

            if self.write_buffer.strict {
                self.write_buffer.seqn = Wrapping(0);
            }

Insertion in thrussh/src/session.rs at line 419 [5.171602]
[5.185762]
[5.185762]
```
    pub nonstrict_packets_received: bool,
```
Insertion in thrussh/src/session.rs at line 433 [5.171602]
[5.186086]
[5.186086]
```
            nonstrict_packets_received: false,
```
Insertion in thrussh/src/session.rs at line 448 [5.171602]
[5.186564]
[5.186564]
```
            nonstrict_packets_received: false,
```
Insertion in thrussh/src/server/mod.rs at line 619 [5.203388]
[5.223082]
[5.223082]
```
        nonstrict_packets_received: false,
```

Replacement in thrussh/src/server/mod.rs at line 646 [5.203388]

B:BD[5.223854] → [5.223854:223899]

            Some(Kex::KexInit(kexinit)) => {

[5.223854]

[5.223899]

            Some(Kex::KexInit(mut kexinit)) => {
                // Two cases: either we already know the algorithm,
                // meaning that this is a re-keying. Or we don't
                // meaning this is the initial KEXINIT packet.
                //
                // In all other cases, this is an error.

Insertion in thrussh/src/server/mod.rs at line 653 [5.203388]

[5.223969]

                    let nonstrict_received = kexinit.nonstrict_packets_received;

Replacement in thrussh/src/server/mod.rs at line 660 [5.203388]

B:BD[5.224254] → [5.224254:224294]

                    return Ok(session);

[5.224254]

[5.224294]

                    if session.common.write_buffer.strict && nonstrict_received {
                        return Err(Error::KexInit.into())
                    }

Replacement in thrussh/src/server/mod.rs at line 664 [5.203388]

B:BD[5.224319] → [5.224319:224496]

                    // Else, i.e. if the other side has not started
                    // the key exchange, process its packets by simple
                    // not returning.

[5.224319]

[5.224496]

                    kexinit.nonstrict_packets_received = true;

Deletion in thrussh/src/server/mod.rs at line 681 [5.203388]
∅:D[4.1352] → [5.224889:224925]
B:BD[5.224889] → [5.224889:224925]
```
                return Ok(session);
```
Deletion in thrussh/src/server/mod.rs at line 694 [5.203388]
B:BD[5.225404] → [5.225404:225440]
```
                return Ok(session);
```
Deletion in thrussh/src/server/mod.rs at line 697 [5.203388]
B:BD[5.225529] → [5.225529:225565]
```
                return Ok(session);
```
Insertion in thrussh/src/server/kex.rs at line 34 [5.225726]
[5.226766]
[5.226766]
```
            write_buffer.strict = algo.strict_kex;
```
Insertion in thrussh/src/negotiation.rs at line 36 [5.268386]
[4.1423]
[5.269535]
```
    pub strict_kex: bool,
```
Replacement in thrussh/src/negotiation.rs at line 57 [5.268386]
B:BD[3.15373] → [3.15373:15406]
```
        kex: &[kex::CURVE25519],
```
[3.15373]
[3.15406]
```
        kex: &[kex::CURVE25519, kex::STRICT],
```
Replacement in thrussh/src/negotiation.rs at line 71 [5.268386]
B:BD[3.15809] → [3.15809:15842]
```
        kex: &[kex::CURVE25519],
```
[3.15809]
[3.15842]
```
        kex: &[kex::CURVE25519, kex::STRICT],
```
Replacement in thrussh/src/negotiation.rs at line 80 [5.268386]
B:BD[5.270122] → [5.270122:270155]
```
        kex: &[kex::CURVE25519],
```
[5.270122]
[5.270155]
```
        kex: &[kex::CURVE25519, kex::STRICT],
```
Replacement in thrussh/src/negotiation.rs at line 89 [5.268386]
B:BD[6.260] → [6.260:293]
```
        kex: &[kex::CURVE25519],
```
[6.260]
[6.293]
```
        kex: &[kex::CURVE25519, kex::STRICT],
```
Replacement in thrussh/src/negotiation.rs at line 97 [5.268386]
B:BD[5.270416] → [5.270416:270449]
```
        kex: &[kex::CURVE25519],
```
[5.270416]
[3.16168]
```
        kex: &[kex::CURVE25519, kex::STRICT],
```

Insertion in thrussh/src/negotiation.rs at line 178 [5.268386]

[4.1623]

[5.272078]

        let client_supports_strict = Self::select(&[kex::STRICT], kex_string).is_some();
        let server_supports_strict = Self::select(&[kex::STRICT], kex_string).is_some();

Insertion in thrussh/src/negotiation.rs at line 243 [5.268386]

[4.1706]

[5.274587]

                    strict_kex: client_supports_strict && server_supports_strict

Insertion in thrussh/src/kex.rs at line 48 [5.306916]
[5.308346]
[4.1791]
```
pub const STRICT: Name = Name("kex-strict-c-v00@openssh.com");
```
Insertion in thrussh/src/client/mod.rs at line 1000 [5.334998]
[5.365830]
[5.365830]
```
            nonstrict_packets_received: false,
```
Replacement in thrussh/src/client/mod.rs at line 1114 [5.334998]
B:BD[5.369605] → [5.369605:369646]
```
        Some(Kex::KexInit(kexinit)) => {
```
[5.369605]
[5.369646]
```
        Some(Kex::KexInit(mut kexinit)) => {
```

Insertion in thrussh/src/client/mod.rs at line 1119 [5.334998]

[5.369794]

                let nonstrict_received = kexinit.nonstrict_packets_received;

Insertion in thrussh/src/client/mod.rs at line 1126 [5.334998]

[5.370070]

                if session.common.write_buffer.strict && nonstrict_received {
                    return Err(Error::KexInit.into())
                }

Insertion in thrussh/src/client/mod.rs at line 1130 [5.334998]

[5.370104]

            } else {
                kexinit.nonstrict_packets_received = true;
                session.common.kex = Some(Kex::KexInit(kexinit))

Insertion in thrussh/src/client/kex.rs at line 28 [5.381546]
[5.382499]
[5.382499]
```
        write_buffer.strict = algo.strict_kex;
```

Replacement in README.md at line 23 [5.441125]

∅:D[2.601] → [5.442203:442349]

B:BD[5.442203] → [5.442203:442349]

Thrussh has a full disclosure vulnerability policy.
Please do NOT attempt to report any security vulnerability in this code privately to anybody.

[2.601]

Thrussh has a responsible disclosure vulnerability policy. Please contact [contact@pijul.org](mailto:contact@pijul.org) if you have identified a security issue.

Fixing CVE-2023-48795

Dependencies

In channels

Change contents

Insertion in thrussh/src/sshbuffer.rs at line 27 [5.165420]

Insertion in thrussh/src/sshbuffer.rs at line 37 [5.165420]

Insertion in thrussh/src/session.rs at line 70 [5.171602]

Insertion in thrussh/src/session.rs at line 419 [5.171602]

Insertion in thrussh/src/session.rs at line 433 [5.171602]

Insertion in thrussh/src/session.rs at line 448 [5.171602]

Insertion in thrussh/src/server/mod.rs at line 619 [5.203388]

Replacement in thrussh/src/server/mod.rs at line 646 [5.203388]

Insertion in thrussh/src/server/mod.rs at line 653 [5.203388]

Replacement in thrussh/src/server/mod.rs at line 660 [5.203388]

Replacement in thrussh/src/server/mod.rs at line 664 [5.203388]

Deletion in thrussh/src/server/mod.rs at line 681 [5.203388]

Deletion in thrussh/src/server/mod.rs at line 694 [5.203388]

Deletion in thrussh/src/server/mod.rs at line 697 [5.203388]

Insertion in thrussh/src/server/kex.rs at line 34 [5.225726]

Insertion in thrussh/src/negotiation.rs at line 36 [5.268386]

Replacement in thrussh/src/negotiation.rs at line 57 [5.268386]

Replacement in thrussh/src/negotiation.rs at line 71 [5.268386]

Replacement in thrussh/src/negotiation.rs at line 80 [5.268386]

Replacement in thrussh/src/negotiation.rs at line 89 [5.268386]

Replacement in thrussh/src/negotiation.rs at line 97 [5.268386]

Insertion in thrussh/src/negotiation.rs at line 178 [5.268386]

Insertion in thrussh/src/negotiation.rs at line 243 [5.268386]

Insertion in thrussh/src/kex.rs at line 48 [5.306916]

Insertion in thrussh/src/client/mod.rs at line 1000 [5.334998]

Replacement in thrussh/src/client/mod.rs at line 1114 [5.334998]

Insertion in thrussh/src/client/mod.rs at line 1119 [5.334998]

Insertion in thrussh/src/client/mod.rs at line 1126 [5.334998]

Insertion in thrussh/src/client/mod.rs at line 1130 [5.334998]

Insertion in thrussh/src/client/kex.rs at line 28 [5.381546]

Replacement in README.md at line 23 [5.441125]