Commit 27f8d830 authored Mar 29, 2007 by unknown

Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my50-bug25309

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/t/openssl_1.test:
  Auto merged

parents 8b873c3f 40df5f68

mysql-test/r/openssl_1.result

+2 −0

Original line number	Diff line number	Diff line
		@@ -51,3 +51,5 @@ SSL error: Unable to get private key from ''
		mysqltest: Could not open connection 'default': 2026 SSL connection error
		SSL error: Unable to get certificate from ''
		mysqltest: Could not open connection 'default': 2026 SSL connection error
		Variable_name Value
		Ssl_cipher DHE-RSA-AES256-SHA

mysql-test/t/openssl_1.test

+8 −1

Original line number	Diff line number	Diff line
		@@ -96,4 +96,11 @@ drop table t1;
		--error 1
		--exec $MYSQL_TEST --ssl-cert= --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1


		#
		# Bug#25309 SSL connections without CA certificate broken since MySQL 5.0.23
		#
		# Test that we can open encrypted connection to server without
		# verification of servers certificate by setting both ca certificate
		# and ca path to NULL
		#
		--exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1

vio/viosslfactories.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -301,6 +301,14 @@ new_VioSSLConnectorFd(const char key_file, const char cert_file,
		{
		struct st_VioSSLFd *ssl_fd;
		int verify= SSL_VERIFY_PEER;

		/*
		Turn off verification of servers certificate if both
		ca_file and ca_path is set to NULL
		*/
		if (ca_file == 0 && ca_path == 0)
		verify= SSL_VERIFY_NONE;

		if (!(ssl_fd= new_VioSSLFd(key_file, cert_file, ca_file,
		ca_path, cipher, TLSv1_client_method())))
		{