postgres
diff --git a/‎src/test/ssl/t/001_ssltests.pl
Lines changed: 2 additions & 3 deletions b/‎src/test/ssl/t/001_ssltests.pl
Lines changed: 2 additions & 3 deletions
diff --git a/‎src/test/ssl/t/SSL/Backend/OpenSSL.pm
Lines changed: 18 additions & 0 deletions b/‎src/test/ssl/t/SSL/Backend/OpenSSL.pm
Lines changed: 18 additions & 0 deletions
diff --git a/‎src/test/ssl/t/SSL/Server.pm
Lines changed: 17 additions & 0 deletions b/‎src/test/ssl/t/SSL/Server.pm
Lines changed: 17 additions & 0 deletions
@@ -35,9 +35,8 @@ sub switch_server_cert
 	$ssl_server->switch_server_cert(@_);
 }
 
-# Determine whether this build uses OpenSSL or LibreSSL. As a heuristic, the
-# HAVE_SSL_CTX_SET_CERT_CB macro isn't defined for LibreSSL.
-my $libressl = not check_pg_config("#define HAVE_SSL_CTX_SET_CERT_CB 1");
+# Determine whether this build uses OpenSSL or LibreSSL.
+my $libressl = $ssl_server->is_libressl;
 
 #### Some configuration
 
 
@@ -26,6 +26,7 @@ package SSL::Backend::OpenSSL;
 
 use strict;
 use warnings FATAL => 'all';
+use PostgreSQL::Test::Utils;
 use File::Basename;
 use File::Copy;
 
@@ -205,6 +206,23 @@ sub get_library
 	return $self->{_library};
 }
 
+=pod
+
+=item $backend->library_is_libressl()
+
+Detect whether the SSL library is LibreSSL.
+
+=cut
+
+sub library_is_libressl
+{
+	my ($self) = @_;
+
+	# The HAVE_SSL_CTX_SET_CERT_CB macro isn't defined for LibreSSL.
+	# We may eventually need a less-bogus heuristic.
+	return not check_pg_config("#define HAVE_SSL_CTX_SET_CERT_CB 1");
+}
+
 # Internal method for copying a set of files, taking into account wildcards
 sub _copy_files
 {
 
@@ -244,6 +244,23 @@ sub ssl_library
 
 =pod
 
+=item $server->is_libressl()
+
+Detect whether the currently used SSL backend is LibreSSL.
+(Ideally we'd not need this hack, but presently we do.)
+
+=cut
+
+sub is_libressl
+{
+	my $self = shift;
+	my $backend = $self->{backend};
+
+	return $backend->library_is_libressl();
+}
+
+=pod
+
 =item switch_server_cert(params)
 
 Change the configuration to use the given set of certificate, key, ca and
Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,8 @@ sub switch_server_cert`
`35`	`35`	`$ssl_server->switch_server_cert(@_);`
`36`	`36`	`}`
`37`	`37`
`38`		`-# Determine whether this build uses OpenSSL or LibreSSL. As a heuristic, the`
`39`		`-# HAVE_SSL_CTX_SET_CERT_CB macro isn't defined for LibreSSL.`
`40`		`-my $libressl = not check_pg_config("#define HAVE_SSL_CTX_SET_CERT_CB 1");`
	`38`	`+# Determine whether this build uses OpenSSL or LibreSSL.`
	`39`	`+my $libressl = $ssl_server->is_libressl;`
`41`	`40`
`42`	`41`	`#### Some configuration`
`43`	`42`