YGGverse/agate
1
0
Fork 0
mirror of https://github.com/YGGverse/agate.git synced 2026-04-08 20:45:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

resolve merge conflicts

Browse source
This commit is contained in:
Johann150 2021-02-09 19:52:29 +01:00
commit 9d9fb3d31b
No known key found for this signature in database
GPG key ID: 9EE6577A2A06F8F1
3 changed files with 67 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main.rs
View file

@ -74,6 +74,7 @@ struct Args {
silent: bool,
serve_secret: bool,
log_ips: bool,
only_tls13: bool,
}
fn args() -> Result<Args> {
@ -117,6 +118,11 @@ fn args() -> Result<Args> {
);
opts.optflag("s", "silent", "Disable logging output");
opts.optflag("h", "help", "Print this help menu");
opts.optflag(
"3",
"only-tls13",
"Only use TLSv1.3 (default also allows TLSv1.2)",
);
opts.optflag(
"",
"serve-secret",
@ -153,6 +159,7 @@ fn args() -> Result<Args> {
silent: matches.opt_present("s"),
serve_secret: matches.opt_present("serve-secret"),
log_ips: matches.opt_present("log-ip"),
only_tls13: matches.opt_present("only-tls13"),
})
}
@ -175,6 +182,9 @@ fn acceptor() -> Result<TlsAcceptor> {
let mut keys = pkcs8_private_keys(&mut BufReader::new(key_file)).or(Err("bad key"))?;
let mut config = ServerConfig::new(NoClientAuth::new());
if ARGS.only_tls13 {
config.versions = vec![rustls::ProtocolVersion::TLSv1_3];
}
config.set_single_cert(certs, keys.remove(0))?;
Ok(TlsAcceptor::from(Arc::new(config)))
}