diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/libpq/fe-secure.c | 6 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpq-fe.h | 14 |
2 files changed, 6 insertions, 14 deletions
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c index e63fdf20f94..8d2f7ccb7dd 100644 --- a/src/interfaces/libpq/fe-secure.c +++ b/src/interfaces/libpq/fe-secure.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.76 2006/04/27 00:36:34 momjian Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.77 2006/04/27 00:53:58 momjian Exp $ * * NOTES * [ Most of these notes are wrong/obsolete, but perhaps not all ] @@ -1014,9 +1014,9 @@ SSLerrfree(char *buf) } /* - * Return pointer to SSL object. + * Return pointer to OpenSSL object. */ -SSL * +void * PQgetssl(PGconn *conn) { if (!conn) diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index 36a601a7d7f..0a4263f9968 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-fe.h,v 1.126 2006/03/20 15:07:05 momjian Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-fe.h,v 1.127 2006/04/27 00:53:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,11 +28,6 @@ extern "C" */ #include "postgres_ext.h" -/* SSL type is needed here only to declare PQgetssl() */ -#ifdef USE_SSL -#include <openssl/ssl.h> -#endif - /* Application-visible enum types */ typedef enum @@ -271,12 +266,9 @@ extern int PQbackendPID(const PGconn *conn); extern int PQclientEncoding(const PGconn *conn); extern int PQsetClientEncoding(PGconn *conn, const char *encoding); -#ifdef USE_SSL -/* Get the SSL structure associated with a connection */ -extern SSL *PQgetssl(PGconn *conn); -#else +/* Get the OpenSSL structure associated with a connection. Returns NULL for + * unencrypted connections or if any other TLS library is in use. */ extern void *PQgetssl(PGconn *conn); -#endif /* Tell libpq whether it needs to initialize OpenSSL */ extern void PQinitSSL(int do_init); |