5 files changed, 10 insertions, 14 deletions
diff --git a/oxish/src/bin/oxish-server.rs b/oxish/src/bin/oxish-server.rs
index 321d064..a88995e 100644
--- a/oxish/src/bin/oxish-server.rs
+++ b/oxish/src/bin/oxish-server.rs
@@ -13,7 +13,7 @@ use clap::Parser;
 use listenfd::ListenFd;
 use oxish::{Config, DEFAULT_PROVIDER, DefaultStore, Server};
 use proto::{
-    key_exchange::HostKeys,
+    HostKeys,
     named::{Named, PublicKeyAlgorithm},
 };
 use tokio::net::TcpListener;
diff --git a/oxish/src/lib.rs b/oxish/src/lib.rs
index 8e389a6..cf453fe 100644
--- a/oxish/src/lib.rs
+++ b/oxish/src/lib.rs
@@ -13,15 +13,15 @@ use std::{io, str, task::ready};
 
 use anyhow::Context as _;
 use proto::{
-    Completion, Decode, Decoded, Encode, Identification, IdentificationError, Ignore,
-    IncomingPacket, PROTOCOL, ProtoError, ReadState, WriteState,
+    Completion, Decode, Decoded, Encode, HostKeys, Identification, IdentificationError, Ignore,
+    IncomingPacket, PROTOCOL, ProtoError, ReadState, ServerHostKey, SessionHostKey, WriteState,
     crypto::{
         CryptoError, CryptoProvider, Digest, HandshakeBuffer, HandshakeHash, KeyLengths,
         KeySourceSide,
     },
     key_exchange::{
-        EcdhKeyExchangeInit, HostKeys, Identities, KeyExchange, KeyExchangeOutput, KeySourceSet,
-        NewKeys, Rekey, ServerHostKey, SessionHostKey, StrictKeyExchange,
+        EcdhKeyExchangeInit, Identities, KeyExchange, KeyExchangeOutput, KeySourceSet, NewKeys,
+        Rekey, StrictKeyExchange,
     },
     named::{EncryptionAlgorithm, ExtensionId},
 };
diff --git a/oxish/src/server.rs b/oxish/src/server.rs
index 30f62f2..7a08e04 100644
--- a/oxish/src/server.rs
+++ b/oxish/src/server.rs
@@ -18,11 +18,7 @@ use std::{
 };
 
 use anyhow::Context as _;
-use proto::{
-    Encode, ReadState, WriteState,
-    crypto::CryptoProvider,
-    key_exchange::{HostKeys, ServerHostKey},
-};
+use proto::{Encode, HostKeys, ReadState, ServerHostKey, WriteState, crypto::CryptoProvider};
 use rustix::net::{
     RecvAncillaryBuffer, RecvFlags, SendAncillaryBuffer, SendAncillaryMessage, SendFlags,
 };
diff --git a/oxish/src/session/mod.rs b/oxish/src/session/mod.rs
index 26a1899..1fdd95c 100644
--- a/oxish/src/session/mod.rs
+++ b/oxish/src/session/mod.rs
@@ -10,10 +10,10 @@ use std::{
 };
 
 use proto::{
-    Decoded, Disconnect, Encoder, MessageType, Pretty, ReadState, WriteState,
+    Decoded, Disconnect, Encoder, MessageType, Pretty, ReadState, SessionHostKey, WriteState,
     channels::{ChannelRequest, ChannelRequestType},
     crypto::CryptoProvider,
-    key_exchange::{Rekey, SessionHostKey},
+    key_exchange::Rekey,
 };
 use rustix::net::{RecvAncillaryBuffer, RecvAncillaryMessage, RecvFlags, SendFlags};
 use tokio::{
diff --git a/oxish/src/tests.rs b/oxish/src/tests.rs
index 4926b92..3470b97 100644
--- a/oxish/src/tests.rs
+++ b/oxish/src/tests.rs
@@ -3,10 +3,10 @@ use std::{env, fs, panic::resume_unwind, path::Path, path::PathBuf, process::Std
 
 use anyhow::Context;
 use proto::{
-    Decoded, Encode,
+    Decoded, Encode, HostKeys, ServerHostKey,
     auth::AuthorizedKey,
     crypto::{CryptoProvider, Digest, KeySourceSide},
-    key_exchange::{HostKeys, Identities, ServerHostKey},
+    key_exchange::Identities,
     named::{EncryptionAlgorithm, PublicKeyAlgorithm},
 };
 use tempfile::TempDir;