Skip to content

Commit f3037cd

Browse files
author
test
committed
Fixed HTTPS mode crash
1 parent baa38df commit f3037cd

5 files changed

Lines changed: 17 additions & 133 deletions

File tree

Cargo.lock

Lines changed: 0 additions & 118 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,3 @@ openssl = { version = "0.10", features = ["vendored"] }
2020
chrono = "0.4.40"
2121
jsonwebtoken = "9.3.1"
2222
log = "0.4.27"
23-
bincode = { version = "2.0", features = ["derive"] }
24-
25-
[dev-dependencies]
26-
actix-test = { version = "0.1.0-beta.13" }
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"default": {}
3+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"default": {}
3+
}

src/main.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,6 @@ async fn main() -> std::io::Result<()> {
8383
Ok(_) => println!("Cold storage loaded"),
8484
Err(e) => eprintln!("Error loading cold storage: {}", e),
8585
}
86-
let mut builder = SslAcceptor::mozilla_intermediate(SslMethod::tls()).unwrap();
87-
builder
88-
.set_private_key_file("./cert/server.key", SslFiletype::PEM)
89-
.unwrap();
90-
builder
91-
.set_certificate_chain_file("./cert/server.crt")
92-
.unwrap();
93-
builder
94-
.set_ca_file("./cert/ca.crt")
95-
.unwrap();
96-
builder.set_verify(SslVerifyMode::PEER | SslVerifyMode::FAIL_IF_NO_PEER_CERT);
9786

9887
// (Optionally) Ensure the default table exists in memory.
9988
{
@@ -194,6 +183,17 @@ async fn main() -> std::io::Result<()> {
194183
};
195184
match use_https {
196185
true => {
186+
let mut builder = SslAcceptor::mozilla_intermediate(SslMethod::tls()).unwrap();
187+
builder
188+
.set_private_key_file("./cert/server.key", SslFiletype::PEM)
189+
.unwrap();
190+
builder
191+
.set_certificate_chain_file("./cert/server.crt")
192+
.unwrap();
193+
builder
194+
.set_ca_file("./cert/ca.crt")
195+
.unwrap();
196+
builder.set_verify(SslVerifyMode::PEER | SslVerifyMode::FAIL_IF_NO_PEER_CERT);
197197
println!("Starting distributed DB engine at https://{}", current_node);
198198

199199
// Build and run the HTTP server.

0 commit comments

Comments
 (0)