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

Refactor OpenSSL initialization and certificate date adjustment for improved clarity and consistency

m3hm3t/pg18_rel_oid_2
Mehmet Yilmaz 2025-05-16 13:14:19 +00:00
parent a70baadecb
commit 3e401a75dc
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/distributed/metadata/node_metadata.c
View File

@ -2970,11 +2970,11 @@ DeleteNodeRow(char *nodeName, int32 nodePort)
/* PG 18+ adds a bool “deferrable_ok” parameter */ /* PG 18+ adds a bool “deferrable_ok” parameter */
Relation replicaIndex = Relation replicaIndex =
index_open(RelationGetPrimaryKeyIndex(pgDistNode, false), index_open(RelationGetPrimaryKeyIndex(pgDistNode, false),
RowExclusiveLock); AccessShareLock);
#else #else
Relation replicaIndex = Relation replicaIndex =
index_open(RelationGetPrimaryKeyIndex(pgDistNode), index_open(RelationGetPrimaryKeyIndex(pgDistNode),
RowExclusiveLock); AccessShareLock);
#endif #endif

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

@ -239,18 +239,20 @@ CreateCertificatesWhenNeeded()
SSL_CTX *sslContext = NULL; SSL_CTX *sslContext = NULL;
/* /*
* Ensure the OpenSSL library is initialized so we can create our SSL context. * Ensure the OpenSSL library is initialized so we can create our SSL context.
* On OpenSSL ≥ 1.1.0 we call OPENSSL_init_ssl() (which also loads the default * On OpenSSL ≥ 1.1.0 we call OPENSSL_init_ssl() (which also loads the default
* config), and on older versions we fall back to SSL_library_init(). * config), and on older versions we fall back to SSL_library_init().
* PostgreSQL itself will perform its full SSL setup when it reloads * PostgreSQL itself will perform its full SSL setup when it reloads
* its configuration with ssl enabled. * its configuration with ssl enabled.
*/ */
#if OPENSSL_VERSION_NUMBER >= 0x10100000L #if OPENSSL_VERSION_NUMBER >= 0x10100000L
/* OpenSSL 1.1.0+ */
OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL); /* OpenSSL 1.1.0+ */
OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL);
#else #else
/* OpenSSL < 1.1.0 */
SSL_library_init(); /* OpenSSL < 1.1.0 */
SSL_library_init();
#endif #endif
sslContext = SSL_CTX_new(SSLv23_method()); sslContext = SSL_CTX_new(SSLv23_method());
@ -383,13 +385,15 @@ CreateCertificate(EVP_PKEY *privateKey)
* expiration date and then suddenly erroring out. * expiration date and then suddenly erroring out.
*/ */
#if OPENSSL_VERSION_NUMBER >= 0x10100000L #if OPENSSL_VERSION_NUMBER >= 0x10100000L
/* OpenSSL 1.1.0+ */
X509_gmtime_adj(X509_getm_notBefore(certificate), 0); /* OpenSSL 1.1.0+ */
X509_gmtime_adj(X509_getm_notAfter (certificate), 0); X509_gmtime_adj(X509_getm_notBefore(certificate), 0);
X509_gmtime_adj(X509_getm_notAfter(certificate), 0);
#else #else
/* OpenSSL < 1.1.0 */
X509_gmtime_adj(X509_get_notBefore(certificate), 0); /* OpenSSL < 1.1.0 */
X509_gmtime_adj(X509_get_notAfter (certificate), 0); X509_gmtime_adj(X509_get_notBefore(certificate), 0);
X509_gmtime_adj(X509_get_notAfter(certificate), 0);
#endif #endif
/* Set the public key for our certificate */ /* Set the public key for our certificate */