git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Make detection of SSL_CTX_set_min_proto_version more portable

author Peter Eisentraut <peter_e@gmx.net>

2018年11月20日 21:59:36 +0000 (22:59 +0100)

committer Peter Eisentraut <peter_e@gmx.net>

2018年11月20日 21:59:36 +0000 (22:59 +0100)

As already explained in configure.in, using the OpenSSL version number
to detect presence of functions doesn't work, because LibreSSL reports
incompatible version numbers. Fortunately, the functions we need here
are actually macros, so we can just test for them directly.

src/backend/libpq/be-secure-openssl.c patch | blob | blame | history

diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c

index b2b0cccdaedb1fd0927044b4b8a0595c4dcccc96..a910ea2cb40cf1134022b88c118091bcca85cfaa 100644 (file)

--- a/src/backend/libpq/be-secure-openssl.c

+++ b/src/backend/libpq/be-secure-openssl.c

@@ -68,7 +68,7 @@ static bool dummy_ssl_passwd_cb_called = false;

static bool ssl_is_server_start;

static int ssl_protocol_version_to_openssl(int v, const char *guc_name);

-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)

+#ifndef SSL_CTX_set_min_proto_version

static int SSL_CTX_set_min_proto_version(SSL_CTX *ctx, int version);

static int SSL_CTX_set_max_proto_version(SSL_CTX *ctx, int version);