mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix list of SSL error codes for older OpenSSL versions.

Browse Source 
Apparently 1.0.1 lacks SSL_R_VERSION_TOO_HIGH and
SSL_R_VERSION_TOO_LOW.  Per buildfarm.
This commit is contained in:
Tom Lane 2020-06-27 13:26:17 -04:00
parent e2bcd99be1
commit e5f63db995
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/libpq/be-secure-openssl.c
View File

@ -474,11 +474,13 @@ aloop:
case SSL_R_UNKNOWN_PROTOCOL: case SSL_R_UNKNOWN_PROTOCOL:
case SSL_R_UNKNOWN_SSL_VERSION: case SSL_R_UNKNOWN_SSL_VERSION:
case SSL_R_UNSUPPORTED_SSL_VERSION: case SSL_R_UNSUPPORTED_SSL_VERSION:
case SSL_R_VERSION_TOO_HIGH:
case SSL_R_VERSION_TOO_LOW:
case SSL_R_WRONG_SSL_VERSION: case SSL_R_WRONG_SSL_VERSION:
case SSL_R_WRONG_VERSION_NUMBER: case SSL_R_WRONG_VERSION_NUMBER:
case SSL_R_TLSV1_ALERT_PROTOCOL_VERSION: case SSL_R_TLSV1_ALERT_PROTOCOL_VERSION:
#ifdef SSL_R_VERSION_TOO_HIGH
case SSL_R_VERSION_TOO_HIGH:
case SSL_R_VERSION_TOO_LOW:
#endif
give_proto_hint = true; give_proto_hint = true;
break; break;
default: default:

6
src/interfaces/libpq/fe-secure-openssl.c
View File

@ -1326,11 +1326,13 @@ open_client_SSL(PGconn *conn)
case SSL_R_UNKNOWN_PROTOCOL: case SSL_R_UNKNOWN_PROTOCOL:
case SSL_R_UNKNOWN_SSL_VERSION: case SSL_R_UNKNOWN_SSL_VERSION:
case SSL_R_UNSUPPORTED_SSL_VERSION: case SSL_R_UNSUPPORTED_SSL_VERSION:
case SSL_R_VERSION_TOO_HIGH:
case SSL_R_VERSION_TOO_LOW:
case SSL_R_WRONG_SSL_VERSION: case SSL_R_WRONG_SSL_VERSION:
case SSL_R_WRONG_VERSION_NUMBER: case SSL_R_WRONG_VERSION_NUMBER:
case SSL_R_TLSV1_ALERT_PROTOCOL_VERSION: case SSL_R_TLSV1_ALERT_PROTOCOL_VERSION:
#ifdef SSL_R_VERSION_TOO_HIGH
case SSL_R_VERSION_TOO_HIGH:
case SSL_R_VERSION_TOO_LOW:
#endif
appendPQExpBuffer(&conn->errorMessage, appendPQExpBuffer(&conn->errorMessage,
libpq_gettext("This may indicate that the server does not support any SSL protocol version between %s and %s.\n"), libpq_gettext("This may indicate that the server does not support any SSL protocol version between %s and %s.\n"),
conn->ssl_min_protocol_version ? conn->ssl_min_protocol_version ?