Bug #20767962 5.1 SSL TESTS FAILING , GENERATE NEW CERTIFICATES

Description: SSL tests are failing in mysql-5.1 pb2 Analysis: The SSL certificates are ended by jan 2015. Hence the SSL tests are failing. Fix: We have generated new certificates with SHA1 algorithm.

Bug #20767962 5.1 SSL TESTS FAILING , GENERATE NEW CERTIFICATES
Description: SSL tests are failing in mysql-5.1 pb2 Analysis: The SSL certificates are ended by jan 2015. Hence the SSL tests are failing. Fix: We have generated new certificates with SHA1 algorithm.
85b12898 · V S Murthy Sidagam · c788e693 · 85b12898 · 85b12898 · 85b12898
Commit 85b12898 authored Mar 30, 2015 by V S Murthy Sidagam
9 changed files
--- a/mysql-test/r/openssl_1.result
+++ b/mysql-test/r/openssl_1.result
@@ -3,8 +3,8 @@ create table t1(f1 int);
 insert into t1 values (5);
 grant select on test.* to ssl_user1@localhost require SSL;
 grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA";
-grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB";
-grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
+grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client";
+grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client" ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA";
 grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";
 flush privileges;
 connect(localhost,ssl_user5,,test,MASTER_PORT,MASTER_SOCKET);

--- a/mysql-test/std_data/cacert.pem
+++ b/mysql-test/std_data/cacert.pem
 -----BEGIN CERTIFICATE-----
-MIICrTCCAhagAwIBAgIJAMI7xZKjhrDbMA0GCSqGSIb3DQEBBAUAMEQxCzAJBgNV
-BAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYD
-VQQKEwhNeVNRTCBBQjAeFw0xMDAxMjkxMTQ3MTBaFw0xNTAxMjgxMTQ3MTBaMEQx
-CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxh
-MREwDwYDVQQKEwhNeVNRTCBBQjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-wQYsOEfrN4ESP3FjsI8cghE+tZVuyK2gck61lwieVxjgFMtBd65mI5a1y9pmlOI1
-yM4SB2Ppqcuw7/e1CdV1y7lvHrGNt5yqEHbN4QX1gvsN8TQauP/2WILturk4R4Hq
-rKg0ZySu7f1Xhl0ed9a48LpaEHD17IcxWEGMMJwAxF0CAwEAAaOBpjCBozAMBgNV
-HRMEBTADAQH/MB0GA1UdDgQWBBSvktYQ0ahLnyxyVKqty+WpBbBrDTB0BgNVHSME
-bTBrgBSvktYQ0ahLnyxyVKqty+WpBbBrDaFIpEYwRDELMAkGA1UEBhMCU0UxEDAO
-BgNVBAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FM
-IEFCggkAwjvFkqOGsNswDQYJKoZIhvcNAQEEBQADgYEAdKN1PjwMHAKG2Ww1145g
-JQGBnKxSFOUaoSvkBi/4ntTM+ysnViWh7WvxyWjR9zU9arfr7aqsDeQxm0XDOqzj
-AQ/cQIla2/Li8tXyfc06bisH/IHRaSc2zWqioTKbEwMdVOdrvq4a8V8ic3xYyIWn
-7F4WeS07J8LKardSvM0+hOA=
+MIIDmTCCAoGgAwIBAgIJAMzY2iwSCa1lMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNV
+BAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEP
+MA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQLDAVNeVNRTDELMAkGA1UEAwwCQ0EwHhcN
+MTUwMzI3MTM1MjMxWhcNMjUwMjAyMTM1MjMxWjBjMQswCQYDVQQGEwJTRTESMBAG
+A1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xDzANBgNVBAoMBk9y
+YWNsZTEOMAwGA1UECwwFTXlTUUwxCzAJBgNVBAMMAkNBMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA1Ydrcrccp8ttYCX+/B/3R/6V30PoEVTpKmALa+P/
+8v26nhTc6Wufjyqxt0hxs65E5jBTk5EsLbJQR4gsjluzvFL/mTrHVefm0Pm/p6yM
+EiEJYbn20Q2eR88WnxWUbXXz6SiTSb3u09TntFqvpqh5Ex8DvoSCHTMaEZ2wguro
+HJMUrz5li+ToiimS8DZUBAQxJhikggwZX2h8bF4L+Jzd0RS1d1mrNCUnl6KZ6oYj
+VEWSbLfmcMhUFQJdo/PXsJBl/SICWURP0pvRoZ/5Qic/VBdHmdltM+pfu15n0Wpd
+7zAQo0Uo95i4lR2pDknPvD3EJjz5dRvPhq024pHo+n72DwIDAQABo1AwTjAdBgNV
+HQ4EFgQUay8Rmt8Sh5YOKLDso0bNCBHnoHEwHwYDVR0jBBgwFoAUay8Rmt8Sh5YO
+KLDso0bNCBHnoHEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAKLCl
+4lVEQyBpWuzAPE6xsayrbmGyO5mEzL8B4MWIiPkjVEemjGMNTa8mV7VUl/rgttru
+hz3VhlWpw6tQTrExTqVWOafVOva4XiJ54hnshkqU2KXc4eX7PIG/eyAAphnj6hnX
+QSWzDx+PKvidrJmyAqylVva3ApOO+5Sh5f/qw57id/Vy8xjtjeW2uWLG84iEVlPp
+sBWPjrM0EXGCZ470g19D35/JY6Gy+7e0Bk4RZuXITP+V7CdrjkDGu6w/zip7ukA
+32snXHeaUwrp8mbDY0c9t5SVM8RlaqrtzUYid2+5RBCo3LYIypCBOYM2BMVFoy16
+T4B8hWXZ/t+ylnp+Mw==
 -----END CERTIFICATE-----
--- a/mysql-test/std_data/client-cert.pem
+++ b/mysql-test/std_data/client-cert.pem
 Certificate:
    Data:
        Version: 1 (0x0)
-        Serial Number: 1048577 (0x100001)
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
+        Serial Number: 1 (0x1)
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
        Validity
-            Not Before: Jan 29 11:50:22 2010 GMT
-            Not After : Jan 28 11:50:22 2015 GMT
-        Subject: C=SE, ST=Uppsala, O=MySQL AB
+            Not Before: Mar 27 13:59:18 2015 GMT
+            Not After : Feb  2 13:59:18 2025 GMT
+        Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=Client
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                Modulus:
-                    00:cc:9a:37:49:13:66:dc:cf:e3:0b:13:a1:23:ed:
-                    78:db:4e:bd:11:f6:8c:0d:76:f9:a3:32:56:9a:f8:
-                    a1:21:6a:55:4e:4d:3f:e6:67:9d:26:99:b2:cd:a4:
-                    9a:d2:2b:59:5c:d7:8a:d3:60:68:f8:18:bd:c5:be:
-                    15:e1:2a:3c:a3:d4:61:cb:f5:11:94:17:81:81:f7:
-                    87:8c:f6:6a:d2:ee:d8:e6:77:f6:62:66:4d:2e:16:
-                    8d:08:81:4a:c9:c6:4b:31:e5:b9:c7:8a:84:96:48:
-                    a7:47:8c:0d:26:90:56:4e:e6:a5:6e:8c:b3:f2:9f:
-                    fc:3d:78:9b:49:6e:86:83:77
+                    00:9d:39:e4:6d:ce:1c:e0:7c:77:aa:9a:2b:94:db:
+                    53:48:2d:b5:77:6c:d3:63:73:b6:ff:b0:31:89:56:
+                    56:dd:fb:ce:ed:d8:94:f5:72:3d:4d:bf:a6:8b:43:
+                    64:f6:2d:66:5d:5a:77:3f:ae:cd:55:f0:02:03:0d:
+                    ac:72:bf:7c:b6:a9:12:d7:fe:66:d6:ca:53:4e:95:
+                    0c:f2:a2:c1:2d:b2:d5:b0:d8:01:4e:07:89:ee:c8:
+                    9a:16:f5:1f:0b:4f:04:e3:dc:00:3a:2f:c4:20:ab:
+                    0f:f4:81:f1:e3:2e:ba:8f:4b:3d:cc:b2:7f:62:3a:
+                    3e:e9:ef:dd:2b:40:99:b5:98:2d:8f:2a:00:20:34:
+                    de:6a:7a:66:fa:c8:8c:b2:c3:ad:7d:4d:31:d0:ba:
+                    35:ee:9d:c7:e3:25:48:02:6d:72:07:d0:ce:db:3b:
+                    7d:83:60:07:39:1a:76:4f:69:23:f3:45:30:07:bd:
+                    eb:c9:b9:ca:91:dd:21:65:ac:e4:53:ad:10:08:71:
+                    bd:74:15:56:a7:d6:d7:d8:fc:91:ac:53:c3:50:86:
+                    9f:53:1e:a7:f3:c5:bd:17:bd:fd:0f:6c:b4:c0:c8:
+                    7b:e6:dd:69:c2:f6:07:09:e4:a1:6f:a7:c7:03:b9:
+                    b8:d9:aa:eb:95:b5:37:2f:cb:8e:fc:55:f0:ad:c7:
+                    33:f3
                Exponent: 65537 (0x10001)
-    Signature Algorithm: md5WithRSAEncryption
-        5e:1f:a3:53:5f:24:13:1c:f8:28:32:b0:7f:69:69:f3:0e:c0:
-        34:87:10:03:7d:da:15:8b:bd:19:b8:1a:56:31:e7:85:49:81:
-        c9:7f:45:20:74:3e:89:c0:e0:26:84:51:cc:04:16:ce:69:99:
-        01:e1:26:99:b3:e3:f5:bd:ec:5f:a0:84:e4:38:da:75:78:7b:
-        89:9c:d2:cd:60:95:20:ba:8e:e3:7c:e6:df:76:3a:7c:89:77:
-        02:94:86:11:3a:c4:61:7d:6f:71:83:21:8a:17:fb:17:e2:ee:
-        02:6b:61:c1:b4:52:63:d7:d8:46:b2:c5:9c:6f:38:91:8a:35:
-        32:0b
+    Signature Algorithm: sha1WithRSAEncryption
+         2b:f5:95:a5:83:87:9b:c3:77:57:10:e0:64:0f:3a:6a:a6:5f:
+         9a:dd:16:b3:71:b1:0c:d7:59:93:ff:89:9f:d0:50:de:cd:c8:
+         d5:a3:2a:1c:6e:e1:0b:82:e4:ae:57:1b:13:c9:c6:ea:09:21:
+         7f:5b:ff:3d:8d:77:25:a8:ed:a8:7c:9d:95:b0:55:60:fc:19:
+         f3:4f:3f:73:1f:72:d8:2e:c7:c6:bb:16:1d:33:07:bf:ea:6b:
+         dc:5f:5d:d0:53:2e:b2:96:ad:ea:64:5f:cb:f4:8c:7a:16:bb:
+         cf:42:b8:f0:9e:33:cb:29:f5:a7:4e:af:b2:a2:a6:4f:8e:6d:
+         85:a1:63:43:aa:dd:11:1d:b2:80:ae:22:6a:b2:4b:0c:27:3c:
+         b4:59:d1:b4:77:48:69:ff:3b:e0:48:e8:3c:3f:df:14:43:80:
+         68:97:06:fa:56:d6:dd:a3:7c:d0:0d:06:3a:a3:13:6f:d0:09:
+         d2:2e:89:5b:b8:22:3f:d5:da:e7:4c:69:ea:55:03:ef:5e:55:
+         49:18:a5:1a:b4:be:1b:68:b4:65:d0:64:ab:29:9d:81:5f:05:
+         31:08:0f:12:b9:c9:6e:8e:2e:b5:8f:d4:e9:55:94:30:e5:13:
+         d4:84:ad:4e:15:62:79:32:36:e8:67:b0:12:14:73:c0:bc:99:
+         44:cf:b2:fb
 -----BEGIN CERTIFICATE-----
-MIIB5zCCAVACAxAAATANBgkqhkiG9w0BAQQFADBEMQswCQYDVQQGEwJTRTEQMA4G
-A1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwg
-QUIwHhcNMTAwMTI5MTE1MDIyWhcNMTUwMTI4MTE1MDIyWjAyMQswCQYDVQQGEwJT
-RTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIwgZ8wDQYJKoZI
-hvcNAQEBBQADgY0AMIGJAoGBAMyaN0kTZtzP4wsToSPteNtOvRH2jA12+aMyVpr4
-oSFqVU5NP+ZnnSaZss2kmtIrWVzXitNgaPgYvcW+FeEqPKPUYcv1EZQXgYH3h4z2
-atLu2OZ39mJmTS4WjQiBSsnGSzHluceKhJZIp0eMDSaQVk7mpW6Ms/Kf/D14m0lu
-hoN3AgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAXh+jU18kExz4KDKwf2lp8w7ANIcQ
-A33aFYu9GbgaVjHnhUmByX9FIHQ+icDgJoRRzAQWzmmZAeEmmbPj9b3sX6CE5Dja
-dXh7iZzSzWCVILqO43zm33Y6fIl3ApSGETrEYX1vcYMhihf7F+LuAmthwbRSY9fY
-RrLFnG84kYo1Mgs=
+MIIDPjCCAiYCAQEwDQYJKoZIhvcNAQEFBQAwYzELMAkGA1UEBhMCU0UxEjAQBgNV
+BAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMQ8wDQYDVQQKDAZPcmFj
+bGUxDjAMBgNVBAsMBU15U1FMMQswCQYDVQQDDAJDQTAeFw0xNTAzMjcxMzU5MTha
+Fw0yNTAyMDIxMzU5MThaMGcxCzAJBgNVBAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hv
+bG0xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQL
+DAVNeVNRTDEPMA0GA1UEAwwGQ2xpZW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAnTnkbc4c4Hx3qporlNtTSC21d2zTY3O2/7AxiVZW3fvO7diU9XI9
+Tb+mi0Nk9i1mXVp3P67NVfACAw2scr98tqkS1/5m1spTTpUM8qLBLbLVsNgBTgeJ
+7siaFvUfC08E49wAOi/EIKsP9IHx4y66j0s9zLJ/Yjo+6e/dK0CZtZgtjyoAIDTe
+anpm+siMssOtfU0x0Lo17p3H4yVIAm1yB9DO2zt9g2AHORp2T2kj80UwB73rybnK
+kd0hZazkU60QCHG9dBVWp9bX2PyRrFPDUIafUx6n88W9F739D2y0wMh75t1pwvYH
+CeShb6fHA7m42arrlbU3L8uO/FXwrccz8wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQAr9ZWlg4ebw3dXEOBkDzpqpl+a3RazcbEM11mT/4mf0FDezcjVoyocbuELguSu
+VxsTycbqCSF/W/89jXclqO2ofJ2VsFVg/BnzTz9zH3LYLsfGuxYdMwe/6mvcX13Q
+Uy6ylq3qZF/L9Ix6FrvPQrjwnjPLKfWnTq+yoqZPjm2FoWNDqt0RHbKAriJqsksM
+Jzy0WdG0d0hp/zvgSOg8P98UQ4Bolwb6Vtbdo3zQDQY6oxNv0AnSLolbuCI/1drn
+TGnqVQPvXlVJGKUatL4baLRl0GSrKZ2BXwUxCA8Sucluji61j9TpVZQw5RPUhK1O
+FWJ5MjboZ7ASFHPAvJlEz7L7
 -----END CERTIFICATE-----
--- a/mysql-test/std_data/client-key.pem
+++ b/mysql-test/std_data/client-key.pem
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
--- a/mysql-test/std_data/server-cert.pem
+++ b/mysql-test/std_data/server-cert.pem
 Certificate:
    Data:
        Version: 1 (0x0)
-        Serial Number: 1048578 (0x100002)
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
+        Serial Number: 1 (0x1)
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
        Validity
-            Not Before: Jan 29 11:56:49 2010 GMT
-            Not After : Jan 28 11:56:49 2015 GMT
-        Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=localhost
+            Not Before: Mar 27 13:57:20 2015 GMT
+            Not After : Feb  2 13:57:20 2025 GMT
+        Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=localhost
        Subject Public Key Info:
            Public Key Algorithm: rsaEncryption
-                Public-Key: (512 bit)
+                Public-Key: (2048 bit)
                Modulus:
-                    00:cd:e4:87:51:9d:72:11:a0:d1:fa:f3:92:8b:13:
-                    1c:eb:f7:e2:9a:2f:72:a8:d6:65:48:d1:69:af:1b:
-                    c0:4c:13:e5:60:60:51:41:e9:ab:a6:bc:13:bb:0c:
-                    5e:32:7c:d9:6c:9e:cd:05:24:84:78:db:80:91:2e:
-                    d8:88:2b:c2:ed
+                    00:f0:b9:fc:2f:f1:39:66:9c:4a:cd:04:95:80:67:
+                    48:03:6b:af:04:51:a6:80:94:13:ff:24:98:e6:38:
+                    5a:37:da:70:26:1a:32:d2:0f:65:3f:79:82:a1:ad:
+                    f8:79:02:e1:35:bc:2e:51:c5:f1:e6:21:5b:9f:74:
+                    67:5a:54:e2:f9:3f:8c:cd:67:ae:f4:d3:ba:13:24:
+                    7f:8b:45:09:df:25:a5:c1:31:e8:d4:a2:07:f3:3c:
+                    9c:9e:cb:fd:a4:1a:d2:ed:9f:de:c7:1e:e8:0b:d9:
+                    42:15:52:96:f8:1d:ca:bd:ab:92:e7:7c:15:23:af:
+                    82:2e:dd:d3:e6:66:96:6e:89:75:01:51:d8:28:73:
+                    cb:9e:a1:25:2e:f1:fe:b4:d4:87:61:5e:96:14:22:
+                    05:6a:22:1d:02:30:e9:27:5d:85:a8:23:e2:88:52:
+                    e8:3d:5a:7f:16:53:b9:7c:d9:58:bc:fb:fd:2a:2c:
+                    7c:68:0b:c2:3a:2e:0c:27:81:41:ce:66:cd:36:ac:
+                    11:2a:fb:cc:e1:a4:d4:1f:4e:0a:e5:7b:26:ef:4e:
+                    21:cd:ab:59:79:50:06:bb:54:a6:b1:37:1f:bd:87:
+                    5c:ab:eb:50:c0:b7:b9:60:a8:ce:1c:24:a1:47:51:
+                    e9:1a:fa:72:1e:53:fe:ad:68:3b:a7:29:58:96:bb:
+                    24:1d
                Exponent: 65537 (0x10001)
-    Signature Algorithm: md5WithRSAEncryption
-        73:ce:9c:6e:39:46:b4:14:be:da:3f:f3:1b:ba:90:bc:23:43:
-        d7:82:2a:70:4e:a6:d9:5a:65:5c:b7:df:71:df:75:77:c5:80:
-        a4:af:fa:d2:59:e2:fd:c9:9c:f0:98:95:8e:69:a9:8c:7c:d8:
-        6f:48:d2:e3:36:e0:cd:ff:3f:d1:a5:e6:ab:75:09:c4:50:10:
-        c4:96:dd:bf:3b:de:32:46:da:ca:4a:f1:d6:52:8a:33:2f:ab:
-        f5:2e:70:3f:d4:9c:be:00:c8:03:f9:39:8a:df:5b:70:3c:40:
-        ef:03:be:7c:3d:1d:32:32:f3:51:81:e2:83:30:6e:3d:38:9b:
-        fb:3c
+    Signature Algorithm: sha1WithRSAEncryption
+         95:6f:51:cb:fe:5e:c5:bc:49:49:4f:c8:e9:db:35:80:34:b2:
+         9c:e1:66:63:7b:48:19:b6:14:53:7d:fd:e4:80:f9:63:cd:a6:
+         75:77:c4:80:6c:6b:8e:25:6f:be:d1:d1:1c:4b:6b:6e:3d:e2:
+         db:99:f5:0e:a9:df:59:1d:f9:9a:06:70:52:19:e8:b2:5f:95:
+         3c:e3:75:f8:0c:1e:58:d5:ba:c0:99:9f:b1:ac:b8:74:8e:fd:
+         95:85:0b:2d:29:e7:70:32:d8:b2:b8:e4:47:cd:b6:59:78:85:
+         e1:f0:ab:89:3e:c5:82:f2:b1:6e:e5:0f:90:3e:6e:9d:62:53:
+         b2:77:7e:54:62:fd:a5:0a:29:3c:65:3c:43:0c:49:95:a4:61:
+         ef:55:79:f3:72:0b:5d:0d:1f:a0:ac:04:4c:f5:38:34:6c:c3:
+         9e:e4:e5:ef:56:01:29:b1:96:fe:fe:a1:9c:ea:88:84:ff:1f:
+         26:d0:38:59:65:cf:33:86:11:10:51:5c:19:ef:c6:2a:39:91:
+         5e:4c:d2:8c:30:cb:1f:07:f7:c5:c7:dc:1d:4b:4c:6e:c7:74:
+         63:2f:a0:de:bf:13:b6:6b:bd:07:3e:60:62:5f:37:ed:f5:69:
+         4a:4d:b1:80:02:1d:dc:b7:8a:b8:ba:14:f6:da:86:08:69:af:
+         9f:d9:d8:1a
 -----BEGIN CERTIFICATE-----
-MIIBtzCCASACAxAAAjANBgkqhkiG9w0BAQQFADBEMQswCQYDVQQGEwJTRTEQMA4G
-A1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwg
-QUIwHhcNMTAwMTI5MTE1NjQ5WhcNMTUwMTI4MTE1NjQ5WjBGMQswCQYDVQQGEwJT
-RTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNVBAMT
-CWxvY2FsaG9zdDBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDN5IdRnXIRoNH685KL
-Exzr9+KaL3Ko1mVI0WmvG8BME+VgYFFB6aumvBO7DF4yfNlsns0FJIR424CRLtiI
-K8LtAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAc86cbjlGtBS+2j/zG7qQvCND14Iq
-cE6m2VplXLffcd91d8WApK/60lni/cmc8JiVjmmpjHzYb0jS4zbgzf8/0aXmq3UJ
-xFAQxJbdvzveMkbaykrx1lKKMy+r9S5wP9ScvgDIA/k5it9bcDxA7wO+fD0dMjLz
-UYHigzBuPTib+zw=
+MIIDQTCCAikCAQEwDQYJKoZIhvcNAQEFBQAwYzELMAkGA1UEBhMCU0UxEjAQBgNV
+BAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMQ8wDQYDVQQKDAZPcmFj
+bGUxDjAMBgNVBAsMBU15U1FMMQswCQYDVQQDDAJDQTAeFw0xNTAzMjcxMzU3MjBa
+Fw0yNTAyMDIxMzU3MjBaMGoxCzAJBgNVBAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hv
+bG0xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQL
+DAVNeVNRTDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA8Ln8L/E5ZpxKzQSVgGdIA2uvBFGmgJQT/ySY5jhaN9pwJhoy
+0g9lP3mCoa34eQLhNbwuUcXx5iFbn3RnWlTi+T+MzWeu9NO6EyR/i0UJ3yWlwTHo
+1KIH8zycnsv9pBrS7Z/exx7oC9lCFVKW+B3KvauS53wVI6+CLt3T5maWbol1AVHY
+KHPLnqElLvH+tNSHYV6WFCIFaiIdAjDpJ12FqCPiiFLoPVp/FlO5fNlYvPv9Kix8
+aAvCOi4MJ4FBzmbNNqwRKvvM4aTUH04K5Xsm704hzatZeVAGu1SmsTcfvYdcq+tQ
+wLe5YKjOHCShR1HpGvpyHlP+rWg7pylYlrskHQIDAQABMA0GCSqGSIb3DQEBBQUA
+A4IBAQCVb1HL/l7FvElJT8jp2zWANLKc4WZje0gZthRTff3kgPljzaZ1d8SAbGuO
+JW++0dEcS2tuPeLbmfUOqd9ZHfmaBnBSGeiyX5U843X4DB5Y1brAmZ+xrLh0jv2V
+hQstKedwMtiyuORHzbZZeIXh8KuJPsWC8rFu5Q+QPm6dYlOyd35UYv2lCik8ZTxD
+DEmVpGHvVXnzcgtdDR+grARM9Tg0bMOe5OXvVgEpsZb+/qGc6oiE/x8m0DhZZc8z
+hhEQUVwZ78YqOZFeTNKMMMsfB/fFx9wdS0xux3RjL6DevxO2a70HPmBiXzft9WlK
+TbGAAh3ct4q4uhT22oYIaa+f2dga
 -----END CERTIFICATE-----
--- a/mysql-test/std_data/server-key.pem
+++ b/mysql-test/std_data/server-key.pem
 -----BEGIN RSA PRIVATE KEY-----
-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
+MIIEowIBAAKCAQEA8Ln8L/E5ZpxKzQSVgGdIA2uvBFGmgJQT/ySY5jhaN9pwJhoy
+0g9lP3mCoa34eQLhNbwuUcXx5iFbn3RnWlTi+T+MzWeu9NO6EyR/i0UJ3yWlwTHo
+1KIH8zycnsv9pBrS7Z/exx7oC9lCFVKW+B3KvauS53wVI6+CLt3T5maWbol1AVHY
+KHPLnqElLvH+tNSHYV6WFCIFaiIdAjDpJ12FqCPiiFLoPVp/FlO5fNlYvPv9Kix8
+aAvCOi4MJ4FBzmbNNqwRKvvM4aTUH04K5Xsm704hzatZeVAGu1SmsTcfvYdcq+tQ
+wLe5YKjOHCShR1HpGvpyHlP+rWg7pylYlrskHQIDAQABAoIBAHAZvBW7WMau66pz
+gwdLkV5+a/8v4sCntHQxX7596Y1u/KDRvG7T2otnk2ylLjt0GtpCKrPL4S0QxbEI
+rQSE2TnG3VPd/7xlSJaXfYmmecVfq8O+8TTry5X62NieGByunSEpPL4vZ1H1N2/k
+iQc8IGiZGI0R3GpE1fPrOz1k8pLAKvZo77JiRPzn8CVWysbv6ujnGv4Q6pDGAPbx
+cjFHvVmv1gXfQq/IoG1dpCq50gtis3acG/r0A2O0JKwW5SjhpK5oqatetoa4gkkA
+ZQ4aPqXm9MSpMFKVnc9GRPFOO5IKX4m3eXLCD9ilUMu5u4fC+D8TjMVJ3yuH3xy8
+4/yNncECgYEA+Ev54LkEMIaQzRs8zOK5CQdDlAOqcZ+s4sfWuQZHzunguX6F74TE
+LYjQV9oYzQhZejlwW+oM5ThzkSOpFpJ1zK6HOVA1GEIfgjjvSX8iK0WG81OHntUM
+FJB4bc6tqr4j6zlcm/+0s5B7ud/ChWYEXuPG9+XKcpZtr70xm2fDc60CgYEA+DHi
+Y1SLKpkgJaLlKnVJM8Yaigkv2ChM7sJ0wJoPbP+yf+JKL6na1xOU3clja/IytMn3
+1nLoCT19cdhBJTRzz8VKh+GM+GeYo0/HdxFQT83eE2UPck23X3eAslD5iHS7UDIi
+xgPT/CK5IibN51t5G7V4eu1Dsdd86StFHT3aADECgYBATgT4E1KncqJbzFsRwQIk
+XGiCtUAulbfINxWbO76Ao5F3CO55YudM1qp9f0IVMo/olKcK2CNmPItO6wWAXZq
+vSSeTkyB7NYWNsKaKUfjJw2NRSvRkeGgDc5yud02ZCoPSHrYl//npVq1x+KsA8DM
+BnfISgYFaTodEoWfdt8ivQKBgHnYk5nMMZ4yGpQfin3zooJmaTUHGZP3BP3aPVMo
+zxXl2g3qXB1WN/eKx3Syn7qo5rfWx3NiagPPSjyPvDu1qn2AD/zxgDGbOlZCnlwY
+BeOH39SJsrGc8b9OfcIM+tRA6oyOcH/h9To9GcJoZoGEaMpvprxCqw8uCUa3VXDr
+opChAoGBANSzQ/rRwKhd7nMu5LyAFuP8AnpPQj99psWfIvsVtW7CCUm+lhaYAoKm
+qffCX2FmXbiZVqF9oEwTTGkjmxQ0uwphiNowQqeWaf4P3khsA57Fon1EoZnYj/f+
+5j7FlBwBZLFEx66bW18B8YdiZ7r5ufmE4XlfG1pkYi8ki0rPRwZR
 -----END RSA PRIVATE KEY-----
--- a/mysql-test/std_data/server8k-cert.pem
+++ b/mysql-test/std_data/server8k-cert.pem
--- a/mysql-test/std_data/server8k-key.pem
+++ b/mysql-test/std_data/server8k-key.pem
--- a/mysql-test/t/openssl_1.test
+++ b/mysql-test/t/openssl_1.test
@@ -15,8 +15,8 @@ insert into t1 values (5);

 grant select on test.* to ssl_user1@localhost require SSL;
 grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA";
-grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB";
-grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
+grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client";
+grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client" ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA";
 grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";
 flush privileges;