Reindent Perl files with perltidy version 20170521.

Discussion: https://postgr.es/m/CABUevEzK3cNiHZQ18f5tK0guoT+cN_jWeVzhYYxY=r+1Q3SmoA@mail.gmail.com

2 files changed, 200 insertions, 149 deletions

diff --git a/src/test/ssl/t/001_ssltests.pl b/src/test/ssl/t/001_ssltests.pl
index 91feac613e..956de962ca 100644
--- a/src/test/ssl/t/001_ssltests.pl
+++ b/src/test/ssl/t/001_ssltests.pl
@@ -53,26 +53,28 @@ configure_test_server_for_ssl($node, $SERVERHOSTADDR, 'trust');
 
 note "testing password-protected keys";
 
-open my $sslconf, '>', $node->data_dir."/sslconfig.conf";
+open my $sslconf, '>', $node->data_dir . "/sslconfig.conf";
 print $sslconf "ssl=on\n";
 print $sslconf "ssl_cert_file='server-cn-only.crt'\n";
 print $sslconf "ssl_key_file='server-password.key'\n";
 print $sslconf "ssl_passphrase_command='echo wrongpassword'\n";
 close $sslconf;
 
-command_fails(['pg_ctl', '-D', $node->data_dir, '-l', $node->logfile, 'restart'],
-			  'restart fails with password-protected key file with wrong password');
+command_fails(
+	[ 'pg_ctl', '-D', $node->data_dir, '-l', $node->logfile, 'restart' ],
+	'restart fails with password-protected key file with wrong password');
 $node->_update_pid(0);
 
-open $sslconf, '>', $node->data_dir."/sslconfig.conf";
+open $sslconf, '>', $node->data_dir . "/sslconfig.conf";
 print $sslconf "ssl=on\n";
 print $sslconf "ssl_cert_file='server-cn-only.crt'\n";
 print $sslconf "ssl_key_file='server-password.key'\n";
 print $sslconf "ssl_passphrase_command='echo secret1'\n";
 close $sslconf;
 
-command_ok(['pg_ctl', '-D', $node->data_dir, '-l', $node->logfile, 'restart'],
-		   'restart succeeds with password-protected key file');
+command_ok(
+	[ 'pg_ctl', '-D', $node->data_dir, '-l', $node->logfile, 'restart' ],
+	'restart succeeds with password-protected key file');
 $node->_update_pid(1);
 
 ### Run client-side tests.
@@ -89,93 +91,110 @@ $common_connstr =
 "user=ssltestuser dbname=trustdb sslcert=invalid hostaddr=$SERVERHOSTADDR host=common-name.pg-ssltest.test";
 
 # The server should not accept non-SSL connections.
-test_connect_fails($common_connstr, "sslmode=disable",
-				   qr/\Qno pg_hba.conf entry\E/,
-				   "server doesn't accept non-SSL connections");
+test_connect_fails(
+	$common_connstr, "sslmode=disable",
+	qr/\Qno pg_hba.conf entry\E/,
+	"server doesn't accept non-SSL connections");
 
 # Try without a root cert. In sslmode=require, this should work. In verify-ca
 # or verify-full mode it should fail.
-test_connect_ok($common_connstr, "sslrootcert=invalid sslmode=require",
-				"connect without server root cert sslmode=require");
-test_connect_fails($common_connstr, "sslrootcert=invalid sslmode=verify-ca",
-				qr/root certificate file "invalid" does not exist/,
-				"connect without server root cert sslmode=verify-ca");
-test_connect_fails($common_connstr, "sslrootcert=invalid sslmode=verify-full",
-				   qr/root certificate file "invalid" does not exist/,
-				   "connect without server root cert sslmode=verify-full");
+test_connect_ok(
+	$common_connstr,
+	"sslrootcert=invalid sslmode=require",
+	"connect without server root cert sslmode=require");
+test_connect_fails(
+	$common_connstr,
+	"sslrootcert=invalid sslmode=verify-ca",
+	qr/root certificate file "invalid" does not exist/,
+	"connect without server root cert sslmode=verify-ca");
+test_connect_fails(
+	$common_connstr,
+	"sslrootcert=invalid sslmode=verify-full",
+	qr/root certificate file "invalid" does not exist/,
+	"connect without server root cert sslmode=verify-full");
 
 # Try with wrong root cert, should fail. (We're using the client CA as the
 # root, but the server's key is signed by the server CA.)
 test_connect_fails($common_connstr,
-				   "sslrootcert=ssl/client_ca.crt sslmode=require",
-				   qr/SSL error/,
-				   "connect with wrong server root cert sslmode=require");
+	"sslrootcert=ssl/client_ca.crt sslmode=require",
+	qr/SSL error/, "connect with wrong server root cert sslmode=require");
 test_connect_fails($common_connstr,
-				   "sslrootcert=ssl/client_ca.crt sslmode=verify-ca",
-				   qr/SSL error/,
-				   "connect with wrong server root cert sslmode=verify-ca");
+	"sslrootcert=ssl/client_ca.crt sslmode=verify-ca",
+	qr/SSL error/, "connect with wrong server root cert sslmode=verify-ca");
 test_connect_fails($common_connstr,
-				   "sslrootcert=ssl/client_ca.crt sslmode=verify-full",
-				   qr/SSL error/,
-				   "connect with wrong server root cert sslmode=verify-full");
+	"sslrootcert=ssl/client_ca.crt sslmode=verify-full",
+	qr/SSL error/, "connect with wrong server root cert sslmode=verify-full");
 
 # Try with just the server CA's cert. This fails because the root file
 # must contain the whole chain up to the root CA.
 test_connect_fails($common_connstr,
-				   "sslrootcert=ssl/server_ca.crt sslmode=verify-ca",
-				   qr/SSL error/,
-				   "connect with server CA cert, without root CA");
+	"sslrootcert=ssl/server_ca.crt sslmode=verify-ca",
+	qr/SSL error/, "connect with server CA cert, without root CA");
 
 # And finally, with the correct root cert.
-test_connect_ok($common_connstr,
-				"sslrootcert=ssl/root+server_ca.crt sslmode=require",
-				"connect with correct server CA cert file sslmode=require");
-test_connect_ok($common_connstr,
-				"sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca",
-				"connect with correct server CA cert file sslmode=verify-ca");
-test_connect_ok($common_connstr,
-				"sslrootcert=ssl/root+server_ca.crt sslmode=verify-full",
-				"connect with correct server CA cert file sslmode=verify-full");
+test_connect_ok(
+	$common_connstr,
+	"sslrootcert=ssl/root+server_ca.crt sslmode=require",
+	"connect with correct server CA cert file sslmode=require");
+test_connect_ok(
+	$common_connstr,
+	"sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca",
+	"connect with correct server CA cert file sslmode=verify-ca");
+test_connect_ok(
+	$common_connstr,
+	"sslrootcert=ssl/root+server_ca.crt sslmode=verify-full",
+	"connect with correct server CA cert file sslmode=verify-full");
 
 # Test with cert root file that contains two certificates. The client should
 # be able to pick the right one, regardless of the order in the file.
-test_connect_ok($common_connstr,
-				"sslrootcert=ssl/both-cas-1.crt sslmode=verify-ca",
-				"cert root file that contains two certificates, order 1");
-test_connect_ok($common_connstr,
-				"sslrootcert=ssl/both-cas-2.crt sslmode=verify-ca",
-				"cert root file that contains two certificates, order 2");
+test_connect_ok(
+	$common_connstr,
+	"sslrootcert=ssl/both-cas-1.crt sslmode=verify-ca",
+	"cert root file that contains two certificates, order 1");
+test_connect_ok(
+	$common_connstr,
+	"sslrootcert=ssl/both-cas-2.crt sslmode=verify-ca",
+	"cert root file that contains two certificates, order 2");
 
 # CRL tests
 
 # Invalid CRL filename is the same as no CRL, succeeds
-test_connect_ok($common_connstr,
-				"sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca sslcrl=invalid",
-				"sslcrl option with invalid file name");
+test_connect_ok(
+	$common_connstr,
+	"sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca sslcrl=invalid",
+	"sslcrl option with invalid file name");
 
 # A CRL belonging to a different CA is not accepted, fails
-test_connect_fails($common_connstr,
-				   "sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca sslcrl=ssl/client.crl",
-				   qr/SSL error/,
-				   "CRL belonging to a different CA");
+test_connect_fails(
+	$common_connstr,
+"sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca sslcrl=ssl/client.crl",
+	qr/SSL error/,
+	"CRL belonging to a different CA");
 
 # With the correct CRL, succeeds (this cert is not revoked)
-test_connect_ok($common_connstr,
-				"sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca sslcrl=ssl/root+server.crl",
-				"CRL with a non-revoked cert");
+test_connect_ok(
+	$common_connstr,
+"sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca sslcrl=ssl/root+server.crl",
+	"CRL with a non-revoked cert");
 
 # Check that connecting with verify-full fails, when the hostname doesn't
 # match the hostname in the server's certificate.
 $common_connstr =
 "user=ssltestuser dbname=trustdb sslcert=invalid sslrootcert=ssl/root+server_ca.crt hostaddr=$SERVERHOSTADDR";
 
-test_connect_ok($common_connstr, "sslmode=require host=wronghost.test",
-				"mismatch between host name and server certificate sslmode=require");
-test_connect_ok($common_connstr, "sslmode=verify-ca host=wronghost.test",
-				"mismatch between host name and server certificate sslmode=verify-ca");
-test_connect_fails($common_connstr, "sslmode=verify-full host=wronghost.test",
-				   qr/\Qserver certificate for "common-name.pg-ssltest.test" does not match host name "wronghost.test"\E/,
-				   "mismatch between host name and server certificate sslmode=verify-full");
+test_connect_ok(
+	$common_connstr,
+	"sslmode=require host=wronghost.test",
+	"mismatch between host name and server certificate sslmode=require");
+test_connect_ok(
+	$common_connstr,
+	"sslmode=verify-ca host=wronghost.test",
+	"mismatch between host name and server certificate sslmode=verify-ca");
+test_connect_fails(
+	$common_connstr,
+	"sslmode=verify-full host=wronghost.test",
+qr/\Qserver certificate for "common-name.pg-ssltest.test" does not match host name "wronghost.test"\E/,
+	"mismatch between host name and server certificate sslmode=verify-full");
 
 # Test Subject Alternative Names.
 switch_server_cert($node, 'server-multiple-alt-names');
@@ -183,20 +202,29 @@ switch_server_cert($node, 'server-multiple-alt-names');
 $common_connstr =
 "user=ssltestuser dbname=trustdb sslcert=invalid sslrootcert=ssl/root+server_ca.crt hostaddr=$SERVERHOSTADDR sslmode=verify-full";
 
-test_connect_ok($common_connstr, "host=dns1.alt-name.pg-ssltest.test",
-				"host name matching with X.509 Subject Alternative Names 1");
-test_connect_ok($common_connstr, "host=dns2.alt-name.pg-ssltest.test",
-				"host name matching with X.509 Subject Alternative Names 2");
-test_connect_ok($common_connstr, "host=foo.wildcard.pg-ssltest.test",
-				"host name matching with X.509 Subject Alternative Names wildcard");
-
-test_connect_fails($common_connstr, "host=wronghost.alt-name.pg-ssltest.test",
-				   qr/\Qserver certificate for "dns1.alt-name.pg-ssltest.test" (and 2 other names) does not match host name "wronghost.alt-name.pg-ssltest.test"\E/,
-				   "host name not matching with X.509 Subject Alternative Names");
-test_connect_fails($common_connstr,
-				   "host=deep.subdomain.wildcard.pg-ssltest.test",
-				   qr/\Qserver certificate for "dns1.alt-name.pg-ssltest.test" (and 2 other names) does not match host name "deep.subdomain.wildcard.pg-ssltest.test"\E/,
-				   "host name not matching with X.509 Subject Alternative Names wildcard");
+test_connect_ok(
+	$common_connstr,
+	"host=dns1.alt-name.pg-ssltest.test",
+	"host name matching with X.509 Subject Alternative Names 1");
+test_connect_ok(
+	$common_connstr,
+	"host=dns2.alt-name.pg-ssltest.test",
+	"host name matching with X.509 Subject Alternative Names 2");
+test_connect_ok(
+	$common_connstr,
+	"host=foo.wildcard.pg-ssltest.test",
+	"host name matching with X.509 Subject Alternative Names wildcard");
+
+test_connect_fails(
+	$common_connstr,
+	"host=wronghost.alt-name.pg-ssltest.test",
+qr/\Qserver certificate for "dns1.alt-name.pg-ssltest.test" (and 2 other names) does not match host name "wronghost.alt-name.pg-ssltest.test"\E/,
+	"host name not matching with X.509 Subject Alternative Names");
+test_connect_fails(
+	$common_connstr,
+	"host=deep.subdomain.wildcard.pg-ssltest.test",
+qr/\Qserver certificate for "dns1.alt-name.pg-ssltest.test" (and 2 other names) does not match host name "deep.subdomain.wildcard.pg-ssltest.test"\E/,
+	"host name not matching with X.509 Subject Alternative Names wildcard");
 
 # Test certificate with a single Subject Alternative Name. (this gives a
 # slightly different error message, that's all)
@@ -205,16 +233,22 @@ switch_server_cert($node, 'server-single-alt-name');
 $common_connstr =
 "user=ssltestuser dbname=trustdb sslcert=invalid sslrootcert=ssl/root+server_ca.crt hostaddr=$SERVERHOSTADDR sslmode=verify-full";
 
-test_connect_ok($common_connstr, "host=single.alt-name.pg-ssltest.test",
-				"host name matching with a single X.509 Subject Alternative Name");
-
-test_connect_fails($common_connstr, "host=wronghost.alt-name.pg-ssltest.test",
-				   qr/\Qserver certificate for "single.alt-name.pg-ssltest.test" does not match host name "wronghost.alt-name.pg-ssltest.test"\E/,
-				   "host name not matching with a single X.509 Subject Alternative Name");
-test_connect_fails($common_connstr,
-				   "host=deep.subdomain.wildcard.pg-ssltest.test",
-				   qr/\Qserver certificate for "single.alt-name.pg-ssltest.test" does not match host name "deep.subdomain.wildcard.pg-ssltest.test"\E/,
-				   "host name not matching with a single X.509 Subject Alternative Name wildcard");
+test_connect_ok(
+	$common_connstr,
+	"host=single.alt-name.pg-ssltest.test",
+	"host name matching with a single X.509 Subject Alternative Name");
+
+test_connect_fails(
+	$common_connstr,
+	"host=wronghost.alt-name.pg-ssltest.test",
+qr/\Qserver certificate for "single.alt-name.pg-ssltest.test" does not match host name "wronghost.alt-name.pg-ssltest.test"\E/,
+	"host name not matching with a single X.509 Subject Alternative Name");
+test_connect_fails(
+	$common_connstr,
+	"host=deep.subdomain.wildcard.pg-ssltest.test",
+qr/\Qserver certificate for "single.alt-name.pg-ssltest.test" does not match host name "deep.subdomain.wildcard.pg-ssltest.test"\E/,
+"host name not matching with a single X.509 Subject Alternative Name wildcard"
+);
 
 # Test server certificate with a CN and SANs. Per RFCs 2818 and 6125, the CN
 # should be ignored when the certificate has both.
@@ -223,13 +257,19 @@ switch_server_cert($node, 'server-cn-and-alt-names');
 $common_connstr =
 "user=ssltestuser dbname=trustdb sslcert=invalid sslrootcert=ssl/root+server_ca.crt hostaddr=$SERVERHOSTADDR sslmode=verify-full";
 
-test_connect_ok($common_connstr, "host=dns1.alt-name.pg-ssltest.test",
-				"certificate with both a CN and SANs 1");
-test_connect_ok($common_connstr, "host=dns2.alt-name.pg-ssltest.test",
-				"certificate with both a CN and SANs 2");
-test_connect_fails($common_connstr, "host=common-name.pg-ssltest.test",
-				   qr/\Qserver certificate for "dns1.alt-name.pg-ssltest.test" (and 1 other name) does not match host name "common-name.pg-ssltest.test"\E/,
-				   "certificate with both a CN and SANs ignores CN");
+test_connect_ok(
+	$common_connstr,
+	"host=dns1.alt-name.pg-ssltest.test",
+	"certificate with both a CN and SANs 1");
+test_connect_ok(
+	$common_connstr,
+	"host=dns2.alt-name.pg-ssltest.test",
+	"certificate with both a CN and SANs 2");
+test_connect_fails(
+	$common_connstr,
+	"host=common-name.pg-ssltest.test",
+qr/\Qserver certificate for "dns1.alt-name.pg-ssltest.test" (and 1 other name) does not match host name "common-name.pg-ssltest.test"\E/,
+	"certificate with both a CN and SANs ignores CN");
 
 # Finally, test a server certificate that has no CN or SANs. Of course, that's
 # not a very sensible certificate, but libpq should handle it gracefully.
@@ -237,13 +277,15 @@ switch_server_cert($node, 'server-no-names');
 $common_connstr =
 "user=ssltestuser dbname=trustdb sslcert=invalid sslrootcert=ssl/root+server_ca.crt hostaddr=$SERVERHOSTADDR";
 
-test_connect_ok($common_connstr,
-				"sslmode=verify-ca host=common-name.pg-ssltest.test",
-				"server certificate without CN or SANs sslmode=verify-ca");
-test_connect_fails($common_connstr,
-				   "sslmode=verify-full host=common-name.pg-ssltest.test",
-				   qr/could not get server's host name from server certificate/,
-				   "server certificate without CN or SANs sslmode=verify-full");
+test_connect_ok(
+	$common_connstr,
+	"sslmode=verify-ca host=common-name.pg-ssltest.test",
+	"server certificate without CN or SANs sslmode=verify-ca");
+test_connect_fails(
+	$common_connstr,
+	"sslmode=verify-full host=common-name.pg-ssltest.test",
+	qr/could not get server's host name from server certificate/,
+	"server certificate without CN or SANs sslmode=verify-full");
 
 # Test that the CRL works
 switch_server_cert($node, 'server-revoked');
@@ -252,13 +294,15 @@ $common_connstr =
 "user=ssltestuser dbname=trustdb sslcert=invalid hostaddr=$SERVERHOSTADDR host=common-name.pg-ssltest.test";
 
 # Without the CRL, succeeds. With it, fails.
-test_connect_ok($common_connstr,
-				"sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca",
-				"connects without client-side CRL");
-test_connect_fails($common_connstr,
-				   "sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca sslcrl=ssl/root+server.crl",
-				   qr/SSL error/,
-				   "does not connect with client-side CRL");
+test_connect_ok(
+	$common_connstr,
+	"sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca",
+	"connects without client-side CRL");
+test_connect_fails(
+	$common_connstr,
+"sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca sslcrl=ssl/root+server.crl",
+	qr/SSL error/,
+	"does not connect with client-side CRL");
 
 ### Server-side tests.
 ###
@@ -270,47 +314,51 @@ $common_connstr =
 "sslrootcert=ssl/root+server_ca.crt sslmode=require dbname=certdb hostaddr=$SERVERHOSTADDR";
 
 # no client cert
-test_connect_fails($common_connstr,
-				   "user=ssltestuser sslcert=invalid",
-				   qr/connection requires a valid client certificate/,
-				   "certificate authorization fails without client cert");
+test_connect_fails(
+	$common_connstr,
+	"user=ssltestuser sslcert=invalid",
+	qr/connection requires a valid client certificate/,
+	"certificate authorization fails without client cert");
 
 # correct client cert
-test_connect_ok($common_connstr,
-				"user=ssltestuser sslcert=ssl/client.crt sslkey=ssl/client_tmp.key",
-				"certificate authorization succeeds with correct client cert");
+test_connect_ok(
+	$common_connstr,
+	"user=ssltestuser sslcert=ssl/client.crt sslkey=ssl/client_tmp.key",
+	"certificate authorization succeeds with correct client cert");
 
 # client key with wrong permissions
-test_connect_fails($common_connstr,
-				   "user=ssltestuser sslcert=ssl/client.crt sslkey=ssl/client_wrongperms_tmp.key",
-				   qr!\Qprivate key file "ssl/client_wrongperms_tmp.key" has group or world access\E!,
-				   "certificate authorization fails because of file permissions");
+test_connect_fails(
+	$common_connstr,
+"user=ssltestuser sslcert=ssl/client.crt sslkey=ssl/client_wrongperms_tmp.key",
+qr!\Qprivate key file "ssl/client_wrongperms_tmp.key" has group or world access\E!,
+	"certificate authorization fails because of file permissions");
 
 # client cert belonging to another user
-test_connect_fails($common_connstr,
-				   "user=anotheruser sslcert=ssl/client.crt sslkey=ssl/client_tmp.key",
-				   qr/certificate authentication failed for user "anotheruser"/,
-				   "certificate authorization fails with client cert belonging to another user");
+test_connect_fails(
+	$common_connstr,
+	"user=anotheruser sslcert=ssl/client.crt sslkey=ssl/client_tmp.key",
+	qr/certificate authentication failed for user "anotheruser"/,
+"certificate authorization fails with client cert belonging to another user");
 
 # revoked client cert
-test_connect_fails($common_connstr,
-				   "user=ssltestuser sslcert=ssl/client-revoked.crt sslkey=ssl/client-revoked_tmp.key",
-				   qr/SSL error/,
-				   "certificate authorization fails with revoked client cert");
+test_connect_fails(
+	$common_connstr,
+"user=ssltestuser sslcert=ssl/client-revoked.crt sslkey=ssl/client-revoked_tmp.key",
+	qr/SSL error/,
+	"certificate authorization fails with revoked client cert");
 
 # intermediate client_ca.crt is provided by client, and isn't in server's ssl_ca_file
 switch_server_cert($node, 'server-cn-only', 'root_ca');
 $common_connstr =
 "user=ssltestuser dbname=certdb sslkey=ssl/client_tmp.key sslrootcert=ssl/root+server_ca.crt hostaddr=$SERVERHOSTADDR";
 
-test_connect_ok($common_connstr,
-				"sslmode=require sslcert=ssl/client+client_ca.crt",
-				"intermediate client certificate is provided by client");
+test_connect_ok(
+	$common_connstr,
+	"sslmode=require sslcert=ssl/client+client_ca.crt",
+	"intermediate client certificate is provided by client");
 test_connect_fails($common_connstr, "sslmode=require sslcert=ssl/client.crt",
-				   qr/SSL error/,
-				   "intermediate client certificate is missing");
+	qr/SSL error/, "intermediate client certificate is missing");
 
 # clean up
-unlink("ssl/client_tmp.key",
-	   "ssl/client_wrongperms_tmp.key",
-	   "ssl/client-revoked_tmp.key");
+unlink("ssl/client_tmp.key", "ssl/client_wrongperms_tmp.key",
+	"ssl/client-revoked_tmp.key");
diff --git a/src/test/ssl/t/002_scram.pl b/src/test/ssl/t/002_scram.pl
index a805a3196b..fa3f856646 100644
--- a/src/test/ssl/t/002_scram.pl
+++ b/src/test/ssl/t/002_scram.pl
@@ -20,7 +20,7 @@ my $SERVERHOSTADDR = '127.0.0.1';
 
 # Determine whether build supports tls-server-end-point.
 my $supports_tls_server_end_point =
-	check_pg_config("#define HAVE_X509_GET_SIGNATURE_NID 1");
+  check_pg_config("#define HAVE_X509_GET_SIGNATURE_NID 1");
 
 # Allocation of base connection string shared among multiple tests.
 my $common_connstr;
@@ -39,38 +39,41 @@ $node->start;
 
 # Configure server for SSL connections, with password handling.
 configure_test_server_for_ssl($node, $SERVERHOSTADDR, "scram-sha-256",
-							  "pass", "scram-sha-256");
+	"pass", "scram-sha-256");
 switch_server_cert($node, 'server-cn-only');
 $ENV{PGPASSWORD} = "pass";
 $common_connstr =
-"user=ssltestuser dbname=trustdb sslmode=require hostaddr=$SERVERHOSTADDR";
+  "user=ssltestuser dbname=trustdb sslmode=require hostaddr=$SERVERHOSTADDR";
 
 # Default settings
 test_connect_ok($common_connstr, '',
-				"SCRAM authentication with default channel binding");
+	"SCRAM authentication with default channel binding");
 
 # Channel binding settings
-test_connect_ok($common_connstr,
+test_connect_ok(
+	$common_connstr,
 	"scram_channel_binding=tls-unique",
 	"SCRAM authentication with tls-unique as channel binding");
-test_connect_ok($common_connstr,
-	"scram_channel_binding=''",
-				"SCRAM authentication without channel binding");
+test_connect_ok($common_connstr, "scram_channel_binding=''",
+	"SCRAM authentication without channel binding");
 if ($supports_tls_server_end_point)
 {
-	test_connect_ok($common_connstr,
-					"scram_channel_binding=tls-server-end-point",
-					"SCRAM authentication with tls-server-end-point as channel binding");
+	test_connect_ok(
+		$common_connstr,
+		"scram_channel_binding=tls-server-end-point",
+		"SCRAM authentication with tls-server-end-point as channel binding");
 }
 else
 {
-	test_connect_fails($common_connstr,
-					"scram_channel_binding=tls-server-end-point",
-					qr/channel binding type "tls-server-end-point" is not supported by this build/,
-					"SCRAM authentication with tls-server-end-point as channel binding");
+	test_connect_fails(
+		$common_connstr,
+		"scram_channel_binding=tls-server-end-point",
+qr/channel binding type "tls-server-end-point" is not supported by this build/,
+		"SCRAM authentication with tls-server-end-point as channel binding");
 	$number_of_tests++;
 }
-test_connect_fails($common_connstr,
+test_connect_fails(
+	$common_connstr,
 	"scram_channel_binding=not-exists",
 	qr/unsupported SCRAM channel-binding type/,
 	"SCRAM authentication with invalid channel binding");