Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add more Secure Session tests #376

Merged
merged 9 commits into from
Feb 12, 2019
Merged

Add more Secure Session tests #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ee3e750
Reorder method declarations in SecureSessionTransport
ilammy Feb 12, 2019
626351b
Add Debug, Clone, Copy impls to SecureSessionState
ilammy Feb 12, 2019
1a22773
Add MockTransport for testing Secure Session
ilammy Feb 12, 2019
b32482d
Replace DummyTransport with MockTransport
ilammy Feb 12, 2019
c88ce8d
Replace ChannelTransport with MockTransport
ilammy Feb 12, 2019
f3952a8
Test reporting connection state in state_changed callback
ilammy Feb 12, 2019
e627831
Test failures in get_public_key_for_id
ilammy Feb 12, 2019
6e5ac79
Test failures in send/receive callbacks
ilammy Feb 12, 2019
9e70949
Test empty message handling
ilammy Feb 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/wrappers/themis/rust/src/secure_session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ struct SecureSessionContext {
/// [`get_public_key_for_id`]: trait.SecureSessionTransport.html#tymethod.get_public_key_for_id
#[allow(unused_variables)]
pub trait SecureSessionTransport {
/// Get a public key corresponding to a peer ID.
///
/// Return `None` if you are unable to find a corresponding public key.
fn get_public_key_for_id(&mut self, id: &[u8]) -> Option<EcdsaPublicKey>;

/// Send the provided data to the peer, return the number of bytes transferred.
///
/// This callback will be called when Secure Session needs to send some data to its peer.
Expand Down Expand Up @@ -97,11 +102,6 @@ pub trait SecureSessionTransport {
///
/// This method is truly optional and has no effect on Secure Session operation.
fn state_changed(&mut self, state: SecureSessionState) {}

/// Get a public key corresponding to a peer ID.
///
/// Return `None` if you are unable to find a corresponding public key.
fn get_public_key_for_id(&mut self, id: &[u8]) -> Option<EcdsaPublicKey>;
}

/// Transport layer error.
Expand Down Expand Up @@ -220,7 +220,7 @@ impl TransportError {
}

/// State of Secure Session connection.
#[derive(PartialEq, Eq)]
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum SecureSessionState {
/// Newly created sessions start in this state.
Idle,
Expand Down
Loading