diff options
| author | Heikki Linnakangas | 2024-04-30 05:22:24 +0000 |
|---|---|---|
| committer | Heikki Linnakangas | 2024-04-30 05:22:24 +0000 |
| commit | 5bcbe9813bf91bcf14ef3a580162f1600dd3d1d4 (patch) | |
| tree | 12cbf5136b85047d9bd8f5605e8bf2c30b53fe01 | |
| parent | b7dc5da1969cb0756739feb393eea51a8265ca04 (diff) | |
Fix compilation on OpenSSL 1.0.2 and LibreSSL
SSL_AD_NO_APPLICATION_PROTOCOL was introduced in OpenSSL 1.1.0.
While we're at it, add a link to the related OpenSSL github issue to
the comment.
Per buildfarm and Tom Lane.
Discussion: https://www.postgresql.org/message-id/[email protected]
| -rw-r--r-- | src/interfaces/libpq/fe-secure-openssl.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c index ee1a47f2b1..4f8ec3221e 100644 --- a/src/interfaces/libpq/fe-secure-openssl.c +++ b/src/interfaces/libpq/fe-secure-openssl.c @@ -1741,17 +1741,21 @@ SSLerrmessage(unsigned long ecode) return errbuf; } + /* + * Server aborted the connection with TLS "no_application_protocol" alert. + * The ERR_reason_error_string() function doesn't give any error string + * for that for some reason, so do it ourselves. See + * https://github.com/openssl/openssl/issues/24300. This is available in + * OpenSSL 1.1.0 and later, but as of this writing not in LibreSSL. + */ +#ifdef SSL_AD_NO_APPLICATION_PROTOCOL if (ERR_GET_LIB(ecode) == ERR_LIB_SSL && ERR_GET_REASON(ecode) == SSL_AD_REASON_OFFSET + SSL_AD_NO_APPLICATION_PROTOCOL) { - /* - * Server aborted the connection with TLS "no_application_protocol" - * alert. The ERR_reason_error_string() function doesn't give any - * error string for that for some reason, so do it ourselves. - */ snprintf(errbuf, SSL_ERR_LEN, libpq_gettext("no application protocol")); return errbuf; } +#endif /* * In OpenSSL 3.0.0 and later, ERR_reason_error_string randomly refuses to |