diff options
| author |   Jake McGinty <me@jake.su> | 2018-02-20 15:24:33 +0000 |
|---|---|---|
| committer | Jake McGinty <me@jake.su> | 2018-02-20 15:24:33 +0000 |
| commit | effbde2f6c8500eac9aed1c9b943329456a46224 (patch) | |
| tree | 3deb09106ecb1d596e0105c714a5ecb072f95528 /src/noise.rs | |
| parent | bump mio-utun (diff) | |
| download | wireguard-rs-effbde2f6c8500eac9aed1c9b943329456a46224.tar.xz wireguard-rs-effbde2f6c8500eac9aed1c9b943329456a46224.zip | |
use Failure crate in snow, get rid of nasty sync adaptors
Diffstat (limited to 'src/noise.rs')
| -rw-r--r-- | src/noise.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/noise.rs b/src/noise.rs index c8ef182..c88d135 100644 --- a/src/noise.rs +++ b/src/noise.rs @@ -14,15 +14,13 @@ fn new_foundation(local_privkey: &[u8]) -> NoiseBuilder { } pub fn build_initiator(local_privkey: &[u8], remote_pubkey: &[u8], psk: &Option<[u8; 32]>) -> Result<Session, Error> { - Ok(new_foundation(local_privkey) + new_foundation(local_privkey) .remote_public_key(remote_pubkey) .psk(2, psk.as_ref().unwrap_or_else(|| &[0u8; 32])) .build_initiator() - .map_err(SyncFailure::new)?) } pub fn build_responder(local_privkey: &[u8]) -> Result<Session, Error> { - Ok(new_foundation(local_privkey) + new_foundation(local_privkey) .build_responder() - .map_err(SyncFailure::new)?) } |