diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2003-04-10 23:03:08 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2003-04-10 23:03:08 +0000 |
| commit | 5674460bb04e00422e8673f9db720e9bbd545567 (patch) | |
| tree | b1ff356a0f8eff522e2803921fde636d46777056 /src/interfaces | |
| parent | 76b45c98420fdb4b4c079f73d0b00ee8ff682109 (diff) | |
| download | postgresql-5674460bb04e00422e8673f9db720e9bbd545567.tar.gz postgresql-5674460bb04e00422e8673f9db720e9bbd545567.zip | |
Fix error recovery for SSL_read/SSL_write calls.
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/libpq/fe-secure.c | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c index 62ac69d0b4a..beed00b425a 100644 --- a/src/interfaces/libpq/fe-secure.c +++ b/src/interfaces/libpq/fe-secure.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-secure.c,v 1.21 2003/02/03 22:33:51 tgl Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-secure.c,v 1.22 2003/04/10 23:03:08 tgl Exp $ * * NOTES * The client *requires* a valid server certificate. Since @@ -266,19 +266,24 @@ pqsecure_read(PGconn *conn, void *ptr, size_t len) #ifdef USE_SSL if (conn->ssl) { + rloop: n = SSL_read(conn->ssl, ptr, len); switch (SSL_get_error(conn->ssl, n)) { case SSL_ERROR_NONE: break; case SSL_ERROR_WANT_READ: - n = pqsecure_read(conn, ptr, len); - break; + case SSL_ERROR_WANT_WRITE: + /* XXX to support nonblock I/O, we should return 0 here */ + goto rloop; case SSL_ERROR_SYSCALL: if (n == -1) printfPQExpBuffer(&conn->errorMessage, libpq_gettext("SSL SYSCALL error: %s\n"), SOCK_STRERROR(SOCK_ERRNO)); + else + printfPQExpBuffer(&conn->errorMessage, + libpq_gettext("SSL SYSCALL error: EOF detected\n")); break; case SSL_ERROR_SSL: printfPQExpBuffer(&conn->errorMessage, @@ -289,6 +294,10 @@ pqsecure_read(PGconn *conn, void *ptr, size_t len) SOCK_ERRNO = ECONNRESET; n = -1; break; + default: + printfPQExpBuffer(&conn->errorMessage, + libpq_gettext("Unknown SSL error code\n")); + break; } } else @@ -313,19 +322,24 @@ pqsecure_write(PGconn *conn, const void *ptr, size_t len) #ifdef USE_SSL if (conn->ssl) { + wloop: n = SSL_write(conn->ssl, ptr, len); switch (SSL_get_error(conn->ssl, n)) { case SSL_ERROR_NONE: break; + case SSL_ERROR_WANT_READ: case SSL_ERROR_WANT_WRITE: - n = pqsecure_write(conn, ptr, len); - break; + /* XXX to support nonblock I/O, we should return 0 here */ + goto wloop; case SSL_ERROR_SYSCALL: if (n == -1) printfPQExpBuffer(&conn->errorMessage, libpq_gettext("SSL SYSCALL error: %s\n"), SOCK_STRERROR(SOCK_ERRNO)); + else + printfPQExpBuffer(&conn->errorMessage, + libpq_gettext("SSL SYSCALL error: EOF detected\n")); break; case SSL_ERROR_SSL: printfPQExpBuffer(&conn->errorMessage, @@ -336,6 +350,10 @@ pqsecure_write(PGconn *conn, const void *ptr, size_t len) SOCK_ERRNO = ECONNRESET; n = -1; break; + default: + printfPQExpBuffer(&conn->errorMessage, + libpq_gettext("Unknown SSL error code\n")); + break; } } else |