List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:May 29 2012 10:27am
Subject:bzr push into mysql-trunk branch (Georgi.Kodinov:3905 to 3906) Bug#14006448
View as plain text  
 3906 Georgi Kodinov	2012-05-22
      Bug #14006448: SSL_CRL AND SSL_CRL_CLRPATH ARE NOT RUN FOR YASSL AND DOES NOT 
      WORK FOR OPENSSL
      
      Regenerated the test cryptography files.
      Renamed mysql-client-valid-[cert|key].pem to mysql-client-[cert|key].pem
      Renamed mysql-client-[cert|key].pem to mysql-client-invalid-[cert|key].pem
      Added an instruction on how to regenerate the cryptography files if needed.

    removed:
      mysql-test/std_data/crldir/fc725416.r0
    added:
      mysql-test/std_data/crl-certificate-readme.txt
      mysql-test/std_data/crl-client-revoked-cert.pem
      mysql-test/std_data/crl-client-revoked-key.pem
      mysql-test/std_data/crldir/ab8a3803.r0
    renamed:
      mysql-test/r/ssl_crl_clrpath.result => mysql-test/r/ssl_crl_crlpath.result
      mysql-test/t/ssl_crl_clrpath-master.opt => mysql-test/t/ssl_crl_crlpath-master.opt
      mysql-test/t/ssl_crl_clrpath.test => mysql-test/t/ssl_crl_crlpath.test
    modified:
      mysql-test/r/ssl_crl_clients_valid.result
      mysql-test/std_data/crl-ca-cert.pem
      mysql-test/std_data/crl-client-cert.pem
      mysql-test/std_data/crl-client-key.pem
      mysql-test/std_data/crl-client-revoked.crl
      mysql-test/std_data/crl-server-cert.pem
      mysql-test/std_data/crl-server-key.pem
      mysql-test/t/ssl_crl.test
      mysql-test/t/ssl_crl_clients-master.opt
      mysql-test/t/ssl_crl_clients_valid-master.opt
      mysql-test/t/ssl_crl_crlpath.test
 3905 Marc Alff	2012-05-29 [merge]
      Local merge

    added:
      mysql-test/suite/innodb/r/innodb-index-online-fk.result
      mysql-test/suite/innodb/t/innodb-index-online-fk.test
    modified:
      sql/share/errmsg-utf8.txt
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_table.cc
      sql/sql_yacc.yy
      storage/innobase/dict/dict0crea.cc
      storage/innobase/dict/dict0dict.cc
      storage/innobase/handler/handler0alter.cc
      storage/innobase/include/dict0crea.h
      storage/innobase/include/dict0dict.h
=== modified file 'mysql-test/r/ssl_crl_clients_valid.result'
--- a/mysql-test/r/ssl_crl_clients_valid.result	2011-08-19 13:24:24 +0000
+++ b/mysql-test/r/ssl_crl_clients_valid.result	2012-05-22 10:19:55 +0000
@@ -6,11 +6,12 @@ have_openssl	YES
 have_ssl	YES
 ssl_ca	MYSQL_TEST_DIR/std_data/crl-ca-cert.pem
 ssl_capath	
-ssl_cert	MYSQL_TEST_DIR/std_data/crl-client-valid-cert.pem
+ssl_cert	MYSQL_TEST_DIR/std_data/crl-client-cert.pem
 ssl_cipher	
 ssl_crl	MYSQL_TEST_DIR/std_data/crl-client-revoked.crl
 ssl_crlpath	
-ssl_key	MYSQL_TEST_DIR/std_data/crl-client-valid-key.pem
+ssl_key	MYSQL_TEST_DIR/std_data/crl-client-key.pem
 ############ Test mysqladmin ##############
 # Test mysqladmin connecting to a server with an empty crl
+Warning: Using a password on the command line interface can be insecure.
 mysqld is alive

=== renamed file 'mysql-test/r/ssl_crl_clrpath.result' => 'mysql-test/r/ssl_crl_crlpath.result'
=== modified file 'mysql-test/std_data/crl-ca-cert.pem'
--- a/mysql-test/std_data/crl-ca-cert.pem	2011-08-19 13:24:24 +0000
+++ b/mysql-test/std_data/crl-ca-cert.pem	2012-05-22 10:19:55 +0000
@@ -2,62 +2,62 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            a5:85:ec:60:b1:68:44:22
+            f9:e2:f3:98:0e:2b:05:7c
         Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=BG, ST=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test CA certificate
         Validity
-            Not Before: Jun 17 07:27:51 2011 GMT
-            Not After : Jun 15 07:27:51 2016 GMT
+            Not Before: May 17 15:08:00 2012 GMT
+            Not After : May 10 15:08:00 2042 GMT
         Subject: C=BG, ST=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test CA certificate
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
                 Modulus (1024 bit):
-                    00:9b:08:0b:96:19:57:fb:21:79:f4:16:c9:b8:2c:
-                    13:2e:e1:fe:5f:6b:18:7d:d4:c4:d7:cd:66:a6:62:
-                    0e:b7:28:b1:39:76:62:6e:5a:4a:80:f6:0e:8e:84:
-                    3e:cf:2f:91:0d:36:6d:8b:b5:f9:78:96:f0:5f:82:
-                    a2:b2:d8:fc:b3:46:b5:30:24:b3:a8:77:60:6c:05:
-                    c9:8f:82:fd:ad:9f:26:23:29:56:5b:02:6f:f2:00:
-                    31:86:60:b7:8c:56:b3:95:a8:8d:a9:bb:6b:91:fd:
-                    5d:f5:6a:21:45:85:63:78:0e:0f:0e:03:6d:53:73:
-                    0d:6c:aa:5b:f9:fc:fa:fd:f7
+                    00:ed:ec:45:e0:22:d7:d0:d5:91:87:74:5f:ee:17:
+                    b5:c7:07:c2:4b:b3:e7:13:93:46:95:1f:5d:09:54:
+                    14:98:40:3d:0e:e6:14:5c:5e:39:c5:75:87:4e:73:
+                    24:62:d9:85:4a:69:c4:35:7d:6b:76:6c:1c:8e:56:
+                    a8:fe:9e:fe:22:ae:c9:41:14:67:d4:11:37:8d:d3:
+                    18:02:9d:8a:36:64:b1:8b:2f:a0:ba:2d:d5:fd:c0:
+                    cd:6a:7d:a5:c0:6b:6b:60:64:2f:24:45:bb:a8:ad:
+                    1c:95:a0:d5:40:79:28:5f:b1:17:97:63:a1:d5:1e:
+                    42:d4:10:70:5d:8f:2e:34:45
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-                C4:1D:2C:68:3F:5F:29:51:EC:C5:54:61:CE:16:13:D2:72:5D:63:E8
+                85:AB:E6:A7:57:88:7D:8D:BE:EB:64:53:73:94:64:CD:4B:8D:29:12
             X509v3 Authority Key Identifier: 
-                keyid:C4:1D:2C:68:3F:5F:29:51:EC:C5:54:61:CE:16:13:D2:72:5D:63:E8
+                keyid:85:AB:E6:A7:57:88:7D:8D:BE:EB:64:53:73:94:64:CD:4B:8D:29:12
                 DirName:/C=BG/ST=Plovdiv/O=Oracle/OU=MySQL/CN=MySQL CRL test CA certificate
-                serial:A5:85:EC:60:B1:68:44:22
+                serial:F9:E2:F3:98:0E:2B:05:7C
 
             X509v3 Basic Constraints: 
                 CA:TRUE
     Signature Algorithm: sha1WithRSAEncryption
-        73:dd:2e:76:71:25:c2:fe:7a:c5:46:ca:f2:c7:a0:43:f0:c7:
-        3c:24:8d:a6:bd:8d:f2:7c:db:03:1b:2b:8a:c8:23:ae:ef:71:
-        25:33:5b:10:61:e7:7d:89:30:a8:67:25:2e:e0:06:30:77:da:
-        b8:87:e5:91:cd:c7:8f:c9:7b:3d:9e:86:80:44:02:6b:d1:06:
-        85:5d:28:78:cc:a7:a8:35:ac:f7:77:6d:e2:c7:a3:37:bc:9f:
-        d3:bf:4a:ca:09:dc:d0:78:0c:59:c7:db:4b:67:f1:09:6d:a9:
-        7a:50:2f:1d:2c:a6:b8:81:0e:e6:4b:ee:d9:be:ae:a5:6a:d7:
-        56:c4
+        90:f7:9b:56:14:df:c4:db:46:a4:67:f5:83:68:e9:70:45:4c:
+        5d:97:07:06:fd:2c:68:0b:9a:ed:6d:7a:d1:18:be:b8:dd:08:
+        bc:ff:10:5b:d9:b2:50:1f:98:b0:5d:be:6d:0b:88:bb:30:93:
+        fa:04:34:f1:3b:f6:56:d5:86:bb:1c:31:f3:7f:7b:38:0b:d1:
+        f9:fd:87:b5:c4:63:a0:b8:46:59:95:a8:b5:ec:4f:d0:ad:df:
+        42:ed:74:4f:2f:fd:7c:65:aa:d7:60:d1:70:55:41:8b:0b:c2:
+        3b:f1:f3:2f:6b:a5:d9:48:b1:2d:84:e9:07:63:92:f0:36:04:
+        cf:5d
 -----BEGIN CERTIFICATE-----
-MIIDHDCCAoWgAwIBAgIJAKWF7GCxaEQiMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
+MIIDHDCCAoWgAwIBAgIJAPni85gOKwV8MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
 BAYTAkJHMRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAMBgNV
 BAsTBU15U1FMMSYwJAYDVQQDEx1NeVNRTCBDUkwgdGVzdCBDQSBjZXJ0aWZpY2F0
-ZTAeFw0xMTA2MTcwNzI3NTFaFw0xNjA2MTUwNzI3NTFaMGgxCzAJBgNVBAYTAkJH
+ZTAeFw0xMjA1MTcxNTA4MDBaFw00MjA1MTAxNTA4MDBaMGgxCzAJBgNVBAYTAkJH
 MRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAMBgNVBAsTBU15
 U1FMMSYwJAYDVQQDEx1NeVNRTCBDUkwgdGVzdCBDQSBjZXJ0aWZpY2F0ZTCBnzAN
-BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAmwgLlhlX+yF59BbJuCwTLuH+X2sYfdTE
-181mpmIOtyixOXZiblpKgPYOjoQ+zy+RDTZti7X5eJbwX4Kistj8s0a1MCSzqHdg
-bAXJj4L9rZ8mIylWWwJv8gAxhmC3jFazlaiNqbtrkf1d9WohRYVjeA4PDgNtU3MN
-bKpb+fz6/fcCAwEAAaOBzTCByjAdBgNVHQ4EFgQUxB0saD9fKVHsxVRhzhYT0nJd
-Y+gwgZoGA1UdIwSBkjCBj4AUxB0saD9fKVHsxVRhzhYT0nJdY+ihbKRqMGgxCzAJ
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA7exF4CLX0NWRh3Rf7he1xwfCS7PnE5NG
+lR9dCVQUmEA9DuYUXF45xXWHTnMkYtmFSmnENX1rdmwcjlao/p7+Iq7JQRRn1BE3
+jdMYAp2KNmSxiy+gui3V/cDNan2lwGtrYGQvJEW7qK0claDVQHkoX7EXl2Oh1R5C
+1BBwXY8uNEUCAwEAAaOBzTCByjAdBgNVHQ4EFgQUhavmp1eIfY2+62RTc5RkzUuN
+KRIwgZoGA1UdIwSBkjCBj4AUhavmp1eIfY2+62RTc5RkzUuNKRKhbKRqMGgxCzAJ
 BgNVBAYTAkJHMRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAM
 BgNVBAsTBU15U1FMMSYwJAYDVQQDEx1NeVNRTCBDUkwgdGVzdCBDQSBjZXJ0aWZp
-Y2F0ZYIJAKWF7GCxaEQiMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEA
-c90udnElwv56xUbK8segQ/DHPCSNpr2N8nzbAxsrisgjru9xJTNbEGHnfYkwqGcl
-LuAGMHfauIflkc3Hj8l7PZ6GgEQCa9EGhV0oeMynqDWs93dt4sejN7yf079Kygnc
-0HgMWcfbS2fxCW2pelAvHSymuIEO5kvu2b6upWrXVsQ=
+Y2F0ZYIJAPni85gOKwV8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEA
+kPebVhTfxNtGpGf1g2jpcEVMXZcHBv0saAua7W160Ri+uN0IvP8QW9myUB+YsF2+
+bQuIuzCT+gQ08Tv2VtWGuxwx8397OAvR+f2HtcRjoLhGWZWotexP0K3fQu10Ty/9
+fGWq12DRcFVBiwvCO/HzL2ul2UixLYTpB2OS8DYEz10=
 -----END CERTIFICATE-----

=== added file 'mysql-test/std_data/crl-certificate-readme.txt'
--- a/mysql-test/std_data/crl-certificate-readme.txt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/std_data/crl-certificate-readme.txt	2012-05-22 10:19:55 +0000
@@ -0,0 +1,31 @@
+These are the instructions on how to generate test files for the CRL tests
+using openSSL.
+
+1. Make sure you have the right validity periods in CA.pl and openssl.cnf
+2. Create a new certification authority : CA.pl -newca
+3. Copy demoCA/cacert.pem to crl-ca-cert.pem
+4. Create one server certificate request : CA.pl -newreq
+5. Sign the server certificate request : CA.pl -signreq
+6. Copy demoCA/newcert.pem to crl-server-cert.pem
+7. Remove the key from server's certificate key while copying it :
+     openssl rsa -in newkey.pem -out crl-server-key.pem
+8. Create one client certificate request : CA.pl -newreq
+9. Sign the client certificate request : CA.pl -signreq
+10. Copy demoCA/newcert.pem to crl-client-cert.pem
+11. Remove the key from client's certificate key while copying it :
+     openssl rsa -in newkey.pem -out crl-client-key.pem
+12. Create one to-be-revoked client certificate request : CA.pl -newreq
+13. Sign the to-be-revoked client certificate request : CA.pl -signreq
+14. Copy demoCA/newcert.pem to crl-client-invalid-cert.pem
+15. Remove the key from the to-be-revoked client's certificate
+  key while copying it :
+     openssl rsa -in newkey.pem -out crl-client-invalid-key.pem
+16. Revoke the crl-client-invalid-cert.pem :
+     openssl ca -revoke crl-client-invalid-key.pem
+17. Generate a CRL file :
+     openssl ca -gencrl -crldays=3650 -out crl-client-revoked.crl
+18. Clean up all the files in the crldir directory
+19. Copy the CA certificate into it :
+     cp crl-ca-cert.pem `openssl -in crl-ca-cert.pem -noout -hash`.0
+20. Copy the CRL file into it :
+     cp crl-client-revoked.crl `openssl -in crl-ca-cert.pem -noout -hash`.r0

=== modified file 'mysql-test/std_data/crl-client-cert.pem'
--- a/mysql-test/std_data/crl-client-cert.pem	2011-08-19 13:24:24 +0000
+++ b/mysql-test/std_data/crl-client-cert.pem	2012-05-22 10:19:55 +0000
@@ -2,26 +2,26 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            a5:85:ec:60:b1:68:44:24
+            f9:e2:f3:98:0e:2b:05:7e
         Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=BG, ST=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test CA certificate
         Validity
-            Not Before: Jun 17 07:32:32 2011 GMT
-            Not After : Jun 16 07:32:32 2014 GMT
-        Subject: C=BG, ST=Plovdiv, L=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test client certificate
+            Not Before: May 17 15:18:14 2012 GMT
+            Not After : May 15 15:18:14 2022 GMT
+        Subject: C=BG, ST=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test client certificate
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
                 Modulus (1024 bit):
-                    00:bd:18:bf:c5:37:7e:f7:8a:1d:22:c0:4f:5a:70:
-                    51:ea:df:56:4f:29:e9:c7:a5:8a:ab:5a:48:b5:f9:
-                    bf:cd:2a:73:f8:fa:13:20:fd:33:17:11:93:51:f0:
-                    4f:fa:a5:6a:bc:37:94:92:de:7d:c1:09:c6:43:c0:
-                    f7:cd:dd:ac:06:bf:fe:0c:9f:fc:ec:5b:83:a1:1e:
-                    34:d8:af:50:17:4d:84:51:20:44:76:81:d1:12:76:
-                    06:fb:05:29:59:47:0f:9d:97:f1:41:2f:92:0d:e4:
-                    b6:c1:fb:cf:75:95:a9:0f:cf:b3:4f:69:a3:d1:14:
-                    e9:6b:cf:be:53:bd:4e:3f:5d
+                    00:d8:03:97:99:2f:54:86:ec:b5:79:4f:8f:ff:bb:
+                    b8:23:e0:9b:d3:d4:ba:40:2e:34:dd:ad:8c:2c:43:
+                    f9:7b:d5:4f:5c:ef:47:bd:e3:b2:ac:76:ea:b2:d5:
+                    97:dc:99:4e:fa:d8:13:48:a2:cb:ee:3f:40:7a:fe:
+                    af:f1:d8:cd:c8:5b:1f:f7:7c:a4:7f:cf:fe:02:91:
+                    e6:d8:39:ef:e8:4f:a8:ff:b6:78:29:78:72:24:a4:
+                    f0:e4:67:8a:41:50:5e:9d:6b:a8:4f:06:f2:b4:8e:
+                    22:f9:05:e6:31:03:f9:1b:a8:29:16:6d:7c:5d:bd:
+                    60:81:ac:6e:9c:63:5b:a4:41
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -29,34 +29,34 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                39:37:9C:0B:9F:E4:8E:48:48:71:23:2B:CA:F0:C1:F9:0B:F2:0A:D0
+                7A:9B:4D:5A:CD:9A:CB:14:B2:A5:D3:B0:89:24:6E:BC:8E:1E:99:1D
             X509v3 Authority Key Identifier: 
-                keyid:C4:1D:2C:68:3F:5F:29:51:EC:C5:54:61:CE:16:13:D2:72:5D:63:E8
+                keyid:85:AB:E6:A7:57:88:7D:8D:BE:EB:64:53:73:94:64:CD:4B:8D:29:12
 
     Signature Algorithm: sha1WithRSAEncryption
-        18:03:42:13:af:86:c3:eb:9c:40:4a:d8:9e:e7:25:e1:43:7b:
-        2f:55:1b:e6:ec:bf:9b:56:b3:c7:cb:78:cd:d2:00:46:39:96:
-        d8:f8:cd:9d:0e:e7:97:51:93:f8:5b:ed:4f:5a:16:6b:56:fb:
-        c0:d1:58:3c:7f:e9:64:aa:11:03:ff:3b:5e:9d:6d:c8:53:a8:
-        4a:30:f7:a6:ae:7c:e0:ed:16:c4:a0:07:9c:75:1a:23:58:13:
-        70:9e:aa:cc:b8:1d:70:26:85:ad:e1:f3:34:83:1b:e0:72:44:
-        c4:28:d5:c5:6a:43:83:47:fe:8b:ab:ac:07:55:ff:2c:d9:0f:
-        5f:c7
+        ba:04:f4:20:39:e3:94:2b:5b:a4:18:2b:8a:0b:12:bd:58:7d:
+        0b:0c:cd:ab:b2:7c:7a:57:2f:8b:31:06:ce:6d:26:7c:50:5c:
+        74:fd:3c:21:8c:20:04:ef:55:e9:2a:fe:f5:35:2d:86:d0:1c:
+        9f:05:96:91:9e:2f:74:a7:50:db:55:dd:ba:ff:8a:9b:ce:50:
+        03:5d:e1:10:5b:a3:4b:d5:46:73:6f:52:e8:e5:0c:b6:23:7a:
+        22:1e:30:86:9f:34:d2:3e:66:2c:dc:b6:96:0d:ee:21:59:5c:
+        17:50:23:a5:9a:2d:37:d8:ef:85:23:c0:e8:84:14:df:95:35:
+        1a:18
 -----BEGIN CERTIFICATE-----
-MIIC3zCCAkigAwIBAgIJAKWF7GCxaEQkMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
+MIICzTCCAjagAwIBAgIJAPni85gOKwV+MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
 BAYTAkJHMRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAMBgNV
 BAsTBU15U1FMMSYwJAYDVQQDEx1NeVNRTCBDUkwgdGVzdCBDQSBjZXJ0aWZpY2F0
-ZTAeFw0xMTA2MTcwNzMyMzJaFw0xNDA2MTYwNzMyMzJaMH4xCzAJBgNVBAYTAkJH
-MRAwDgYDVQQIEwdQbG92ZGl2MRAwDgYDVQQHEwdQbG92ZGl2MQ8wDQYDVQQKEwZP
-cmFjbGUxDjAMBgNVBAsTBU15U1FMMSowKAYDVQQDEyFNeVNRTCBDUkwgdGVzdCBj
-bGllbnQgY2VydGlmaWNhdGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL0Y
-v8U3fveKHSLAT1pwUerfVk8p6celiqtaSLX5v80qc/j6EyD9MxcRk1HwT/qlarw3
-lJLefcEJxkPA983drAa//gyf/Oxbg6EeNNivUBdNhFEgRHaB0RJ2BvsFKVlHD52X
-8UEvkg3ktsH7z3WVqQ/Ps09po9EU6WvPvlO9Tj9dAgMBAAGjezB5MAkGA1UdEwQC
-MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
-MB0GA1UdDgQWBBQ5N5wLn+SOSEhxIyvK8MH5C/IK0DAfBgNVHSMEGDAWgBTEHSxo
-P18pUezFVGHOFhPScl1j6DANBgkqhkiG9w0BAQUFAAOBgQAYA0ITr4bD65xAStie
-5yXhQ3svVRvm7L+bVrPHy3jN0gBGOZbY+M2dDueXUZP4W+1PWhZrVvvA0Vg8f+lk
-qhED/ztenW3IU6hKMPemrnzg7RbEoAecdRojWBNwnqrMuB1wJoWt4fM0gxvgckTE
-KNXFakODR/6Lq6wHVf8s2Q9fxw==
+ZTAeFw0xMjA1MTcxNTE4MTRaFw0yMjA1MTUxNTE4MTRaMGwxCzAJBgNVBAYTAkJH
+MRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAMBgNVBAsTBU15
+U1FMMSowKAYDVQQDEyFNeVNRTCBDUkwgdGVzdCBjbGllbnQgY2VydGlmaWNhdGUw
+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANgDl5kvVIbstXlPj/+7uCPgm9PU
+ukAuNN2tjCxD+XvVT1zvR73jsqx26rLVl9yZTvrYE0iiy+4/QHr+r/HYzchbH/d8
+pH/P/gKR5tg57+hPqP+2eCl4ciSk8ORnikFQXp1rqE8G8rSOIvkF5jED+RuoKRZt
+fF29YIGsbpxjW6RBAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
+HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBR6m01azZrL
+FLKl07CJJG68jh6ZHTAfBgNVHSMEGDAWgBSFq+anV4h9jb7rZFNzlGTNS40pEjAN
+BgkqhkiG9w0BAQUFAAOBgQC6BPQgOeOUK1ukGCuKCxK9WH0LDM2rsnx6Vy+LMQbO
+bSZ8UFx0/TwhjCAE71XpKv71NS2G0ByfBZaRni90p1DbVd26/4qbzlADXeEQW6NL
+1UZzb1Lo5Qy2I3oiHjCGnzTSPmYs3LaWDe4hWVwXUCOlmi032O+FI8DohBTflTUa
+GA==
 -----END CERTIFICATE-----

=== modified file 'mysql-test/std_data/crl-client-key.pem'
--- a/mysql-test/std_data/crl-client-key.pem	2011-08-19 13:24:24 +0000
+++ b/mysql-test/std_data/crl-client-key.pem	2012-05-22 10:19:55 +0000
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC9GL/FN373ih0iwE9acFHq31ZPKenHpYqrWki1+b/NKnP4+hMg
-/TMXEZNR8E/6pWq8N5SS3n3BCcZDwPfN3awGv/4Mn/zsW4OhHjTYr1AXTYRRIER2
-gdESdgb7BSlZRw+dl/FBL5IN5LbB+891lakPz7NPaaPRFOlrz75TvU4/XQIDAQAB
-AoGAYMe37rIWk47mlpCijIEMDA++Vsn20q2RKV4N9MUcO19M99LV036DlXzzT26V
-II1k8Wvo6Lpi1lewV6D9symPDwuxO3L/lSwInVSbAaCkRYq7BlpL+ShxsUpWT788
-ealwFTj3TeM1MCHpFwvO0xGBqFVk+ZadCNZjvwdQi44JCykCQQDqJgOTPPniq5Lk
-J6d+KWiCPVAEnEWk5lR0jQ2NZhSm4fFmCd0v6bNYhztk7dizSOiIrXnPLXx9Z8v0
-rwKr5WrHAkEAzr5ps9d/t4V60vAJCK+Sq1b+Qj42yEnH2eIjKAUFO63jkPtpOv9h
-nzYJTqajvEkHbYJ92elpzGx47FuSOjzAuwJAYpZC5xnDdSccoCf6I+q3cC70pBxQ
-TpAUe0ZwsFqM039KrtX0ZZoWw22dGm/yz/ogvnucUBks03iCrbGKhGoCPQJAdlhj
-U5I5Rsl+vH6w/Srbz37Vvv+0BkTNxPiA3Wi6TSZGDPkNjLshm6yn+UDEm4RGXzaC
-ahoF+QHi2pG0i+e4/wJBAOmbrYbjE2LAzIBy0NvRHslPABTK4zn1L9lzU5XIjV9r
-y8JiMfGNC5r7To/ERlFUlMbaPA5Zm9XNrZhDROMZLTc=
+MIICXQIBAAKBgQDYA5eZL1SG7LV5T4//u7gj4JvT1LpALjTdrYwsQ/l71U9c70e9
+47Ksduqy1ZfcmU762BNIosvuP0B6/q/x2M3IWx/3fKR/z/4CkebYOe/oT6j/tngp
+eHIkpPDkZ4pBUF6da6hPBvK0jiL5BeYxA/kbqCkWbXxdvWCBrG6cY1ukQQIDAQAB
+AoGBAL2RAXQcFhjGGEfaa6toaKOLlBSk5cI3CovTpmSeTo2+14PeNN5OuVkijrrc
+OQYNwELgZqPiwgZVmdeWNH+P3J2vo+QqfxskondSDM2ZDedvO8tc4W74oSQzsASr
+37ptEJlAdumzQ1XPxGwZi6E2KPzmTBQ4Q0j50UB2vagbR2cxAkEA7C3dVMyNYLew
+ycujuU7F4SQcYFY5/BMj6yanovBF80FRT2X+mxj3lSZux/tjZFvxeb9Q5vmJJRp6
+PUP/ROQVVQJBAOokfqS6jrvvNvqYZnMb54iDTP7Jx+EJyBJxYtJM53WC3NXarCQq
+EWyVD1KxJxxW1gfcmJbhVQYeUsictO24Uz0CQGEtxgJcYFfJfW6q4eUfqoAm8Z4a
+HKXB4mehchyzLLUYzTIUT5zVuxmdxLt4jr7+re9gbxN63ZlsuZt33RMlnjkCQGbF
+igkIEeqPv1QTXLSdxOz4pO0Y6HDweC8QMc4ZD2dW/1Om3fQpuugsLUOgmogn3V4q
+B5gCY+2BldiUYB4P0AkCQQDDkyhWJQvtXSLGFkfUBZ6PCzVfO+Pkb7tISQuDGT4J
+HY+UpnQBbe6WP2hGXzwaGw9rVYaA9IcvX8pOpWsCDk80
 -----END RSA PRIVATE KEY-----

=== added file 'mysql-test/std_data/crl-client-revoked-cert.pem'
--- a/mysql-test/std_data/crl-client-revoked-cert.pem	1970-01-01 00:00:00 +0000
+++ b/mysql-test/std_data/crl-client-revoked-cert.pem	2012-05-22 10:19:55 +0000
@@ -0,0 +1,62 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            f9:e2:f3:98:0e:2b:05:7f
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=BG, ST=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test CA certificate
+        Validity
+            Not Before: May 17 15:21:12 2012 GMT
+            Not After : May 15 15:21:12 2022 GMT
+        Subject: C=BG, ST=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test client certificate revoked
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:a5:dd:99:d5:fd:3a:9c:06:f4:2e:1a:e0:52:1b:
+                    f6:24:ca:e8:07:41:38:a6:9c:5f:84:5a:07:43:9e:
+                    de:91:37:6d:40:44:cd:8e:48:a2:b8:c4:39:75:41:
+                    d6:aa:97:26:01:37:76:7b:02:45:18:78:e1:1e:56:
+                    5d:f8:5d:e0:cc:a4:c4:bd:0d:1b:40:6e:00:4e:e0:
+                    ba:06:61:9f:81:f2:29:ae:db:31:b2:8f:26:2e:32:
+                    c5:74:b2:09:5f:76:a8:4a:5e:b4:f1:44:59:7e:3d:
+                    2a:9c:aa:b0:71:a4:2e:70:3b:8c:f2:93:2f:87:c1:
+                    a6:87:e6:6b:7c:1f:a5:f5:6b
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                20:75:FB:E7:F0:11:4F:64:48:C6:F9:85:7C:1E:3A:C7:F0:16:8F:51
+            X509v3 Authority Key Identifier: 
+                keyid:85:AB:E6:A7:57:88:7D:8D:BE:EB:64:53:73:94:64:CD:4B:8D:29:12
+
+    Signature Algorithm: sha1WithRSAEncryption
+        d9:23:63:c2:da:d4:4a:53:85:c2:87:ab:e5:a4:7b:ea:cb:8a:
+        0e:6e:6c:ef:a7:a3:e2:ff:29:9e:af:d0:24:08:40:44:0e:0c:
+        91:5c:5e:38:25:c9:1b:c5:55:b1:17:01:12:57:60:5b:78:f5:
+        e3:3c:47:e0:df:10:11:38:f6:18:ce:37:5f:ec:c6:a9:95:39:
+        db:36:5d:78:12:9a:57:f8:bc:4d:cd:e5:e9:77:85:71:72:d1:
+        66:99:0c:35:51:8a:3d:61:cf:0f:21:5e:e1:cb:4b:33:f7:68:
+        8c:d2:fc:ca:a5:44:a7:d6:d3:76:9a:60:fb:0b:17:97:ee:3a:
+        23:22
+-----BEGIN CERTIFICATE-----
+MIIC1TCCAj6gAwIBAgIJAPni85gOKwV/MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
+BAYTAkJHMRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAMBgNV
+BAsTBU15U1FMMSYwJAYDVQQDEx1NeVNRTCBDUkwgdGVzdCBDQSBjZXJ0aWZpY2F0
+ZTAeFw0xMjA1MTcxNTIxMTJaFw0yMjA1MTUxNTIxMTJaMHQxCzAJBgNVBAYTAkJH
+MRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAMBgNVBAsTBU15
+U1FMMTIwMAYDVQQDEylNeVNRTCBDUkwgdGVzdCBjbGllbnQgY2VydGlmaWNhdGUg
+cmV2b2tlZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApd2Z1f06nAb0Lhrg
+Uhv2JMroB0E4ppxfhFoHQ57ekTdtQETNjkiiuMQ5dUHWqpcmATd2ewJFGHjhHlZd
++F3gzKTEvQ0bQG4ATuC6BmGfgfIprtsxso8mLjLFdLIJX3aoSl608URZfj0qnKqw
+caQucDuM8pMvh8Gmh+ZrfB+l9WsCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
+hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
+FCB1++fwEU9kSMb5hXweOsfwFo9RMB8GA1UdIwQYMBaAFIWr5qdXiH2NvutkU3OU
+ZM1LjSkSMA0GCSqGSIb3DQEBBQUAA4GBANkjY8La1EpThcKHq+Wke+rLig5ubO+n
+o+L/KZ6v0CQIQEQODJFcXjglyRvFVbEXARJXYFt49eM8R+DfEBE49hjON1/sxqmV
+Ods2XXgSmlf4vE3N5el3hXFy0WaZDDVRij1hzw8hXuHLSzP3aIzS/MqlRKfW03aa
+YPsLF5fuOiMi
+-----END CERTIFICATE-----

=== added file 'mysql-test/std_data/crl-client-revoked-key.pem'
--- a/mysql-test/std_data/crl-client-revoked-key.pem	1970-01-01 00:00:00 +0000
+++ b/mysql-test/std_data/crl-client-revoked-key.pem	2012-05-22 10:19:55 +0000
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQCl3ZnV/TqcBvQuGuBSG/YkyugHQTimnF+EWgdDnt6RN21ARM2O
+SKK4xDl1QdaqlyYBN3Z7AkUYeOEeVl34XeDMpMS9DRtAbgBO4LoGYZ+B8imu2zGy
+jyYuMsV0sglfdqhKXrTxRFl+PSqcqrBxpC5wO4zyky+HwaaH5mt8H6X1awIDAQAB
+AoGAKkkoowmAG68aKXbooYZHZnHkXZUfIDrVjyR0naSvEU6UJ8JitVeHRJuiGmbC
+l5MZOU4ugoW9n9ORcO6L3nnwiVKWmG7K561ctp2tPQbUtCEMcFmGbnrJuJHrkyJX
+I0+E7+3mg2cCsTwofjR6bUeM7NnnM0Tf6Q5rKk/aXMW90MECQQDO9d3xt4TU1u/l
+uep52w43x23ZYx+YLIHVR9VRMZrYF62B8GpSf9TOdLOQBUyifdVJiXnuV1OkdHSX
+58G3P6sjAkEAzSrw66gH9YRC72tSU/m6LrMh9xmm3VqUWIYvzgX0Mw/a51VE+blr
+q/jctYicy1rbcDRsI9iKraXmB6fBhAA1GQJAK6VESh6Wv8AYVY0wusQMqoy/SNIT
+rqbsNotwnC/m5N2RdM67zWwx99w6pgvIDpiU6243raDy/cKleAejHb8qmwJBAJyQ
+Bzcdi61MV7PSJwoUCIK4idPBjHdgNtHy3CoQmxAYKkjb5f3XBBZAm1QgQt5foBLY
+vikAhpsKfSYcWuz7J4kCQQCX22QkqP9/JnC7CYfSasb69kD0A/zOn8wT3LQi4HRj
+3c2Mh+hKSVdMUXzULEnF+oZbMADSlPRY1qgykg+fK38R
+-----END RSA PRIVATE KEY-----

=== modified file 'mysql-test/std_data/crl-client-revoked.crl'
--- a/mysql-test/std_data/crl-client-revoked.crl	2011-08-19 13:24:24 +0000
+++ b/mysql-test/std_data/crl-client-revoked.crl	2012-05-22 10:19:55 +0000
@@ -1,10 +1,10 @@
 -----BEGIN X509 CRL-----
-MIIBbDCB1gIBATANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJCRzEQMA4GA1UE
+MIIBXjCByAIBATANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJCRzEQMA4GA1UE
 CBMHUGxvdmRpdjEPMA0GA1UEChMGT3JhY2xlMQ4wDAYDVQQLEwVNeVNRTDEmMCQG
-A1UEAxMdTXlTUUwgQ1JMIHRlc3QgQ0EgY2VydGlmaWNhdGUXDTExMDgxOTEwMDQ1
-MFoXDTE3MDIwODEwMDQ1MFowKjAoAgkApYXsYLFoRCQXDTExMDYxNzA3Mzc1OVow
-DDAKBgNVHRUEAwoBBaAOMAwwCgYDVR0UBAMCAQMwDQYJKoZIhvcNAQEFBQADgYEA
-BXAwYBjHUHG6MQ22/+1hvOaRtSYfj/E5bhKbBB8JlKSRFO+xIOF2i2H1AigunWpC
-R10NicSS7qjsr6yDyBaywZmi0TCNGksR7b3m1m97RnhrxkVRlr/i7L+o04ZwWo/b
-z9zoTX6RTj8rHgQtEdIOi/EArCvDv+wqYmkI+XMScGI=
+A1UEAxMdTXlTUUwgQ1JMIHRlc3QgQ0EgY2VydGlmaWNhdGUXDTEyMDUyMTE0NDEx
+NFoXDTIyMDUxOTE0NDExNFowHDAaAgkA+eLzmA4rBX8XDTEyMDUxNzE1Mjc1OVqg
+DjAMMAoGA1UdFAQDAgECMA0GCSqGSIb3DQEBBQUAA4GBAIEYWLAI+mGt21DVlg/t
+mGaQ629aabNhZL3An5+2z+tqzQbOv6bKMW5H8gNNeNrRqQR/XEJvhlg0BrxfIicM
+GbvVoud0HmECIoxNVmeI8UCNPkkeQONT+8ZW029iuJF2KgGI0m1ZJa3bjRaArian
+ag9dgLE4zLppD4aMal0ysHPZ
 -----END X509 CRL-----

=== modified file 'mysql-test/std_data/crl-server-cert.pem'
--- a/mysql-test/std_data/crl-server-cert.pem	2011-08-19 13:24:24 +0000
+++ b/mysql-test/std_data/crl-server-cert.pem	2012-05-22 10:19:55 +0000
@@ -2,26 +2,26 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            a5:85:ec:60:b1:68:44:23
+            f9:e2:f3:98:0e:2b:05:7d
         Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=BG, ST=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test CA certificate
         Validity
-            Not Before: Jun 17 07:29:11 2011 GMT
-            Not After : Jun 16 07:29:11 2014 GMT
-        Subject: C=BG, ST=Plovdiv, L=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test server certificate
+            Not Before: May 17 15:09:56 2012 GMT
+            Not After : May 15 15:09:56 2022 GMT
+        Subject: C=BG, ST=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test server certificate
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
                 Modulus (1024 bit):
-                    00:c4:c6:01:29:db:e6:62:40:07:bd:43:ce:37:8e:
-                    90:0e:3c:86:cc:6a:0c:40:8e:8e:30:27:f2:84:d3:
-                    59:e8:7d:e7:97:1e:0d:36:08:0b:cc:28:bb:86:b0:
-                    0a:64:8c:55:33:f6:ce:19:00:08:b9:93:ca:84:7e:
-                    9a:4e:81:91:e2:56:32:2a:de:b5:1f:82:b9:8f:33:
-                    f4:87:f8:10:84:69:69:9a:79:58:08:9a:29:dc:09:
-                    79:27:90:ec:af:c8:2d:5f:2e:c1:e1:4a:f1:52:21:
-                    37:58:d4:f9:ef:49:ce:a9:9d:eb:dc:f4:34:30:40:
-                    d0:d7:38:54:94:2e:d1:ac:25
+                    00:af:0b:31:f9:f6:20:3b:6c:3f:9a:84:d0:85:b4:
+                    d4:ed:f9:ea:29:37:44:77:2b:37:25:da:9f:b8:f9:
+                    b3:02:9d:62:fc:e5:fc:d8:c1:56:7d:4f:7e:fa:6b:
+                    4f:f5:2b:98:b2:e2:fe:7c:7e:b8:57:bb:03:a5:2b:
+                    03:86:f5:d4:c4:66:6d:41:a7:fa:2a:09:02:7a:8e:
+                    c7:cd:44:15:46:64:fc:77:99:1e:53:06:ef:c5:d6:
+                    b4:19:3a:db:7b:26:16:60:0a:f8:62:ae:40:22:1b:
+                    1b:c2:20:2e:b0:bf:18:37:96:5c:a8:16:35:81:1f:
+                    f6:4b:3a:14:fb:4c:58:8e:37
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -29,34 +29,34 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                4A:18:8F:0C:A3:CF:D7:4A:38:83:07:FC:26:E3:EB:96:32:73:FA:8C
+                E1:3D:2B:5B:A1:96:FC:80:19:27:BA:F6:88:94:58:E3:EB:F6:85:10
             X509v3 Authority Key Identifier: 
-                keyid:C4:1D:2C:68:3F:5F:29:51:EC:C5:54:61:CE:16:13:D2:72:5D:63:E8
+                keyid:85:AB:E6:A7:57:88:7D:8D:BE:EB:64:53:73:94:64:CD:4B:8D:29:12
 
     Signature Algorithm: sha1WithRSAEncryption
-        61:74:cc:62:70:9e:1f:3e:96:ac:cd:54:4f:34:60:1c:27:51:
-        f4:d5:f8:2e:d7:18:11:86:4e:b5:52:8c:a1:ef:28:c9:43:d7:
-        23:2a:22:15:4a:a3:e7:ff:76:fa:25:be:ed:30:05:ea:12:aa:
-        3f:c8:ab:a7:22:02:ea:cf:50:d4:43:31:5f:51:de:4c:e1:fa:
-        31:ba:2e:4e:d8:a4:3d:80:ad:17:83:67:0f:1b:6f:0b:74:43:
-        ce:36:cb:2f:17:9e:6e:ae:c6:eb:ec:93:70:69:82:42:04:b3:
-        a7:31:1f:65:70:ff:06:ce:9c:22:8a:dc:7d:92:bc:04:24:ca:
-        20:66
+        67:04:e4:39:2e:80:71:a8:63:ad:7e:e8:61:86:c7:a3:93:9e:
+        0d:0a:82:fd:21:29:9a:68:46:fa:95:b0:8d:23:7e:78:68:0f:
+        a9:19:3a:05:a1:df:b5:78:95:7c:f1:7f:8c:2a:40:23:c0:2b:
+        c8:a5:b0:1a:0e:8a:c4:42:ac:fc:e3:9d:f2:bb:e9:7f:75:b5:
+        94:2e:64:eb:ac:33:53:cd:8f:e8:4d:17:80:f7:ad:dd:03:57:
+        3e:e9:65:76:d3:c1:14:13:62:23:4b:bf:e1:38:0e:da:d0:74:
+        8e:52:9b:9d:9e:cc:ba:e5:a1:94:d1:f2:76:f9:c5:c7:ab:60:
+        01:c8
 -----BEGIN CERTIFICATE-----
-MIIC3zCCAkigAwIBAgIJAKWF7GCxaEQjMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
+MIICzTCCAjagAwIBAgIJAPni85gOKwV9MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
 BAYTAkJHMRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAMBgNV
 BAsTBU15U1FMMSYwJAYDVQQDEx1NeVNRTCBDUkwgdGVzdCBDQSBjZXJ0aWZpY2F0
-ZTAeFw0xMTA2MTcwNzI5MTFaFw0xNDA2MTYwNzI5MTFaMH4xCzAJBgNVBAYTAkJH
-MRAwDgYDVQQIEwdQbG92ZGl2MRAwDgYDVQQHEwdQbG92ZGl2MQ8wDQYDVQQKEwZP
-cmFjbGUxDjAMBgNVBAsTBU15U1FMMSowKAYDVQQDEyFNeVNRTCBDUkwgdGVzdCBz
-ZXJ2ZXIgY2VydGlmaWNhdGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMTG
-ASnb5mJAB71DzjeOkA48hsxqDECOjjAn8oTTWeh955ceDTYIC8wou4awCmSMVTP2
-zhkACLmTyoR+mk6BkeJWMiretR+CuY8z9If4EIRpaZp5WAiaKdwJeSeQ7K/ILV8u
-weFK8VIhN1jU+e9Jzqmd69z0NDBA0Nc4VJQu0awlAgMBAAGjezB5MAkGA1UdEwQC
-MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
-MB0GA1UdDgQWBBRKGI8Mo8/XSjiDB/wm4+uWMnP6jDAfBgNVHSMEGDAWgBTEHSxo
-P18pUezFVGHOFhPScl1j6DANBgkqhkiG9w0BAQUFAAOBgQBhdMxicJ4fPpaszVRP
-NGAcJ1H01fgu1xgRhk61Uoyh7yjJQ9cjKiIVSqPn/3b6Jb7tMAXqEqo/yKunIgLq
-z1DUQzFfUd5M4foxui5O2KQ9gK0Xg2cPG28LdEPONssvF55ursbr7JNwaYJCBLOn
-MR9lcP8Gzpwiitx9krwEJMogZg==
+ZTAeFw0xMjA1MTcxNTA5NTZaFw0yMjA1MTUxNTA5NTZaMGwxCzAJBgNVBAYTAkJH
+MRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAMBgNVBAsTBU15
+U1FMMSowKAYDVQQDEyFNeVNRTCBDUkwgdGVzdCBzZXJ2ZXIgY2VydGlmaWNhdGUw
+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAK8LMfn2IDtsP5qE0IW01O356ik3
+RHcrNyXan7j5swKdYvzl/NjBVn1PfvprT/UrmLLi/nx+uFe7A6UrA4b11MRmbUGn
++ioJAnqOx81EFUZk/HeZHlMG78XWtBk623smFmAK+GKuQCIbG8IgLrC/GDeWXKgW
+NYEf9ks6FPtMWI43AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
+HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBThPStboZb8
+gBknuvaIlFjj6/aFEDAfBgNVHSMEGDAWgBSFq+anV4h9jb7rZFNzlGTNS40pEjAN
+BgkqhkiG9w0BAQUFAAOBgQBnBOQ5LoBxqGOtfuhhhsejk54NCoL9ISmaaEb6lbCN
+I354aA+pGToFod+1eJV88X+MKkAjwCvIpbAaDorEQqz8453yu+l/dbWULmTrrDNT
+zY/oTReA963dA1c+6WV208EUE2IjS7/hOA7a0HSOUpudnsy65aGU0fJ2+cXHq2AB
+yA==
 -----END CERTIFICATE-----

=== modified file 'mysql-test/std_data/crl-server-key.pem'
--- a/mysql-test/std_data/crl-server-key.pem	2011-08-19 13:24:24 +0000
+++ b/mysql-test/std_data/crl-server-key.pem	2012-05-22 10:19:55 +0000
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDExgEp2+ZiQAe9Q843jpAOPIbMagxAjo4wJ/KE01nofeeXHg02
-CAvMKLuGsApkjFUz9s4ZAAi5k8qEfppOgZHiVjIq3rUfgrmPM/SH+BCEaWmaeVgI
-mincCXknkOyvyC1fLsHhSvFSITdY1PnvSc6pnevc9DQwQNDXOFSULtGsJQIDAQAB
-AoGAfecnZW4jWegYS5xv/RJF0CYgJfkQv9m21s8omJ5W37B3lzSORW0eh1Hkswg+
-jhlQhwA63Lot2vfaU65h8ytqeGSxUSj0X8bVCsG+7aoQOxeowZs+CLgWPHmXbXw8
-BI9mFbfkIQ/1x5yMSTv0BNRGUtg+t5FGPsmWxSUtfTme4CECQQDxQGEoesrJ25uE
-MUcrTSeVpNmzqA8e41+8YIzbyi8nmwzp5gbsgIIF6/P5iMo1T7nIal/8N+FQMft4
-Ebzb0ZFNAkEA0M2JmH/ctyDQ7RbQx5lVwiHYn9a3inusvsV47kfH24kdRZYSymI8
-of7O8SGkHFJNeYsJmM3UrsNDlbSd+sCaOQJBAKoM+i8hVp2weU9VuNex28wkVfvH
-41ifZtUOrVsjidd9+D1KkejUsFHiPqfOntGzL74wFRZggSYZBStePWQotSUCQH29
-aMDnLtkw79/2v1+TnSs9CqCmwvyoIYz4iiykGVzBI1mGWGZ75ht/wMtBAPz1Kyao
-be0Q9qUPfaGnlQMt/TECQGrMh32zFPFR98yNS6JDVAVib+d5SaJsV5HXXqKCYxQR
-u1sv7YeF4/Y+TPKpBSasDNZHQ3zex0M9YOgI+9eEBHk=
+MIICXQIBAAKBgQCvCzH59iA7bD+ahNCFtNTt+eopN0R3Kzcl2p+4+bMCnWL85fzY
+wVZ9T376a0/1K5iy4v58frhXuwOlKwOG9dTEZm1Bp/oqCQJ6jsfNRBVGZPx3mR5T
+Bu/F1rQZOtt7JhZgCvhirkAiGxvCIC6wvxg3llyoFjWBH/ZLOhT7TFiONwIDAQAB
+AoGAeS6b87vURq9DPTszjU1KmFILLWuIp6OwczFuoEWmC2pgTEsAiCMZOHmfo8hF
+O6tp9HY3zoKAJqRe+qrTr0xjdkprgdOW8N34nbzQXJh4pqQJqVzsTOAtuxbzWiXs
+Ge7LOQT6HtOaxH71cIs2bgFM4ToUeXMsdxurlfZ0SReNGekCQQDmzqqt6KeBZwir
+W8CfQw3aek/KX7NP/pQQK4thFcJDKl7y9zID7fE0sf76Ga6sGol4GafP1juPHbj8
+MNh7IYcjAkEAwiZa5ucPS8ucG5jRvQluSsJblwikQnl9cniLz+4/HQU/0aHYr3U5
+U14f+S4jU4Gm+DSjZGVL0/x8rShFKz5X3QJBANzKlMHajuqeCtAJ7KEtvwHiAZRB
+qkH68d7qGOIds4EW9k+Moz7ZDuXu5FCR4uNmW10Vhc+vS7hjoYM2otBfSWsCQQCQ
+kT7e8O7S4ao8Ym7K9FrMEC1jKWwmk5B1zI1PJ3iXg3EiCAHxpLgq+8uTIGftpn1O
+FOQVvdfY4gl0ZqgaqzGBAkAghAjdEB6uOrKOkyDfgRvfz46EDdI3iJFtkVpywqdb
+cllH1bDiH5cpkGwX+yWbbnZaNjOZoSIGrAW7lJNDp22Q
 -----END RSA PRIVATE KEY-----

=== added file 'mysql-test/std_data/crldir/ab8a3803.r0'
--- a/mysql-test/std_data/crldir/ab8a3803.r0	1970-01-01 00:00:00 +0000
+++ b/mysql-test/std_data/crldir/ab8a3803.r0	2012-05-22 10:19:55 +0000
@@ -0,0 +1,10 @@
+-----BEGIN X509 CRL-----
+MIIBXjCByAIBATANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJCRzEQMA4GA1UE
+CBMHUGxvdmRpdjEPMA0GA1UEChMGT3JhY2xlMQ4wDAYDVQQLEwVNeVNRTDEmMCQG
+A1UEAxMdTXlTUUwgQ1JMIHRlc3QgQ0EgY2VydGlmaWNhdGUXDTEyMDUyMTE0NDEx
+NFoXDTIyMDUxOTE0NDExNFowHDAaAgkA+eLzmA4rBX8XDTEyMDUxNzE1Mjc1OVqg
+DjAMMAoGA1UdFAQDAgECMA0GCSqGSIb3DQEBBQUAA4GBAIEYWLAI+mGt21DVlg/t
+mGaQ629aabNhZL3An5+2z+tqzQbOv6bKMW5H8gNNeNrRqQR/XEJvhlg0BrxfIicM
+GbvVoud0HmECIoxNVmeI8UCNPkkeQONT+8ZW029iuJF2KgGI0m1ZJa3bjRaArian
+ag9dgLE4zLppD4aMal0ysHPZ
+-----END X509 CRL-----

=== removed file 'mysql-test/std_data/crldir/fc725416.r0'
--- a/mysql-test/std_data/crldir/fc725416.r0	2011-08-19 13:24:24 +0000
+++ b/mysql-test/std_data/crldir/fc725416.r0	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
------BEGIN X509 CRL-----
-MIIBbDCB1gIBATANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJCRzEQMA4GA1UE
-CBMHUGxvdmRpdjEPMA0GA1UEChMGT3JhY2xlMQ4wDAYDVQQLEwVNeVNRTDEmMCQG
-A1UEAxMdTXlTUUwgQ1JMIHRlc3QgQ0EgY2VydGlmaWNhdGUXDTExMDgxOTEwMDQ1
-MFoXDTE3MDIwODEwMDQ1MFowKjAoAgkApYXsYLFoRCQXDTExMDYxNzA3Mzc1OVow
-DDAKBgNVHRUEAwoBBaAOMAwwCgYDVR0UBAMCAQMwDQYJKoZIhvcNAQEFBQADgYEA
-BXAwYBjHUHG6MQ22/+1hvOaRtSYfj/E5bhKbBB8JlKSRFO+xIOF2i2H1AigunWpC
-R10NicSS7qjsr6yDyBaywZmi0TCNGksR7b3m1m97RnhrxkVRlr/i7L+o04ZwWo/b
-z9zoTX6RTj8rHgQtEdIOi/EArCvDv+wqYmkI+XMScGI=
------END X509 CRL-----

=== modified file 'mysql-test/t/ssl_crl.test'
--- a/mysql-test/t/ssl_crl.test	2011-08-19 13:24:24 +0000
+++ b/mysql-test/t/ssl_crl.test	2012-05-22 10:19:55 +0000
@@ -11,13 +11,13 @@ if (!$crllen)
 
 --echo # test --crl for the client : should connect
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-valid-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-valid-cert.pem test --ssl-crl=$MYSQL_TEST_DIR/std_data/crl-client-revoked.crl -e "SHOW VARIABLES like '%ssl%';"
+--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-cert.pem test --ssl-crl=$MYSQL_TEST_DIR/std_data/crl-client-revoked.crl -e "SHOW VARIABLES like '%ssl%';"
 
 --echo # test --crlpath for the client : should connect
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-valid-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-valid-cert.pem --ssl-crlpath=$MYSQL_TEST_DIR/std_data/crldir test -e "SHOW VARIABLES like '%ssl%';"
+--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-cert.pem --ssl-crlpath=$MYSQL_TEST_DIR/std_data/crldir test -e "SHOW VARIABLES like '%ssl%';"
 
 --echo # try logging in with a certificate in the server's --ssl-crl : should fail
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 --error 1
---exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-cert.pem test -e "SHOW VARIABLES like '%ssl%';"
+--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-revoked-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-revoked-cert.pem test -e "SHOW VARIABLES like '%ssl%';"

=== modified file 'mysql-test/t/ssl_crl_clients-master.opt'
--- a/mysql-test/t/ssl_crl_clients-master.opt	2011-08-19 13:24:24 +0000
+++ b/mysql-test/t/ssl_crl_clients-master.opt	2012-05-22 10:19:55 +0000
@@ -1,4 +1,4 @@
 --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem
---ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-key.pem
---ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-cert.pem
+--ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-revoked-key.pem
+--ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-revoked-cert.pem
 --ssl-crl=$MYSQL_TEST_DIR/std_data/crl-client-revoked.crl

=== modified file 'mysql-test/t/ssl_crl_clients_valid-master.opt'
--- a/mysql-test/t/ssl_crl_clients_valid-master.opt	2011-08-19 13:24:24 +0000
+++ b/mysql-test/t/ssl_crl_clients_valid-master.opt	2012-05-22 10:19:55 +0000
@@ -1,4 +1,4 @@
 --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem
---ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-valid-key.pem
---ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-valid-cert.pem
+--ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-key.pem
+--ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-cert.pem
 --ssl-crl=$MYSQL_TEST_DIR/std_data/crl-client-revoked.crl

=== renamed file 'mysql-test/t/ssl_crl_clrpath-master.opt' => 'mysql-test/t/ssl_crl_crlpath-master.opt'
=== renamed file 'mysql-test/t/ssl_crl_clrpath.test' => 'mysql-test/t/ssl_crl_crlpath.test'
--- a/mysql-test/t/ssl_crl_clrpath.test	2011-08-19 13:24:24 +0000
+++ b/mysql-test/t/ssl_crl_crlpath.test	2012-05-22 10:19:55 +0000
@@ -11,13 +11,13 @@ if (!$crllen)
 
 --echo # test --crl for the client : should connect
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-valid-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-valid-cert.pem test --ssl-crl=$MYSQL_TEST_DIR/std_data/crl-client-revoked.crl -e "SHOW VARIABLES like '%ssl%';"
+--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-cert.pem test --ssl-crl=$MYSQL_TEST_DIR/std_data/crl-client-revoked.crl -e "SHOW VARIABLES like '%ssl%';"
 
 --echo # test --crlpath for the client : should connect
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-valid-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-valid-cert.pem --ssl-crlpath=$MYSQL_TEST_DIR/std_data/crldir test -e "SHOW VARIABLES like '%ssl%';"
+--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-cert.pem --ssl-crlpath=$MYSQL_TEST_DIR/std_data/crldir test -e "SHOW VARIABLES like '%ssl%';"
 
 --echo # try logging in with a certificate in the server's --ssl-crlpath : should fail
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 --error 1
---exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-cert.pem test -e "SHOW VARIABLES like '%ssl%';"
+--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-revoked-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-revoked-cert.pem test -e "SHOW VARIABLES like '%ssl%';"

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (Georgi.Kodinov:3905 to 3906) Bug#14006448Georgi Kodinov29 May