Compare commits

...

140 Commits

Author SHA1 Message Date
aa7a18d1eb Update Rust crate env_logger to 0.10.1 2023-12-14 00:17:48 +00:00
62fd095171 Merge pull request 'Update Rust crate futures to 0.3.29' () from renovate/futures-0.x into master
Reviewed-on: 
2023-12-13 08:46:24 +00:00
7c5e82d9de Merge pull request 'Update Rust crate actix to 0.13.1' () from renovate/actix-0.x into master
Reviewed-on: 
2023-12-13 08:46:08 +00:00
a73a87b636 Merge pull request 'Update Rust crate rustls-pemfile to 1.0.4' () from renovate/rustls-pemfile-1.x into master
Reviewed-on: 
2023-12-13 08:45:47 +00:00
edfce0a15e Merge pull request 'Update Rust crate clap to 4.4.0' () from renovate/clap-4.x into master
Reviewed-on: 
2023-12-13 08:45:32 +00:00
41e6e43da9 Merge pull request 'Update Rust crate mktemp to 0.5.1' () from renovate/mktemp-0.x into master
Reviewed-on: 
2023-12-13 08:45:15 +00:00
301ee29e95 Update Rust crate rustls-pemfile to 1.0.4 2023-11-10 00:38:16 +00:00
50c88074f8 Update Rust crate futures to 0.3.29 2023-10-27 00:32:09 +00:00
965c235169 Update Rust crate webpki to 0.22.4 2023-10-10 00:08:40 +00:00
863a835e9a Update Rust crate webpki to 0.22.2 2023-10-01 00:07:31 +00:00
6310d8a55f Update Rust crate mktemp to 0.5.1 2023-09-09 00:31:04 +00:00
b6b196f2fb Update Rust crate webpki to 0.22.1 2023-08-31 00:31:56 +00:00
f1d31d0496 Update Rust crate actix to 0.13.1 2023-08-31 00:31:46 +00:00
db1f3fccad Update Rust crate actix-tls to 3.1.1 2023-08-30 00:30:52 +00:00
16803df507 Update Rust crate actix-tls to 3.1.0 2023-08-27 00:37:03 +00:00
781e5860af Update Rust crate clap to 4.4.0 2023-08-26 00:35:59 +00:00
e0c29e8aa8 Update Rust crate pem to 3.0.2 2023-08-25 00:42:21 +00:00
80e5c3abc3 Update Rust crate serde to 1.0.185 2023-08-22 00:41:48 +00:00
5b6b525b1e Update Rust crate clap to 4.3.23 2023-08-19 00:30:45 +00:00
17282b82df Update Rust crate log to 0.4.20 2023-08-13 00:34:51 +00:00
07124b452b Update Rust crate clap to 4.3.21 2023-08-09 00:30:19 +00:00
fa057bd233 Update Rust crate serde to 1.0.183 2023-08-08 00:30:49 +00:00
0df1567020 Update Rust crate serde to 1.0.182 2023-08-07 00:29:51 +00:00
9ac7c74379 Merge pull request 'Update Rust crate pem to v3' () from renovate/pem-3.x into master
Reviewed-on: 
2023-08-05 08:26:23 +00:00
07622a7cec Update Rust crate pem to v3 2023-08-05 00:25:28 +00:00
85a728319c Update Rust crate x509-parser to 0.15.1 2023-08-04 01:15:24 +00:00
985457da43 Update Rust crate serde to 1.0.181 2023-08-04 00:36:34 +00:00
917b035b6f Update Rust crate serde to 1.0.180 2023-08-01 00:20:27 +00:00
ddd4fed0ca Update Rust crate serde to 1.0.178 2023-07-29 00:30:57 +00:00
cc99e5052b Update Rust crate serde to 1.0.177 2023-07-28 00:31:01 +00:00
d89fef263e Update Rust crate serde to 1.0.176 2023-07-27 00:31:20 +00:00
7774c946cf Update Rust crate serde to 1.0.175 2023-07-25 00:37:43 +00:00
404cd681e8 Update Rust crate urlencoding to 2.1.3 2023-07-22 08:05:11 +00:00
6db636638c Update Rust crate serde to 1.0.174 2023-07-22 01:32:38 +00:00
9d8caeeac5 Update Rust crate clap to 4.3.19 2023-07-22 00:40:37 +00:00
590bc33aa7 Update Rust crate serde to 1.0.173 2023-07-20 01:03:27 +00:00
33aa208cdb Update Rust crate clap to 4.3.17 2023-07-20 00:18:47 +00:00
ed4c7b066f Update Rust crate clap to 4.3.16 2023-07-19 00:17:53 +00:00
83bea2a428 Update Rust crate clap to 4.3.14 2023-07-18 00:18:20 +00:00
5d1e2510f5 Update Rust crate clap to 4.3.12 2023-07-15 00:16:31 +00:00
5779410575 Update Rust crate serde to 1.0.171 2023-07-11 00:17:34 +00:00
7ce658ab92 Update Rust crate clap to 4.3.11 2023-07-08 00:17:19 +00:00
1d0c3a719c Enable auto-merge of Renovate PR 2023-07-07 15:49:36 +00:00
b3060aef43 Merge pull request 'Update Rust crate rustls-pemfile to 1.0.3' () from renovate/rustls-pemfile-1.x into master
Reviewed-on: 
2023-07-04 16:41:14 +00:00
6439c36b8c Merge pull request 'Update Rust crate clap to 4.3.10' () from renovate/clap-4.x into master
Reviewed-on: 
2023-07-04 16:41:06 +00:00
600f441c14 Merge pull request 'Update Rust crate serde to 1.0.166' () from renovate/serde-1.x into master
Reviewed-on: 
2023-07-04 16:40:54 +00:00
75400eec47 Update Rust crate serde to 1.0.166 2023-07-04 00:11:44 +00:00
b96e045ecf Update Rust crate clap to 4.3.10 2023-07-01 00:11:03 +00:00
35a7aee89f Update Rust crate rustls-pemfile to 1.0.3 2023-06-29 00:10:40 +00:00
2d368dfdd5 Merge pull request 'Update Rust crate clap to 4.3.5' () from renovate/clap-4.x into master
Reviewed-on: 
2023-06-21 16:18:35 +00:00
4c7ab677de Update Rust crate clap to 4.3.5 2023-06-21 00:18:22 +00:00
6998400962 Merge pull request 'Update Rust crate clap to 4.3.4' () from renovate/clap-4.x into master
Reviewed-on: 
2023-06-15 13:30:38 +00:00
ca64c20397 Update Rust crate clap to 4.3.4 2023-06-15 00:27:58 +00:00
a44820ba0c Merge pull request 'Update Rust crate log to 0.4.19' () from renovate/log-0.x into master
Reviewed-on: 
2023-06-14 06:40:50 +00:00
5654bc25f9 Update Rust crate log to 0.4.19 2023-06-12 00:27:03 +00:00
835164d431 Merge pull request 'Update Rust crate serde to 1.0.164' () from renovate/serde-1.x into master
Reviewed-on: 
2023-06-09 09:20:32 +00:00
af6974d769 Update Rust crate serde to 1.0.164 2023-06-09 00:27:54 +00:00
08f27b61bb Merge pull request 'Update Rust crate clap to 4.3.2' () from renovate/clap-4.x into master
Reviewed-on: 
2023-06-06 06:34:40 +00:00
87c5ec87b3 Update Rust crate clap to 4.3.2 2023-06-06 00:27:40 +00:00
85f5828446 Merge pull request 'Update Rust crate log to 0.4.18' () from renovate/log-0.x into master
Reviewed-on: 
2023-05-30 08:38:17 +00:00
ab14d9f6cf Update Rust crate log to 0.4.18 2023-05-29 00:35:50 +00:00
35b10ea4a9 Merge pull request 'Update Rust crate serde to 1.0.163' () from renovate/serde-1.x into master
Reviewed-on: 
2023-05-23 11:37:11 +00:00
6847e080d2 Merge pull request 'Update Rust crate clap to 4.3.0' () from renovate/clap-4.x into master
Reviewed-on: 
2023-05-23 11:36:57 +00:00
4fa1ea491a Update Rust crate clap to 4.3.0 2023-05-23 09:52:34 +00:00
f87f259af5 Update Rust crate serde to 1.0.163 2023-05-23 09:52:31 +00:00
4bd92e7ee2 Update RustTLS to version 0.20.7 ()
Reviewed-on: 
2023-05-19 11:10:59 +00:00
b3cc6f01a2 Merge pull request 'Update Rust crate serde to 1.0.162' () from renovate/serde-1.x into master
Reviewed-on: 
2023-05-11 11:47:33 +00:00
830003e527 Merge pull request 'Update Rust crate clap to 4.2.7' () from renovate/clap-4.x into master
Reviewed-on: 
2023-05-11 11:47:24 +00:00
968a485b44 Update Rust crate serde to 1.0.162 2023-05-11 00:12:09 +00:00
41d3d7f69e Update Rust crate clap to 4.2.7 2023-05-11 00:11:58 +00:00
e65c0d7eb9 Merge pull request 'Update Rust crate clap to 4.2.5' () from renovate/clap-4.x into master
Reviewed-on: 
2023-05-01 08:29:07 +00:00
5df45fd295 Update Rust crate clap to 4.2.5 2023-04-28 00:25:51 +00:00
c3084982b3 Merge pull request 'Update Rust crate serde to 1.0.160' () from renovate/serde-1.x into master
Reviewed-on: 
2023-04-24 09:24:55 +00:00
858f01e1b9 Merge pull request 'Update Rust crate clap to 4.2.3' () from renovate/clap-4.x into master
Reviewed-on: 
2023-04-24 09:24:44 +00:00
4766f8b796 Update Rust crate clap to 4.2.4 2023-04-20 00:26:49 +00:00
9c7157d591 Update Rust crate serde to 1.0.160 2023-04-12 00:29:46 +00:00
e7d5bac8db Update a few dependencies ()
Unable to update rustls for now (`actix-web` depends on a too old version of `rustls`)

Reviewed-on: 
2023-04-11 12:37:48 +00:00
a3052e08e7 Merge pull request 'Update Rust crate serde to 1.0.159' () from renovate/serde-1.x into master
Reviewed-on: 
2023-04-11 11:51:38 +00:00
61774e13b2 Update Rust crate serde to 1.0.159 2023-04-01 00:10:21 +00:00
9e848225e2 Merge pull request 'Update Rust crate clap to 4.1.6' () from renovate/clap-4.x into master
Reviewed-on: 
2023-03-11 12:45:18 +00:00
266c906abf Merge pull request 'Update Rust crate serde to 1.0.154' () from renovate/serde-1.x into master
Reviewed-on: 
2023-03-11 12:45:08 +00:00
40f1d720fe Update Rust crate serde to 1.0.154 2023-03-10 00:25:10 +00:00
ecc77ccb99 Update Rust crate clap to 4.1.8 2023-03-10 00:25:08 +00:00
764f04da38 Merge pull request 'Update Rust crate bytes to 1.4.0' () from renovate/bytes-1.x into master
Reviewed-on: 
2023-02-10 17:14:19 +00:00
865b854409 Update Rust crate bytes to 1.4.0 2023-02-04 00:17:45 +00:00
d65a7d232c cargo update 2023-02-02 10:28:06 +01:00
76469dd6fc Update to code to Rust 1.67 2023-02-02 10:27:37 +01:00
c839a52f4c Merge pull request 'Update Rust crate actix-web-actors to 4.2.0' () from renovate/actix-web-actors-4.x into master
Reviewed-on: 
2023-01-24 09:06:15 +00:00
c98bacb070 Update Rust crate actix-web-actors to 4.2.0 2023-01-24 00:15:45 +00:00
02fe48cb0d Merge pull request 'Update Rust crate pem to 1.1.1' () from renovate/pem-1.x into master
Reviewed-on: 
2023-01-23 13:58:58 +00:00
a9ca0584ed Merge pull request 'Update Rust crate clap to 4.1.1' () from renovate/clap-4.x into master
Reviewed-on: 
2023-01-23 13:58:16 +00:00
82f2358f32 Merge pull request 'Update Rust crate rustls-pemfile to 1.0.2' () from renovate/rustls-pemfile-1.x into master
Reviewed-on: 
2023-01-23 13:58:07 +00:00
4e1302cf3f Update Rust crate clap to 4.1.1 2023-01-19 09:18:57 +00:00
ea177f6eb8 Update Rust crate rustls-pemfile to 1.0.2 2023-01-19 09:18:52 +00:00
15d640127a Update Rust crate pem to 1.1.1 2023-01-19 09:18:34 +00:00
fefe684fdd Merge pull request 'Update Rust crate hyper-rustls to 0.23.2' () from renovate/hyper-rustls-0.x into master
Reviewed-on: 
2023-01-02 09:11:12 +00:00
efa26e3d01 Merge pull request 'Update Rust crate serde to 1.0.151' () from renovate/serde-1.x into master
Reviewed-on: 
2023-01-02 09:10:59 +00:00
1ba7c9602b Merge pull request 'Update Rust crate tokio-tungstenite to 0.18.0' () from renovate/tokio-tungstenite-0.x into master
Reviewed-on: 
2023-01-02 09:10:47 +00:00
1ef7d3a52c Merge pull request 'Update Rust crate clap to 4.0.32' () from renovate/clap-4.x into master
Reviewed-on: 
2023-01-02 09:10:36 +00:00
0bb37ddfb2 Update Rust crate serde to 1.0.152 2022-12-29 00:22:33 +00:00
cdb0afc601 Update Rust crate clap to 4.0.32 2022-12-24 00:26:18 +00:00
0cfe671320 Update Rust crate hyper-rustls to 0.23.2 2022-12-13 00:24:08 +00:00
d15455e5ce Merge pull request 'Update Rust crate clap to 4.0.29' () from renovate/clap-4.x into master
Reviewed-on: 
2022-12-08 11:26:48 +00:00
6c75064a1c Update Rust crate clap to 4.0.29 2022-11-30 00:35:12 +00:00
3e2720099e Merge pull request 'Update Rust crate serde to 1.0.148' () from renovate/serde-1.x into master
Reviewed-on: 
2022-11-29 07:58:16 +00:00
45bf153682 Merge pull request 'Update Rust crate env_logger to 0.10.0' () from renovate/env_logger-0.x into master
Reviewed-on: 
2022-11-29 07:58:09 +00:00
9920c63b8b Update Rust crate tokio-tungstenite to 0.18.0 2022-11-29 00:37:56 +00:00
369639510a Update Rust crate env_logger to 0.10.0 2022-11-29 00:37:53 +00:00
0e1076cfb6 Update Rust crate serde to 1.0.148 2022-11-29 00:37:49 +00:00
79cb4ff469 Merge pull request 'Update Rust crate env_logger to 0.9.3' () from renovate/env_logger-0.x into master
Reviewed-on: 
2022-11-24 11:25:08 +00:00
3c2ea933c4 Merge pull request 'Update Rust crate mktemp to 0.5.0' () from renovate/mktemp-0.x into master
Reviewed-on: 
2022-11-24 11:25:01 +00:00
0205a40600 Merge pull request 'Update Rust crate clap to 4.0.25' () from renovate/clap-4.x into master
Reviewed-on: 
2022-11-24 11:24:53 +00:00
0c7c6c4df2 Merge pull request 'Update Rust crate hyper-rustls to 0.23.1' () from renovate/hyper-rustls-0.x into master
Reviewed-on: 
2022-11-24 11:24:44 +00:00
9fa409df26 Update Rust crate hyper-rustls to 0.23.1 2022-11-16 00:15:56 +00:00
2f4af66a19 Update Rust crate clap to 4.0.25 2022-11-16 00:15:53 +00:00
4b61f79be8 Merge pull request 'Update Rust crate clap to 4.0.18' () from renovate/clap-4.x into master
Reviewed-on: 
2022-11-12 14:50:13 +00:00
96bb688a32 Merge pull request 'Update Rust crate rustls to 0.20.7' () from renovate/rustls-0.x into master
Reviewed-on: 
2022-11-12 14:50:06 +00:00
6d6c8e4bfa Merge pull request 'Update Rust crate futures to 0.3.25' () from renovate/futures-0.x into master
Reviewed-on: 
2022-11-12 14:49:59 +00:00
27f6834ab5 Merge pull request 'Update Rust crate serde to 1.0.147' () from renovate/serde-1.x into master
Reviewed-on: 
2022-11-12 14:49:50 +00:00
5e3a36dbcc Update Rust crate mktemp to 0.5.0 2022-11-10 00:25:48 +00:00
4468a75326 Update Rust crate env_logger to 0.9.3 2022-11-10 00:25:36 +00:00
05474fd50e Update Rust crate clap to 4.0.22 2022-11-10 00:25:32 +00:00
0572161b00 Update Rust crate serde to 1.0.147 2022-11-04 00:40:15 +00:00
68f6d85ffe Update Rust crate rustls to 0.20.7 2022-11-04 00:40:08 +00:00
9ac66b702f Update Rust crate futures to 0.3.25 2022-11-04 00:40:03 +00:00
aa7bea05f5 Merge pull request 'Update Rust crate clap to 4.0.11' () from renovate/clap-4.x into master
Reviewed-on: 
2022-10-10 15:52:44 +00:00
5625a0d738 Update Rust crate clap to 4.0.11 2022-10-10 00:33:25 +00:00
50c8ac03b2 Merge pull request 'Update Rust crate serde to 1.0.145' () from renovate/serde-1.x into master
Reviewed-on: 
2022-10-08 12:55:26 +00:00
f0fec7564c Merge pull request 'Update Rust crate clap to v4' () from renovate/clap-4.x into master
Reviewed-on: 
2022-10-08 12:55:17 +00:00
9e383fc7cf Update Rust crate clap to v4 2022-10-08 00:35:55 +00:00
8f688b54e3 Update Rust crate serde to 1.0.145 2022-10-01 00:11:46 +00:00
47dde332d2 Merge pull request 'Update Rust crate clap to 3.2.22' () from renovate/clap-3.x into master
Reviewed-on: 
2022-09-21 06:42:46 +00:00
a30122b533 Merge pull request 'Update Rust crate env_logger to 0.9.1' () from renovate/env_logger-0.x into master
Reviewed-on: 
2022-09-21 06:42:34 +00:00
011f70c119 Update Rust crate env_logger to 0.9.1 2022-09-20 00:36:44 +00:00
2b1b2484af Update Rust crate clap to 3.2.22 2022-09-20 00:36:38 +00:00
8efccaaa45 Merge pull request 'Update Rust crate urlencoding to 2.1.2' () from renovate/urlencoding-2.x into master
Reviewed-on: 
2022-09-12 07:34:55 +00:00
1574dd7196 Merge branch 'master' into renovate/urlencoding-2.x 2022-09-12 07:34:46 +00:00
3f5f92eaa6 Merge pull request 'Update Rust crate clap to 3.2.20' () from renovate/clap-3.x into master
Reviewed-on: 
2022-09-12 07:34:39 +00:00
58b21bf59d Update Rust crate urlencoding to 2.1.2 2022-09-09 17:51:53 +00:00
585735769f Update Rust crate clap to 3.2.20 2022-09-09 17:51:49 +00:00
6 changed files with 767 additions and 479 deletions

1196
Cargo.lock generated

File diff suppressed because it is too large Load Diff

@ -5,27 +5,27 @@ edition = "2021"
description = "TCP-over-HTTP solution"
[dependencies]
clap = { version = "3.2.18", features = ["derive", "env"] }
log = "0.4.17"
env_logger = "0.9.0"
actix = "0.13.0"
clap = { version = "4.4.0", features = ["derive", "env"] }
log = "0.4.20"
env_logger = "0.10.1"
actix = "0.13.1"
actix-web = { version = "4", features = ["rustls"] }
actix-web-actors = "4.1.0"
actix-tls = "3.0.3"
serde = { version = "1.0.144", features = ["derive"] }
actix-web-actors = "4.2.0"
actix-tls = "3.1.1"
serde = { version = "1.0.185", features = ["derive"] }
tokio = { version = "1", features = ["full"] }
futures = "0.3.24"
webpki = "0.22.0"
x509-parser = "0.14.0"
pem = "1.1.0"
futures = "0.3.29"
webpki = "0.22.4"
x509-parser = "0.15.1"
pem = "3.0.2"
reqwest = { version = "0.11", features = ["json", "rustls-tls"], default-features = false }
tokio-tungstenite = { version = "0.17.2", features = ["__rustls-tls", "rustls-tls-native-roots"] }
urlencoding = "2.1.0"
hyper-rustls = { version = "0.23.0", features = ["rustls-native-certs"] }
bytes = "1.2.1"
rustls-pemfile = "1.0.1"
rustls = "0.20.6"
tokio-tungstenite = { version = "0.18.0", features = ["__rustls-tls", "rustls-tls-native-roots"] }
urlencoding = "2.1.3"
hyper-rustls = { version = "0.23.2", features = ["rustls-native-certs"] }
bytes = "1.4.0"
rustls-pemfile = "1.0.4"
rustls = { version = "0.20.7", features = ["dangerous_configuration"] }
[dev-dependencies]
rand = "0.8.5"
mktemp = "0.4.1"
mktemp = "0.5.1"

@ -1,3 +1,9 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json"
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"packageRules": [
{
"matchUpdateTypes": ["minor", "patch"],
"automerge": true
}
]
}

@ -93,7 +93,7 @@ fn load_pem_file(path: &Option<String>, name: &str) -> std::io::Result<Option<Ve
None => None,
Some(p) => Some(
std::fs::read(p)
.map_err(|e| encpasulate_error(e, format!("Failed to load {}!", name)))?,
.map_err(|e| encpasulate_error(e, format!("Failed to load {name}!")))?,
),
})
}

@ -76,7 +76,7 @@ pub async fn run_app(mut args: ClientConfig) -> std::io::Result<()> {
Err(e) => {
Err(std::io::Error::new(
ErrorKind::Other,
format!("Failed to fetch relay configuration from server! {}", e),
format!("Failed to fetch relay configuration from server! {e}"),
))?;
unreachable!();
}

@ -55,7 +55,7 @@ impl CustomCertClientVerifier {
let parsed_crl = pem::parse(crl_file)
.map_err(|e| encpasulate_error(e, "Failed to decode CRL file!"))?;
Some(parsed_crl.contents)
Some(parsed_crl.into_contents())
} else {
None
};