database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-24 00:23:06 +03:00
Code Activity

SSL_read/SSL_write do not approximate the return conventions of recv()

Browse Source 
and send() very well at all; and in any case we can't use retval==0
for EOF due to race conditions.  Make the same fixes in the backend as
are required in libpq.
This commit is contained in:
Tom Lane
2003-08-04 17:58:25 +00:00
parent 5365a0cf52
commit d1f35b73ac
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/backend/libpq/be-secure.c
View File

@@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.15.2.11 2003/04/10 23:03:13 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.15.2.12 2003/08/04 17:58:25 tgl Exp $
* *
* Since the server static private key ($DataDir/server.key) * Since the server static private key ($DataDir/server.key)
* will normally be stored unencrypted so that the database * will normally be stored unencrypted so that the database
@@ -287,18 +287,22 @@ secure_read(Port *port, void *ptr, size_t len)
if (n == -1) if (n == -1)
elog(COMMERROR, "SSL SYSCALL error: %m"); elog(COMMERROR, "SSL SYSCALL error: %m");
else else
{
elog(COMMERROR, "SSL SYSCALL error: EOF detected"); elog(COMMERROR, "SSL SYSCALL error: EOF detected");
errno = ECONNRESET;
n = -1;
}
break; break;
case SSL_ERROR_SSL: case SSL_ERROR_SSL:
elog(COMMERROR, "SSL error: %s", SSLerrmessage()); elog(COMMERROR, "SSL error: %s", SSLerrmessage());
/* fall through */ /* fall through */
case SSL_ERROR_ZERO_RETURN: case SSL_ERROR_ZERO_RETURN:
secure_close(port);
errno = ECONNRESET; errno = ECONNRESET;
n = -1; n = -1;
break; break;
default: default:
elog(COMMERROR, "Unknown SSL error code"); elog(COMMERROR, "Unknown SSL error code");
n = -1;
break; break;
} }
} }
@@ -352,18 +356,22 @@ secure_write(Port *port, void *ptr, size_t len)
if (n == -1) if (n == -1)
elog(COMMERROR, "SSL SYSCALL error: %m"); elog(COMMERROR, "SSL SYSCALL error: %m");
else else
{
elog(COMMERROR, "SSL SYSCALL error: EOF detected"); elog(COMMERROR, "SSL SYSCALL error: EOF detected");
errno = ECONNRESET;
n = -1;
}
break; break;
case SSL_ERROR_SSL: case SSL_ERROR_SSL:
elog(COMMERROR, "SSL error: %s", SSLerrmessage()); elog(COMMERROR, "SSL error: %s", SSLerrmessage());
/* fall through */ /* fall through */
case SSL_ERROR_ZERO_RETURN: case SSL_ERROR_ZERO_RETURN:
secure_close(port);
errno = ECONNRESET; errno = ECONNRESET;
n = -1; n = -1;
break; break;
default: default:
elog(COMMERROR, "Unknown SSL error code"); elog(COMMERROR, "Unknown SSL error code");
n = -1;
break; break;
} }
} }