external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enhance OpenSSL initialization and certificate date adjustment for compatibility with OpenSSL versions

m3hm3t/pg18_rel_oid_2
Mehmet Yilmaz 2025-05-14 12:18:34 +00:00
parent 63c32c0d81
commit a70baadecb
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/backend/distributed/utils/enable_ssl.c
View File

@ -239,14 +239,17 @@ CreateCertificatesWhenNeeded()
SSL_CTX *sslContext = NULL; SSL_CTX *sslContext = NULL;
/* /*
* Since postgres might not have initialized ssl at this point we need to initialize * Ensure the OpenSSL library is initialized so we can create our SSL context.
* it our self to be able to create a context. This code is less extensive then * On OpenSSL ≥ 1.1.0 we call OPENSSL_init_ssl() (which also loads the default
* postgres' initialization but that will happen when postgres reloads its * config), and on older versions we fall back to SSL_library_init().
* configuration with ssl enabled. * PostgreSQL itself will perform its full SSL setup when it reloads
* its configuration with ssl enabled.
*/ */
#ifdef HAVE_OPENSSL_INIT_SSL #if OPENSSL_VERSION_NUMBER >= 0x10100000L
/* OpenSSL 1.1.0+ */
OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL); OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL);
#else #else
/* OpenSSL < 1.1.0 */
SSL_library_init(); SSL_library_init();
#endif #endif
@ -379,8 +382,15 @@ CreateCertificate(EVP_PKEY *privateKey)
* would fail right after an upgrade. Instead of working until the certificate * would fail right after an upgrade. Instead of working until the certificate
* expiration date and then suddenly erroring out. * expiration date and then suddenly erroring out.
*/ */
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
/* OpenSSL 1.1.0+ */
X509_gmtime_adj(X509_getm_notBefore(certificate), 0);
X509_gmtime_adj(X509_getm_notAfter (certificate), 0);
#else
/* OpenSSL < 1.1.0 */
X509_gmtime_adj(X509_get_notBefore(certificate), 0); X509_gmtime_adj(X509_get_notBefore(certificate), 0);
X509_gmtime_adj(X509_get_notAfter(certificate), 0); X509_gmtime_adj(X509_get_notAfter (certificate), 0);
#endif
/* Set the public key for our certificate */ /* Set the public key for our certificate */
X509_set_pubkey(certificate, privateKey); X509_set_pubkey(certificate, privateKey);