Skip to content

Commit c2d9127

Browse files
authored
Update openssl to 0.10.71 (#1063)
* w * Update `openssl` to 0.10.71
1 parent 12af7ba commit c2d9127

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ multer = "3"
8181
multimap = "0.10"
8282
native-tls = "0.2"
8383
nix = { version = "0.29", default-features = false }
84-
openssl = { version = ">=0.10.0, <=0.10.69" }
84+
openssl = { version = "0.10" }
8585
opentelemetry = { version = "0.28", default-features = false }
8686
opentelemetry-http = { version = "0.28", default-features = false }
8787
opentelemetry-prometheus = { version = "0.28", default-features = false }

crates/core/src/conn/openssl/config.rs

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
//! openssl module
2-
use std::fmt::{self, Debug, Formatter};
2+
use std::fmt::{self, Debug, Formatter};
33
use std::fs::File;
44
use std::future::{Ready, ready};
55
use std::io::{Error as IoError, Read, Result as IoResult};
66
use std::path::Path;
77

8-
use futures_util::stream::{once, Once, Stream};
8+
use futures_util::stream::{Once, Stream, once};
99
use openssl::pkey::PKey;
1010
use openssl::ssl::{SslAcceptor, SslMethod};
1111
use openssl::x509::X509;
@@ -166,7 +166,13 @@ impl OpensslConfig {
166166
builder.set_alpn_protos(&self.alpn_protocols)?;
167167
// set uo ALPN selection routine - as select_next_proto
168168
builder.set_alpn_select_callback(move |_, list| {
169-
openssl::ssl::select_next_proto(&alpn_protocols, list).ok_or(openssl::ssl::AlpnError::NOACK)
169+
let proto = openssl::ssl::select_next_proto(&alpn_protocols, list)
170+
.ok_or(openssl::ssl::AlpnError::NOACK)?;
171+
let pos = list
172+
.windows(proto.len())
173+
.position(|window| window == proto)
174+
.expect("selected alpn proto should be present in client protos");
175+
Ok(&list[pos..pos + proto.len()])
170176
});
171177
if let Some(modifier) = &mut self.builder_modifier {
172178
modifier(&mut builder);

0 commit comments

Comments
 (0)