From d87de7ec139023b6e7f9c808e70913e919047b18 Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Wed, 4 Sep 2024 15:20:00 +0200 Subject: [PATCH v5 2/2] Review comments --- src/backend/libpq/be-secure-openssl.c | 18 +++++------------- src/interfaces/libpq/fe-secure-openssl.c | 17 +++++------------ 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c index 1f86b0cd98..b248ab384c 100644 --- a/src/backend/libpq/be-secure-openssl.c +++ b/src/backend/libpq/be-secure-openssl.c @@ -993,30 +993,22 @@ port_bio_method(void) static int ssl_set_port_bio(Port *port) { - int ret = 0; BIO *bio; BIO_METHOD *bio_method; bio_method = port_bio_method(); if (bio_method == NULL) - { - SSLerr(SSL_F_SSL_SET_FD, ERR_R_BUF_LIB); - goto err; - } - bio = BIO_new(bio_method); + return 0; + bio = BIO_new(bio_method); if (bio == NULL) - { - SSLerr(SSL_F_SSL_SET_FD, ERR_R_BUF_LIB); - goto err; - } + return 0; + BIO_set_data(bio, port); BIO_set_init(bio, 1); SSL_set_bio(port->ssl, bio, bio); - ret = 1; -err: - return ret; + return 1; } /* diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c index 420443a031..6739e009bd 100644 --- a/src/interfaces/libpq/fe-secure-openssl.c +++ b/src/interfaces/libpq/fe-secure-openssl.c @@ -1814,29 +1814,22 @@ err: static int ssl_set_pgconn_bio(PGconn *conn) { - int ret = 0; BIO *bio; BIO_METHOD *bio_method; bio_method = pgconn_bio_method(); if (bio_method == NULL) - { - SSLerr(SSL_F_SSL_SET_FD, ERR_R_BUF_LIB); - goto err; - } + return 0; + bio = BIO_new(bio_method); if (bio == NULL) - { - SSLerr(SSL_F_SSL_SET_FD, ERR_R_BUF_LIB); - goto err; - } + return 0; + BIO_set_data(bio, conn); BIO_set_init(bio, 1); SSL_set_bio(conn->ssl, bio, bio); - ret = 1; -err: - return ret; + return 1; } /* -- 2.39.3 (Apple Git-146)