Implement feedback

Author: MarnixKuijs

.circleci/config.yml

@@ -21,7 +21,7 @@ jobs:
             - /usr/local/cargo/registry/index
       - restore_cache:
           key: deps-<< parameters.image >>-{{ checksum "Cargo.lock" }}
-      - run: cargo test
+      - run: cargo test --features alpn
       - run: rustdoc --test README.md -L target/debug/deps -L target/debug
       - save_cache:
           key: deps-<< parameters.image >>-{{ checksum "Cargo.lock" }}
@@ -51,7 +51,7 @@ jobs:
             - ~/.cargo/registry/index
       - restore_cache:
           key: macos-deps-<< parameters.version >>
-      - run: cargo test
+      - run: cargo test --features alpn
       - save_cache:
           key: macos-deps-<< parameters.version >>
           paths:

Cargo.toml

@@ -10,8 +10,11 @@ readme = "README.md"
 [features]
 vendored = ["openssl/vendored"]
 
+# Switch for MacOS to keep support for older versions, Windows targets and openssl target will have alpn regardless
+alpn = ["security-framework/alpn"] 
+
 [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
-security-framework = {version = "2.0.0", features = ["alpn"]}
+security-framework = "2.0.0"
 security-framework-sys = "2.0.0"
 lazy_static = "1.4.0"
 libc = "0.2"

src/lib.rs

@@ -656,10 +656,11 @@ impl<S: io::Read + io::Write> TlsStream<S> {
 
     /// Returns the negotiated ALPN protocols
     pub fn negotiated_alpn(&self) -> Result<Option<String>> {
-        Ok(self
+        let protocol = self
             .0
             .negotiated_alpn()?
-            .map(|bytes| String::from_utf8(bytes).unwrap())) //negotiated_alpn always returns valid utf-8
+            .map(|bytes| String::from_utf8_lossy(&bytes).into_owned());
+        Ok(protocol)
     }
 
     /// Shuts down the TLS session.

src/test.rs

@@ -420,6 +420,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg_attr(not(feature = "alpn"), ignore)]
     fn alpn_google_h2() {
         let builder = p!(TlsConnector::builder().request_alpns(&["h2"]).build());
         let s = p!(TcpStream::connect("google.com:443"));
@@ -434,6 +435,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg_attr(not(feature = "alpn"), ignore)]
     fn alpn_google_invalid() {
         let builder = p!(TlsConnector::builder().request_alpns(&["h2c"]).build());
         let s = p!(TcpStream::connect("google.com:443"));
@@ -448,6 +450,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg_attr(not(feature = "alpn"), ignore)]
     fn alpn_google_none() {
         let builder = p!(TlsConnector::new());
         let s = p!(TcpStream::connect("google.com:443"));