0002-nss-handle-NULL-host.patch
text/x-patch
Filename: 0002-nss-handle-NULL-host.patch
Type: text/x-patch
Part: 1
Patch
Format: format-patch
Series: patch 0002
Subject: nss: handle NULL host
| File | + | − |
|---|---|---|
| src/interfaces/libpq/fe-secure-nss.c | 5 | 2 |
From 2a23b00084538d9d9849a1ca46d054c1c84c53c3 Mon Sep 17 00:00:00 2001 From: Jacob Champion <pchampion@vmware.com> Date: Mon, 19 Jul 2021 10:29:45 -0700 Subject: [PATCH 2/4] nss: handle NULL host ...in the case that we're using a hostaddr instead. --- src/interfaces/libpq/fe-secure-nss.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/interfaces/libpq/fe-secure-nss.c b/src/interfaces/libpq/fe-secure-nss.c index 87e18fdde2..cc66f5bb8c 100644 --- a/src/interfaces/libpq/fe-secure-nss.c +++ b/src/interfaces/libpq/fe-secure-nss.c @@ -183,6 +183,7 @@ pgtls_open_client(PGconn *conn) PRFileDesc *model; NSSInitParameters params; SSLVersionRange desired_range; + const char *host; #ifdef ENABLE_THREAD_SAFETY #ifdef WIN32 @@ -449,9 +450,11 @@ pgtls_open_client(PGconn *conn) /* * Specify which hostname we are expecting to talk to for the ClientHello - * SNI extension. + * SNI extension. TODO: what if the host is an IP address? */ - SSL_SetURL(conn->pr_fd, (conn->connhost[conn->whichhost]).host); + host = conn->connhost[conn->whichhost].host; + if (host && host[0]) + SSL_SetURL(conn->pr_fd, host); status = SSL_ForceHandshake(conn->pr_fd); -- 2.25.1