Commit e1cc25f5 authored by Tom Lane's avatar Tom Lane

Fix list of SSL error codes for older OpenSSL versions.

Apparently 1.0.1 lacks SSL_R_VERSION_TOO_HIGH and
SSL_R_VERSION_TOO_LOW.  Per buildfarm.
parent b63dd3d8
...@@ -474,11 +474,13 @@ aloop: ...@@ -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:
......
...@@ -1326,11 +1326,13 @@ open_client_SSL(PGconn *conn) ...@@ -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 ?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment