Skip to content

Commit ff77761

Browse files
authored
chore(deps): update openssl related crates (#22352)
* chore(deps): update openssl related crates * fix with leak * hyper-proxy abandoned crate - revert update to hyper-openssl - dep hell
1 parent f66fe74 commit ff77761

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,12 +347,12 @@ async-nats = { version = "0.38.0", default-features = false, features = ["ring"]
347347
nkeys = { version = "0.4.4", default-features = false, optional = true }
348348
nom = { version = "7.1.3", default-features = false, optional = true }
349349
notify = { version = "8.0.0", default-features = false, features = ["macos_fsevent"] }
350-
openssl = { version = "0.10.68", default-features = false, features = ["vendored"] }
350+
openssl = { version = "0.10.70", default-features = false, features = ["vendored"] }
351351
openssl-probe = { version = "0.1.5", default-features = false }
352352
ordered-float = { version = "4.6.0", default-features = false }
353353
paste = "1.0.15"
354354
percent-encoding = { version = "2.3.1", default-features = false }
355-
postgres-openssl = { version = "0.5.0", default-features = false, features = ["runtime"], optional = true }
355+
postgres-openssl = { version = "0.5.1", default-features = false, features = ["runtime"], optional = true }
356356
pulsar = { version = "6.3.0", default-features = false, features = ["tokio-runtime", "auth-oauth2", "flate2", "lz4", "snap", "zstd"], optional = true }
357357
rand.workspace = true
358358
rand_distr = { version = "0.4.3", default-features = false }

lib/vector-core/src/tls/settings.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,10 @@ impl TlsSettings {
330330
if let Some(alpn) = &self.alpn_protocols {
331331
if for_server {
332332
let server_proto = alpn.clone();
333+
// See https://github.com/sfackler/rust-openssl/pull/2360.
334+
let server_proto_ref: &'static [u8] = Box::leak(server_proto.into_boxed_slice());
333335
context.set_alpn_select_callback(move |_, client_proto| {
334-
select_next_proto(server_proto.as_slice(), client_proto).ok_or(AlpnError::NOACK)
336+
select_next_proto(server_proto_ref, client_proto).ok_or(AlpnError::NOACK)
335337
});
336338
} else {
337339
context

0 commit comments

Comments
 (0)