diff --git a/crates/ironrdp-acceptor/src/credssp.rs b/crates/ironrdp-acceptor/src/credssp.rs index f8aa233e..13adfe7f 100644 --- a/crates/ironrdp-acceptor/src/credssp.rs +++ b/crates/ironrdp-acceptor/src/credssp.rs @@ -33,10 +33,9 @@ impl PduHint for CredsspTsRequestHint { } #[derive(Debug)] -pub(crate) struct CredsspSequence<'a> { +pub struct CredsspSequence<'a> { server: CredSspServer>, state: CredsspState, - // selected_protocol: nego::SecurityProtocol, } #[derive(Debug)] @@ -66,7 +65,7 @@ impl CredentialsProxy for CredentialsProxyImpl<'_> { } impl<'a> CredsspSequence<'a> { - pub(crate) fn next_pdu_hint(&self) -> ConnectorResult> { + pub fn next_pdu_hint(&self) -> ConnectorResult> { match &self.state { CredsspState::Ongoing => Ok(Some(&CREDSSP_TS_REQUEST_HINT)), CredsspState::Finished => Ok(None), @@ -74,7 +73,7 @@ impl<'a> CredsspSequence<'a> { } } - pub(crate) fn init( + pub fn init( creds: &'a AuthIdentity, client_computer_name: ServerName, public_key: Vec, @@ -110,7 +109,7 @@ impl<'a> CredsspSequence<'a> { } /// Returns Some(ts_request) when a TS request is received from client, - pub(crate) fn decode_client_message(&mut self, input: &[u8]) -> ConnectorResult> { + pub fn decode_client_message(&mut self, input: &[u8]) -> ConnectorResult> { match self.state { CredsspState::Ongoing => { let message = TsRequest::from_buffer(input).map_err(|e| custom_err!("TsRequest", e))?; @@ -123,11 +122,11 @@ impl<'a> CredsspSequence<'a> { } } - pub(crate) fn process_ts_request(&mut self, request: TsRequest) -> Result> { + pub fn process_ts_request(&mut self, request: TsRequest) -> Result> { Ok(self.server.process(request)?) } - pub(crate) fn handle_process_result( + pub fn handle_process_result( &mut self, result: Result>, output: &mut WriteBuf, diff --git a/crates/ironrdp-acceptor/src/lib.rs b/crates/ironrdp-acceptor/src/lib.rs index e42566f3..8b0812a8 100644 --- a/crates/ironrdp-acceptor/src/lib.rs +++ b/crates/ironrdp-acceptor/src/lib.rs @@ -13,7 +13,7 @@ use ironrdp_core::WriteBuf; mod channel_connection; mod connection; -mod credssp; +pub mod credssp; mod finalization; mod util;