Roll WPR to the lastest commit

telemetry/third_party/web-page-replay/certutils.py

Index: telemetry/third_party/web-page-replay/certutils.py
diff --git a/telemetry/third_party/web-page-replay/certutils.py b/telemetry/third_party/web-page-replay/certutils.py
index 46c31a8167b77082160029b760a3d4c8b4e407f4..c396a06ab72582d26184e86a3121a2072efd459a 100644
--- a/telemetry/third_party/web-page-replay/certutils.py
+++ b/telemetry/third_party/web-page-replay/certutils.py
@@ -130,8 +130,6 @@ def generate_dummy_ca_cert(subject='_WebPageReplayCert'):
   ca_cert.set_pubkey(key)
   ca_cert.add_extensions([
       crypto.X509Extension('basicConstraints', True, 'CA:TRUE'),
-      crypto.X509Extension('subjectAltName', False, 'DNS:' + subject),
-      crypto.X509Extension('nsCertType', True, 'sslCA'),
       crypto.X509Extension('extendedKeyUsage', True,
                            ('serverAuth,clientAuth,emailProtection,'
                             'timeStamping,msCodeInd,msCodeCom,msCTLSign,'
@@ -230,32 +228,29 @@ def generate_cert(root_ca_cert_str, server_cert_str, server_host):
   Returns:
     a PEM formatted certificate string
   """
-  EXTENSION_WHITELIST = set(['subjectAltName'])
-
   if openssl_import_error:
     raise openssl_import_error  # pylint: disable=raising-bad-type
 
   common_name = server_host
-  reused_extensions = []
   if server_cert_str:
     original_cert = load_cert(server_cert_str)
     common_name = original_cert.get_subject().commonName
-    for i in xrange(original_cert.get_extension_count()):
-      original_cert_extension = original_cert.get_extension(i)
-      if original_cert_extension.get_short_name() in EXTENSION_WHITELIST:
-        reused_extensions.append(original_cert_extension)
 
   ca_cert = load_cert(root_ca_cert_str)
   ca_key = load_privatekey(root_ca_cert_str)
 
   cert = crypto.X509()
+  cert.set_version(2)
   cert.get_subject().CN = common_name
   cert.gmtime_adj_notBefore(-60 * 60)
   cert.gmtime_adj_notAfter(60 * 60 * 24 * 30)
   cert.set_issuer(ca_cert.get_subject())
   cert.set_serial_number(int(time.time()*10000))
   cert.set_pubkey(ca_key)
-  cert.add_extensions(reused_extensions)
+  cert.add_extensions([
+    crypto.X509Extension('subjectAltName', False, 'DNS:' + server_host),
+    crypto.X509Extension('extendedKeyUsage', False, 'serverAuth,clientAuth'),
+  ])
   cert.sign(ca_key, 'sha256')
 
   return _dump_cert(cert)