Merge branch 'mysql-8.0' into mysql-trunk

Author: harinvadodaria

mysql-test/std_data/server-sha1-1024-cert.pem

@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICWzCCAcQCAQEwDQYJKoZIhvcNAQEFBQAwdDELMAkGA1UEBhMCSU4xCzAJBgNV
+BAgMAktBMRIwEAYDVQQHDAlCYW5nYWxvcmUxDzANBgNVBAoMBk9yYWNsZTEOMAwG
+A1UECwwFTXlTUUwxIzAhBgNVBAMMGlJvdXRlciB0ZXN0IENBIGNlcnRpZmljYXRl
+MB4XDTE5MDcwNTA2NTQ0MVoXDTI5MDUxMzA2NTQ0MVoweDELMAkGA1UEBhMCSU4x
+CzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCYW5nYWxvcmUxDzANBgNVBAoMBk9yYWNs
+ZTEOMAwGA1UECwwFTXlTUUwxJzAlBgNVBAMMHlJvdXRlciB0ZXN0IHNlcnZlciBj
+ZXJ0aWZpY2F0ZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0A9YQoew+CF5
+TpnPGj5Di47TMeNY11BYYR5jcCzUqjEiR+zEBG/z3Ld2SW2q8bUk0SY/IZzx9Tx0
+/PWO10AcwRqFeve7I/2IbaYyVf0bnZw4jS34kfCt9oKXHIL7NJRY/yUJbDHAUqZV
+5IW4dt2jsd7NLDPt82eqRh9DLDl8mmECAwEAATANBgkqhkiG9w0BAQUFAAOBgQCB
+0ns5MZwM3ACGb1vr8A1drBrxo3hDLkYXw2VvUaAfLtbGmlLyHD7a9Fi98SUE4IMY
+ZisRGyRX8chCWEbxuEI91s4RIaT2tHSk5Gd+q99X0E8dJcZ99wqLQnuG9SK/z5bn
+hJsKIIPWor6FI97oinxbijWjl+mWRkM7QWkc3XYafQ==
+-----END CERTIFICATE-----

mysql-test/std_data/server-sha1-1024-key.pem

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDQD1hCh7D4IXlOmc8aPkOLjtMx41jXUFhhHmNwLNSqMSJH7MQE
+b/Pct3ZJbarxtSTRJj8hnPH1PHT89Y7XQBzBGoV697sj/YhtpjJV/RudnDiNLfiR
+8K32gpccgvs0lFj/JQlsMcBSplXkhbh23aOx3s0sM+3zZ6pGH0MsOXyaYQIDAQAB
+AoGBAKt5ihdC+AJ4rB6wuzR4znhtnPgH1IeYK07XmcKw4BDob8VxiFfT4NsuxSld
+Xj7ZOV+6sttEG1Ivood85l3W9BpiBef7SURaCtcHZVCiG61tq+CrQ13iN5Tdq+H0
+uGk+62ll4OZHLndEvV5kbKQMrC2ink1YZQp9Nc+JCHy4gd/BAkEA6pmuD3Baup6e
+J3u9oEaP6CIKtNF9gRaYAscPPDmZLDTkZaqwWcEO9Ty7zEa4h2TvfS+TE8UjoGVf
+VRhUV3r+KQJBAOMJ5s7yxM82y6ZpF9UIITDomHWnl+enEi+O6Z4WHngpmdVzT/cf
+kAqAyPnZvz2cxI7Ix+NQuqXn2tssRWVj0XkCQQCPxDH44B+Zsc6134zrhZJ27TWm
+baL90rzBJv/dJmcJwjgdXabIuhjSjK+Ble1Le72P9/Gn8e3NQ5JScaBuI79RAkBA
+qSxEGl41Cc0cWuf/sy4IyOXK9G1N+4YxZ0lfzbrlzCtU4F+Q6TtT0nPqvLo7qO9O
+Hx7WvcI6x/rL2yL0imY5AkBoR98GWZYbMUYX/WSl4ng3ZMne8GQFbpaWOqM8Ap1b
+nQ7FvB/hmiS3fw/JuK1l5ToD+nG7PAfdsfTYFy1r8SXC
+-----END RSA PRIVATE KEY-----

router/tests/component/test_http_server.cc

@@ -796,7 +796,8 @@ INSTANTIATE_TEST_CASE_P(
 const char kServerCertFile[]{"server-cert.pem"};  // 2048 bit
 const char kServerKeyFile[]{"server-key.pem"};
 const char kServerCertCaFile[]{"cacert.pem"};
-static const char kServerCertRsa1024File[]{"crl-server-cert.pem"};  // 1024 bit
+static const char kServerCertRsa1024File[]{
+    "server-sha1-1024-cert.pem"};  // 1024 bit
 
 #ifdef EVENT__HAVE_OPENSSL
 static const char kWrongServerCertCaFile[]{"ca-sha512.pem"};