diff options
| -rw-r--r-- | src/test/ssl/t/001_ssltests.pl | 3 | ||||
| -rw-r--r-- | src/test/ssl/t/002_scram.pl | 1 | ||||
| -rw-r--r-- | src/test/ssl/t/003_sslinfo.pl | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/test/ssl/t/001_ssltests.pl b/src/test/ssl/t/001_ssltests.pl index 4eb181bd041..45f8d4b5308 100644 --- a/src/test/ssl/t/001_ssltests.pl +++ b/src/test/ssl/t/001_ssltests.pl @@ -56,6 +56,7 @@ foreach my $keyfile (@keys) chmod 0600, "$cert_tempdir/$keyfile" or die "failed to change permissions on $cert_tempdir/$keyfile: $!"; $key{$keyfile} = PostgreSQL::Test::Utils::perl2host("$cert_tempdir/$keyfile"); + $key{$keyfile} =~ s!\\!/!g if $PostgreSQL::Test::Utils::windows_os; } # Also make a copy of that explicitly world-readable. We can't @@ -67,7 +68,7 @@ copy("ssl/client.key", "$cert_tempdir/client_wrongperms.key") chmod 0644, "$cert_tempdir/client_wrongperms.key" or die "failed to change permissions on $cert_tempdir/client_wrongperms.key: $!"; $key{'client_wrongperms.key'} = PostgreSQL::Test::Utils::perl2host("$cert_tempdir/client_wrongperms.key"); - +$key{'client_wrongperms.key'} =~ s!\\!/!g if $PostgreSQL::Test::Utils::windows_os; #### Set up the server. note "setting up data directory"; diff --git a/src/test/ssl/t/002_scram.pl b/src/test/ssl/t/002_scram.pl index b965ff038a5..1c14bb62e62 100644 --- a/src/test/ssl/t/002_scram.pl +++ b/src/test/ssl/t/002_scram.pl @@ -102,6 +102,7 @@ copy("ssl/client.key", "$cert_tempdir/client_scram.key") "couldn't copy ssl/client_key to $cert_tempdir/client_scram.key for permission change: $!"; chmod 0600, "$cert_tempdir/client_scram.key" or die "failed to change permissions on $cert_tempdir/client_scram.key: $!"; +$client_tmp_key =~ s!\\!/!g if $PostgreSQL::Test::Utils::windows_os; $node->connect_fails( "sslcert=ssl/client.crt sslkey=$client_tmp_key sslrootcert=invalid hostaddr=$SERVERHOSTADDR dbname=certdb user=ssltestuser channel_binding=require", "Cert authentication and channel_binding=require", diff --git a/src/test/ssl/t/003_sslinfo.pl b/src/test/ssl/t/003_sslinfo.pl index 448742129f4..61300402830 100644 --- a/src/test/ssl/t/003_sslinfo.pl +++ b/src/test/ssl/t/003_sslinfo.pl @@ -44,6 +44,7 @@ copy("ssl/client_ext.key", "$cert_tempdir/client_ext.key") "couldn't copy ssl/client_ext.key to $cert_tempdir/client_ext.key for permissions change: $!"; chmod 0600, "$cert_tempdir/client_ext.key" or die "failed to change permissions on $cert_tempdir/client_ext.key: $!"; +$client_tmp_key =~ s!\\!/!g if $PostgreSQL::Test::Utils::windows_os; #### Set up the server. |