YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-01 18:25:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

aquatic_ws: add setting for using tls; update TODO

Browse source
This commit is contained in:
Joakim Frostegård 2020-05-13 16:43:23 +02:00
parent 300aa85cbb
commit 6d06a43db8
5 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
aquatic_ws/src/lib/network/mod.rs
View file

@ -25,7 +25,6 @@ pub fn run_socket_worker(
socket_worker_index: usize,
in_message_sender: InMessageSender,
out_message_receiver: OutMessageReceiver,
use_tls: bool
){
let poll_timeout = Duration::from_millis(
config.network.poll_timeout_milliseconds
@ -39,7 +38,7 @@ pub fn run_socket_worker(
.register(&mut listener, Token(0), Interest::READABLE)
.unwrap();
let opt_tls_acceptor = if use_tls {
let opt_tls_acceptor = if config.network.use_tls {
Some(create_tls_acceptor(&config))
} else {
None

4
aquatic_ws/src/lib/network/utils.rs
View file

@ -40,14 +40,14 @@ pub fn create_tls_acceptor(
config: &Config,
) -> TlsAcceptor {
let mut identity_bytes = Vec::new();
let mut file = File::open(&config.network.pkcs12_path)
let mut file = File::open(&config.network.tls_pkcs12_path)
.expect("open pkcs12 file");
file.read_to_end(&mut identity_bytes).expect("read pkcs12 file");
let identity = Identity::from_pkcs12(
&mut identity_bytes,
&config.network.pkcs12_password
&config.network.tls_pkcs12_password
).expect("create pkcs12 identity");
let acceptor = TlsAcceptor::new(identity)