Skip to content

Commit f0b24c9

Browse files
committed
negotiated_alpn now returns string instead of Vec<u8>
1 parent bccbc04 commit f0b24c9

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/lib.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -655,8 +655,11 @@ impl<S: io::Read + io::Write> TlsStream<S> {
655655
}
656656

657657
/// Returns the negotiated ALPN protocols
658-
pub fn negotiated_alpn(&self) -> Result<Option<Vec<u8>>> {
659-
Ok(self.0.negotiated_alpn()?)
658+
pub fn negotiated_alpn(&self) -> Result<Option<String>> {
659+
Ok(self
660+
.0
661+
.negotiated_alpn()?
662+
.map(|bytes| String::from_utf8(bytes).unwrap())) //negotiated_alpn always returns valid utf-8
660663
}
661664

662665
/// Shuts down the TLS session.

src/test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ mod tests {
424424
let s = p!(TcpStream::connect("google.com:443"));
425425
let socket = p!(builder.connect("google.com", s));
426426

427-
assert_eq!(p!(socket.negotiated_alpn()), Some(b"h2".to_vec()));
427+
assert_eq!(p!(socket.negotiated_alpn()).as_deref(), Some("h2"));
428428
}
429429

430430
#[test]
@@ -433,7 +433,7 @@ mod tests {
433433
let s = p!(TcpStream::connect("google.com:443"));
434434
let socket = p!(builder.connect("google.com", s));
435435

436-
assert_eq!(p!(socket.negotiated_alpn()), None);
436+
assert_eq!(p!(socket.negotiated_alpn()).as_deref(), None);
437437
}
438438

439439
#[test]

0 commit comments

Comments
 (0)