database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Add ssl_library preset parameter

Browse Source 
This allows querying the SSL implementation used on the server side.
It's analogous to using PQsslAttribute(conn, "library") in libpq.

Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
This commit is contained in:
Peter Eisentraut
2018-06-26 10:19:35 +02:00
parent ab87b8fedc
commit 98efa76fe3
5 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/backend/libpq/be-secure.c
View File

@ -38,6 +38,7 @@
#include "storage/proc.h"
char *ssl_library;
char *ssl_cert_file;
char *ssl_key_file;
char *ssl_ca_file;

15
src/backend/utils/misc/guc.c
View File

@ -3723,6 +3723,21 @@ static struct config_string ConfigureNamesString[] =
check_canonical_path, NULL, NULL
},
{
{"ssl_library", PGC_INTERNAL, PRESET_OPTIONS,
gettext_noop("Name of the SSL library."),
NULL,
GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE
},
&ssl_library,
#ifdef USE_SSL
"OpenSSL",
#else
"",
#endif
NULL, NULL, NULL
},
{
{"ssl_cert_file", PGC_SIGHUP, CONN_AUTH_SSL,
gettext_noop("Location of the SSL server certificate file."),

1
src/include/libpq/libpq.h
View File

@ -75,6 +75,7 @@ extern int pq_putbytes(const char *s, size_t len);
/*
* prototypes for functions in be-secure.c
*/
extern char *ssl_library;
extern char *ssl_cert_file;
extern char *ssl_key_file;
extern char *ssl_ca_file;

7
src/test/ssl/t/001_ssltests.pl
View File

@ -8,7 +8,7 @@ use File::Copy;
if ($ENV{with_openssl} eq 'yes')
{
plan tests => 64;
plan tests => 65;
}
else
{
@ -49,6 +49,11 @@ $node->init;
$ENV{PGHOST} = $node->host;
$ENV{PGPORT} = $node->port;
$node->start;
# Run this before we lock down access below.
my $result = $node->safe_psql('postgres', "SHOW ssl_library");
is($result, 'OpenSSL', 'ssl_library parameter');
configure_test_server_for_ssl($node, $SERVERHOSTADDR, 'trust');
note "testing password-protected keys";