Update Hyper and OpenSSL

python/servo/bootstrap.py

@@ -196,7 +196,7 @@ def windows_msvc(context, force=False):
     '''Bootstrapper for MSVC building on Windows.'''
 
     deps_dir = os.path.join(context.sharedir, "msvc-dependencies")
-    deps_url = "https://servo-rust.s3.amazonaws.com/msvc-deps/"
+    deps_url = "https://servo-deps.s3.amazonaws.com/msvc-deps/"
 
     def version(package):
         return packages.WINDOWS_MSVC[package]

python/servo/build_commands.py

@@ -321,7 +321,7 @@ class MachCommands(CommandBase):
                         call(["editbin", "/nologo", "/subsystem:windows", path.join(servo_exe_dir, "servo.exe")],
                              verbose=verbose)
                     # on msvc, we need to copy in some DLLs in to the servo.exe dir
-                    for ssl_lib in ["ssleay32md.dll", "libeay32md.dll"]:
+                    for ssl_lib in ["libcryptoMD.dll", "libsslMD.dll"]:
                         shutil.copy(path.join(env['OPENSSL_LIB_DIR'], "../bin" + msvc_x64, ssl_lib),
                                     servo_exe_dir)
 

python/servo/command_base.py

@@ -407,7 +407,7 @@ class CommandBase(object):
             # Link openssl
             env["OPENSSL_INCLUDE_DIR"] = path.join(package_dir("openssl"), "include")
             env["OPENSSL_LIB_DIR"] = path.join(package_dir("openssl"), "lib" + msvc_x64)
-            env["OPENSSL_LIBS"] = "ssleay32MD:libeay32MD"
+            env["OPENSSL_LIBS"] = "libsslMD:libcryptoMD"
             # Link moztools
             env["MOZTOOLS_PATH"] = path.join(package_dir("moztools"), "bin")
 

python/servo/package_commands.py

@@ -108,7 +108,7 @@ def copy_dependencies(binary_path, lib_path):
 
 def copy_windows_dependencies(binary_path, destination):
     try:
-        [shutil.copy(path.join(binary_path, d), destination) for d in ["libeay32md.dll", "ssleay32md.dll"]]
+        [shutil.copy(path.join(binary_path, d), destination) for d in ["libcryptoMD.dll", "libsslMD.dll"]]
     except:
         deps = [
             "libstdc++-6.dll",
@@ -119,8 +119,8 @@ def copy_windows_dependencies(binary_path, destination):
             "zlib1.dll",
             "libiconv-2.dll",
             "libintl-8.dll",
-            "libeay32.dll",
-            "ssleay32.dll",
+            "libcryptoMD.dll",
+            "libsslMD.dll",
         ]
         for d in deps:
             dep_path = path.join("C:\\msys64\\mingw64\\bin", d)

python/servo/packages.py

@@ -21,5 +21,5 @@ WINDOWS_MSVC = {
     "cmake": "3.6.1",
     "moztools": "0.0.1-5",
     "ninja": "1.7.1",
-    "openssl": "1.0.1t-vs2015",
+    "openssl": "1.1.0e-vs2015",
 }