shimun/wireguard-user
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

parse keys as hex
Some checks are pending
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
shimunn 2019-04-03 13:54:53 +02:00
parent e3815e3198
commit 88b68a1de9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wg-event-gen/src/controller.rs
View File

@ -1,5 +1,5 @@
use crate::model::{ use crate::model::{
Base64Backed, ECCKey, Interface, Peer, PeerBuilder, SharedKey, WireguardController, ECCKey, HexBackend, Interface, Peer, PeerBuilder, SharedKey, WireguardController,
}; };
use std::io::{BufRead, BufReader, Error, ErrorKind, Result, Write}; use std::io::{BufRead, BufReader, Error, ErrorKind, Result, Write};
use std::net::{IpAddr, SocketAddr}; use std::net::{IpAddr, SocketAddr};
@ -53,13 +53,13 @@ impl WireguardController for Userspace {
build_peer(&mut peer, builder); //TODO: handle possible actual error case build_peer(&mut peer, builder); //TODO: handle possible actual error case
} }
"public_key" => { "public_key" => {
add_key(&mut peer, parse_err(ECCKey::from_base64(value))?)?; add_key(&mut peer, parse_err(ECCKey::from_hex(value))?)?;
} }
"private_key" => { "private_key" => {
add_key(&mut peer, ECCKey::from_base64(value)?)?; add_key(&mut peer, ECCKey::from_hex(value)?)?;
} }
"preshared_key" => { "preshared_key" => {
builder.shared_key(Some(SharedKey::from_base64(value)?)); builder.shared_key(Some(SharedKey::from_hex(value)?));
} }
"endpoint" => { "endpoint" => {
builder.endpoint(Some(parse_err(value.parse::<SocketAddr>())?)); builder.endpoint(Some(parse_err(value.parse::<SocketAddr>())?));