diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/pg_config.h.in | 6 | ||||
| -rw-r--r-- | src/port/pg_strong_random.c | 14 |
2 files changed, 7 insertions, 13 deletions
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 427030f31a7..cdd9a6e9355 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -280,9 +280,6 @@ /* Define to 1 if you have the `mkdtemp' function. */ #undef HAVE_MKDTEMP -/* Define to 1 if you have the `OPENSSL_init_ssl' function. */ -#undef HAVE_OPENSSL_INIT_SSL - /* Define to 1 if you have the <ossp/uuid.h> header file. */ #undef HAVE_OSSP_UUID_H @@ -358,6 +355,9 @@ /* Define to 1 if you have the `SSL_CTX_set_cert_cb' function. */ #undef HAVE_SSL_CTX_SET_CERT_CB +/* Define to 1 if you have the `SSL_CTX_set_ciphersuites' function. */ +#undef HAVE_SSL_CTX_SET_CIPHERSUITES + /* Define to 1 if you have the `SSL_CTX_set_num_tickets' function. */ #undef HAVE_SSL_CTX_SET_NUM_TICKETS diff --git a/src/port/pg_strong_random.c b/src/port/pg_strong_random.c index a8efb2b1886..b5f0ea2fdc1 100644 --- a/src/port/pg_strong_random.c +++ b/src/port/pg_strong_random.c @@ -31,7 +31,9 @@ * cryptographically secure, suitable for use e.g. in authentication. * * Before pg_strong_random is called in any process, the generator must first - * be initialized by calling pg_strong_random_init(). + * be initialized by calling pg_strong_random_init(). Initialization is a no- + * op for all supported randomness sources, it is kept to maintain backwards + * compatibility with extensions. * * We rely on system facilities for actually generating the numbers. * We support a number of sources: @@ -50,20 +52,12 @@ #ifdef USE_OPENSSL -#include <openssl/opensslv.h> #include <openssl/rand.h> void pg_strong_random_init(void) { -#if (OPENSSL_VERSION_NUMBER < 0x10101000L) - /* - * Make sure processes do not share OpenSSL randomness state. This is not - * required on LibreSSL and no longer required in OpenSSL 1.1.1 and later - * versions. - */ - RAND_poll(); -#endif + /* No initialization needed */ } bool |