git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c

index e63fdf20f943695bef3a5624677b50e346827b5d..8d2f7ccb7dd5f6825caf981c288e5aa1b8c48a92 100644 (file)

--- a/src/interfaces/libpq/fe-secure.c

+++ b/src/interfaces/libpq/fe-secure.c

*

*

* 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 ]

}

/*

- * 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 36a601a7d7ff0f8df112ba951371720bd0c9d356..0a4263f9968933a39190ae3c13d79d6b7aba9875 100644 (file)

--- a/src/interfaces/libpq/libpq-fe.h

+++ b/src/interfaces/libpq/libpq-fe.h

* 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 $

*

*-------------------------------------------------------------------------

*/

*/

#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

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);