pijul/thrussh - Change 3CA4JK7LKRMO4AQ3VOTNTOBQDCGAFYLO6MFQEZYKK6DSIOMJE5KAC

Move PubKey trait to thrussh-keys. The trait is used by thrussh but seems like a better fit to live in thrussh-keys, being closer to the types it's working on.

Created by fintohaps on August 9, 2021

3CA4JK7LKRMO4AQ3VOTNTOBQDCGAFYLO6MFQEZYKK6DSIOMJE5KAC

Dependencies

In discussions

#45 Migrate PubKey trait to thrussh-keys

Change contents

Insertion in thrussh-keys/src/key.rs at line 462 [3.57451]

[3.71318]


#[doc(hidden)]
pub trait PubKey {
    fn push_to(&self, buffer: &mut CryptoVec);
}
impl PubKey for PublicKey {
    fn push_to(&self, buffer: &mut CryptoVec) {
        match self {
            &PublicKey::Ed25519(ref public) => {
                buffer.push_u32_be((ED25519.0.len() + public.key.len() + 8) as u32);
                buffer.extend_ssh_string(ED25519.0.as_bytes());
                buffer.extend_ssh_string(&public.key);
            }
            #[cfg(feature = "openssl")]
            &PublicKey::RSA { ref key, .. } => {
                use crate::encoding::mpint_len;
                let rsa = key.0.rsa().unwrap();
                let e = rsa.e().to_vec();
                let n = rsa.n().to_vec();
                buffer.push_u32_be((4 + SSH_RSA.0.len() + mpint_len(&n) + mpint_len(&e)) as u32);
                buffer.extend_ssh_string(SSH_RSA.0.as_bytes());
                buffer.extend_ssh_mpint(&e);
                buffer.extend_ssh_mpint(&n);
            }
        }
    }
}
impl PubKey for KeyPair {
    fn push_to(&self, buffer: &mut CryptoVec) {
        match self {
            &KeyPair::Ed25519(ref key) => {
                let public = &key.key[32..];
                buffer.push_u32_be((ED25519.0.len() + public.len() + 8) as u32);
                buffer.extend_ssh_string(ED25519.0.as_bytes());
                buffer.extend_ssh_string(public);
            }
            #[cfg(feature = "openssl")]
            &KeyPair::RSA { ref key, .. } => {
                use crate::encoding::mpint_len;
                let e = key.e().to_vec();
                let n = key.n().to_vec();
                buffer.push_u32_be((4 + SSH_RSA.0.len() + mpint_len(&n) + mpint_len(&e)) as u32);
                buffer.extend_ssh_string(SSH_RSA.0.as_bytes());
                buffer.extend_ssh_mpint(&e);
                buffer.extend_ssh_mpint(&n);
            }
        }
    }
}

Deletion in thrussh/src/server/kex.rs at line 3 [3.225726]
B:BD[3.225772] → [3.225772:225796]
```
use crate::key::PubKey;
```
Insertion in thrussh/src/server/kex.rs at line 7 [3.225726]
[3.225936]
[3.225936]
```
use thrussh_keys::key::PubKey;
```
Deletion in thrussh/src/lib.rs at line 285 [3.278640]
B:BD[3.289959] → [3.289959:289968]
```
mod key;
```

Deletion in thrussh/src/key.rs at line 1 [3.304500]

B:BD[3.304500] → [3.304501:305632]

B:BD[3.305632] → [2.884:924]

∅:D[2.924] → [3.305632:306491]

B:BD[3.305632] → [3.305632:306491]

B:BD[3.306491] → [2.925:965]

∅:D[2.965] → [3.306491:306906]

B:BD[3.306491] → [3.306491:306906]

// Copyright 2016 Pierre-Étienne Meunier
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
use cryptovec::CryptoVec;
use thrussh_keys::encoding::*;
use thrussh_keys::key::*;
#[doc(hidden)]
pub trait PubKey {
    fn push_to(&self, buffer: &mut CryptoVec);
}
impl PubKey for PublicKey {
    fn push_to(&self, buffer: &mut CryptoVec) {
        match self {
            &PublicKey::Ed25519(ref public) => {
                buffer.push_u32_be((ED25519.0.len() + public.key.len() + 8) as u32);
                buffer.extend_ssh_string(ED25519.0.as_bytes());
                buffer.extend_ssh_string(&public.key);
            }
            #[cfg(feature = "openssl")]
            &PublicKey::RSA { ref key, .. } => {
                let rsa = key.0.rsa().unwrap();
                let e = rsa.e().to_vec();
                let n = rsa.n().to_vec();
                buffer.push_u32_be((4 + SSH_RSA.0.len() + mpint_len(&n) + mpint_len(&e)) as u32);
                buffer.extend_ssh_string(SSH_RSA.0.as_bytes());
                buffer.extend_ssh_mpint(&e);
                buffer.extend_ssh_mpint(&n);
            }
        }
    }
}
impl PubKey for KeyPair {
    fn push_to(&self, buffer: &mut CryptoVec) {
        match self {
            &KeyPair::Ed25519(ref key) => {
                let public = &key.key[32..];
                buffer.push_u32_be((ED25519.0.len() + public.len() + 8) as u32);
                buffer.extend_ssh_string(ED25519.0.as_bytes());
                buffer.extend_ssh_string(public);
            }
            #[cfg(feature = "openssl")]
            &KeyPair::RSA { ref key, .. } => {
                let e = key.e().to_vec();
                let n = key.n().to_vec();
                buffer.push_u32_be((4 + SSH_RSA.0.len() + mpint_len(&n) + mpint_len(&e)) as u32);
                buffer.extend_ssh_string(SSH_RSA.0.as_bytes());
                buffer.extend_ssh_mpint(&e);
                buffer.extend_ssh_mpint(&n);
            }
        }
    }
}

Replacement in thrussh/src/kex.rs at line 15 [3.306916]
B:BD[3.307516] → [3.307516:307547]
```
use crate::{cipher, key, msg};
```
[3.307516]
[3.307547]
```
use crate::{cipher, msg};
```
Insertion in thrussh/src/kex.rs at line 20 [3.306916]
[3.307643]
[3.307656]
```
use rand::RngCore;
```
Replacement in thrussh/src/kex.rs at line 24 [3.306916]
B:BD[3.307730] → [2.995:1014]
```
use rand::RngCore;
```
[3.307730]
[3.307730]
```
use thrussh_keys::key;
```
Deletion in thrussh/src/client/encrypted.rs at line 17 [3.383877]
B:BD[3.384519] → [3.384519:384543]
```
use crate::key::PubKey;
```
Insertion in thrussh/src/client/encrypted.rs at line 26 [3.383877]
[3.384823]
[3.384823]
```
use thrussh_keys::key::PubKey;
```

Move PubKey trait to thrussh-keys. The trait is used by thrussh but seems like a better fit to live in thrussh-keys, being closer to the types it's working on.

Dependencies

In discussions

Change contents

Insertion in thrussh-keys/src/key.rs at line 462 [3.57451]

Deletion in thrussh/src/server/kex.rs at line 3 [3.225726]

Insertion in thrussh/src/server/kex.rs at line 7 [3.225726]

Deletion in thrussh/src/lib.rs at line 285 [3.278640]

Deletion in thrussh/src/key.rs at line 1 [3.304500]

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

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

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

Deletion in thrussh/src/client/encrypted.rs at line 17 [3.383877]

Insertion in thrussh/src/client/encrypted.rs at line 26 [3.383877]