Merge pilot.(none):/data/msvensson/mysql/yassl_import/my50-yassl_import (c2b81701) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/t/rpl_ssl.test

+15 −0

Original line number	Diff line number	Diff line
		@@ -41,24 +41,39 @@ select * from t1;

		# Do the same thing a number of times
		disable_query_log;
		disable_result_log;
		let $i= 100;
		while ($i)
		{
		start slave;
		connection master;
		insert into t1 values (NULL);
		select * from t1; # Some variance
		connection slave;
		select * from t1; # Some variance
		stop slave;
		dec $i;
		}
		start slave;
		enable_query_log;
		enable_result_log;
		connection master;
		insert into t1 values (NULL);
		let $master_count= `select count(*) from t1`;

		sync_slave_with_master;
		--source include/wait_for_slave_to_start.inc
		--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT
		--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
		query_vertical show slave status;

		let $slave_count= `select count(*) from t1`;

		if (`select $slave_count != $master_count`)
		{
		echo master and slave differed in number of rows;
		echo master: $master_count;
		echo slave: $slave_count;
		}

		--echo End of 5.0 tests

vio/viossl.c

+46 −96

Original line number	Diff line number	Diff line
		@@ -172,67 +172,79 @@ void vio_ssl_delete(Vio *vio)
		vio_delete(vio);
		}


		int sslaccept(struct st_VioSSLFd ptr, Vio vio, long timeout)
		{
		DBUG_ENTER("sslaccept");
		DBUG_RETURN(sslconnect(ptr, vio, timeout));
		}


		int sslconnect(struct st_VioSSLFd ptr, Vio vio, long timeout)
		{
		SSL *ssl;
		my_bool unused;
		my_bool net_blocking;
		enum enum_vio_type old_type;
		DBUG_ENTER("sslaccept");
		DBUG_PRINT("enter", ("sd: %d ptr: 0x%lx, timeout: %ld",
		vio->sd, (long) ptr, timeout));
		my_bool was_blocking;

		old_type= vio->type;
		net_blocking= vio_is_blocking(vio);
		vio_blocking(vio, 1, &unused); /* Must be called before reset */
		vio_reset(vio, VIO_TYPE_SSL, vio->sd, 0, FALSE);
		DBUG_ENTER("sslconnect");
		DBUG_PRINT("enter", ("ptr: 0x%lx, sd: %d ctx: 0x%lx",
		(long) ptr, vio->sd, (long) ptr->ssl_context));

		/* Set socket to blocking if not already set */
		vio_blocking(vio, 1, &was_blocking);

		if (!(ssl= SSL_new(ptr->ssl_context)))
		{
		DBUG_PRINT("error", ("SSL_new failure"));
		report_errors(ssl);
		vio_reset(vio, old_type,vio->sd,0,FALSE);
		vio_blocking(vio, net_blocking, &unused);
		vio_blocking(vio, was_blocking, &unused);
		DBUG_RETURN(1);
		}
		vio->ssl_arg= (void*)ssl;
		DBUG_PRINT("info", ("ssl: 0x%lx timeout: %ld", (long) ssl, timeout));
		SSL_clear(ssl);
		SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout);
		SSL_set_fd(ssl, vio->sd);
		if (SSL_accept(ssl) < 1)

		/*
		SSL_do_handshake will select between SSL_connect
		or SSL_accept depending on server or client side
		*/
		if (SSL_do_handshake(ssl) < 1)
		{
		DBUG_PRINT("error", ("SSL_accept failure"));
		DBUG_PRINT("error", ("SSL_do_handshake failure"));
		report_errors(ssl);
		SSL_free(ssl);
		vio->ssl_arg= 0;
		vio_reset(vio, old_type,vio->sd,0,FALSE);
		vio_blocking(vio, net_blocking, &unused);
		vio_blocking(vio, was_blocking, &unused);
		DBUG_RETURN(1);
		}

		#ifndef DBUG_OFF
		{
		char buf[1024];
		X509 *client_cert;
		DBUG_PRINT("info",("cipher_name= '%s'", SSL_get_cipher_name(ssl)));
		/*
		Connection succeeded. Install new function handlers,
		change type, set sd to the fd used when connecting
		and set pointer to the SSL structure
		*/
		vio_reset(vio, VIO_TYPE_SSL, SSL_get_fd(ssl), 0, 0);
		vio->ssl_arg= (void*)ssl;

		if ((client_cert= SSL_get_peer_certificate (ssl)))
		#ifndef DBUG_OFF
		{
		DBUG_PRINT("info",("Client certificate:"));
		X509_NAME_oneline (X509_get_subject_name (client_cert),
		buf, sizeof(buf));
		DBUG_PRINT("info",("\t subject: %s", buf));
		/* Print some info about the peer */
		X509 *cert;
		char buf[512];

		X509_NAME_oneline (X509_get_issuer_name (client_cert),
		buf, sizeof(buf));
		DBUG_PRINT("info",("\t issuer: %s", buf));
		DBUG_PRINT("info",("SSL connection succeeded"));
		DBUG_PRINT("info",("Using cipher: '%s'" , SSL_get_cipher_name(ssl)));

		X509_free (client_cert);
		if ((cert= SSL_get_peer_certificate (ssl)))
		{
		DBUG_PRINT("info",("Peer certificate:"));
		X509_NAME_oneline(X509_get_subject_name(cert), buf, sizeof(buf));
		DBUG_PRINT("info",("\t subject: '%s'", buf));
		X509_NAME_oneline(X509_get_issuer_name(cert), buf, sizeof(buf));
		DBUG_PRINT("info",("\t issuer: '%s'", buf));
		X509_free(cert);
		}
		else
		DBUG_PRINT("info",("Client does not have certificate."));
		DBUG_PRINT("info",("Peer does not have certificate."));

		if (SSL_get_shared_ciphers(ssl, buf, sizeof(buf)))
		{
		@@ -247,68 +259,6 @@ int sslaccept(struct st_VioSSLFd ptr, Vio vio, long timeout)
		}


		int sslconnect(struct st_VioSSLFd ptr, Vio vio, long timeout)
		{
		SSL *ssl;
		my_bool unused;
		my_bool net_blocking;
		enum enum_vio_type old_type;

		DBUG_ENTER("sslconnect");
		DBUG_PRINT("enter", ("sd: %d ptr: 0x%lx ctx: 0x%lx",
		vio->sd, (long) ptr, (long) ptr->ssl_context));

		old_type= vio->type;
		net_blocking= vio_is_blocking(vio);
		vio_blocking(vio, 1, &unused); /* Must be called before reset */
		vio_reset(vio, VIO_TYPE_SSL, vio->sd, 0, FALSE);
		if (!(ssl= SSL_new(ptr->ssl_context)))
		{
		DBUG_PRINT("error", ("SSL_new failure"));
		report_errors(ssl);
		vio_reset(vio, old_type, vio->sd, 0, FALSE);
		vio_blocking(vio, net_blocking, &unused);
		DBUG_RETURN(1);
		}
		vio->ssl_arg= (void*)ssl;
		DBUG_PRINT("info", ("ssl: 0x%lx timeout: %ld", (long) ssl, timeout));
		SSL_clear(ssl);
		SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout);
		SSL_set_fd(ssl, vio->sd);
		if (SSL_connect(ssl) < 1)
		{
		DBUG_PRINT("error", ("SSL_connect failure"));
		report_errors(ssl);
		SSL_free(ssl);
		vio->ssl_arg= 0;
		vio_reset(vio, old_type, vio->sd, 0, FALSE);
		vio_blocking(vio, net_blocking, &unused);
		DBUG_RETURN(1);
		}
		#ifndef DBUG_OFF
		{
		X509 *server_cert;
		DBUG_PRINT("info",("cipher_name: '%s'" , SSL_get_cipher_name(ssl)));

		if ((server_cert= SSL_get_peer_certificate (ssl)))
		{
		char buf[256];
		DBUG_PRINT("info",("Server certificate:"));
		X509_NAME_oneline(X509_get_subject_name(server_cert), buf, sizeof(buf));
		DBUG_PRINT("info",("\t subject: %s", buf));
		X509_NAME_oneline (X509_get_issuer_name(server_cert), buf, sizeof(buf));
		DBUG_PRINT("info",("\t issuer: %s", buf));
		X509_free (server_cert);
		}
		else
		DBUG_PRINT("info",("Server does not have certificate."));
		}
		#endif

		DBUG_RETURN(0);
		}


		int vio_ssl_blocking(Vio *vio __attribute__((unused)),
		my_bool set_blocking_mode,
		my_bool *old_mode)