Add ALPN and signature algorithms to OpenSSL config

1 files changed, 7 insertions, 14 deletions

diff --git a/components/net/tests/fetch.rs b/components/net/tests/fetch.rs
index 328ca734576..5b6031335cb 100644
--- a/components/net/tests/fetch.rs
+++ b/components/net/tests/fetch.rs
@@ -24,7 +24,7 @@ use hyper::body::Body;
 use hyper::{Request as HyperRequest, Response as HyperResponse};
 use mime::{self, Mime};
 use msg::constellation_msg::TEST_PIPELINE_ID;
-use net::connector::create_ssl_connector_builder;
+use net::connector::{create_tls_config, ALPN_H2_H1};
 use net::fetch::cors_cache::CorsCache;
 use net::fetch::methods::{self, CancellationListener, FetchContext};
 use net::filemanager_thread::FileManager;
@@ -38,8 +38,7 @@ use net_traits::{
 };
 use servo_arc::Arc as ServoArc;
 use servo_url::{ImmutableOrigin, ServoUrl};
-use std::fs::File;
-use std::io::Read;
+use std::fs;
 use std::iter::FromIterator;
 use std::path::Path;
 use std::sync::atomic::{AtomicUsize, Ordering};
@@ -218,13 +217,11 @@ fn test_fetch_file() {
     assert_eq!(content_type, mime::TEXT_CSS);
 
     let resp_body = fetch_response.body.lock().unwrap();
-    let mut file = File::open(path).unwrap();
-    let mut bytes = vec![];
-    let _ = file.read_to_end(&mut bytes);
+    let file = fs::read(path).unwrap();
 
     match *resp_body {
         ResponseBody::Done(ref val) => {
-            assert_eq!(val, &bytes);
+            assert_eq!(val, &file);
         },
         _ => panic!(),
     }
@@ -653,15 +650,11 @@ fn test_fetch_with_hsts() {
         .unwrap();
     let (server, url) = make_ssl_server(handler, cert_path.clone(), key_path.clone());
 
-    let mut ca_content = String::new();
-    File::open(cert_path)
-        .unwrap()
-        .read_to_string(&mut ca_content)
-        .unwrap();
-    let ssl_client = create_ssl_connector_builder(&ca_content);
+    let certs = fs::read_to_string(cert_path).expect("Couldn't find certificate file");
+    let tls_config = create_tls_config(&certs, ALPN_H2_H1);
 
     let mut context = FetchContext {
-        state: Arc::new(HttpState::new(ssl_client)),
+        state: Arc::new(HttpState::new(tls_config)),
         user_agent: DEFAULT_USER_AGENT.into(),
         devtools_chan: None,
         filemanager: FileManager::new(create_embedder_proxy()),