|
|
|
|
@ -11,7 +11,7 @@ |
|
|
|
|
* |
|
|
|
|
* |
|
|
|
|
* IDENTIFICATION |
|
|
|
|
* $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.15.2.2 2002/12/13 22:20:22 momjian Exp $ |
|
|
|
|
* $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.15.2.3 2002/12/14 18:39:39 momjian Exp $ |
|
|
|
|
* |
|
|
|
|
* Since the server static private key ($DataDir/server.key) |
|
|
|
|
* will normally be stored unencrypted so that the database |
|
|
|
|
@ -289,10 +289,10 @@ secure_read(Port *port, void *ptr, size_t len) |
|
|
|
|
break; |
|
|
|
|
case SSL_ERROR_SYSCALL: |
|
|
|
|
if (n == -1) |
|
|
|
|
elog(ERROR, "SSL SYSCALL error: %s", strerror(errno)); |
|
|
|
|
elog(COMMERROR, "SSL SYSCALL error: %s", strerror(errno)); |
|
|
|
|
break; |
|
|
|
|
case SSL_ERROR_SSL: |
|
|
|
|
elog(ERROR, "SSL error: %s", SSLerrmessage()); |
|
|
|
|
elog(COMMERROR, "SSL error: %s", SSLerrmessage()); |
|
|
|
|
/* fall through */ |
|
|
|
|
case SSL_ERROR_ZERO_RETURN: |
|
|
|
|
secure_close(port); |
|
|
|
|
@ -339,10 +339,10 @@ secure_write(Port *port, const void *ptr, size_t len) |
|
|
|
|
break; |
|
|
|
|
case SSL_ERROR_SYSCALL: |
|
|
|
|
if (n == -1) |
|
|
|
|
elog(ERROR, "SSL SYSCALL error: %s", strerror(errno)); |
|
|
|
|
elog(COMMERROR, "SSL SYSCALL error: %s", strerror(errno)); |
|
|
|
|
break; |
|
|
|
|
case SSL_ERROR_SSL: |
|
|
|
|
elog(ERROR, "SSL error: %s", SSLerrmessage()); |
|
|
|
|
elog(COMMERROR, "SSL error: %s", SSLerrmessage()); |
|
|
|
|
/* fall through */ |
|
|
|
|
case SSL_ERROR_ZERO_RETURN: |
|
|
|
|
secure_close(port); |
|
|
|
|
@ -678,7 +678,7 @@ open_server_SSL(Port *port) |
|
|
|
|
!SSL_set_fd(port->ssl, port->sock) || |
|
|
|
|
SSL_accept(port->ssl) <= 0) |
|
|
|
|
{ |
|
|
|
|
elog(ERROR, "failed to initialize SSL connection: %s", SSLerrmessage()); |
|
|
|
|
elog(COMMERROR, "failed to initialize SSL connection: %s", SSLerrmessage()); |
|
|
|
|
close_SSL(port); |
|
|
|
|
return -1; |
|
|
|
|
} |
|
|
|
|
|