Next part of merge. See TODO for details

9 files changed, 106 insertions, 0 deletions

diff --git a/mysql-test/r/openssl.require b/mysql-test/r/openssl.require
new file mode 100644
index 00000000000..dae48a472b5
--- /dev/null
+++ b/mysql-test/r/openssl.require
@@ -0,0 +1,2 @@
+Variable_name	Value
+have_openssl	YES
diff --git a/mysql-test/r/ssl-crl-revoked-crl.result b/mysql-test/r/ssl-crl-revoked-crl.result
new file mode 100644
index 00000000000..8ecc6a509d3
--- /dev/null
+++ b/mysql-test/r/ssl-crl-revoked-crl.result
@@ -0,0 +1 @@
+# try logging in with a certificate in the server's --ssl-crl : should fail
diff --git a/mysql-test/r/ssl.result b/mysql-test/r/ssl.result
index 53fbb1988e7..14c37c1575d 100644
--- a/mysql-test/r/ssl.result
+++ b/mysql-test/r/ssl.result
@@ -1,6 +1,12 @@
 SHOW STATUS LIKE 'Ssl_cipher';
 Variable_name	Value
 Ssl_cipher	DHE-RSA-AES256-SHA
+SHOW STATUS LIKE 'Ssl_server_not_before';
+Variable_name	Value
+Ssl_server_not_before	Jan 29 11:56:49 2010 GMT
+SHOW STATUS LIKE 'Ssl_server_not_after';
+Variable_name	Value
+Ssl_server_not_after	Jan 28 11:56:49 2015 GMT
 drop table if exists t1,t2,t3,t4;
 CREATE TABLE t1 (
 Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL,
diff --git a/mysql-test/r/ssl_crl.result b/mysql-test/r/ssl_crl.result
new file mode 100644
index 00000000000..570dd9cab06
--- /dev/null
+++ b/mysql-test/r/ssl_crl.result
@@ -0,0 +1,23 @@
+# test --crl for the client : should connect
+Variable_name	Value
+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-server-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-server-key.pem
+# test --crlpath for the client : should connect
+Variable_name	Value
+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-server-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-server-key.pem
+# try logging in with a certificate in the server's --ssl-crl : should fail
diff --git a/mysql-test/r/ssl_crl_clients-valid.result b/mysql-test/r/ssl_crl_clients-valid.result
new file mode 100644
index 00000000000..f3f47d51846
--- /dev/null
+++ b/mysql-test/r/ssl_crl_clients-valid.result
@@ -0,0 +1,24 @@
+# Test clients with and without CRL lists
+############ Test mysql ##############
+# Test mysql connecting to a server with an empty crl
+Variable_name	Value
+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-cert.pem
+ssl_cipher	
+ssl_crl	
+ssl_crlpath	
+ssl_key	MYSQL_TEST_DIR/std_data/crl-client-key.pem
+# Test mysql connecting to a server with a certificate revoked by -crl
+# Test mysql connecting to a server with a certificate revoked by -crlpath
+############ Test mysqladmin ##############
+# Test mysqladmin connecting to a server with an empty crl
+mysqld is alive
+# Test mysqladmin connecting to a server with a certificate revoked by -crl
+mysqladmin: connect to server at 'localhost' failed
+error: 'SSL connection error: Failed to set ciphers to use'
+# Test mysqladmin connecting to a server with a certificate revoked by -crlpath
+mysqladmin: connect to server at 'localhost' failed
+error: 'SSL connection error: error:00000005:lib(0):func(0):DH lib'
diff --git a/mysql-test/r/ssl_crl_clients.result b/mysql-test/r/ssl_crl_clients.result
new file mode 100644
index 00000000000..3bb9b4ee7e2
--- /dev/null
+++ b/mysql-test/r/ssl_crl_clients.result
@@ -0,0 +1,7 @@
+# Test clients with and without CRL lists
+############ Test mysql ##############
+# Test mysql connecting to a server with a certificate revoked by -crl
+# Test mysql connecting to a server with a certificate revoked by -crlpath
+############ Test mysqladmin ##############
+# Test mysqladmin connecting to a server with a certificate revoked by -crl
+# Test mysqladmin connecting to a server with a certificate revoked by -crlpath
diff --git a/mysql-test/r/ssl_crl_clients_valid.result b/mysql-test/r/ssl_crl_clients_valid.result
new file mode 100644
index 00000000000..32ee72d5c39
--- /dev/null
+++ b/mysql-test/r/ssl_crl_clients_valid.result
@@ -0,0 +1,16 @@
+# Test clients with and without CRL lists
+############ Test mysql ##############
+# Test mysql connecting to a server with an empty crl
+Variable_name	Value
+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_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
+############ Test mysqladmin ##############
+# Test mysqladmin connecting to a server with an empty crl
+mysqld is alive
diff --git a/mysql-test/r/ssl_crl_clrpath.result b/mysql-test/r/ssl_crl_clrpath.result
new file mode 100644
index 00000000000..b4b4d13eca1
--- /dev/null
+++ b/mysql-test/r/ssl_crl_clrpath.result
@@ -0,0 +1,23 @@
+# test --crl for the client : should connect
+Variable_name	Value
+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-server-cert.pem
+ssl_cipher	
+ssl_crl	
+ssl_crlpath	MYSQL_TEST_DIR/std_data/crldir
+ssl_key	MYSQL_TEST_DIR/std_data/crl-server-key.pem
+# test --crlpath for the client : should connect
+Variable_name	Value
+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-server-cert.pem
+ssl_cipher	
+ssl_crl	
+ssl_crlpath	MYSQL_TEST_DIR/std_data/crldir
+ssl_key	MYSQL_TEST_DIR/std_data/crl-server-key.pem
+# try logging in with a certificate in the server's --ssl-crlpath : should fail
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 4b1e525e1df..a193751048c 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -982,6 +982,8 @@ ssl_ca	#
 ssl_capath	#
 ssl_cert	#
 ssl_cipher	#
+ssl_crl	#
+ssl_crlpath	#
 ssl_key	#
 select * from information_schema.session_variables where variable_name like 'ssl%' order by 1;
 VARIABLE_NAME	VARIABLE_VALUE
@@ -989,6 +991,8 @@ SSL_CA	#
 SSL_CAPATH	#
 SSL_CERT	#
 SSL_CIPHER	#
+SSL_CRL	#
+SSL_CRLPATH	#
 SSL_KEY	#
 select @@log_queries_not_using_indexes;
 @@log_queries_not_using_indexes