wptserve: Import latest version of wpt-tools.

third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/sslutils/openssl.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/sslutils/openssl.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/sslutils/openssl.py b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/sslutils/openssl.py
index 26ed711356d31d8597329cc151dec6bc3434fc87..1b636f02272acc1a3a892c85d72779c49410d2d7 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/sslutils/openssl.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/sslutils/openssl.py
@@ -57,7 +57,13 @@ class OpenSSL(object):
             self.cmd += ["-config", self.conf_path]
         self.cmd += list(args)
 
-        env = os.environ.copy()
+        # Copy the environment, converting to plain strings. Windows
+        # StartProcess is picky about all the keys/values being plain strings,
+        # but at least in MSYS shells, the os.environ dictionary can be mixed.
+        env = {}
+        for k, v in os.environ.iteritems():
+            env[k.encode("utf8")] = v.encode("utf8")
+
         if self.base_conf_path is not None:
             env["OPENSSL_CONF"] = self.base_conf_path.encode("utf8")